Add option for configurable maintenance schedules

classes/items.php

@@ -145,11 +145,9 @@ public function getProperty($fieldNameIntern, $column, $format = '')
         }
 
         $value = $this->mItemFields[$fieldNameIntern]->getValue($column, $format);
-
-        if ($column === 'imf_value_list' && in_array($this->mItemFields[$fieldNameIntern]->getValue('imf_type'), ['DROPDOWN', 'RADIO_BUTTON'])) {
+        if ($column === 'imf_value_list' && in_array($this->mItemFields[$fieldNameIntern]->getValue('imf_type'), ['DROPDOWN', 'RADIO_BUTTON', 'DATE_INTERVAL'])) {
             $value = $this->getListValue($fieldNameIntern, $value, $format);
         }
-
         return $value;
     }
 
@@ -291,12 +289,24 @@ public function getHtmlValue($fieldNameIntern, $value): string
 
                 case 'DROPDOWN':
                 case 'RADIO_BUTTON':
+                case 'DATE_INTERVAL':
                     $arrListValuesWithItems = array(); // array with list values and items that represents the internal value
 
                     // first replace windows new line with unix new line and then create an array
                     $valueFormatted = str_replace("\r\n", "\n", $this->mItemFields[$fieldNameIntern]->getValue('imf_value_list', 'database'));
                     $arrListValues = explode("\n", $valueFormatted);
 
