Rml workorder/v6

application/Workorder/WorkorderModel.php

@@ -53,7 +53,7 @@ class WorkorderModel extends TTCrudBaseModel
 
         $sql = "
             SELECT
-                w.id, w.status, w.deadlineDate, w.companyId, w.additionalInfo, p.preordercampaign_id, hn.rimo_fcp_name,
+                w.id, w.status, w.deadlineDate, w.appointmentDate, w.companyId, w.additionalInfo, p.preordercampaign_id, hn.rimo_fcp_name,
                 n.owner_id as tenantId, p.ucode, CONCAT_WS(' ', p.firstname, p.lastname) as customerName,
                 p.company as customerCompany, p.oaid, IFNULL(c_civil.name, c.name) as companyName, str.name as street, hn.hausnummer,
                 hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city,
@@ -86,7 +86,6 @@ class WorkorderModel extends TTCrudBaseModel
         $sql .= $orderBy;
 
         if ($limit !== null) $sql .= " LIMIT " . intval($limit) . " OFFSET " . intval($offset);
-
         $result = $db->query($sql);
         return $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
     }
@@ -192,4 +191,4 @@ class WorkorderModel extends TTCrudBaseModel
         $result = $db->query($sql);
         return $result ? $result->fetch_assoc()['count'] : 0;
     }
-}
+}

application/WorkorderAdmin/WorkorderAdminController.php

@@ -98,7 +98,7 @@ class WorkorderAdminController extends WorkorderBaseController
     {
         if (empty($this->postData['workorderIds']) || empty($this->postData['companyId'])) self::sendError("Erforderliche Felder fehlen.");
 
-        $deadline = strtotime($this->postData['deadlineDate'] ?? '+6 weeks');
+        $deadline = $this->postData['deadlineDate'] ?? strtotime('+6 weeks');
         $count = 0;
         foreach ($this->postData['workorderIds'] as $workorderId) {
             if ($this->assignSingleWorkorder($workorderId, $this->postData['companyId'], $deadline, $this->user->id)) $count++;
@@ -293,4 +293,4 @@ class WorkorderAdminController extends WorkorderBaseController
         }
     }
     //endregion
-}
+}