diff --git a/application/RMLWorkorderAdmin/RMLWorkorderAdminController.php b/application/RMLWorkorderAdmin/RMLWorkorderAdminController.php index a905c3744..7dd33cb34 100644 --- a/application/RMLWorkorderAdmin/RMLWorkorderAdminController.php +++ b/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.']); + } } \ No newline at end of file diff --git a/application/RMLWorkorderCompany/RMLWorkorderCompanyController.php b/application/RMLWorkorderCompany/RMLWorkorderCompanyController.php index 7342952a0..dce0851a5 100644 --- a/application/RMLWorkorderCompany/RMLWorkorderCompanyController.php +++ b/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'] = "Kunde: {$kunde}
" . - "Anschluss: {$anschlussadresse}
" . - "Kontakt: {$row['phone']} / {$row['email']}
" . - "OAID: {$row['oaid']}"; - - // 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 "Kunde: {$kunde}
" . + "Anschluss: {$anschlussadresse}
" . + "Kontakt: {$data['phone']} / {$data['email']}
" . + "OAID: {$data['oaid']}"; + } + 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) { diff --git a/db/migrations/20250812110000_rmlworkorder_update_status_enum.php b/db/migrations/20250812110000_rmlworkorder_update_status_enum.php new file mode 100644 index 000000000..bb5a11b35 --- /dev/null +++ b/db/migrations/20250812110000_rmlworkorder_update_status_enum.php @@ -0,0 +1,21 @@ +getEnvironment() == 'thetool') { + $this->execute("ALTER TABLE `RMLWorkorder` MODIFY `status` enum('new','assigned','scheduled','correction_requested','documented','completed','intervention_required') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci NOT NULL DEFAULT 'new'"); + } + } + + public function down(): void + { + if ($this->getEnvironment() == 'thetool') { + $this->execute("ALTER TABLE `RMLWorkorder` MODIFY `status` enum('new','assigned','scheduled','documented','completed') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci NOT NULL DEFAULT 'new'"); + } + } +} diff --git a/public/js/pages/RMLWorkorderAdmin/RMLWorkorderAdmin.js b/public/js/pages/RMLWorkorderAdmin/RMLWorkorderAdmin.js index 837c80506..515f0224c 100644 --- a/public/js/pages/RMLWorkorderAdmin/RMLWorkorderAdmin.js +++ b/public/js/pages/RMLWorkorderAdmin/RMLWorkorderAdmin.js @@ -39,7 +39,7 @@ Vue.component('r-m-l-workorder-admin', { additional-class="btn-link btn-sm p-0 m-0" title="Zur Bestellung" /> - + @@ -103,10 +103,28 @@ Vue.component('r-m-l-workorder-admin', { @@ -128,6 +147,7 @@ Vue.component('r-m-l-workorder-admin', { window, workordersToAssign: [], editingWorkorderId: null, + editingDeadlineId: null, companies: [], massAssignCompanyId: null, massAssignLoading: false, @@ -141,8 +161,7 @@ Vue.component('r-m-l-workorder-admin', { if (['completed', 'new'].includes(row.status) || !deadlineDate.isValid()) { return 'tt-rml-workorder-irrelevant'; } - // if status is correction_requested, return tt-rml-workorder-high - if (row.status === 'correction_requested') { + if (['correction_requested', 'intervention_required'].includes(row.status)) { return 'tt-rml-workorder-high'; } @@ -231,6 +250,43 @@ Vue.component('r-m-l-workorder-admin', { this.massAssignLoading = false; this.massAssignCompanyId = null; } + }, + async updateDeadline(workorder, newDate) { + if (!newDate) { + this.editingDeadlineId = null; + return; + } + try { + const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RMLWorkorderAdmin/updateDeadline`, { + workorderId: workorder.id, + deadlineDate: newDate + }); + if (response.data.success) { + window.notify('success', response.data.message); + this.$refs.table.$refs.table.refreshTable(); + } else { + window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten.'); + } + } catch (e) { + window.notify('error', 'Ein Netzwerkfehler ist aufgetreten.'); + } finally { + this.editingDeadlineId = null; + } + }, + async acceptDocumentation(workorderId) { + if (!confirm('Soll die Dokumentation für diesen Arbeitsauftrag wirklich akzeptiert und der Auftrag abgeschlossen werden?')) return; + + try { + const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RMLWorkorderAdmin/acceptDocumentation`, { workorderId }); + if (response.data.success) { + window.notify('success', response.data.message); + this.$refs.table.$refs.table.refreshTable(); + } else { + window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten.'); + } + } catch (e) { + window.notify('error', 'Ein Netzwerkfehler ist aufgetreten.'); + } } } }); @@ -273,17 +329,16 @@ Vue.component('rml-documentation-viewer-admin', { -
-
Dokumentation akzeptieren
-
-

