Mix 1498 1629

zmsadmin/src/Zmsadmin/Application.php

@@ -27,7 +27,7 @@ class Application extends \BO\Slim\Application
 
     const DEBUG = false;
 
-    const TWIG_CACHE = '/cache/';
+    const TWIG_CACHE = false;
 
     const TEMPLATE_PATH = ZMS_ADMIN_TEMPLATE_FOLDER;
 

zmsadmin/src/Zmsadmin/Helper/GraphDefaults.php

@@ -253,6 +253,7 @@ public static function getProcess()
     id
     status
     createTimestamp
+    updateTimestamp
     reminderTimestamp
     appointments{
         date

zmsadmin/templates/block/queue/table.twig

@@ -261,7 +261,19 @@
                                 {% endif %}
                             </td>
                             <td>Dieser Kunde ist nicht erschienen</td>
-                            <td><a href="#" data-id="{{ item.id }}" class="process-reset">wieder aufnehmen</a></td>
+                            <td>{{ item.customTextfield|decodeEntities|raw }}</td>
+                            {% set currentTime = "now"|date('U') %}
+                            {% set updateTimestamp = item.updateTimestamp|date('U') %}
+                            {% set fiveMinutes = 300 %}
+
+                            {% if currentTime - updateTimestamp > fiveMinutes %}
+                                <td>
+                                    {{ item.updateTimestamp }}
+                                    <a href="#" data-id="{{ item.id }}" class="process-reset">wieder aufnehmen</a>
+                                </td>
+                            {% else %}
+                                <td>{{ item.updateTimestamp }}</td>
+                            {% endif %}
                         </tr>
                     {% endfor %}
                 </table>

zmsdb/migrations/1700484515-add-recall-time-for-process-queue.sql

@@ -0,0 +1,5 @@
+ALTER TABLE buerger 
+ADD COLUMN `recall_time` time DEFAULT NULL;
+
+ALTER TABLE standort 
+ADD COLUMN `recall_time_limit` INT(5) NOT NULL DEFAULT 5;

zmsdb/src/Zmsdb/Query/Process.php

@@ -203,9 +203,10 @@ public function getEntityMapping()
             'customTextfield' => 'process.custom_text_field',
             'createIP' => 'process.IPAdresse',
             'createTimestamp' => 'process.IPTimeStamp',
+            'updateTimestamp' => 'process.updateTimestamp',
             'lastChange' => 'process.updateTimestamp',
             'showUpTime' => 'process.showUpTime',
-            'finishTime' => 'process.finishTime',
+            'finishTime' => 'process.finishTime',           
             'status' => $status_expression,
             'queue__status' => $status_expression,
             'queue__arrivalTime' => self::expression(
@@ -794,13 +795,15 @@ protected function addProcessingTimeData($process, \DateTimeInterface $dateTime)
     {
         $data = array();
 
+        //print($process->status);
+
         if ($process->status == 'processing') { 
             $data['showUpTime'] = $dateTime->format('Y-m-d H:i:s'); 
         } 
 
         if ($process->status == 'finished') { 
             $data['finishTime'] = $dateTime->format('Y-m-d H:i:s'); 
-        }
+        }    
 
         $this->addValues($data);
     }

zmsdb/tests/Zmsdb/IcsTest.php

@@ -11,11 +11,11 @@ class IcsTest extends Base
     public function testBasic()
     {
         setlocale(LC_ALL, 'de_DE');
-        $testTimestamp = 1463062089; // 12.5.2016, 16:08:09 GMT+2:00 DST saved in base64 ics string below
+        $updateTimestamp = 1463062089; // 12.5.2016, 16:08:09 GMT+2:00 DST saved in base64 ics string below
         $process = (new Process())->readEntity(169530, 'b3b0', 3); //process from testDB import
         $config = (new Config())->readEntity();
 
-        $ics = \BO\Zmsentities\Helper\Messaging::getMailIcs($process, $config, 'appointment', null, $testTimestamp);
+        $ics = \BO\Zmsentities\Helper\Messaging::getMailIcs($process, $config, 'appointment', null, $updateTimestamp);
 
         $this->assertEntity("\\BO\\Zmsentities\\Ics", $ics);
         $this->assertStringContainsString('169530', $ics->getContent());
@@ -25,11 +25,11 @@ public function testBasic()
 
     public function testDeleteIcs()
     {
-        $testTimestamp = 1463062089; // 12.5.2016, 16:08:09 GMT+2:00 DST saved in base64 ics string below
+        $updateTimestamp = 1463062089; // 12.5.2016, 16:08:09 GMT+2:00 DST saved in base64 ics string below
         $process = (new Process())->readEntity(169530, 'b3b0'); //process from testDB import
         $process->status = 'deleted';
         $config = (new Config())->readEntity();
-        $ics = \BO\Zmsentities\Helper\Messaging::getMailIcs($process, $config, 'deleted', null, $testTimestamp);
+        $ics = \BO\Zmsentities\Helper\Messaging::getMailIcs($process, $config, 'deleted', null, $updateTimestamp);
         $this->assertEntity("\\BO\\Zmsentities\\Ics", $ics);
         $this->assertStringContainsString('CANCELLED', $ics->getContent());
         $this->assertStringContainsString('UID:20160408-169530', $ics->getContent());

zmsentities/schema/dereferenced/day.json

@@ -295,6 +295,10 @@
                         "type": "string",
                         "description": "unix timestamp og time when process has been finished"
                     },
+                    "updateTimestamp": {
+                        "type": "string",
+                        "description": "unix timestamp og time when process has been missed"
+                    },
                     "scope": {
                         "id": 123,
                         "hint": "Standort aus Beispiel-Termin",

zmsentities/schema/dereferenced/mail.json

@@ -405,6 +405,10 @@
                     "type": "string",
                     "description": "unix timestamp og time when process has been finished"
                 },
+                "updateTimestamp": {
+                    "type": "string",
+                    "description": "unix timestamp og time when process has been missed"
+                },                
                 "clients": {
                     "type": "array",
                     "items": {

zmsentities/schema/dereferenced/notification.json

@@ -308,6 +308,10 @@
                     "type": "string",
                     "description": "unix timestamp og time when process has been finished"
                 },
+                "updateTimestamp": {
+                    "type": "string",
+                    "description": "unix timestamp og time when process has been missed"
+                },                
                 "clients": {
                     "type": "array",
                     "items": {

zmsentities/schema/dereferenced/process.json

@@ -24,6 +24,7 @@
         "createIP": "145.15.3.10",
         "createTimestamp": 1447931596,
         "lastChange": 1447931596,
+        "updateTimestamp": 1447931596,
         "id": 123456,
         "queue": {
             "arrivalTime": 1447922893,
@@ -233,6 +234,10 @@
             "type": "string",
             "description": "unix timestamp og time when process has been finished"
         },
+        "updateTimestamp": {
+            "type": "string",
+            "description": "unix timestamp og time when process has been missed"
+        },        
         "queue": {
             "type": "object",
             "description": "A queue represents a waiting queue for processes\/clients.",

zmsentities/schema/dereferenced/workstation.json

@@ -168,6 +168,10 @@
                     "type": "string",
                     "description": "unix timestamp og time when process has been finished"
                 },
+                "updateTimestamp": {
+                    "type": "string",
+                    "description": "unix timestamp og time when process has been missed"
+                },                
                 "clients": {
                     "type": "array",
                     "items": {

zmsentities/schema/process.json

@@ -23,6 +23,7 @@
     "createIP": "145.15.3.10",
     "createTimestamp": 1447931596,
     "lastChange": 1447931596,
+    "updateTimestamp": 1447931596,
     "id": 123456,
     "queue": {
       "arrivalTime": 1447922893,
@@ -316,6 +317,10 @@
         "type": "string",
         "description": "unix timestamp og time when process has been finished"
     },
+    "updateTimestamp": {
+      "type": "string",
+      "description": "unix timestamp og time when process has been missed"
+    },    
     "queue": {
       "$ref": "queue.json"
     },

zmsentities/src/Zmsentities/Process.php

@@ -37,6 +37,7 @@ public function getDefaults()
         return [
             'amendment' => '',
             'customTextfield' => '',
+            'updateTimestamp' => time(),
             'appointments' => new Collection\AppointmentList(),
             'apiclient' => new Apiclient(),
             'authKey' => '',
@@ -461,6 +462,7 @@ public function withLessData(array $keepArray = [])
         }
 
         unset($entity['createTimestamp']);
+        unset($entity['updateTimestamp']);
         unset($entity['createIP']);
 
         if ($entity->toProperty()->scope->status->isAvailable()) {
@@ -579,6 +581,7 @@ public function toDerefencedAmendment()
                 'StandortID' => $this->scope['id'],
                 'Anmerkung' => $this->amendment,
                 'IPTimeStamp' => $this->createTimestamp,
+                'updateTimestamp' => $this->updateTimestamp,
                 'LastChange' => $lastChange,
             ),
             1
@@ -594,6 +597,7 @@ public function toDerefencedCustomTextfield()
                 'StandortID' => $this->scope['id'],
                 'CustomTextfield' => $this->customTextfield,
                 'IPTimeStamp' => $this->createTimestamp,
+                'updateTimestamp' => $this->updateTimestamp,
                 'LastChange' => $lastChange,
             ),
             1