added new rml features

application/RMLWorkorderAdmin/RMLWorkorderAdminController.php

@@ -18,6 +18,7 @@ class RMLWorkorderAdminController extends TTCrud
             ['value' => 'assigned', 'text' => 'Zugewiesen', 'icon' => 'fas fa-user-check text-info'],
             ['value' => 'scheduled', 'text' => 'Terminiert', 'icon' => 'fas fa-calendar-check text-warning'],
             ['value' => 'correction_requested', 'text' => 'Korrektur angefordert', 'icon' => 'fas fa-exclamation-triangle text-danger'],
+            ['value' => 'intervention_required', 'text' => 'Eingriff benötigt', 'icon' => 'fas fa-times-circle text-danger'],
             ['value' => 'documented', 'text' => 'Dokumentiert', 'icon' => 'fas fa-file-alt text-success'],
             ['value' => 'completed', 'text' => 'Abgeschlossen', 'icon' => 'fas fa-check-double text-secondary'],
         ]]],
@@ -214,4 +215,49 @@ class RMLWorkorderAdminController extends TTCrud
         ]);
     }
 
+    protected function updateDeadlineAction() {
+        $post = json_decode(file_get_contents('php://input'), true);
+        if (empty($post['workorderId']) || empty($post['deadlineDate'])) self::sendError("Required fields are missing.");
+
+        $workorder = RMLWorkorderModel::get($post['workorderId']);
+        if (!$workorder) self::sendError("Workorder not found.");
+
+        $workorder->deadlineDate = $post['deadlineDate'];
+        RMLWorkorderModel::update((array)$workorder);
+
+        RMLWorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Deadline wurde auf ' . date('d.m.Y', $post['deadlineDate']) . ' geändert.',
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Deadline erfolgreich aktualisiert.']);
+    }
+
+    protected function acceptDocumentationAction() {
+        $post = json_decode(file_get_contents('php://input'), true);
+        if (empty($post['workorderId'])) self::sendError("Workorder ID is missing.");
+
+        $workorder = RMLWorkorderModel::get($post['workorderId']);
+        if (!$workorder) self::sendError("Workorder not found.");
+
+        if ($workorder->status !== 'documented') {
+            self::sendError("Die Dokumentation muss zuerst von der Firma als fertig markiert werden.");
+        }
+
+        $oldStatus = $workorder->status;
+        $workorder->status = 'completed';
+        RMLWorkorderModel::update((array)$workorder);
+
+        RMLWorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Dokumentation wurde akzeptiert und der Auftrag abgeschlossen.',
+            'statusChange' => "$oldStatus -> completed",
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Dokumentation akzeptiert und Auftrag abgeschlossen.']);
+    }
 }

application/RMLWorkorderCompany/RMLWorkorderCompanyController.php

@@ -15,6 +15,7 @@ class RMLWorkorderCompanyController extends TTCrud
             ['value' => 'assigned', 'text' => 'Zugewiesen', 'icon' => 'fas fa-user-check text-info'],
             ['value' => 'scheduled', 'text' => 'Terminiert', 'icon' => 'fas fa-calendar-check text-warning'],
             ['value' => 'correction_requested', 'text' => 'Korrektur angefordert', 'icon' => 'fas fa-exclamation-triangle text-danger'],
+            ['value' => 'intervention_required', 'text' => 'Eingriff benötigt', 'icon' => 'fas fa-times-circle text-danger'],
             ['value' => 'documented', 'text' => 'Dokumentiert', 'icon' => 'fas fa-file-alt text-success'],
             ['value' => 'completed', 'text' => 'Abgeschlossen', 'icon' => 'fas fa-check-double text-secondary'],
         ]]],
@@ -29,7 +30,8 @@ class RMLWorkorderCompanyController extends TTCrud
         if ($company) {
             $this->additionalJSVariables['COMPANY_ID'] = $company->id;
         } else {
-            $this->sendError('Access Denied. You are not associated with a registered RML company.', 403);
+            // Allow access but show no data if not associated
+            $this->additionalJSVariables['COMPANY_ID'] = 0;
         }
     }
 