Wenn die Dokumentation korrekt ist, können Sie sie hier akzeptieren.

- -
+
Dokumentation akzeptieren
+
+

Wenn die Dokumentation korrekt ist, können Sie sie hier akzeptieren.

+ +
diff --git a/public/js/pages/RMLWorkorderCompany/RMLWorkorderCompany.js b/public/js/pages/RMLWorkorderCompany/RMLWorkorderCompany.js index da58f3bf3..8df9e1165 100644 --- a/public/js/pages/RMLWorkorderCompany/RMLWorkorderCompany.js +++ b/public/js/pages/RMLWorkorderCompany/RMLWorkorderCompany.js @@ -1,50 +1,76 @@ // RMLWorkorderCompany.js Vue.component('r-m-l-workorder-company', { template: ` - - - +
+ + + - + - + - + + + - + + - - + +

Auftrag: #{{ rescheduleData.workorder.id }}

+ + + +
`, data() { return { + rescheduleData: null, crudConfig: { ...window.TT_CONFIG.CRUD_CONFIG, expandable: true, @@ -55,6 +81,10 @@ Vue.component('r-m-l-workorder-company', { return 'tt-rml-workorder-irrelevant'; } + if (['correction_requested', 'intervention_required'].includes(row.status)) { + return 'tt-rml-workorder-high'; + } + const daysLeft = deadlineDate.diff(moment(), 'days'); if (daysLeft <= 7) return 'tt-rml-workorder-urgent'; @@ -71,12 +101,20 @@ Vue.component('r-m-l-workorder-company', { const column = this.crudConfig.columns.find(c => c.key === 'status'); return column.table.filterOptions.find(opt => opt.value === status) || {}; }, - formatDate(timestamp) { + formatDate(timestamp, withTime = false) { if (!timestamp) return '–'; - return window.moment.unix(timestamp).format('DD.MM.YYYY'); + const format = withTime ? 'DD.MM.YYYY HH:mm' : 'DD.MM.YYYY'; + return window.moment.unix(timestamp).format(format); }, async setAppointment(workorder, date) { if (!date) return; + + const hour = moment.unix(date).hour(); + if (hour >= 23 || hour < 1) { + this.$refs.table.$refs.table.refreshTable(); // Re-render to clear invalid date from picker + return window.notify('error', 'Bitte Uhrzeit angeben!'); + } + try { const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RMLWorkorderCompany/scheduleAppointment`, { workorderId: workorder.id, @@ -89,7 +127,44 @@ Vue.component('r-m-l-workorder-company', { window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten.'); } } catch (e) { - window.notify('error', 'Ein Netzwerkfehler ist aufgetreten.'); + window.notify('error', e.response?.data?.message || 'Ein Netzwerkfehler ist aufgetreten.'); + } + }, + openRescheduleModal(row) { + this.rescheduleData = { + workorder: row, + newDate: row.appointmentDate, + reason: '' + }; + }, + closeRescheduleModal() { + this.rescheduleData = null; + }, + async rescheduleAppointment() { + const { workorder, newDate, reason } = this.rescheduleData; + if (!newDate || !reason) { + return window.notify('error', 'Bitte geben Sie ein neues Datum und einen Grund an.'); + } + const hour = moment.unix(newDate).hour(); + if (hour >= 23 || hour < 1) { + return window.notify('error', 'Bitte Uhrzeit angeben!'); + } + + try { + const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RMLWorkorderCompany/rescheduleAppointment`, { + workorderId: workorder.id, + appointmentDate: newDate, + reason: reason + }); + if (response.data.success) { + window.notify('success', response.data.message); + this.$refs.table.$refs.table.refreshTable(); + this.closeRescheduleModal(); + } else { + window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten.'); + } + } catch (e) { + window.notify('error', e.response?.data?.message || 'Ein Netzwerkfehler ist aufgetreten.'); } } } @@ -135,31 +210,45 @@ Vue.component('documentation-manager', { - + Bitte laden Sie alle benötigten Dokumente hoch, um den Auftrag abzuschließen. -
- Auftrag bereits abgeschlossen. +
+ Auftrag zur Prüfung eingereicht.
+ +
+
Eingriff benötigt
+
+

Falls ein Problem auftritt, das ein Eingreifen erfordert, melden Sie es hier.

+ +
+
+
Journal
  • Keine Einträge vorhanden.
    • -
  • +
  • {{ formatDate(log.create) }} ({{ log.createByName }}):
    {{ log.text }}
-
+
-
+
Neues Dokument hochladen
@@ -191,8 +280,8 @@ Vue.component('documentation-manager', { @@ -207,6 +296,18 @@ Vue.component('documentation-manager', {
+ + + + + +
`, data() { @@ -219,17 +320,19 @@ Vue.component('documentation-manager', { journals: [], newJournalMessage: '', addingJournalEntry: false, + interventionData: null, uploadData: { files: [], - documentType: 'photo_before', + documentType: 'photo_hup_mounted', description: '' }, requiredDocTypes: [ - { value: 'photo_before', text: 'Foto: Zustand vorher' }, - { value: 'photo_during', text: 'Foto: Während der Arbeit' }, - { value: 'photo_after', text: 'Foto: Zustand nachher' }, - { value: 'measurement_protocol', text: 'Messprotokoll (z.B. OTDR)' }, - { value: 'customer_signature', text: 'Unterschriebenes Arbeitsprotokoll' }, + { value: 'photo_hup_mounted', text: 'Foto vom montierten HÜP' }, + { value: 'photo_hup_open', text: 'Foto von dem offen HÜP' }, + { value: 'photo_splice_cassette', text: 'Foto der Spleißkassette' }, + { value: 'photo_hup_closed_stickers', text: 'Foto vom geschlossenen HÜP mit allen Aufklebern' }, + { value: 'photo_fcp_labeled', text: 'Foto vom FCP beschriftet' }, + { value: 'measurement_protocol_otdr', text: 'ODTR – Messung (1310nm & 1510nm)' }, ] } }, @@ -326,7 +429,7 @@ Vue.component('documentation-manager', { this.uploading = false; }, async completeWorkorder() { - if(!confirm('Möchten Sie diesen Auftrag wirklich abschließen? Diese Aktion kann nicht rückgängig gemacht werden.')) return; + if(!confirm('Möchten Sie diesen Auftrag wirklich abschließen und zur Prüfung einreichen?')) return; this.completing = true; try { const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RMLWorkorderCompany/completeWorkorder`, { workorderId: this.workorder.id }); @@ -390,6 +493,41 @@ Vue.component('documentation-manager', { } finally { this.addingJournalEntry = false; } + }, + openInterventionModal() { + this.interventionData = { type: 'stuck', distance: '', otherReason: '' }; + }, + async requestIntervention() { + let journalText = ''; + const { type, distance, otherReason } = this.interventionData; + + if (type === 'stuck') { + if (!distance || isNaN(distance)) return window.notify('error', 'Bitte eine gültige Distanz eingeben.'); + journalText = `Ab ${distance} Laufmeter stecken geblieben.`; + } else if (type === 'no_air') { + journalText = 'Keine Luftverbindung.'; + } else if (type === 'other') { + if (!otherReason.trim()) return window.notify('error', 'Bitte geben Sie einen Grund an.'); + journalText = otherReason.trim(); + } else { + return window.notify('error', 'Ungültiger Problemtyp.'); + } + + try { + const response = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RMLWorkorderCompany/requestIntervention`, { + workorderId: this.workorderId, + journalText: journalText + }); + if (response.data.success) { + window.notify('success', response.data.message); + this.interventionData = null; + this.$emit('workorder-completed'); // This just refreshes the table + } else { + window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten.'); + } + } catch (e) { + window.notify('error', 'Ein Netzwerkfehler ist aufgetreten.'); + } } }, async mounted() {