ADD filtering and searching 0.9.7

admin/src/Controller/PackageController.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package		Depot.Administrator
+ * @subpackage	com_depot
+ * @author		Thomas Kuschel <thomas@kuschel.at>
+ * @copyright	(C) 2023 KW4NZ, <https://www.kuschel.at>
+ * @license		GNU General Public License version 2 or later; see LICENSE.md
+ * @since		0.9.7
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\Controller;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+defined('_JEXEC') or die;
+
+class PackageController extends FormController
+{
+}

admin/src/Model/PackageModel.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * @package		Depot.Administrator
+ * @subpackage	com_depot
+ * @author		Thomas Kuschel <thomas@kuschel.at>
+ * @copyright	(C) 2023 KW4NZ, <https://www.kuschel.at>
+ * @license		GNU General Public License version 2 or later; see LICENSE.md
+ * @since		0.9.7
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\Model;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+\defined('_JEXEC') or die;
+
+class PackageModel extends AdminModel
+{
+	public function getForm($data = [], $loadData = true)
+	{
+		$form = $this->loadForm('com_depot.package', 'package', ['control' => 'jform', 'load_data' => $loadData]);
+
+		if (empty($form)) {
+			return false;
+		}
+
+		return $form;
+	}
+
+	protected function loadFormData()
+	{
+		$app = Factory::getApplication();
+		$data = $app->getUserState('com_depot.edit.package.data', []);
+
+		if (empty($data)) {
+			$data = $this->getItem();
+		}
+
+		return $data;
+	}
+
+	public function save($data)
+	{
+		/* Add code to modify data before saving */
+
+		// if (Factory::getConfig()->get('unicodeslugs') == 1) {
+		//	$data['alias'] = OutputFilter::stringURLUnicodeSlug($data['component_name']);
+		// } else {
+		//	$data['alias'] = OutputFilter::stringURLSafe($data['component_name']);
+		// }
+
+		/* replaced by: */
+		if (empty($data['alias'])) {
+			$data['alias'] = ApplicationHelper::stringURLSafe($data['name']);
+		}
+		$result = parent::save($data);
+		// if ($result) {
+		//	$this->getTable('', 'Administrator')->rebuild(1);
+		// }
+		return $result;
+	}
+}

admin/src/Model/PackagesModel.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * @package		Depot.Administrator
+ * @subpackage	com_depot
+ * @author		Thomas Kuschel <thomas@kuschel.at>
+ * @copyright	(C) 2023 KW4NZ, <https://www.kuschel.at>
+ * @license		GNU General Public License version 2 or later; see LICENSE.md
+ * @since		0.9.7
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\Model;
+
+use Joomla\CMS\MVC\Model\ListModel;
+// use Joomla\CMS\Table\Table;
+use Joomla\Database\ParameterType;
+
+\defined('_JEXEC') or die;
+
+class PackagesModel extends ListModel
+{
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  \Joomla\Database\DatabaseQuery
+	 *
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		$db = $this->getDatabase();
+		$query = $db->getQuery(true);
+
+
+		//		$query->select('*')
+//			->from($db->quoteName('#__depot', 'd'));
+
+		// order by
+//		$query->order('d.id ASC');
+//		if (true) {
+//			return $query;
+//		}
+
+		// select the required fields from the table
+		$query->select(
+			$this->getState(
+				'list.select',
+				[
+					$db->quoteName('p.id'),
+					$db->quoteName('p.name'),
+					$db->quoteName('p.alias'),
+					$db->quoteName('p.description'),
+					$db->quoteName('p.image'),
+					$db->quoteName('p.state'),
+				]
+			)
+		)
+			->select(
+				[
+					$db->quoteName('u.name', 'creator'),
+					$db->quoteName('ms.title', 'mounting_style'),
+				]
+			)
+			->from($db->quoteName('#__depot_package', 'p'))
+			->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('p.checked_out'))
+			->join('LEFT', $db->quoteName('#__depot_mounting_style', 'ms'), $db->quoteName('ms.id') . ' = ' . $db->quoteName('p.mounting_style_id'));
+
+		// filter: like / search
+		$search = $this->getState('filter.search');
+		if (!empty($search)) {
+			$like = $db->quote('%' . $search . '%');
+			$query->where($db->quoteName('p.name') . ' LIKE ' . $like);
+		}
+
+		// Filter by published state
+		$published = (string) $this->getState('filter.published');
+		if (is_numeric($published)) {
+			$published = (int) $published;
+			$query->where($db->quoteName('p.state') . ' = :published')
+				->bind(':published', $published, ParameterType::INTEGER);
+		} elseif ($published === '') {
+			$query->where($db->quoteName('p.state') . ' IN (0, 1)');
+		}
+
+		return $query;
+	}
+}

admin/src/Model/PartsModel.php

@@ -52,6 +52,7 @@ class PartsModel extends ListModel
 					$db->quoteName('d.quantity'),
 					$db->quoteName('d.quantity_exp'),
 					$db->quoteName('d.ordering'),
+					$db->quoteName('d.package_id'),
 				]
 			)
 		)
@@ -61,13 +62,17 @@ class PartsModel extends ListModel
 					$db->quoteName('m.name_short', 'manufacturer'),
 					$db->quoteName('m.name_long', 'manufacturer_long'),
 					$db->quoteName('s.name', 'stock_name'),
+					$db->quoteName('p.name', 'package_name'),
+					$db->quoteName('p.description', 'package_description'),
+					$db->quoteName('ms.title', 'mounting_style'),
 				]
 			)
 			->from($db->quoteName('#__depot', 'd'))
 			->join('LEFT', $db->quoteName('#__depot_manufacturer', 'm'), $db->quoteName('m.id') . ' = ' . $db->quoteName('d.manufacturer_id'))
 			->join('LEFT', $db->quoteName('#__depot_stock', 's'), $db->quoteName('s.id') . ' = ' . $db->quoteName('d.stock_id'))