@@ -49,34 +51,19 @@ class RMLWorkorderCompanyController extends TTCrud
         $filters = $json['filters'] ?? [];
         $order = $json['order'] ?? ['key' => 'deadlineDate', 'order' => 'ASC'];
 
-        $company = RMLWorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
-        if (!$company) {
-            self::sendError("Company not found for user.", 403);
+        $companyId = $this->user->address_id;
+        if ($companyId === 0) {
+            self::returnJson(['rows' => [], 'pagination' => array_merge($pagination, ['total_rows' => 0, 'total_pages' => 0, 'filtered_available' => 0])]);
+            return;
         }
 
-        // Get paginated workorders and total count from the new model methods
-        $workorders = RMLWorkorderModel::getCompanyWorkorders($filters, $pagination['per_page'], ($pagination['page'] - 1) * $pagination['per_page'], $order, $company->id);
-        $totalCount = RMLWorkorderModel::countCompanyWorkorders($filters, $company->id);
+        $workorders = RMLWorkorderModel::getCompanyWorkorders($filters, $pagination['per_page'], ($pagination['page'] - 1) * $pagination['per_page'], $order, $companyId);
+        $totalCount = RMLWorkorderModel::countCompanyWorkorders($filters, $companyId);
 
-        // Format rows for the frontend
         $rows = array_map(function($workorder) {
             $row = (array)$workorder;
-
-            $anschlussadresse = "{$row['street']} {$row['hausnummer']}";
-            if ($row['stiege']) $anschlussadresse .= "/{$row['stiege']}";
-            if ($row['apartment']) $anschlussadresse .= " / WE: {$row['apartment']}";
-            $anschlussadresse .= ", {$row['plz']} {$row['city']}";
-
-            $kunde = $row['customerCompany'] ?: $row['customerName'];
-
-            $row['preorderInfo'] = "<strong>Kunde:</strong> {$kunde}<br>" .
-                "<strong>Anschluss:</strong> {$anschlussadresse}<br>" .
-                "<strong>Kontakt:</strong> {$row['phone']} / {$row['email']}<br>" .
-                "<strong>OAID:</strong> <span class='text-pink'>{$row['oaid']}</span>";
-
-            // Clean up unnecessary fields before sending
+            $row['preorderInfo'] = $this->getPreorderInfoTextByData($row);
             unset($row['customerName'], $row['customerCompany'], $row['street'], $row['hausnummer'], $row['stiege'], $row['oaid'], $row['apartment'], $row['plz'], $row['city'], $row['phone'], $row['email']);
-
             return $row;
         }, $workorders);
 
@@ -91,6 +78,21 @@ class RMLWorkorderCompanyController extends TTCrud
             ]
         ]);
     }
+
+    private function getPreorderInfoTextByData($data) {
+        $anschlussadresse = "{$data['street']} {$data['hausnummer']}";
+        if ($data['stiege']) $anschlussadresse .= "/{$data['stiege']}";
+        if ($data['apartment']) $anschlussadresse .= " / WE: {$data['apartment']}";
+        $anschlussadresse .= ", {$data['plz']} {$data['city']}";
+
+        $kunde = $data['customerCompany'] ?: $data['customerName'];
+
+        return "<strong>Kunde:</strong> {$kunde}<br>" .
+            "<strong>Anschluss:</strong> {$anschlussadresse}<br>" .
+            "<strong>Kontakt:</strong> {$data['phone']} / {$data['email']}<br>" .
+            "<strong>OAID:</strong> <span class='text-pink'>{$data['oaid']}</span>";
+    }
+
     public function getWorkorderByIdAction() {
         $id = $this->request->id;
         if(!$id) self::sendError("ID missing");
@@ -129,13 +131,80 @@ class RMLWorkorderCompanyController extends TTCrud
         $workorder = RMLWorkorderModel::get($post['workorderId']);
         if(!$workorder) self::sendError("Workorder not found");
 
+        $hour = (int)date('H', $post['appointmentDate']);
+        if ($hour >= 23 || $hour < 1) {
+            self::sendError("Bitte Uhrzeit angeben!");
+        }
+
         $workorder->appointmentDate = $post['appointmentDate'];
         $workorder->status = 'scheduled';
         RMLWorkorderModel::update((array)$workorder);
 
+        RMLWorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => 'Termin festgelegt auf: ' . date('d.m.Y H:i', $post['appointmentDate']),
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
         self::returnJson(['success' => true, 'message' => 'Termin erfolgreich gespeichert.']);
     }
 
