+ * @license GNU General Public License version 2 or later; see LICENSE.md
+ * @since 0.9.9
+ */
+
+namespace KW4NZ\Component\Depot\Administrator\Controller;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+defined('_JEXEC') or die;
+
+class StocksController extends AdminController
+{
+ /**
+ * The prefix to use with controller messages.
+ *
+ * @var string
+ * @since 0.9.9
+ */
+ protected $text_prefix = 'COM_DEPOT_STOCKS';
+
+ public function getModel($name = 'Stock', $prefix = 'Administrator', $config = ['ignore_request' => true])
+ {
+ return parent::getModel($name, $prefix, $config);
+ }
+}
\ No newline at end of file
diff --git a/admin/src/Model/ManufacturersModel.php b/admin/src/Model/ManufacturersModel.php
index 2f3ad3c..2718a1e 100644
--- a/admin/src/Model/ManufacturersModel.php
+++ b/admin/src/Model/ManufacturersModel.php
@@ -18,6 +18,30 @@ use Joomla\Database\ParameterType;
class ManufacturersModel extends ListModel
{
+ public function __construct($config = [])
+ {
+ $config['filter_fields'] = [
+ 'id',
+ 'm.id',
+ 'name_short',
+ 'm.name_short',
+ 'name_long',
+ 'm.name_long',
+ 'alias',
+ 'm.alias',
+ 'state',
+ 'm.state',
+ 'published',
+ 'm.published',
+ 'description',
+ 'm.descrition',
+ 'image',
+ 'm.image',
+ ];
+ parent::__construct($config);
+ }
+
+
/**
* Build an SQL query to load the list data.
*
@@ -79,6 +103,11 @@ class ManufacturersModel extends ListModel
$query->where($db->quoteName('m.state') . ' IN (0, 1)');
}
+ // add list ordering clause
+ $orderCol = $this->state->get('list.ordering', 'id');
+ $orderDirn = $this->state->get('list.direction', 'asc');
+ $query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
return $query;
}
}
\ No newline at end of file
diff --git a/admin/src/Model/PackagesModel.php b/admin/src/Model/PackagesModel.php
index 4907669..1c4fa1e 100644
--- a/admin/src/Model/PackagesModel.php
+++ b/admin/src/Model/PackagesModel.php
@@ -18,6 +18,28 @@ use Joomla\Database\ParameterType;
class PackagesModel extends ListModel
{
+ public function __construct($config = [])
+ {
+ $config['filter_fields'] = [
+ 'id',
+ 'p.id',
+ 'name',
+ 'p.name',
+ 'alias',
+ 'p.alias',
+ 'state',
+ 'p.state',
+ 'published',
+ 'p.published',
+ 'mounting_style_id',
+ 'p.mounting_style_id',
+ 'mounting_style',
+ 'description',
+ 'p.description',
+ ];
+ parent::__construct($config);
+ }
+
/**
* Build an SQL query to load the list data.
*
@@ -81,6 +103,11 @@ class PackagesModel extends ListModel
$query->where($db->quoteName('p.state') . ' IN (0, 1)');
}
+ // add list ordering clause
+ $orderCol = $this->state->get('list.ordering', 'id');
+ $orderDirn = $this->state->get('list.direction', 'asc');
+ $query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
return $query;
}
}
\ No newline at end of file
diff --git a/admin/src/Model/PartsModel.php b/admin/src/Model/PartsModel.php
index 6aa5e93..a44b666 100644
--- a/admin/src/Model/PartsModel.php
+++ b/admin/src/Model/PartsModel.php
@@ -18,6 +18,25 @@ use Joomla\Database\ParameterType;
class PartsModel extends ListModel
{
+ public function __construct($config = [])
+ {
+ $config['filter_fields'] = [
+ 'id',
+ 'd.id',
+ 'component_name',
+ 'd.component_name',
+ 'alias',
+ 'd.alias',
+ 'quantity',
+ 'd.quantity',
+ 'published',
+ 'd.published',
+ 'package',
+ 'manufacturer',
+ 'stock_name',
+ ];
+ parent::__construct($config);
+ }
/**
* Build an SQL query to load the list data.
*
@@ -65,6 +84,7 @@ class PartsModel extends ListModel
$db->quoteName('p.name', 'package_name'),
$db->quoteName('p.description', 'package_description'),
$db->quoteName('ms.title', 'mounting_style'),
+ $db->quoteName('v.name', 'owner'),
]
)
->from($db->quoteName('#__depot', 'd'))
@@ -72,7 +92,8 @@ class PartsModel extends ListModel
->join('LEFT', $db->quoteName('#__depot_stock', 's'), $db->quoteName('s.id') . ' = ' . $db->quoteName('d.stock_id'))
->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'));
+ ->join('LEFT', $db->quoteName('#__depot_mounting_style', 'ms'), $db->quoteName('ms.id') . ' = ' . $db->quoteName('p.mounting_style_id'))
+ ->join('LEFT', $db->quoteName('#__users', 'v'), $db->quoteName('v.id') . ' = ' . $db->quoteName('s.owner_id'));
// filter: like / search
$search = $this->getState('filter.search');
if (!empty($search)) {
@@ -86,10 +107,14 @@ class PartsModel extends ListModel
$query->where($db->quoteName('d.state') . ' = :published')
->bind(':published', $published, ParameterType::INTEGER);
} elseif ($published === '') {
- //$query->where($db->quoteName('d.state') . ' IN (0, 1)');
$query->whereIn($db->quoteName('d.state'), [0, 1]);
}
+ // add list ordering clause
+ $orderCol = $this->state->get('list.ordering', 'id');
+ $orderDirn = $this->state->get('list.direction', 'desc');
+ $query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
return $query;
}
}
\ No newline at end of file
diff --git a/admin/src/Model/StockModel.php b/admin/src/Model/StockModel.php
index 31fdf59..a838fbf 100644
--- a/admin/src/Model/StockModel.php
+++ b/admin/src/Model/StockModel.php
@@ -53,7 +53,7 @@ class StockModel extends AdminModel
/* replaced by: */
if (empty($data['alias'])) {
- $data['alias'] = ApplicationHelper::stringURLSafe($data['name_short']);
+ $data['alias'] = ApplicationHelper::stringURLSafe($data['owner_id'] . '-' . $data['name']);
}
$result = parent::save($data);
// if ($result) {
diff --git a/admin/src/Model/StocksModel.php b/admin/src/Model/StocksModel.php
index bd00148..0f27407 100644
--- a/admin/src/Model/StocksModel.php
+++ b/admin/src/Model/StocksModel.php
@@ -18,6 +18,23 @@ use Joomla\Database\ParameterType;
class StocksModel extends ListModel
{
+ public function __construct($config = [])
+ {
+ $config['filter_fields'] = [
+ 'id',
+ 's.id',
+ 's.name',
+ 'name',
+ 'alias',
+ 's.alias',
+ 's.description',
+ 'description',
+ 'published',
+ 'd.published',
+ 'owner',
+ ];
+ parent::__construct($config);
+ }
/**
* Build an SQL query to load the list data.
*
@@ -55,10 +72,13 @@ class StocksModel extends ListModel
->select(
[
$db->quoteName('u.name', 'creator'),
+ $db->quoteName('o.name', 'owner'),
+ $db->quoteName('o.username', 'owner_username'),
]
)
->from($db->quoteName('#__depot_stock', 's'))
- ->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('s.checked_out'));
+ ->join('LEFT', $db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('s.checked_out'))
+ ->join('LEFT', $db->quoteName('#__users', 'o'), $db->quoteName('o.id') . ' = ' . $db->quoteName('s.owner_id'));
// filter: like / search
$search = $this->getState('filter.search');
if (!empty($search)) {
@@ -77,6 +97,11 @@ class StocksModel extends ListModel
$query->where($db->quoteName('s.state') . ' IN (0, 1)');
}
+ // add list ordering clause
+ $orderCol = $this->state->get('list.ordering', 'id');
+ $orderDirn = $this->state->get('list.direction', 'asc');
+ $query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
return $query;
}
}
\ No newline at end of file
diff --git a/admin/src/View/Manufacturers/HtmlView.php b/admin/src/View/Manufacturers/HtmlView.php
index 9f5919a..565047a 100644
--- a/admin/src/View/Manufacturers/HtmlView.php
+++ b/admin/src/View/Manufacturers/HtmlView.php
@@ -29,6 +29,10 @@ class HtmlView extends BaseHtmlView
$app = Factory::getApplication();
$this->items = $this->get('Items');
+ $this->state = $this->get('State');
+ // list order
+ $this->listOrder = $this->escape($this->state->get('list.ordering'));
+ $this->listDirn = $this->escape($this->state->get('list.direction'));
// adding filters
$this->filterForm = $this->get('FilterForm');
diff --git a/admin/src/View/Packages/HtmlView.php b/admin/src/View/Packages/HtmlView.php
index 1459912..21614d9 100644
--- a/admin/src/View/Packages/HtmlView.php
+++ b/admin/src/View/Packages/HtmlView.php
@@ -29,6 +29,10 @@ class HtmlView extends BaseHtmlView
$app = Factory::getApplication();
$this->items = $this->get('Items');
+ $this->state = $this->get('State');
+ // list order
+ $this->listOrder = $this->escape($this->state->get('list.ordering'));
+ $this->listDirn = $this->escape($this->state->get('list.direction'));
// adding filters
$this->filterForm = $this->get('FilterForm');
diff --git a/admin/src/View/Parts/HtmlView.php b/admin/src/View/Parts/HtmlView.php
index 2a2d532..ff6f074 100644
--- a/admin/src/View/Parts/HtmlView.php
+++ b/admin/src/View/Parts/HtmlView.php
@@ -29,6 +29,10 @@ class HtmlView extends BaseHtmlView
$app = Factory::getApplication();
$this->items = $this->get('Items');
+ $this->state = $this->get('State');
+ // list order
+ $this->listOrder = $this->escape($this->state->get('list.ordering'));
+ $this->listDirn = $this->escape($this->state->get('list.direction'));
// adding filters
$this->filterForm = $this->get('FilterForm');
diff --git a/admin/src/View/Stocks/HtmlView.php b/admin/src/View/Stocks/HtmlView.php
index b30b6eb..29d6582 100644
--- a/admin/src/View/Stocks/HtmlView.php
+++ b/admin/src/View/Stocks/HtmlView.php
@@ -29,7 +29,10 @@ class HtmlView extends BaseHtmlView
$app = Factory::getApplication();
$this->items = $this->get('Items');
-
+ $this->state = $this->get('State');
+ // list order
+ $this->listOrder = $this->escape($this->state->get('list.ordering'));
+ $this->listDirn = $this->escape($this->state->get('list.direction'));
// adding filters
$this->filterForm = $this->get('FilterForm');
$this->activeFilters = $this->get('ActiveFilters');
diff --git a/admin/tmpl/manufacturers/default.php b/admin/tmpl/manufacturers/default.php
index 2ddd482..c94b232 100644
--- a/admin/tmpl/manufacturers/default.php
+++ b/admin/tmpl/manufacturers/default.php
@@ -34,13 +34,31 @@ use Joomla\CMS\Layout\LayoutHelper;
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
diff --git a/admin/tmpl/packages/default.php b/admin/tmpl/packages/default.php
index f392661..d3fc98f 100644
--- a/admin/tmpl/packages/default.php
+++ b/admin/tmpl/packages/default.php
@@ -34,16 +34,40 @@ use Joomla\CMS\Layout\LayoutHelper;
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
diff --git a/admin/tmpl/parts/default.php b/admin/tmpl/parts/default.php
index e57a69b..92362ea 100644
--- a/admin/tmpl/parts/default.php
+++ b/admin/tmpl/parts/default.php
@@ -33,22 +33,52 @@ use Joomla\CMS\Layout\LayoutHelper;
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
@@ -94,10 +124,15 @@ use Joomla\CMS\Layout\LayoutHelper;
-
escape($item->stock_name); ?>
+
+ escape($item->owner); ?>
+
+
|
diff --git a/admin/tmpl/stock/edit.php b/admin/tmpl/stock/edit.php
index 13d2cda..932b52b 100644
--- a/admin/tmpl/stock/edit.php
+++ b/admin/tmpl/stock/edit.php
@@ -35,9 +35,11 @@ $wa->useScript('form.validate')
form->renderFieldset('details'); ?>
+
diff --git a/admin/tmpl/stocks/default.php b/admin/tmpl/stocks/default.php
index 5013b5e..004e575 100644
--- a/admin/tmpl/stocks/default.php
+++ b/admin/tmpl/stocks/default.php
@@ -33,14 +33,35 @@ use Joomla\CMS\Layout\LayoutHelper;
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
-
+ listDirn,
+ $this->listOrder
+ ); ?>
|
|
+
+ listDirn,
+ $this->listOrder
+ ); ?>
+ |
@@ -61,6 +82,18 @@ use Joomla\CMS\Layout\LayoutHelper;
escape($item->description); ?>
|
+
+
+ owner)): ?>
+ owner; ?>
+
+ owner_username; ?>
+
+
+
+
+ |
diff --git a/depot.xml b/depot.xml
index fac6938..5a44b94 100644
--- a/depot.xml
+++ b/depot.xml
@@ -2,12 +2,12 @@
Depot
KW4NZ
- 2023-10-24
+ 2023-10-30
(C) KW4NZ Thomas Kuschel
GPL v2 +; see LICENSE.md
thomas@kuschel.at
https://kuschel.at
- 0.9.7
+ 0.9.9
COM_DEPOT_XML_DESCRIPTION
KW4NZ\Component\Depot
@@ -45,14 +45,6 @@
>
COM_DEPOT_MENU
-
+