-			->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('d.checked_out'));
-
+			->join('LEFT', $db->quoteName('#__depot_package', 'p'), $db->quoteName('p.id') . ' = ' . $db->quoteName('d.package_id'))
+			->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('d.checked_out'))
+			->join('LEFT', $db->quoteName('#__depot_mounting_style', 'ms'), $db->quoteName('ms.id') . ' = ' . $db->quoteName('p.mounting_style_id'));
 		// filter: like / search
 		$search = $this->getState('filter.search');
 		if (!empty($search)) {

admin/src/Table/ManufacturerTable.php

@@ -70,5 +70,4 @@ class ManufacturerTable extends Table
 
 		return parent::store($updateNulls);
 	}
-
 }

admin/src/Table/PackageTable.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package		Depot.Administrator
+ * @subpackage	com_depot
+ * @author		Thomas Kuschel <thomas@kuschel.at>
+ * @copyright	(C) 2023 KW4NZ, <https://www.kuschel.at>
+ * @license		GNU General Public License version 2 or later; see LICENSE.md
+ * @since		0.9.7
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\Table;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+\defined('_JEXEC') or die;
+
+class PackageTable extends Table
+{
+	function __construct(DatabaseDriver $db)
+	{
+		parent::__construct('#__depot_package', 'id', $db);
+
+		// add an alias for published:
+		$this->setColumnAlias('published', 'state');
+	}
+
+	public function store($updateNulls = true)
+	{
+		$app = Factory::getApplication();
+		$date = Factory::getDate()->toSql();
+		// $user = Factory::getUser();
+		// $user = $this->getCurrentUser();
+		$user = $app->getIdentity();
+
+		if (!$this->created) {
+			$this->created = $date;
+		}
+
+		if (!$this->created_by) {
+			$this->created_by = $user->get('id');
+		}
+
+		if ($this->id) {
+			// existing item
+			$this->modified_by = $user->get('id');
+			$this->modified = $date;
+		} else {
+			// set modified to created date if not set
+			if (!$this->modified) {
+				$this->modified = $this->created;
+			}
+			if (empty($this->modified_by)) {
+				$this->modified_by = $this->created_by;
+			}
+		}
+
+		// Verify that the alias is unique
+		$table = $app->bootComponent('com_depot')->getMVCFactory()->createTable('Package', 'Administrator');
+		if ($table->load(['alias' => $this->alias]) && ($table->id != $this->id || $this->id == 0)) {
+			$this->setError('Alias is not unique.');
+
+			if ($table->state == -2) {
+				$this->setError('Alias is not unique. The item is in Trash.');
+			}
+
+			return false;
+		}
+
+		return parent::store($updateNulls);
+	}
+}

admin/src/View/Package/HtmlView.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package		Depot.Administrator
+ * @subpackage	com_depot
+ * @author		Thomas Kuschel <thomas@kuschel.at>
+ * @copyright	(C) 2023 KW4NZ, <https://www.kuschel.at>
+ * @license		GNU General Public License version 2 or later; see LICENSE.md
+ * @since		0.9.7
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\View\Package;
+
+use Joomla\CMS\Factory;
+// use Joomla\CMS\MVC\View\GenericDataException;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+\defined('_JEXEC') or die;
+
+/**
+ * View to edit an article.
+ *
+ * @since  1.6
+ */
+class HtmlView extends BaseHtmlView
+{
+	/**
+	 * The \JForm object
+	 *
+	 * @var  \JForm
+	 */
+	protected $form;
+
+	/**
+	 * The active item
+	 *
+	 * @var  object
+	 */
+	protected $item;
+
+	/**
+	 * Execute and display a template script.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 *
+	 * @throws	\Exception
+	 * @since	1.6
+	 */
+	public function display($tpl = null)
+	{
+		$this->form = $this->get('Form');
+		$this->item = $this->get('Item');
+
+		//	if (count($errors = $this->get('Errors'))) {
+		//		throw new GenericDataException(implode("\n", $errors), 500);
+		//	}
+		$this->addToolbar();
+
+		return parent::display($tpl);
+	}
+
+	protected function addToolbar()
+	{
+		Factory::getApplication()->getInput()->set('hidemainmenu', true);
+
+		ToolbarHelper::title('Package: Add');
+
+		ToolbarHelper::apply('package.apply');
+		ToolbarHelper::save('package.save');
+		ToolbarHelper::cancel('package.cancel', 'JTOOLBAR_CLOSE');
+	}
+}

admin/src/View/Packages/HtmlView.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package		Depot.Administrator
+ * @subpackage	com_depot
+ * @author		Thomas Kuschel <thomas@kuschel.at>
+ * @copyright	(C) 2023 KW4NZ, <https://www.kuschel.at>
+ * @license		GNU General Public License version 2 or later; see LICENSE.md
+ * @since		0.9.7
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\View\Packages;
+
+defined('_JEXEC') or die;
+
+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
+{
+	public function display($tpl = null)
+	{
+		// Get application
+		$app = Factory::getApplication();
+
+		$this->items = $this->get('Items');
+
+		// adding filters
+		$this->filterForm = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		// set the toolbar
+		$this->addToolbar();
+
+		parent::display($tpl);
+	}
+
+	protected function addToolbar()
+	{
+		ToolbarHelper::title(Text::_('COM_DEPOT_MANAGER_PACKAGES'));
+		ToolbarHelper::addNew('package.add');
+		ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'packages.delete');
+		ToolbarHelper::publish('packages.publish', 'JTOOLBAR_PUBLISH', true);
+		ToolbarHelper::unpublish('packages.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+	}
+}