From eb704af915e3d188b7f195b3bebda37deb06a836 Mon Sep 17 00:00:00 2001
From: Christian Wolf <git@christianwolf.email>
Date: Mon, 3 Jun 2019 11:59:36 +0200
Subject: [PATCH] List views updated to new structure

---
 src/admin/common/models/position.php       |  2 +-
 src/admin/views/clubs/tmpl/default.php     | 18 ++++++++----------
 src/admin/views/clubs/view.html.php        | 19 ++++++++++++-------
 src/admin/views/positions/tmpl/default.php | 12 +++++-------
 src/admin/views/positions/view.html.php    | 17 ++++++++++++-----
 src/admin/views/users/tmpl/default.php     | 12 ++++++------
 src/admin/views/users/view.html.php        | 17 +++++++++++------
 7 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/src/admin/common/models/position.php b/src/admin/common/models/position.php
index a2e9133..0c836ae 100644
--- a/src/admin/common/models/position.php
+++ b/src/admin/common/models/position.php
@@ -7,7 +7,7 @@ class CommonClubsModelPosition extends AbstractCommonClubsModel
 {
     protected function getFactory()
     {
-        new CommonClubsModelFactoryPosition();
+        return new CommonClubsModelFactoryPosition();
     }
     
     public function getName()
diff --git a/src/admin/views/clubs/tmpl/default.php b/src/admin/views/clubs/tmpl/default.php
index 33c30ea..0dbab60 100644
--- a/src/admin/views/clubs/tmpl/default.php
+++ b/src/admin/views/clubs/tmpl/default.php
@@ -1,7 +1,6 @@
 <?php
 
 // No direct access.
-use Joomla\CMS\Router\Route;
 
 defined('_JEXEC') or die;
 
@@ -11,26 +10,25 @@ defined('_JEXEC') or die;
   <thead>
   <tr>
     <th width='30%'>Bezeichnung</th>
-    <th width='25%'>Stadt</th>
+    <th width='20%'>Stadt</th>
     <th width='20%'>Homepage</th>
-    <th width='25%'>E-Mail</th>
-    <th width='5%'>L&ouml;schen?</th>
-    <th width='5%'>id</th>
+    <th width='20%'>E-Mail</th>
+    <th width='10%'></th>
+    <th width='3%'>id</th>
   </tr>
   </thead>
-<?php foreach($this->clubs as $club): ?>
-<?php $link = Route::_('index.php?option=com_clubs&view=club&id=' . $club->getId()); ?>
+<?php foreach($this->objects as $club): ?>
 <?php $url = htmlentities($club->getHomepage()); ?>
 <?php $mail = htmlentities($club->getMail()); ?>
   <tr>
-    <td><a href='<?php echo $link; ?>'><?php echo htmlentities($club->getName()); ?></a></td>
+    <td><a href='<?php echo str_replace('__ID__', $club->getId(), $this->changeUrl); ?>'><?php echo htmlentities($club->getName()); ?></a></td>
   	<td><?php echo htmlentities($club->getCity()); ?></td>
   	<td><a href='<?php echo $url; ?>' target='_blank'><?php echo $url; ?></a></td>
   	<td><a href='mailto:<?php echo $mail; ?>'><?php echo $mail; ?></a></td>
-  	<td><!--<a href='<?php echo Route::_('index.php?option=com_clubs&task=club.delete&id=' . $club->getId()); ?>'>Del</a> --></td>
+  	<td><a href='<?php echo str_replace('__ID__', $club->getId(), $this->delUrl); ?>'><span class='icon-delete'></span>L&ouml;schen</a></td>
     <td><?php echo htmlentities($club->getId()); ?></td>
   </tr>
 <?php endforeach; ?>
 </table>
 
-<div><a href='<?php echo Route::_('index.php?option=com_clubs&view=club&id=new'); ?>'>Neuen Verein anlegen</a></div>
+<div><a href='<?php echo $this->addUrl; ?>'><span class='icon-new'></span>Neuen Verein anlegen</a></div>
diff --git a/src/admin/views/clubs/view.html.php b/src/admin/views/clubs/view.html.php
index 9124741..91f0630 100644
--- a/src/admin/views/clubs/view.html.php
+++ b/src/admin/views/clubs/view.html.php
@@ -1,22 +1,27 @@
 <?php
 
-use Joomla\CMS\MVC\View\HtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
 // No direct access.
 defined('_JEXEC') or die;
 
-class ClubsViewClubs extends HtmlView
+class ClubsViewClubs extends AbstractClubsViewList
 {
     
     function display($tpl = null)
     {
-//         $this->offers = ClubsOffer::loadOffers();
-        $factory = new CommonClubsModelFactoryClub();
-        $this->clubs = $factory->loadElements();
-        
-        ToolbarHelper::title('Club-Management - Clubs');
+        ToolbarHelper::title('Club-Management - Clubs', 'cube');
         parent::display($tpl);
     }
+    protected function getFactory()
+    {
+        return new CommonClubsModelFactoryClub();
+    }
+
+    protected function getSingleBaseName()
+    {
+        return 'club';
+    }
+
     
 }
diff --git a/src/admin/views/positions/tmpl/default.php b/src/admin/views/positions/tmpl/default.php
index ff8a4fa..6fbb9b3 100644
--- a/src/admin/views/positions/tmpl/default.php
+++ b/src/admin/views/positions/tmpl/default.php
@@ -1,7 +1,6 @@
 <?php
 
 // No direct access.
-use Joomla\CMS\Router\Route;
 
 defined('_JEXEC') or die;
 
@@ -11,18 +10,17 @@ defined('_JEXEC') or die;
   <thead>
   <tr>
     <th width='30%'>Bezeichnung</th>
-    <th width='5%'>L&ouml;schen?</th>
+    <th width='5%'></th>
     <th width='5%'>id</th>
   </tr>
   </thead>
-<?php foreach($this->positions as $position): ?>
-<?php $link = Route::_('index.php?option=com_clubs&view=position&id=' . $position->getId()); ?>
+<?php foreach($this->objects as $position): ?>
   <tr>
-    <td><a href='<?php echo $link; ?>'><?php echo htmlentities($position->getName()); ?></a></td>
-  	<td><a href='<?php echo Route::_('index.php?option=com_clubs&task=position.delete&id=' . $position->getId()); ?>'>Del</a></td>
+    <td><a href='<?php echo str_replace('__ID__', $position->getId(), $this->changeUrl); ?>'><?php echo htmlentities($position->getName()); ?></a></td>
+  	<td><a href='<?php echo str_replace('__ID__', $position->getId(), $this->delUrl); ?>'><span class='icon-delete'></span>L&ouml;schen</a></td>
     <td><?php echo htmlentities($position->getId()); ?></td>
   </tr>
 <?php endforeach; ?>
 </table>
 
-<div><a href='<?php echo Route::_('index.php?option=com_clubs&view=position&id=new'); ?>'>Neuen Posten anlegen</a></div>
+<div><a href='<?php echo $this->addUrl; ?>'><span class='icon-new'></span>Neuen Posten anlegen</a></div>
diff --git a/src/admin/views/positions/view.html.php b/src/admin/views/positions/view.html.php
index d165d50..dd7d94c 100644
--- a/src/admin/views/positions/view.html.php
+++ b/src/admin/views/positions/view.html.php
@@ -1,20 +1,27 @@
 <?php
 
-use Joomla\CMS\MVC\View\HtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
 // No direct access.
 defined('_JEXEC') or die;
 
-class ClubsViewPositions extends HtmlView
+class ClubsViewPositions extends AbstractClubsViewList
 {
     
     function display($tpl = null)
     {
-        $this->positions = ClubsPosition::loadPositions();
-        
-        ToolbarHelper::title('Club-Management - Positionen');
+        ToolbarHelper::title('Club-Management - Positionen', 'users');
         parent::display($tpl);
     }
+    protected function getFactory()
+    {
+        return new CommonClubsModelFactoryPosition();
+    }
+
+    protected function getSingleBaseName()
+    {
+        return 'position';
+    }
+
     
 }
diff --git a/src/admin/views/users/tmpl/default.php b/src/admin/views/users/tmpl/default.php
index fd1c66f..d03b8eb 100644
--- a/src/admin/views/users/tmpl/default.php
+++ b/src/admin/views/users/tmpl/default.php
@@ -14,22 +14,22 @@ defined('_JEXEC') or die;
     <th width='20%'>Name</th>
     <th width='30%'>Ort</th>
     <th width='30%'>E-Mail</th>
-    <th width='5%'>L&ouml;schen?</th>
+    <th width='5%'></th>
     <th width='5%'>id</th>
   </tr>
   </thead>
-<?php foreach($this->users as $user): ?>
-<?php $link = Route::_('index.php?option=com_clubs&view=user&id=' . $user->getId()); ?>
+<?php foreach($this->objects as $user): ?>
+<?php $link = str_replace('__ID__', $user->getId(), $this->changeUrl); ?>
   <tr>
-    <td><a href='<?php echo $link; ?>'><?php echo htmlentities($user->getUser()); ?></a></td>
+    <td><a href='<?php echo $link; ?>'><?php echo htmlentities($user->getUserName()); ?></a></td>
     <td><a href='<?php echo $link; ?>'><?php echo htmlentities($user->getName()); ?></a></td>
     <td><?php echo htmlentities($user->getCity()); ?></td>
     <td><a href='mailto:<?php echo htmlentities($user->getMail()); ?>'><?php echo htmlentities($user->getMail()); ?></a></td>
-  	<td><a href='<?php echo Route::_('index.php?option=com_clubs&task=user.delete&id=' . $user->getId()); ?>'>Del</a></td>
+  	<td><a href='<?php echo str_replace('__ID__', $user->getId(), $this->delUrl); ?>'><span class='icon-delete'></span>L&ouml;schen</a></td>
     <td><?php echo htmlentities($user->getId()); ?></td>
   </tr>
 <?php endforeach; ?>
 </table>
 
-<div><a href='<?php echo Route::_('index.php?option=com_clubs&view=user&id=new'); ?>'>Neuen Benutzer anlegen</a></div>
+<div><a href='<?php echo $this->addUrl; ?>'><span class='icon-new'></span>Neuen Benutzer anlegen</a></div>
 
diff --git a/src/admin/views/users/view.html.php b/src/admin/views/users/view.html.php
index 2b9ce88..6389d88 100644
--- a/src/admin/views/users/view.html.php
+++ b/src/admin/views/users/view.html.php
@@ -1,22 +1,27 @@
 <?php
 
-use Joomla\CMS\MVC\View\HtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 
 // No direct access.
 defined('_JEXEC') or die;
 
-// JLoader::register("ClubsModelUser", JPATH_ROOT . "/administrator/components/com_clubs/models/user.php");
-
-class ClubsViewUsers extends HtmlView
+class ClubsViewUsers extends AbstractClubsViewList
 {
     function display($tpl = null)
     {
-        $this->users = ClubsUser::loadUsers();
-        
         ToolbarHelper::title('Club-Management - Personen', 'user');
         
         parent::display($tpl);
     }
+    protected function getFactory()
+    {
+        return new CommonClubsModelFactoryUser();
+    }
+
+    protected function getSingleBaseName()
+    {
+        return 'user';
+    }
+
     
 }