+                    //Clean up control-chars from maintenance scheudule
+                    if($imfType == 'DATE_INTERVAL'){
+                        $cleanArrListValues = array();
+                        foreach ($arrListValues as $line) {
+                            if(substr($line,0,1) != '#'){
+                                array_push($cleanArrListValues, explode('|', $line)[0]);
+                            }
+                        }
+                        $arrListValues = $cleanArrListValues;
+                    }
+
                     foreach ($arrListValues as $index => $listValue) {
                         // if value is imagefile or imageurl then show image
                         if ($imfType === 'RADIO_BUTTON' && (Image::isFontAwesomeIcon($listValue)

fields/fields.php

@@ -151,7 +151,8 @@ function moveCategory(direction, imfID) {
         'TEXT' => $gL10n->get('SYS_TEXT') . ' (100)',
         'TEXT_BIG' => $gL10n->get('SYS_TEXT') . ' (4000)',
         'NUMBER' => $gL10n->get('SYS_NUMBER'),
-        'DECIMAL' => $gL10n->get('SYS_DECIMAL_NUMBER')
+        'DECIMAL' => $gL10n->get('SYS_DECIMAL_NUMBER'),
+        'DATE_INTERVAL' => $gL10n->get('PLG_INVENTORY_MANAGER_DATE_INTERVAL')
     );
 
     $imfSystem = $itemField->getValue('imf_system') == 1

fields/fields_delete.php

@@ -68,6 +68,7 @@ function setValueList() {
 	'RADIO_BUTTON' => $gL10n->get('SYS_RADIO_BUTTON'),
 	'TEXT' => $gL10n->get('SYS_TEXT') . ' (100 ' . $gL10n->get('SYS_CHARACTERS') . ')',
 	'TEXT_BIG' => $gL10n->get('SYS_TEXT') . ' (4000 ' . $gL10n->get('SYS_CHARACTERS') . ')',
+	'DATE_INTERVAL' => $gL10n->get('PLG_INVENTORY_MANAGER_DATE_INTERVAL')
 );
 asort($itemFieldText);
 

fields/fields_edit_new.php

@@ -67,12 +67,25 @@
 
 $page->addJavascript('
     function setValueList() {
-        if ($("#imf_type").val() === "DROPDOWN" || $("#imf_type").val() === "RADIO_BUTTON") {
+        if ($("#imf_type").val() === "DROPDOWN" || $("#imf_type").val() === "RADIO_BUTTON" || $("#imf_type").val() === "DATE_INTERVAL") {
             $("#imf_value_list_group").show("slow");
             $("#imf_value_list").attr("required", "required");
+            if ($("#imf_type").val() === "DATE_INTERVAL") {
+                $("#imf_date_interval_field_group").show("slow");
+                $("#imf_date_interval_field").attr("required", "required");
+            }
         } else {
             $("#imf_value_list").removeAttr("required");
             $("#imf_value_list_group").hide();
+            $("#imf_date_interval_field").removeAttr("required");
+            $("#imf_date_interval_field_group").hide();
+        }
+
+        var valueListTooltipContainer = document.getElementById("imf_value_list_group").getElementsByTagName("label")[0].getElementsByTagName("i")[0];
+        if($("#imf_type").val() === "DATE_INTERVAL"){
+            valueListTooltipContainer.setAttribute("data-content","' . $gL10n->get('PLG_INVENTORY_MANAGER_DATE_INTERVAL_DESC') . '");
+        }else{
+            valueListTooltipContainer.setAttribute("data-content","' . $gL10n->get('ORG_VALUE_LIST_DESC') . '");
         }
     }
 
@@ -108,7 +121,7 @@ function setValueList() {
     'RADIO_BUTTON' => $gL10n->get('SYS_RADIO_BUTTON'),
     'TEXT' => $gL10n->get('SYS_TEXT') . ' (100 ' . $gL10n->get('SYS_CHARACTERS') . ')',
     'TEXT_BIG' => $gL10n->get('SYS_TEXT') . ' (4000 ' . $gL10n->get('SYS_CHARACTERS') . ')',
-);
+    'DATE_INTERVAL' => $gL10n->get('PLG_INVENTORY_MANAGER_DATE_INTERVAL'));
 asort($itemFieldText);
 
 //bei Systemfeldern darf der Datentyp nicht mehr veraendert werden
@@ -118,6 +131,14 @@ function setValueList() {
     )
 );
 
+$sql = "SELECT imf_id, imf_name FROM " . TBL_INVENTORY_MANAGER_FIELDS . " WHERE imf_type = 'DATE'";
+$form->addSelectBoxFromSql('imf_date_interval_field', $gL10n->get('PLG_INVENTORY_MANAGER_DATE_INTERVAL_FIELD'), $gDb, $sql, array(
+        'property' => HtmlForm::FIELD_REQUIRED,
+        'defaultValue' => $itemField->getValue('imf_date_interval_field'),
+        'helpTextIdLabel' => 'PLG_INVENTORY_MANAGER_DATE_INTERVAL_FIELD_DESC'
+    )
+);
+
 $form->addMultilineTextInput('imf_value_list', $gL10n->get('ORG_VALUE_LIST'), (string)$itemField->getValue('imf_value_list', 'database'), 6, array(
         'property' => HtmlForm::FIELD_REQUIRED,
         'helpTextIdLabel' => 'ORG_VALUE_LIST_DESC'

inventory_manager.php

@@ -470,7 +470,12 @@
     $imfNameIntern = $itemField->getValue('imf_name_intern');
     $columnHeader = convlanguagePIM($items->getProperty($imfNameIntern, 'imf_name'));
 
-    if ($disableBorrowing == 1 && ($imfNameIntern === 'LAST_RECEIVER' || $imfNameIntern === 'RECEIVED_ON' || $imfNameIntern === 'RECEIVED_BACK_ON')) { 
+    if($items->getProperty($imfNameIntern, 'imf_type') === 'DATE_INTERVAL'){
+        // modify column Header for DATE_INTERVAL fields
+        $columnHeader .= ' ' . $gL10n->get('PLG_INVENTORY_MANAGER_DATE_INTERVAL_DAYS_REMAINING');
+    }
+
+    if ($disableBorrowing == 1 && ($imfNameIntern === 'LAST_RECEIVER' || $imfNameIntern === 'RECEIVED_ON' || $imfNameIntern === 'RECEIVED_BACK_ON')) {
         break;
     }
 
@@ -629,6 +634,52 @@
         elseif (in_array($items->getProperty($imfNameIntern, 'imf_type'), array('DROPDOWN', 'RADIO_BUTTON'))) {
             $content = $items->getHtmlValue($imfNameIntern, $content);
         }
+        elseif ($items->getProperty($imfNameIntern, 'imf_type') == 'DATE_INTERVAL') {
+            $selectedInterval = $content;
+            $content = '';
+
+            $intervalValues = $items->getProperty($imfNameIntern, 'imf_value_list');
+            $dateIntervalFieldId = $items->getProperty($imfNameIntern, 'imf_date_interval_field', 'database');
+            if (isset($items->mItemData[$dateIntervalFieldId])) {
+                $dateInternalFieldName = $items->mItemData[$dateIntervalFieldId]->getValue('imf_name_intern');
+                $filteredSelectionItems = array();
+
+                foreach ($intervalValues as $value) {
+                    $filteredSelectionItems[] = trim(explode('|', $value)[1]);
+                }
+                //use part after # as internal_name for last test date
+                $compDate1 = date_create($items->getValue($dateInternalFieldName, 'database'));
+                $compDate2 = date_create();
+
+                //Calculate future test date
+                $dateAdditionSplit = array();
+                if (isset($filteredSelectionItems[$selectedInterval-1])) {
+                    preg_match("/^\s*(\d*)([wymd])\s*$/", $filteredSelectionItems[$selectedInterval-1], $dateAdditionSplit);
+                }
+
+                if(isset($dateAdditionSplit[1]) && isset($dateAdditionSplit[2]) && is_numeric($dateAdditionSplit[1])){
+                    switch ($dateAdditionSplit[2]) {
+                    case 'w':
+                        date_add($compDate1, new DateInterval('P' . $dateAdditionSplit[1] . 'W'));
+                        break;
+                    case 'm':
+                        date_add($compDate1, new DateInterval('P' . $dateAdditionSplit[1] . 'M'));
+                        break;
+                    case 'y':
+                        date_add($compDate1, new DateInterval('P' . $dateAdditionSplit[1] . 'Y'));
+                        break;
+                    case 'd':
+                    default:
+                        date_add($compDate1, new DateInterval('P' . $dateAdditionSplit[1] . 'D'));
+                        break;
+                    }
+
+                    //Compare last test date with future date and output days
+                    $dateDiff = date_diff($compDate2, $compDate1);
+                    $content = $dateDiff->format('%R%a');
+                }
+            }
+        }
 
         $columnValues[] = ($strikethrough && $getMode != 'csv' && $getMode != 'ods' && $getMode != 'xlsx') ? '<s>' . $content . '</s>' : $content;
         $columnNumber++;

items/items_edit_new.php

@@ -262,6 +262,7 @@ function validateReceivedOnAndBackOn() {
             break;
 
         case 'DROPDOWN':
+        case'DATE_INTERVAL':
             $form->addSelectBox(
                 'imf-' . $items->getProperty($imfNameIntern, 'imf_id'),
                 convlanguagePIM($items->getProperty($imfNameIntern, 'imf_name')),