+    protected function rescheduleAppointmentAction() {
+        $post = json_decode(file_get_contents('php://input'), true);
+        if (empty($post['workorderId']) || empty($post['appointmentDate']) || empty($post['reason'])) {
+            self::sendError("Required fields are missing.");
+        }
+
+        $workorder = RMLWorkorderModel::get($post['workorderId']);
+        if(!$workorder) self::sendError("Workorder not found.");
+
+        $hour = (int)date('H', $post['appointmentDate']);
+        if ($hour >= 23 || $hour < 1) {
+            self::sendError("Bitte Uhrzeit angeben!");
+        }
+
+        $oldDateFormatted = $workorder->appointmentDate ? date('d.m.Y H:i', $workorder->appointmentDate) : 'N/A';
+        $newDateFormatted = date('d.m.Y H:i', $post['appointmentDate']);
+
+        $workorder->appointmentDate = $post['appointmentDate'];
+        RMLWorkorderModel::update((array)$workorder);
+
+        RMLWorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => "Termin verschoben von {$oldDateFormatted} auf {$newDateFormatted}. Grund: " . $post['reason'],
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Termin erfolgreich verschoben.']);
+    }
+
+    protected function requestInterventionAction() {
+        $post = json_decode(file_get_contents('php://input'), true);
+        if (empty($post['workorderId']) || empty($post['journalText'])) {
+            self::sendError("Required fields are missing.");
+        }
+
+        $workorder = RMLWorkorderModel::get($post['workorderId']);
+        if(!$workorder) self::sendError("Workorder not found.");
+
+        $oldStatus = $workorder->status;
+        $workorder->status = 'intervention_required';
+        RMLWorkorderModel::update((array)$workorder);
+
+        RMLWorkorderJournalModel::create([
+            'workorderId' => $workorder->id,
+            'text' => "Eingriff benötigt: " . $post['journalText'],
+            'statusChange' => "$oldStatus -> intervention_required",
+            'create' => time(),
+            'createBy' => $this->user->id,
+        ]);
+
+        self::returnJson(['success' => true, 'message' => 'Eingriff wurde angefordert.']);
+    }
+
+
     protected function uploadDocumentationAction()
     {
         if (empty($_FILES['files']) || empty($_POST['workorderId'])) {
@@ -199,11 +268,12 @@ class RMLWorkorderCompanyController extends TTCrud
         $typeCounts = [];
 
         $translationMap = [
-            'photo_before' => 'Foto vorher',
-            'photo_during' => 'Foto währenddessen',
-            'photo_after' => 'Foto nachher',
-            'measurement_protocol' => 'Messprotokoll',
-            'customer_signature' => 'Kundenunterschrift',
+            'photo_hup_mounted' => 'Foto_montierter_HÜP',
+            'photo_hup_open' => 'Foto_offener_HÜP',
+            'photo_splice_cassette' => 'Foto_Spleißkassette',
+            'photo_hup_closed_stickers' => 'Foto_geschlossener_HÜP_mit_Aufklebern',
+            'photo_fcp_labeled' => 'Foto_FCP_beschriftet',
+            'measurement_protocol_otdr' => 'ODTR_Messung',
         ];
 
         foreach($docs as $doc) {