small fixes inventory module

Author: MightyMCoder

languages/en.xml

@@ -865,6 +865,7 @@
   <string name="SYS_INVENTORY_LAST_RECEIVER">Last receiver</string>
   <string name="SYS_INVENTORY_LAST_RECEIVER_DESC">Last receiver of the item</string>
   <string name="SYS_INVENTORY_NO_NEW_IMPORT_DATA">There was no new data in the import file!</string>
+  <string name="SYS_INVENTORY_NO_EDITABLE_CATEGORIES">There are no categories available for you that can be assigned to items. Please contact an administrator of the inventory manager.</string>
   <string name="SYS_INVENTORY_NOTIFICATION_MESSAGE_ITEM_CHANGED">The item #VAR1_BOLD# was changed by #VAR2_BOLD#:</string>
   <string name="SYS_INVENTORY_NOTIFICATION_MESSAGE_ITEM_CREATED">The item #VAR1_BOLD# was created by #VAR2_BOLD#:</string>
   <string name="SYS_INVENTORY_NOTIFICATION_MESSAGE_ITEM_DELETED">The following item was deleted:</string>

modules/inventory.php

@@ -326,7 +326,7 @@
         case 'item_delete_keeper_explain_msg':
             // check if all items are shown
             $showAll = admFuncVariableIsValid($_GET, 'items_filter_status', 'int', array('defaultValue' => 1)) === 0;
-
+            $retireOnClick = 'callUrlHideElement(\'adm_inventory_item_' . $getiniUUID . '\', \'' . SecurityUtils::encodeUrl(ADMIDIO_URL . FOLDER_MODULES . '/inventory.php', array('mode' => 'item_retire', 'item_uuid' => $getiniUUID)) . '\', \'' . $gCurrentSession->getCsrfToken() . '\', ' . ($showAll ?  '\'refreshInventoryTable\'' : '\'\'') . ')';
             $msg = '
                 <div class="modal-header">
                     <h3 class="modal-title">' . $gL10n->get('SYS_INVENTORY_ITEM_RETIRE') . '</h3>
@@ -336,7 +336,7 @@
                     <p><i class="bi bi-eye-slash-fill"></i>&nbsp;' . $gL10n->get('SYS_INVENTORY_KEEPER_ITEM_RETIRE_DESC', array('SYS_INVENTORY_KEEPER_ITEM_DELETE_DESC')) . '</p>
                 </div>
                 <div class="modal-footer">
-                <button id="adm_button_retire" type="button" class="btn btn-primary mr-4" onclick="callUrlHideElement(\'adm_inventory_item_' . $getiniUUID . '\', \'' . SecurityUtils::encodeUrl(ADMIDIO_URL . FOLDER_MODULES . '/inventory.php', array('mode' => 'item_retire', 'item_uuid' => $getiniUUID)) . '\', \'' . $gCurrentSession->getCsrfToken() . '\', ' . $showAll ?  '\'refreshInventoryTable\'' : ' \'\' ' . ')">
+                <button id="adm_button_retire" type="button" class="btn btn-primary mr-4" onclick="' . $retireOnClick . '">
                         <i class="bi bi-eye-slash"></i>' . $gL10n->get('SYS_INVENTORY_ITEM_RETIRE') . '</button>
                 <div id="adm_status_message" class="mt-4 w-100"></div>
                 </div>';

src/Categories/Service/CategoryService.php

@@ -79,6 +79,11 @@ public function getEditableCategories(): array
         if ($this->editableCategories === null) {
             $editableCategoryIDs = $gCurrentUser->getAllEditableCategories($this->type);
 
+            if (count($editableCategoryIDs) === 0) {
+                // No editable categories
+                return array();
+            }
+
             $sql = 'SELECT cat_id, cat_uuid, cat_name, cat_default
                       FROM ' . TBL_CATEGORIES . '
                      WHERE cat_id IN (' . Database::getQmForValues($editableCategoryIDs) . ')';
@@ -122,6 +127,11 @@ public function getVisibleCategories(): array
         if ($this->visibleCategories === null) {
             $visibleCategoryIDs = $gCurrentUser->getAllVisibleCategories($this->type);
 
+            if (count($visibleCategoryIDs) === 0) {
+                // No visible categories
+                return array();
+            }
+
             $sql = 'SELECT cat_id, cat_uuid, cat_name, cat_default
                       FROM ' . TBL_CATEGORIES . '
                      WHERE cat_id IN (' . Database::getQmForValues($visibleCategoryIDs) . ')';

src/UI/Presenter/InventoryItemPresenter.php

@@ -11,8 +11,6 @@
 use Admidio\Infrastructure\Utils\PhpIniUtils;
 use Admidio\Inventory\Entity\Item;
 use Admidio\Inventory\ValueObjects\ItemsData;
-use Admidio\UI\Presenter\FormPresenter;
-use Admidio\UI\Presenter\PagePresenter;
 use Admidio\Users\Entity\User;
 use DateTime;
 use Ramsey\Uuid\Uuid;
@@ -191,7 +189,7 @@ function callbackItemPicture() {
                         );
 
                     } elseif ($categoryService->count() > 0) {
-                        if (!empty($gCurrentUser->getAllEditableCategories('IVT'))) {
+                        if (!empty($categoryService->getEditableCategories())) {
                             $form->addSelectBoxForCategories(
                                 'INF-' . $infNameIntern,
                                 $gL10n->get('SYS_CATEGORY'),
@@ -204,18 +202,14 @@ function callbackItemPicture() {
                                 )
                             );
                         } else {
-                            $categories = array();
-                            foreach ($categoryService->getVisibleCategories() as $category) {
-                                $categories[$category['cat_uuid']] = $category['cat_name'];
-                            }
-
-                            $form->addSelectBox(
+                            $form->addInput(
                                 'INF-' . $infNameIntern,
                                 $gL10n->get('SYS_CATEGORY'),
-                                $categories,
+                                $items->getValue($infNameIntern),
                                 array(
-                                    'property' => FormPresenter::FIELD_REQUIRED,
-                                    'defaultValue' => $items->getValue($infNameIntern, 'database'),
+                                    'type' => 'text',
+                                    'property' => FormPresenter::FIELD_DISABLED,
+                                    'helpTextId' => 'SYS_INVENTORY_NO_EDITABLE_CATEGORIES'
                                 )
                             );
                         }
@@ -929,9 +923,9 @@ function isSelect2Empty(selectId) {
                             $maxlength = null;
                             $date = new DateTime('now');
                             if ($fieldType === 'datetime') {
-                                $defaultDate = $date->format('Y-m-d H:i');
+                                $defaultDate = $date->format($gSettingsManager->getString('system_date') . ' ' . $gSettingsManager->getString('system_time'));
                             } else {
-                                $defaultDate = $date->format('Y-m-d');
+                                $defaultDate = $date->format($gSettingsManager->getString('system_date'));
                             }
 
                         } elseif ($infNameIntern === 'ITEMNAME') {

src/UI/Presenter/PreferencesPresenter.php

@@ -1018,7 +1018,7 @@ public function createInventoryForm(): string
 
         $formInventory->addInput(
             'inventory_export_filename',
-            $gL10n->get('SYS_INVENTORY_FILENAME'),
+            'SYS_INVENTORY_FILENAME',
             $formValues['inventory_export_filename'],
             array('maxLength' => 50, 'property' => FormPresenter::FIELD_REQUIRED, 'helpTextId' => 'SYS_INVENTORY_FILENAME_DESC')
         );