diff --git a/admin/language/en-GB/com_depot.ini b/admin/language/en-GB/com_depot.ini index 446d2c9..0c6a542 100644 --- a/admin/language/en-GB/com_depot.ini +++ b/admin/language/en-GB/com_depot.ini @@ -20,6 +20,8 @@ COM_DEPOT_FIELD_SELECT_MANUFACTURER="Manufacturer" COM_DEPOT_FIELD_SELECT_STOCK="Stock Location" COM_DEPOT_LEGEND_DETAILS="Component Details" COM_DEPOT_LEGEND_STATISTICS="Component Statistics" +COM_DEPOT_N_ITEMS_DELETED_1="One component deleted" +COM_DEPOT_N_ITEMS_DELETED_MORE="%d components deleted" COM_DEPOT_SELECT_YOUR_OPTION="Select your option" COM_DEPOT_TAB_NEW_PART="New Component" COM_DEPOT_TAB_EDIT_PART="Component Details" diff --git a/admin/src/Controller/PartsController.php b/admin/src/Controller/PartsController.php new file mode 100644 index 0000000..0133ea8 --- /dev/null +++ b/admin/src/Controller/PartsController.php @@ -0,0 +1,23 @@ + + * @copyright (C) 2023 KW4NZ, + * @license GNU General Public License version 2 or later; see LICENSE.md + * @since 0.0.6 + */ + +namespace KW4NZ\Component\Depot\Administrator\Controller; + +use Joomla\CMS\MVC\Controller\AdminController; + +defined('_JEXEC') or die; + +class PartsController extends AdminController +{ + public function getModel($name = 'Part', $prefix = 'Administrator', $config = ['ignore_request' => true]) + { + return parent::getModel($name, $prefix, $config); + } +} \ No newline at end of file diff --git a/admin/src/Model/PartsModel.php b/admin/src/Model/PartsModel.php index ac148ba..d943fe1 100644 --- a/admin/src/Model/PartsModel.php +++ b/admin/src/Model/PartsModel.php @@ -30,14 +30,14 @@ class PartsModel extends ListModel $query = $db->getQuery(true); - $query->select('*') - ->from($db->quoteName('#__depot', 'd')); + // $query->select('*') +// ->from($db->quoteName('#__depot', 'd')); // order by - $query->order('d.id ASC'); - if (true) { - return $query; - } +// $query->order('d.id ASC'); +// if (true) { +// return $query; +// } // select the required fields from the table $query->select( @@ -57,8 +57,8 @@ class PartsModel extends ListModel ->select( [ $db->quoteName('u.name', 'creator'), - $db->quoteName('m.short_name', 'manufacturer'), - $db->quoteName('m.long_name', 'manufacturer_long'), + $db->quoteName('m.name_short', 'manufacturer'), + $db->quoteName('m.name_long', 'manufacturer_long'), $db->quoteName('s.name', 'stock_name'), ] ) diff --git a/admin/src/View/Parts/HtmlView.php b/admin/src/View/Parts/HtmlView.php index dc8ac8d..43610f3 100644 --- a/admin/src/View/Parts/HtmlView.php +++ b/admin/src/View/Parts/HtmlView.php @@ -12,8 +12,13 @@ namespace KW4NZ\Component\Depot\Administrator\View\Parts; defined('_JEXEC') or die; -use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; use Joomla\CMS\Factory; +use Joomla\CMS\Language\Text; +use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView; +// use Joomla\CMS\Toolbar; +use Joomla\CMS\Toolbar\ToolbarHelper; + +// use Joomla\CMS\Language\Text; class HtmlView extends BaseHtmlView @@ -25,6 +30,18 @@ class HtmlView extends BaseHtmlView $this->items = $this->get('Items'); + // set the toolbar + $this->addToolbar(); + parent::display($tpl); } + + protected function addToolbar() + { + ToolbarHelper::title(Text::_('COM_DEPOT_MANAGER_PARTS')); + ToolbarHelper::addNew('part.add'); + ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'parts.delete'); + ToolbarHelper::publish('parts.publish', 'JTOOLBAR_PUBLISH', true); + ToolbarHelper::unpublish('parts.unpublish', 'JTOOLBAR_UNPUBLISH', true); + } } \ No newline at end of file diff --git a/admin/tmpl/parts/default.php b/admin/tmpl/parts/default.php index 6925bc5..81258ba 100644 --- a/admin/tmpl/parts/default.php +++ b/admin/tmpl/parts/default.php @@ -7,26 +7,61 @@ * @license GNU General Public License version 2 or later; see LICENSE.md * @since 0.0.1 */ + +use Joomla\CMS\HTML\HTMLHelper; +use Joomla\CMS\Language\Text; +use Joomla\CMS\Router\Route; + ?>

Welcome to my Depot Component!

-

Link: Part

+
- - - - - - - - - items as $i => $item): ?> - - - - -
COM_DEPOT_TABLE_HEAD_IDCOM_DEPOT_TABLE_HEAD_NAME
- id ?> - - component_name ?> -
\ No newline at end of file + items)): ?> +
+ + +
+ + + + + + + + + + + + items as $i => $item): ?> + + + + + + + +
+ + + + + +
+ id); ?> + + id ?> + + + escape($item->component_name); ?> + +
+ + + + + + +
\ No newline at end of file