@@ -399,6 +429,22 @@ $pagination_entity_name = "Rechnungen";
todayBtn: 'linked',
autoclose: true
});
+ $('#manual_invoice_date_from').datepicker({
+ orientation: "bottom",
+ language: 'de',
+ format: "dd.mm.yyyy",
+ showWeekDays: true,
+ todayBtn: 'linked',
+ autoclose: true
+ });
+ $('#manual_invoice_date_to').datepicker({
+ orientation: "bottom",
+ language: 'de',
+ format: "dd.mm.yyyy",
+ showWeekDays: true,
+ todayBtn: 'linked',
+ autoclose: true
+ });
$('.datepicker').datepicker({
orientation: "bottom",
language: 'de',
diff --git a/Layout/default/ManualInvoice/PDF_HEADER.html b/Layout/default/ManualInvoice/PDF_HEADER.html
index 075f2c9bc..49e6196c0 100644
--- a/Layout/default/ManualInvoice/PDF_HEADER.html
+++ b/Layout/default/ManualInvoice/PDF_HEADER.html
@@ -68,9 +68,7 @@
-
- 
- |
+ {{ qrCodeHtml }}
diff --git a/Layout/default/ManualInvoice/PDF_MAIN.php b/Layout/default/ManualInvoice/PDF_MAIN.php
index 49ef1d468..3e6523035 100644
--- a/Layout/default/ManualInvoice/PDF_MAIN.php
+++ b/Layout/default/ManualInvoice/PDF_MAIN.php
@@ -17,7 +17,7 @@ foreach($invoice->positions as $p) {
}
}
-$gesamtrabatt = $invoice->gesamtrabatt ?? 0;
+$total_discount = $invoice->total_discount ?? 0;
$subtotal = 0;
foreach($invoice->positions as $p) {
$subtotal += $p->price_total ?? 0;
@@ -127,8 +127,8 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
Ihre Xinon vom invoice_date)?>
- einleitender_text ?? ''): ?>
- einleitender_text))?>
+ introductory_text ?? ''): ?>
+ introductory_text))?>
@@ -166,7 +166,7 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
">
|
- product_name ?? '')?>
+ warehousearticle_name ?? '')?>
product_info) && $p->product_info): ?>
product_info)?>
@@ -186,17 +186,17 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
endforeach;
endforeach;
?>
- 0): ?>
+ 0): ?>
|
| Zwischensumme: |
|
- | Gesamtrabatt %: |
- - |
+ Gesamtrabatt %: |
+ - |
-
+
| Gesamt Netto: |
|
diff --git a/Layout/default/MobileApp/App.php b/Layout/default/MobileApp/App.php
new file mode 100644
index 000000000..a7f33fb95
--- /dev/null
+++ b/Layout/default/MobileApp/App.php
@@ -0,0 +1,9 @@
+ 'Xinon Mobile',
+ 'appName' => 'Xinon',
+ 'manifestPath' => '/mobile/manifest.json',
+ 'appJsPath' => '/mobile/app.js',
+ 'swPath' => '/mobile/sw.js',
+];
+require __DIR__ . '/Base.php';
diff --git a/Layout/default/MobileApp/Base.php b/Layout/default/MobileApp/Base.php
new file mode 100644
index 000000000..63f7f6500
--- /dev/null
+++ b/Layout/default/MobileApp/Base.php
@@ -0,0 +1,71 @@
+ 'Xinon Mobile',
+ 'appName' => 'Xinon',
+ 'manifestPath' => '/mobile/manifest.json',
+ 'appJsPath' => '/mobile/app.js',
+ 'swPath' => '/mobile/sw.js',
+ 'additionalStylesheets' => [],
+], $appConfig ?? []);
+?>
+
+
+
+
+
+ <?= htmlspecialchars($config['title']) ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ Lädt...
+
+
+
@@ -553,7 +553,6 @@
-
Produkte
@@ -585,6 +584,9 @@
+ preorder_id): ?>
+
+
-
-
-
+ preorder_id): ?>
+
+
@@ -641,7 +645,17 @@
-
+
+ product->getAttributeValue("oaid_enabled")): ?>
+
+
+
product->attributes) && count($product->product->attributes))
&& (array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $product->product->attributes)
@@ -828,7 +842,7 @@
@@ -869,7 +883,14 @@
-
+
+
+
@@ -1383,8 +1404,15 @@
});
} else {
$('#termination_id-' + id + '-line').hide();
- //$('#termination_id-' + id + '-line').hide();
}
+
+ if(typeof p.attributes === 'object' && "oaid_enabled" in p.attributes && p.attributes.oaid_enabled == 1) {
+ console.log("oaid_enabled");
+ $('#oaid-' + id + '-line').show();
+ console.log($('#oaid-' + id).val());
+ } else {
+ $('#oaid-' + id + '-line').hide();
+ }
if(typeof p.attributes === 'object' && "needs_number" in p.attributes && p.attributes.needs_number == 1) {
console.log("needs_number");
@@ -1893,7 +1921,7 @@
} else {
$('#products-' + id + '-delete').val(0);
//$('#position-' + id + ' .delete-button-container i').removeClass("fa-trash-can-slash").addClass("fa-trash-can");
- $('#position-' + id + ' .delete-button-container').html(' ');
+ $('#position-' + id + ' .delete-button-container').html(' ');
//$('#position-' + id + ' .delete-button-container i').removeClass("btn-outline-white fa-trash-can-slash").addClass("text-danger fa-trash-can");
$('#position-' + id).removeClass('text-white deleted');
@@ -1932,7 +1960,7 @@
\
\
\
@@ -1973,7 +2001,14 @@
\
\
\
- \
+\
+ \
+\
\
\
\
diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index 35974b831..8e44ad0e2 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -299,6 +299,10 @@
$order->id])?>" onclick="if(!confirm('Soll der Service-PIN an den Vertragsinhaber gesendet werden?')) return false;">
$order->id, "filter" => $filter, "noTermProducts" => 1])?>">
$order->id])?>" onclick="if(!confirm('Bestellung wirklich löschen?')) return false;" class="text-danger" title="Löschen">
+
+ getSnoppProduct() && ($order->getPreorderProduct() || $order->getOaidProduct())): ?>
+ $order->id, "filter" => $filter, "noTermProducts" => 1])?>" class="ml-2">?>img/snop-logo.png)
+
" id="order-dates-id?>">
@@ -543,7 +547,10 @@
| pos?> |
formatAmount()?> |
- product->name?>
+ snopp_order_id): ?>
+ ?>/img/snop-logo.png "Bestellung in Snopp")
+
+ product->name?> oaid ? "{$product->oaid}" : ""?>
product->attributes) && count($product->product->attributes))
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 6a1a44cbb..2f8219386 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -888,9 +888,10 @@ $pagination_entity_name = "Vorbestellungen";
Filter-Vorlagen
|
+
+
+
@@ -697,6 +711,7 @@
ctag |
Typ |
External ID |
+ External Name |
External State |
ctags) && count($preorder->ctags)): ?>
@@ -706,6 +721,7 @@
ctag?> |
service_type?> |
ext_id)?> |
+ ext_name)?> |
ext_status)?> |
diff --git a/Layout/default/Voicenumber/Form.php b/Layout/default/Voicenumber/Form.php
index 1d2e94ac7..ed90b52e4 100644
--- a/Layout/default/Voicenumber/Form.php
+++ b/Layout/default/Voicenumber/Form.php
@@ -117,6 +117,7 @@
+
diff --git a/Layout/default/Voicenumberblock/include/block-detail.php b/Layout/default/Voicenumberblock/include/block-detail.php
index 918bd4ebb..d9fa9ff16 100644
--- a/Layout/default/Voicenumberblock/include/block-detail.php
+++ b/Layout/default/Voicenumberblock/include/block-detail.php
@@ -17,14 +17,16 @@
id, $num_from) ? $num_from[$block->id] : $block->first), $block->last) as $number): ?>
$block->id, 'number' => $number]) ?>
-
+ ">
|
active): ?>
-
- (seit id) ? date("d.m.Y H:i:s", $num->activated_date) : ""?>)
+
+ (seit id) ? date("d.m.Y H:i:s", $num->activated_date) : ""?>)
+ disabled): ?>
+
-
+
|
$num->contract_id])?>">contract_id?> |
@@ -40,7 +42,7 @@
Lokal
- disabled_reason?> |
+ disabled_reason?>disabled > 1) ? " (".date("d.m.Y H:i", $num->disabled).")" : ""?> |
id && $num->enable_on_date) ? date("d.m.Y", $num->enable_on_date) : ""?> |
$block->id, "number" => $number])?>">
diff --git a/Layout/default/VueViews/WarehouseStocktakePWA.php b/Layout/default/VueViews/WarehouseStocktakePWA.php
index 9c65502bb..8da06d02c 100644
--- a/Layout/default/VueViews/WarehouseStocktakePWA.php
+++ b/Layout/default/VueViews/WarehouseStocktakePWA.php
@@ -1,4 +1,12 @@
id) {
+ $openreplayUserId = (string) $user->id;
+ }
+}
?>
@@ -32,6 +40,34 @@
}
+
+
+
-
+
diff --git a/Layout/default/WarehouseArticle/LABEL_BULK.php b/Layout/default/WarehouseArticle/LABEL_BULK.php
new file mode 100644
index 000000000..b6fa823c7
--- /dev/null
+++ b/Layout/default/WarehouseArticle/LABEL_BULK.php
@@ -0,0 +1,54 @@
+ QRCode::OUTPUT_IMAGE_PNG,
+ 'scale' => 10,
+ 'quietzoneSize' => 1,
+]);
+$qrcode = new QRCode($options);
+?>
+
+
+
+
+
+
+id . ":" . $article->articleNumber;
+ $qrCodeBase64 = $qrcode->render($qrData);
+?>
+
+
+
+
+ 
+ |
+
+ 
+ articleNumber); ?>
+ title); ?>
+ |
+
+
+ | Leistungszeitraum: | " . htmlspecialchars($invoice->leistungszeitraum) . " | " : "",
- "{{ externeReferenzHtml }}" => ($invoice->externe_referenz ?? '') ? "| Externe Referenz: | " . htmlspecialchars($invoice->externe_referenz) . " | " : "",
+ "{{ leistungszeitraumHtml }}" => ($invoice->performance_period ?? '') ? "| Leistungszeitraum: | " . htmlspecialchars($invoice->performance_period) . " | " : "",
+ "{{ externeReferenzHtml }}" => ($invoice->external_reference ?? '') ? "| Externe Referenz: | " . htmlspecialchars($invoice->external_reference) . " | " : "",
"{{ vatHtml }}" => ($invoice->uid ?? '') ? "| Ihre UID: | " . $invoice->uid . " | " : "",
- "{{ qrCodeSrc }}" => $this->generateSepaQRCode($invoice->invoice_number ?? "VORSCHAU", round($invoice->total_gross ?? 0, 2))
+ "{{ qrCodeHtml }}" => ($invoice->total_gross ?? 0) >= 0
+ ? ' total_gross ?? 0, 2)) . '" style="display: block; height: 100%; max-height: 3.5cm; width: auto;"> | '
+ : ''
];
$headerHtml = str_replace(array_keys($replacements), array_values($replacements), file_get_contents(BASEDIR . "/Layout/default/ManualInvoice/PDF_HEADER.html"));
@@ -208,8 +210,6 @@ class ManualInvoiceController extends TTCrud
$post = json_decode(file_get_contents('php://input'), true);
$id = $post['id'] ?? null;
$recipientEmail = $post['email'] ?? null;
- $subject = $post['subject'] ?? 'Ihre Rechnung von XINON GmbH';
- $bodyText = $post['body'] ?? 'Sehr geehrte Damen und Herren,\n\nanbei erhalten Sie Ihre Rechnung.\n\nMit freundlichen Grüßen\nIhr Xinon Team';
if (!$id || !$recipientEmail) {
self::returnJson(['success' => false, 'message' => 'ID oder E-Mail-Adresse fehlt']);
@@ -222,6 +222,19 @@ class ManualInvoiceController extends TTCrud
return;
}
+ // Format invoice date for display
+ $invoiceDateFormatted = date('d.m.Y', $invoice->invoice_date);
+
+ // Set default subject and body with invoice number and date
+ $defaultSubject = "Ihre Rechnung {$invoice->invoice_number} vom {$invoiceDateFormatted}";
+ $defaultBody = "Sehr geehrte Damen und Herren,\n\nanbei erhalten Sie Ihre Rechnung Nr. {$invoice->invoice_number} vom {$invoiceDateFormatted}.\n\nMit freundlichen Grüßen\nIhr XINON Team";
+
+ $subject = $post['subject'] ?? $defaultSubject;
+ $bodyText = $post['body'] ?? $defaultBody;
+
+ // Convert literal \n strings to actual newlines (in case frontend sends escaped strings)
+ $bodyText = str_replace('\n', "\n", $bodyText);
+
// Generate PDF
$pdf_filename = $this->createPDFAction(true);
if (!$pdf_filename || !file_exists($pdf_filename)) {
@@ -232,19 +245,33 @@ class ManualInvoiceController extends TTCrud
$pdfContent = file_get_contents($pdf_filename);
// --- HTML Email Generation ---
- $logoToolPath = BASEDIR . '/public/assets/images/the-tool-logo.png';
$logoXinonPath = BASEDIR . '/public/assets/images/xinon-full.png';
- $logoToolExists = file_exists($logoToolPath);
$logoXinonExists = file_exists($logoXinonPath);
- // Construct HTML Body
- $html = 'Rechnung';
- $html .= '';
+ // Construct HTML Body with Outlook compatibility
+ $html = '';
+ $html .= '';
+ $html .= '';
+ $html .= ' ';
+ $html .= ' ';
+ $html .= ' ';
+ $html .= ' Rechnung';
+ $html .= '';
+ $html .= '';
+ $html .= '';
+ $html .= '';
- // Logos
- $html .= ' ';
- if ($logoToolExists) $html .= '  ';
- if ($logoXinonExists) $html .= '  ';
+ // Outlook-safe container table
+ $html .= '';
+ $html .= ' ';
+
+ // Logo with Outlook-safe sizing
+ $html .= ' ';
+ if ($logoXinonExists) {
+ $html .= '';
+ $html .= ' ';
+ $html .= '';
+ }
$html .= ' ';
$html .= ' ' . htmlspecialchars($subject) . '';
@@ -254,7 +281,9 @@ class ManualInvoiceController extends TTCrud
$html .= ' ';
+ $html .= '
{$article->title}";
+ }
+ }
+
+ $row['quantityBefore'] = $row['quantityBefore'] !== null ? number_format((float)$row['quantityBefore'], 2, ',', '.') : '-';
+ $row['quantityAfter'] = $row['quantityAfter'] !== null ? number_format((float)$row['quantityAfter'], 2, ',', '.') : '-';
+ $row['quantity'] = number_format((float)$row['quantity'], 2, ',', '.');
+
+ $allCategories = WarehouseMovementModel::getReasonCategories();
+ $row['reasonCategory'] = $allCategories[$rawType][$row['reasonCategory']] ?? $row['reasonCategory'];
+
+ return $row;
+ }
+
+ /**
+ * Get reason categories for a specific movement type
+ */
+ protected function getReasonCategoriesAction() {
+ $type = $this->request->type ?? null;
+ $categories = WarehouseMovementModel::getReasonCategories($type);
+
+ if ($type && is_array($categories)) {
+ $items = [];
+ foreach ($categories as $key => $label) {
+ $items[] = ['value' => $key, 'text' => $label];
+ }
+ self::returnJson(['success' => true, 'categories' => $items]);
+ } else {
+ self::returnJson(['success' => true, 'categories' => $categories]);
+ }
+ }
+
+ /**
+ * Get current stock for an article at a location
+ */
+ protected function getCurrentStockAction() {
+ $articleId = intval($this->request->articleId ?? 0);
+ $locationId = intval($this->request->locationId ?? 0);
+
+ if (!$articleId || !$locationId) {
+ self::returnJson(['success' => false, 'currentStock' => 0]);
+ return;
+ }
+
+ $existingItems = WarehouseItemModel::getAll([
+ 'articleId' => $articleId,
+ 'warehouseLocationId' => $locationId
+ ]);
+
+ $currentStock = count($existingItems) > 0 ? floatval($existingItems[0]->quantity) : 0;
+
+ self::returnJson(['success' => true, 'currentStock' => $currentStock]);
+ }
+}
diff --git a/application/WarehouseMovement/WarehouseMovementModel.php b/application/WarehouseMovement/WarehouseMovementModel.php
new file mode 100644
index 000000000..fa069a20e
--- /dev/null
+++ b/application/WarehouseMovement/WarehouseMovementModel.php
@@ -0,0 +1,140 @@
+query("SELECT movementNumber FROM WarehouseMovement
+ WHERE movementNumber LIKE '{$prefix}%'
+ ORDER BY movementNumber DESC LIMIT 1");
+
+ if ($row = $result->fetch_assoc()) {
+ $lastNumber = intval(substr($row['movementNumber'], -6));
+ $nextNumber = $lastNumber + 1;
+ } else {
+ $nextNumber = 1;
+ }
+
+ return $prefix . str_pad((string)$nextNumber, 6, '0', STR_PAD_LEFT);
+ }
+
+ /**
+ * Get reason categories for a movement type
+ */
+ public static function getReasonCategories(?string $type = null): array {
+ $categories = [
+ 'IN' => [
+ 'Warenlieferung' => 'Warenlieferung',
+ 'Rueckgabe' => 'Rückgabe',
+ 'Gefunden' => 'Gefunden/Inventurdifferenz',
+ 'UmlagerungEingang' => 'Umlagerung (Eingang)',
+ 'Erstbestand' => 'Erstbestand',
+ 'Sonstiges' => 'Sonstiges'
+ ],
+ 'OUT' => [
+ 'Verbrauch' => 'Verbrauch',
+ 'Beschaedigung' => 'Beschädigung/Defekt',
+ 'Verlust' => 'Verlust/Schwund',
+ 'UmlagerungAusgang' => 'Umlagerung (Ausgang)',
+ 'Entsorgung' => 'Entsorgung',
+ 'Sonstiges' => 'Sonstiges'
+ ],
+ 'ADJUSTMENT' => [
+ 'Inventurkorrektur' => 'Inventurkorrektur',
+ 'Buchungsfehler' => 'Buchungsfehler',
+ 'Systemkorrektur' => 'Systemkorrektur',
+ 'SonstigeKorrektur' => 'Sonstige Korrektur'
+ ]
+ ];
+
+ if ($type && isset($categories[$type])) {
+ return $categories[$type];
+ }
+
+ return $categories;
+ }
+
+ /**
+ * Get movement type labels
+ */
+ public static function getMovementTypes(): array {
+ return [
+ 'IN' => 'Einbuchung',
+ 'OUT' => 'Ausbuchung',
+ 'ADJUSTMENT' => 'Korrektur'
+ ];
+ }
+
+ public function getArticle(): ?WarehouseArticleModel {
+ return WarehouseArticleModel::get($this->articleId);
+ }
+
+ /**
+ * Get location object
+ */
+ public function getLocation(): ?WarehouseLocationModel {
+ return WarehouseLocationModel::get($this->warehouseLocationId);
+ }
+
+ /**
+ * Get user who made the movement
+ */
+ public function getUser(): ?UserModel {
+ return UserModel::get($this->userId);
+ }
+
+ /**
+ * Get warehouse item if linked
+ */
+ public function getWarehouseItem(): ?WarehouseItemModel {
+ if (!$this->warehouseItemId) return null;
+ return WarehouseItemModel::get($this->warehouseItemId);
+ }
+
+ /**
+ * Get linked order if this movement was created from an order delivery
+ */
+ public function getLinkedOrder(): ?WarehouseOrderModel {
+ if (!$this->linkedOrderId) return null;
+ return WarehouseOrderModel::get($this->linkedOrderId);
+ }
+
+ /**
+ * Get formatted movement type label
+ */
+ public function getMovementTypeLabel(): string {
+ $types = self::getMovementTypes();
+ return $types[$this->movementType] ?? $this->movementType;
+ }
+
+ /**
+ * Get formatted reason category label
+ */
+ public function getReasonCategoryLabel(): string {
+ $allCategories = self::getReasonCategories();
+ foreach ($allCategories as $typeCategories) {
+ if (isset($typeCategories[$this->reasonCategory])) {
+ return $typeCategories[$this->reasonCategory];
+ }
+ }
+ return $this->reasonCategory;
+ }
+}
diff --git a/application/WarehouseOffer/WarehouseOfferController.php b/application/WarehouseOffer/WarehouseOfferController.php
index 8658804f4..771e3ae58 100644
--- a/application/WarehouseOffer/WarehouseOfferController.php
+++ b/application/WarehouseOffer/WarehouseOfferController.php
@@ -56,7 +56,7 @@ class WarehouseOfferController extends TTCrud
$this->postData['offerNumber'] = 'AN' . date('Y') . '-' . str_pad($currentCount + 1, 4, '0', STR_PAD_LEFT);
$this->postData['status'] = 'new';
$this->postData['version'] = 1;
- $this->postData['validity'] = 14;
+ $this->postData['validity'] = 31;
$this->postData['alternativePositions'] = json_encode([]);
return true;
}
@@ -366,10 +366,13 @@ class WarehouseOfferController extends TTCrud
$version = $this->request->version ?? null;
$offerData = null;
+ $versionDate = null; // Date when this version was created (for validity calculation)
+
if ($version) {
$historyEntry = WarehouseHistoryModel::getOneByVersion($id, $this->mod, $version);
if ($historyEntry && !empty($historyEntry->data)) {
$offerData = json_decode($historyEntry->data);
+ $versionDate = $historyEntry->create; // Use version creation date
}
}
@@ -377,6 +380,10 @@ class WarehouseOfferController extends TTCrud
$offer = WarehouseOfferModel::get($id);
if (!$offer || !$offer->id) self::sendError('Angebot nicht gefunden');
$offerData = $offer;
+
+ // Get latest history entry for current version's date
+ $latestHistory = WarehouseHistoryModel::getOneByVersion($id, $this->mod, $offer->version);
+ $versionDate = $latestHistory ? $latestHistory->create : $offer->create;
}
@@ -432,11 +439,12 @@ class WarehouseOfferController extends TTCrud
"alternativeTotal" => $alternativeTotal,
"offerNumber" => $offerData->offerNumber,
"offerDate" => $offerData->create,
+ "versionDate" => $versionDate ?? $offerData->create, // Date for validity calculation
"offerEditorName" => $editor ? $editor->name : 'Unbekannt',
"includeTax" => true,
"vatRate" => 0.20,
"offerText" => $offerData->notes ?? '',
- "validity" => $offerData->validity ?? 14,
+ "validity" => $offerData->validity ?? 31,
"closingText" => $offerData->closingText ?? '',
"bank_iban" => TT_INVOICE_BANK_IBAN,
"bank_bic" => TT_INVOICE_BANK_BIC,
diff --git a/application/WarehouseOrder/WarehouseOrderController.php b/application/WarehouseOrder/WarehouseOrderController.php
index 0e4d9d939..dc486fcfe 100644
--- a/application/WarehouseOrder/WarehouseOrderController.php
+++ b/application/WarehouseOrder/WarehouseOrderController.php
@@ -406,9 +406,72 @@ $appendToBody
];
try {
+ $createdMovementIds = [];
+
+ // Create warehouse movements for delivery statuses
+ if (in_array($postData['status'], ['partiallyDelivered', 'fullyDelivered'])
+ && isset($postData['deliveryData']) && is_array($postData['deliveryData'])) {
+
+ // Get location ID from request or use default (K1 Fladnitz 150)
+ $locationId = intval($postData['locationId'] ?? 0);
+ if ($locationId <= 0) {
+ // Default to K1 Fladnitz 150
+ $allLocations = WarehouseLocationModel::getAll();
+ $defaultLocation = null;
+ foreach ($allLocations as $loc) {
+ if ($loc->title === 'K1 Fladnitz 150') {
+ $defaultLocation = $loc;
+ break;
+ }
+ }
+ $locationId = $defaultLocation ? $defaultLocation->id : 1;
+ }
+
+ // Prepare delivery data with articleId from order positions
+ $positions = json_decode($order->positions, true) ?: [];
+ $deliveryDataWithArticleIds = [];
+
+ foreach ($postData['deliveryData'] as $index => $delivery) {
+ if (isset($positions[$index])) {
+ $delivery['articleId'] = $positions[$index]['article'];
+ }
+ $deliveryDataWithArticleIds[] = $delivery;
+ }
+
+ $createdMovementIds = $this->createMovementsForDelivery(
+ intval($postData['orderId']),
+ $deliveryDataWithArticleIds,
+ $locationId
+ );
+
+ if (!empty($createdMovementIds)) {
+ // Update order with linked movement IDs
+ $existingMovementIds = $order->linkedMovementIds
+ ? json_decode($order->linkedMovementIds, true) : [];
+ $allMovementIds = array_merge($existingMovementIds, $createdMovementIds);
+ $orderAsArray['linkedMovementIds'] = json_encode($allMovementIds);
+
+ // Add movement info to log message
+ $fullLogMessage .= ($fullLogMessage ? "\n\n" : "") .
+ count($createdMovementIds) . " Lagerbewegung(en) erstellt.";
+ $log['message'] = trim($fullLogMessage);
+ }
+ }
+
+ // Store delivery note file IDs
+ if (!empty($postData['deliveryNoteFileIds'])) {
+ $existingFileIds = $order->deliveryNoteFileIds
+ ? json_decode($order->deliveryNoteFileIds, true) : [];
+ $allFileIds = array_merge($existingFileIds, $postData['deliveryNoteFileIds']);
+ $orderAsArray['deliveryNoteFileIds'] = json_encode($allFileIds);
+ }
+
if ($postData['status'] !== 'noChanges') {
$orderAsArray['status'] = $postData['status'];
WarehouseOrderModel::update($orderAsArray);
+ } elseif (!empty($orderAsArray['linkedMovementIds']) || !empty($orderAsArray['deliveryNoteFileIds'])) {
+ // Update even if status didn't change but we added linked data
+ WarehouseOrderModel::update($orderAsArray);
}
// Only create a log entry if there's actually something to log
@@ -416,7 +479,11 @@ $appendToBody
WarehouseLogModel::create($log);
}
- self::returnJson(['success' => true, 'message' => 'Log entry created']);
+ self::returnJson([
+ 'success' => true,
+ 'message' => 'Log entry created',
+ 'createdMovementIds' => $createdMovementIds
+ ]);
} catch (Exception $e) {
self::returnJson(['error' => 'Error creating log entry: ' . $e->getMessage()]);
}
@@ -485,6 +552,107 @@ $appendToBody
}
}
+ protected function createMovementsForDelivery(int $orderId, array $deliveryData, int $locationId): array {
+ $order = WarehouseOrderModel::get($orderId);
+ $createdMovementIds = [];
+ foreach ($deliveryData as $delivery) {
+ $deliveredAmount = floatval($delivery['amount']);
+ $articleId = intval($delivery['articleId']);
+
+ // Only create movements for items actually delivered
+ if ($deliveredAmount <= 0 || $articleId <= 0) {
+ continue;
+ }
+
+ // Find or create WarehouseItem for article + location
+ $existingItems = WarehouseItemModel::getAll([
+ 'articleId' => $articleId,
+ 'warehouseLocationId' => $locationId
+ ]);
+ $warehouseItem = count($existingItems) > 0 ? $existingItems[0] : null;
+
+ if (!$warehouseItem) {
+ // Create new warehouse item with zero quantity
+ $warehouseItemId = WarehouseItemModel::create([
+ 'articleId' => $articleId,
+ 'warehouseLocationId' => $locationId,
+ 'quantity' => 0
+ ]);
+ $warehouseItem = WarehouseItemModel::get($warehouseItemId);
+ }
+
+ $quantityBefore = $warehouseItem->quantity;
+ $quantityAfter = $quantityBefore + $deliveredAmount;
+
+ // Create warehouse movement
+ $movementData = [
+ 'movementNumber' => WarehouseMovementModel::generateMovementNumber(),
+ 'movementType' => 'IN',
+ 'articleId' => $articleId,
+ 'warehouseLocationId' => $locationId,
+ 'warehouseItemId' => $warehouseItem->id,
+ 'quantity' => $deliveredAmount,
+ 'quantityBefore' => $quantityBefore,
+ 'quantityAfter' => $quantityAfter,
+ 'reasonCategory' => 'Warenlieferung',
+ 'linkedOrderId' => $orderId,
+ 'note' => "Lagereingang aus Bestellung {$order->orderNumber}",
+ 'userId' => $this->user->id,
+ 'createBy' => $this->user->id,
+ 'create' => time()
+ ];
+
+ $movementId = WarehouseMovementModel::create($movementData);
+ $createdMovementIds[] = $movementId;
+
+ // Update warehouse item quantity
+ $warehouseItem->quantity = $quantityAfter;
+ WarehouseItemModel::update((array)$warehouseItem);
+ }
+
+ return $createdMovementIds;
+ }
+
+ protected function getLinkedMovementsAction() {
+ $orderId = $this->request->orderId;
+ if (empty($orderId)) {
+ self::returnJson(['error' => 'Order ID is required']);
+ return;
+ }
+
+ $order = WarehouseOrderModel::get($orderId);
+ $linkedMovementIds = $order->linkedMovementIds ? json_decode($order->linkedMovementIds, true) : [];
+
+ $movements = [];
+ foreach ($linkedMovementIds as $movementId) {
+ $movement = WarehouseMovementModel::get($movementId);
+ if ($movement) {
+ $article = $movement->getArticle();
+ $location = $movement->getLocation();
+ $movements[] = [
+ 'id' => $movement->id,
+ 'movementNumber' => $movement->movementNumber,
+ 'quantity' => $movement->quantity,
+ 'articleName' => $article ? $article->title : 'Unbekannt',
+ 'locationName' => $location ? $location->title : 'Unbekannt',
+ 'create' => $movement->create
+ ];
+ }
+ }
+
+ self::returnJson($movements);
+ }
+
+ protected function getLocationsAction() {
+ $locations = WarehouseLocationModel::getAll();
+ $result = array_map(function($loc) {
+ return [
+ 'value' => $loc->id,
+ 'text' => $loc->title
+ ];
+ }, $locations);
+ self::returnJson($result);
+ }
}
\ No newline at end of file
diff --git a/application/WarehouseOrder/WarehouseOrderModel.php b/application/WarehouseOrder/WarehouseOrderModel.php
index 4e14082c7..237f55ca2 100644
--- a/application/WarehouseOrder/WarehouseOrderModel.php
+++ b/application/WarehouseOrder/WarehouseOrderModel.php
@@ -32,6 +32,8 @@ class WarehouseOrderModel extends TTCrudBaseModel {
public string $delAddrPLZ;
public int $editor;
public ?string $note;
+ public ?string $linkedMovementIds = null;
+ public ?string $deliveryNoteFileIds = null;
public string $positions;
public ?int $sendShippingNote;
public int $create;
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteController.php b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
index 02b07ee85..fbf175801 100644
--- a/application/WarehouseShippingNote/WarehouseShippingNoteController.php
+++ b/application/WarehouseShippingNote/WarehouseShippingNoteController.php
@@ -6,7 +6,7 @@ class WarehouseShippingNoteController extends TTCrud {
//@formatter:off
protected array $columns = [
- ['key' => 'id', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap']],
+ ['key' => 'shippingNoteNumber', 'text' => 'LS-Nr.', 'required' => false, 'modal' => false, 'table' => ['class' => 'text-nowrap', 'filter' => 'search']],
['key' => 'note', 'text' => 'Art der Arbeit', 'required' => true],
['key' => 'billingAddressId', 'text' => 'Rechnungsadresse', 'type' => 'autocomplete', 'table' => false, 'modal' => ['apiUrl' => 'Address/api?do=findAddress', 'items' => '/Address/Api?do=findAddress', 'type' => 'autocomplete']],
['key' => 'status', 'text' => 'Status', 'required' => true, 'table' => ['filter' => 'iconSelect'], 'modal' => ['type' => 'iconSelect', 'items' => [
@@ -56,6 +56,7 @@ class WarehouseShippingNoteController extends TTCrud {
]);
$this->postData['positions'] = json_encode($this->postData['positions']);
if (isset($this->postData['metadata'])) $this->postData['metadata'] = json_encode($this->postData['metadata']);
+ $this->postData['shippingNoteNumber'] = WarehouseShippingNoteModel::generateShippingNoteNumber();
return true;
}
@@ -130,7 +131,10 @@ class WarehouseShippingNoteController extends TTCrud {
// Get billing address info
$billingAddress = null;
if ($shippingNote->billingAddressId) {
- $billingAddress = Address::getOne($shippingNote->billingAddressId);
+ $billingAddress = new Address($shippingNote->billingAddressId);
+ if (!$billingAddress->id) {
+ $billingAddress = null;
+ }
}
// Determine price type ONCE (not in loop for performance)
@@ -486,10 +490,6 @@ class WarehouseShippingNoteController extends TTCrud {
"bank_bank" => TT_INVOICE_BANK_BANK,
"bank_owner" => TT_INVOICE_BANK_OWNER];
- // Replace placeholders in header
- // create shipping note in this format LS2024-X0001
- // pad number on the left side with zeros
- $shippingNoteNumber = "LS" . date("Y", $shippingNote->create) . "-" . str_pad($shippingNote->id, 4, "0", STR_PAD_LEFT);
$headerHtml = file_get_contents(BASEDIR . "/Layout/default/WarehouseShippingNote/PDF_HEADER.html");
$headerHtml = str_replace("{{ basedir }}", BASEDIR, $headerHtml);
$headerHtml = str_replace("{{ addressLine_1 }}", $shippingNote->deliveryAddressName, $headerHtml);
@@ -504,7 +504,7 @@ class WarehouseShippingNoteController extends TTCrud {
$headerHtml = str_replace("{{ billingAddressLine_4 }}", "", $headerHtml);
$headerHtml = str_replace("{{ billingAddressLine_5 }}", "", $headerHtml);
$headerHtml = str_replace("{{ customerNumber }}", !isset($address) ? '' : $address->customer_number, $headerHtml);
- $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNoteNumber, $headerHtml);
+ $headerHtml = str_replace("{{ shippingNoteNumber }}", $shippingNote->shippingNoteNumber, $headerHtml);
$headerHtml = str_replace("{{ shippingNoteDate }}", date("d.m.Y", $shippingNote->create), $headerHtml);
$headerFile = BASEDIR . "/var/temp/shipping-note_header-" . date("U") . "-" . rand(1000, 9999) . ".html";
diff --git a/application/WarehouseShippingNote/WarehouseShippingNoteModel.php b/application/WarehouseShippingNote/WarehouseShippingNoteModel.php
index 8cc4e5721..5354951b0 100644
--- a/application/WarehouseShippingNote/WarehouseShippingNoteModel.php
+++ b/application/WarehouseShippingNote/WarehouseShippingNoteModel.php
@@ -2,6 +2,7 @@
class WarehouseShippingNoteModel extends TTCrudBaseModel {
public int $id;
+ public ?string $shippingNoteNumber = null;
public ?int $billingAddressId;
public ?string $type;
public ?string $metadata;
@@ -21,4 +22,23 @@ class WarehouseShippingNoteModel extends TTCrudBaseModel {
public ?int $eShopOrderId;
public ?int $create;
public ?int $createBy;
+
+ public static function generateShippingNoteNumber(): string {
+ $year = date('Y');
+ $prefix = "LS{$year}-X";
+
+ $db = FronkDB::singleton();
+ $result = $db->query("SELECT shippingNoteNumber FROM WarehouseShippingNote
+ WHERE shippingNoteNumber LIKE '{$prefix}%'
+ ORDER BY shippingNoteNumber DESC LIMIT 1");
+
+ if ($row = $result->fetch_assoc()) {
+ $lastNumber = intval(substr($row['shippingNoteNumber'], -4));
+ $nextNumber = $lastNumber + 1;
+ } else {
+ $nextNumber = 1;
+ }
+
+ return $prefix . str_pad((string)$nextNumber, 4, '0', STR_PAD_LEFT);
+ }
}
\ No newline at end of file
diff --git a/application/Workorder/WorkorderModel.php b/application/Workorder/WorkorderModel.php
index b5762a147..680e51244 100644
--- a/application/Workorder/WorkorderModel.php
+++ b/application/Workorder/WorkorderModel.php
@@ -16,6 +16,7 @@ class WorkorderModel extends TTCrudBaseModel
public ?string $additionalInfo;
public ?string $cableLength;
public ?string $cableType;
+ public ?string $metadata;
public int $create;
public int $createBy;
@@ -199,4 +200,62 @@ class WorkorderModel extends TTCrudBaseModel
$result = $db->query($sql);
return $result ? $result->fetch_assoc()['count'] : 0;
}
+
+ public static function getTechnicalData(int $workorderId): ?array {
+ $workorder = self::get($workorderId);
+ if (!$workorder || !$workorder->preorderId) return null;
+
+ $preorder = new Preorder($workorder->preorderId);
+ if (!$preorder->id || !$preorder->adb_wohneinheit_id) return null;
+
+ $wohneinheit = $preorder->adb_wohneinheit;
+ if (!$wohneinheit) return null;
+
+ $defaultCluster = '';
+ if ($preorder->adb_hausnummer && $preorder->adb_hausnummer->netzgebiet) {
+ $defaultCluster = $preorder->adb_hausnummer->netzgebiet->extref ?? '';
+ }
+
+ $patchposition = [
+ 'equipmentName' => $wohneinheit->getPatchEqString(),
+ 'equipmentPort' => $wohneinheit->patch_port,
+ 'cluster' => $wohneinheit->patch_cluster ?: $defaultCluster,
+ 'shelf' => $wohneinheit->patch_shelf,
+ 'module' => $wohneinheit->patch_module,
+ ];
+
+ // Get dropcable data from metadata
+ $dropkabelData = [];
+ $ahaParsed = null;
+ $mapFile = null;
+ if (!empty($workorder->metadata)) {
+ $metadata = json_decode($workorder->metadata, true);
+ if (!empty($metadata['dropcable'])) {
+ $ahaParsed = $metadata['dropcable']['parsed_at'] ?? null;
+ $dropkabelData = $metadata['dropcable']['entries'] ?? [];
+ if ($mapFileId = $metadata['dropcable']['map_file_id'] ?? null) {
+ $file = new File($mapFileId);
+ if ($file->id) {
+ $mapFile = ['id' => $file->id, 'name' => $file->name, 'download_url' => '/File/show?id=' . $file->id];
+ }
+ }
+ }
+ }
+
+ $rimoWorkorders = [];
+ if (is_array($wohneinheit->rimo_workorders) && count($wohneinheit->rimo_workorders)) {
+ foreach ($wohneinheit->rimo_workorders as $wo) {
+ $rimoWorkorders[] = [
+ 'id' => $wo->id, 'rimoName' => $wo->rimo_name, 'rimoId' => $wo->rimo_id,
+ 'rimoStatus' => $wo->rimo_status, 'downloadUrl' => "/RimoWorkorder/downloadAha?id=" . $wo->id,
+ ];
+ }
+ }
+
+ return [
+ 'patchposition' => $patchposition,
+ 'rimoWorkorders' => $rimoWorkorders,
+ 'dropcable' => ['parsed_at' => $ahaParsed, 'entries' => $dropkabelData, 'map_file' => $mapFile],
+ ];
+ }
}
\ No newline at end of file
diff --git a/application/WorkorderAdmin/WorkorderAdminController.php b/application/WorkorderAdmin/WorkorderAdminController.php
index c0771036f..40259cb0b 100644
--- a/application/WorkorderAdmin/WorkorderAdminController.php
+++ b/application/WorkorderAdmin/WorkorderAdminController.php
@@ -54,6 +54,7 @@ class WorkorderAdminController extends WorkorderBaseController
public function indexAction()
{
$this->createWorkordersFromPreorders();
+ $this->autoCompleteDocumentedWorkorders();
$this->archiveWorkorders();
parent::indexAction();
}
diff --git a/application/WorkorderBase/WorkorderBaseController.php b/application/WorkorderBase/WorkorderBaseController.php
index fcfce3a08..8fac50f33 100644
--- a/application/WorkorderBase/WorkorderBaseController.php
+++ b/application/WorkorderBase/WorkorderBaseController.php
@@ -60,6 +60,10 @@ class WorkorderBaseController extends TTCrud
$translationMap = array_merge(['civil_engineering_photo' => 'Tiefbau_Foto'], $customMap);
}
+ // Auto-parse AHA if enabled and not yet parsed
+ if ($tenantConfig?->showTechnicalData) {
+ RimoWorkorder::autoParseForWorkorder((int)$this->request->workorderId);
+ }
$responseDocs = [];
$typeCounts = [];
@@ -141,6 +145,13 @@ class WorkorderBaseController extends TTCrud
return WorkorderTenantConfigModel::getFirst(['addressId' => $network->owner_id]) ?? null;
}
+ /**
+ * Retrieves technical data (patchposition and AHA Blatt info) for a workorder.
+ */
+ protected function getTechnicalData(int $workorderId): ?array {
+ return WorkorderModel::getTechnicalData($workorderId);
+ }
+
//region BACKGROUND TASKS
/**
* Creates new workorders from preorders based on tenant configurations.
@@ -272,5 +283,50 @@ class WorkorderBaseController extends TTCrud
}
file_put_contents($lockFile, time());
}
+
+ protected function autoCompleteDocumentedWorkorders()
+ {
+ $lockFile = TEMP_DIR . "/task_auto_complete_workorders.lock";
+ if (file_exists($lockFile) && (time() - intval(file_get_contents($lockFile))) < 300) return;
+
+ foreach (WorkorderTenantConfigModel::getAll() as $config) {
+ $filter = json_decode($config->autoCompleteFilter ?? '', true);
+ if (empty($filter)) continue;
+
+ $networks = NetworkModel::search(['owner_id' => $config->addressId]);
+ if (empty($networks)) continue;
+
+ $networkIds = array_map(fn($n) => $n->id, $networks);
+ $campaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => $networkIds]));
+ if (empty($campaignIds)) continue;
+
+ $filter['preordercampaign_id'] = $campaignIds;
+ $matchingPreorders = PreorderModel::searchActive($filter);
+ if (empty($matchingPreorders)) continue;
+
+ $preorderIds = array_map(fn($p) => $p->id, $matchingPreorders);
+ $preorderIdSet = array_flip($preorderIds);
+
+ $workorders = WorkorderModel::getAll([
+ 'status' => ['new', 'assigned', 'scheduled', 'in_progress', 'correction_requested', 'intervention_required', 'civil_engineering_required', 'civil_engineering_completed', 'problem_solved', 'documented', 'archived'],
+ 'preorderId' => $preorderIds
+ ]);
+
+ foreach ($workorders as $workorder) {
+ if (!isset($preorderIdSet[$workorder->preorderId])) continue;
+ $oldStatus = $workorder->status;
+ $workorder->status = 'completed';
+ WorkorderModel::update((array)$workorder);
+ WorkorderJournalModel::create([
+ 'workorderId' => $workorder->id,
+ 'text' => 'Dokumentation automatisch akzeptiert (Auto-Complete Filter).',
+ 'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('completed'),
+ 'create' => time(),
+ 'createBy' => 1,
+ ]);
+ }
+ }
+ file_put_contents($lockFile, time());
+ }
//endregion
}
diff --git a/application/WorkorderCompany/WorkorderCompanyController.php b/application/WorkorderCompany/WorkorderCompanyController.php
index 6125b6e81..fd6f93d53 100644
--- a/application/WorkorderCompany/WorkorderCompanyController.php
+++ b/application/WorkorderCompany/WorkorderCompanyController.php
@@ -121,6 +121,23 @@ class WorkorderCompanyController extends WorkorderBaseController {
self::returnJson(['success' => true, 'message' => 'Termin erfolgreich verschoben.']);
}
+ protected function clearAppointmentAction() {
+ if (empty($this->postData['workorderId'])) self::sendError("Arbeitsauftrags-ID fehlt.");
+ $workorder = WorkorderModel::get($this->postData['workorderId']);
+ if (!$workorder) self::sendError("Arbeitsauftrag nicht gefunden.");
+
+ $oldDateFormatted = $workorder->appointmentDate ? date('d.m.Y H:i', $workorder->appointmentDate) : 'N/A';
+ $workorder->appointmentDate = null;
+ $workorder->status = 'assigned';
+ WorkorderModel::update((array)$workorder);
+
+ WorkorderJournalModel::create([
+ 'workorderId' => $workorder->id, 'text' => "Termin gelöscht (war: {$oldDateFormatted}).",
+ 'create' => time(), 'createBy' => $this->user->id,
+ ]);
+ self::returnJson(['success' => true, 'message' => 'Termin erfolgreich gelöscht.']);
+ }
+
protected function requestInterventionAction() {
if (empty($this->postData['workorderId']) || empty($this->postData['journalText'])) self::sendError("Erforderliche Felder fehlen.");
$workorder = WorkorderModel::get($this->postData['workorderId']);
@@ -167,14 +184,23 @@ class WorkorderCompanyController extends WorkorderBaseController {
self::returnJson(['success' => false, 'message' => 'Keine Mandantenkonfiguration gefunden.']);
return;
}
- self::returnJson([
+
+ $response = [
'success' => true,
'documentationTypes' => json_decode($tenantConfig->documentationTypes, true),
'civilEngineeringDocsRequired' => $tenantConfig->civilEngineeringDocsRequired,
'interventionTypes' => json_decode($tenantConfig->interventionTypes, true),
'requireCableLength' => $tenantConfig->requireCableLength,
- 'requireCableType' => $tenantConfig->requireCableType
- ]);
+ 'requireCableType' => $tenantConfig->requireCableType,
+ 'showTechnicalData' => (bool)$tenantConfig->showTechnicalData,
+ 'tiefbauSeesNormalDocs' => (bool)$tenantConfig->tiefbauSeesNormalDocs,
+ ];
+
+ if ($tenantConfig->showTechnicalData) {
+ $response['technicalData'] = $this->getTechnicalData((int)$this->request->workorderId);
+ }
+
+ self::returnJson($response);
}
protected function uploadDocumentationAction() {
diff --git a/application/WorkorderDashboard/WorkorderDashboardController.php b/application/WorkorderDashboard/WorkorderDashboardController.php
new file mode 100644
index 000000000..204609ee8
--- /dev/null
+++ b/application/WorkorderDashboard/WorkorderDashboardController.php
@@ -0,0 +1,304 @@
+",
+ "",
+ "",
+ ""
+ ];
+
+ protected array $statusLabels = [
+ 'new' => 'Neu', 'assigned' => 'Zugewiesen', 'scheduled' => 'Geplant', 'in_progress' => 'In Bearbeitung',
+ 'correction_requested' => 'Korrektur angefordert', 'intervention_required' => 'Eingriff erforderlich',
+ 'civil_engineering_required' => 'Tiefbau benötigt', 'civil_engineering_completed' => 'Tiefbau abgeschlossen',
+ 'problem_solved' => 'Problem gelöst', 'documented' => 'Dokumentiert', 'completed' => 'Abgeschlossen',
+ 'charged' => 'Verrechnet', 'cancelled' => 'Abgebrochen', 'archived' => 'Archiviert',
+ ];
+
+ protected array $statusColors = [
+ 'new' => '#3b82f6', 'assigned' => '#06b6d4', 'scheduled' => '#8b5cf6', 'in_progress' => '#f59e0b',
+ 'correction_requested' => '#ef4444', 'intervention_required' => '#dc2626', 'civil_engineering_required' => '#ea580c',
+ 'civil_engineering_completed' => '#65a30d', 'problem_solved' => '#22c55e', 'documented' => '#14b8a6',
+ 'completed' => '#10b981', 'charged' => '#8b5cf6', 'cancelled' => '#6b7280', 'archived' => '#9ca3af',
+ ];
+
+ protected function indexAction()
+ {
+ $this->layout()->set('additionalHead', $this->additionalHead);
+ Helper::renderVue($this, 'WorkorderDashboard', $this->headerTitle, []);
+ }
+
+ protected function getFilterOptionsAction()
+ {
+ if ($this->user->isAdmin()) {
+ $tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
+ } else {
+ $tenants = WorkorderTenantConfigModel::getAll(['addressId' => $this->user->address_id], null, 0, ['key' => 'name', 'order' => 'ASC']);
+ }
+ $companies = WorkorderCompanyModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
+
+ self::returnJson([
+ 'tenants' => array_map(fn($t) => ['value' => $t->id, 'text' => $t->name], $tenants),
+ 'companies' => array_map(fn($c) => ['value' => $c->id, 'text' => $c->name], $companies),
+ 'statuses' => array_map(fn($key, $label) => ['value' => $key, 'text' => $label], array_keys($this->statusLabels), $this->statusLabels),
+ 'campaigns' => []
+ ]);
+ }
+
+ protected function getCampaignsForTenantAction()
+ {
+ $tenantId = $this->postData['tenantId'] ?? null;
+ if (!$tenantId || !($config = WorkorderTenantConfigModel::get($tenantId))) {
+ self::returnJson([]);
+ return;
+ }
+ if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) {
+ self::returnJson([]);
+ return;
+ }
+
+ $networks = NetworkModel::search(['owner_id' => $config->addressId]);
+ if (empty($networks)) {
+ self::returnJson([]);
+ return;
+ }
+
+ $campaigns = PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]);
+ $options = array_map(fn($c) => ['value' => $c->id, 'text' => $c->name], $campaigns);
+ usort($options, fn($a, $b) => strcmp($a['text'], $b['text']));
+ self::returnJson($options);
+ }
+
+ protected function getDashboardDataAction()
+ {
+ $tenantId = $this->postData['tenantId'] ?? null;
+ $dateFrom = $this->postData['dateFrom'] ?? null;
+ $dateTo = $this->postData['dateTo'] ?? null;
+ $companyIds = $this->postData['companyIds'] ?? [];
+ $statuses = $this->postData['statuses'] ?? [];
+ $campaignIds = $this->postData['campaignIds'] ?? [];
+
+ if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.');
+ $config = WorkorderTenantConfigModel::get($tenantId);
+ if (!$config) self::sendError('Mandant nicht gefunden.');
+ if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) self::sendError('Keine Berechtigung für diesen Mandanten.');
+
+ $networks = NetworkModel::search(['owner_id' => $config->addressId]);
+ $tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]));
+
+ if (empty($tenantCampaignIds)) {
+ self::returnJson($this->getEmptyDashboardData());
+ return;
+ }
+
+ if (!empty($campaignIds)) $tenantCampaignIds = array_intersect($tenantCampaignIds, $campaignIds);
+
+ $db = FronkDB::singleton();
+ $whereConditions = ["p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ")"];
+ if ($dateFrom) $whereConditions[] = "w.`create` >= " . intval($dateFrom);
+ if ($dateTo) $whereConditions[] = "w.`create` <= " . intval($dateTo);
+ if (!empty($companyIds)) $whereConditions[] = "w.companyId IN (" . implode(',', array_map('intval', $companyIds)) . ")";
+ if (!empty($statuses)) $whereConditions[] = "w.status IN (" . implode(',', array_map(fn($s) => "'" . $db->escape($s) . "'", $statuses)) . ")";
+ $whereClause = implode(' AND ', $whereConditions);
+
+ self::returnJson([
+ 'kpis' => $this->getKPIs($db, $whereClause, $tenantCampaignIds, $dateFrom, $dateTo),
+ 'statusDistribution' => $this->getStatusDistribution($db, $whereClause),
+ 'companyPerformance' => $this->getCompanyPerformance($db, $whereClause),
+ 'timeTrends' => $this->getTimeTrends($db, $tenantCampaignIds, $dateFrom, $dateTo, $companyIds),
+ 'companyStatusCampaign' => $this->getCompanyStatusCampaign($db, $whereClause),
+ 'interventionRates' => $this->getInterventionRates($db, $whereClause),
+ 'statusTransitions' => $this->getStatusTransitions($db, $tenantCampaignIds, $dateFrom, $dateTo),
+ ]);
+ }
+
+ private function getKPIs($db, $whereClause, $tenantCampaignIds, $dateFrom, $dateTo): array
+ {
+ $total = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause")->fetch_assoc()['c'] ?? 0;
+ $offen = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status NOT IN ('completed', 'charged', 'archived')")->fetch_assoc()['c'] ?? 0;
+ $terminisiert = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status NOT IN ('completed', 'charged', 'archived') AND w.appointmentDate IS NOT NULL")->fetch_assoc()['c'] ?? 0;
+ $issues = $db->query("SELECT COUNT(*) as c FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause AND w.status IN ('intervention_required', 'correction_requested')")->fetch_assoc()['c'] ?? 0;
+
+ return [
+ 'total' => (int)$total,
+ 'offen' => (int)$offen,
+ 'terminisiert' => (int)$terminisiert,
+ 'issues' => (int)$issues,
+ 'interventionRate' => $total > 0 ? round(($issues / $total) * 100, 1) : 0,
+ 'avgCompletionDays' => $this->calculateAvgCompletionTime($db, $tenantCampaignIds),
+ ];
+ }
+
+ private function calculateAvgCompletionTime($db, $tenantCampaignIds): ?float
+ {
+ $sql = "SELECT w.id,
+ MIN(CASE WHEN wj.statusChange LIKE '%Zugewiesen%' OR wj.statusChange LIKE '%-> Zugewiesen' THEN wj.`create` END) as assigned_time,
+ MIN(CASE WHEN wj.statusChange LIKE '%-> Abgeschlossen%' THEN wj.`create` END) as completed_time
+ FROM thetool.Workorder w
+ JOIN thetool.Preorder p ON w.preorderId = p.id
+ JOIN thetool.WorkorderJournal wj ON w.id = wj.workorderId
+ WHERE p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ") AND w.status IN ('completed', 'charged')
+ GROUP BY w.id HAVING assigned_time IS NOT NULL AND completed_time IS NOT NULL";
+
+ $result = $db->query($sql);
+ $totalDays = $count = 0;
+ while ($row = $result->fetch_assoc()) {
+ if ($row['completed_time'] > $row['assigned_time']) {
+ $totalDays += ($row['completed_time'] - $row['assigned_time']) / 86400;
+ $count++;
+ }
+ }
+ return $count > 0 ? round($totalDays / $count, 1) : null;
+ }
+
+ private function getStatusDistribution($db, $whereClause): array
+ {
+ $result = $db->query("SELECT w.status, COUNT(*) as count FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id WHERE $whereClause GROUP BY w.status ORDER BY count DESC");
+ $distribution = [];
+ while ($row = $result->fetch_assoc()) {
+ $distribution[] = [
+ 'status' => $row['status'],
+ 'label' => $this->statusLabels[$row['status']] ?? $row['status'],
+ 'count' => (int)$row['count'],
+ 'color' => $this->statusColors[$row['status']] ?? '#6b7280',
+ ];
+ }
+ return $distribution;
+ }
+
+ private function getCompanyPerformance($db, $whereClause): array
+ {
+ $sql = "SELECT wc.name as company, wc.id as companyId,
+ SUM(CASE WHEN w.status IN ('completed', 'charged') THEN 1 ELSE 0 END) as completed,
+ SUM(CASE WHEN w.status IN ('new', 'assigned', 'scheduled', 'in_progress', 'documented') THEN 1 ELSE 0 END) as pending,
+ SUM(CASE WHEN w.status IN ('intervention_required', 'correction_requested') THEN 1 ELSE 0 END) as issues,
+ COUNT(*) as total
+ FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+ LEFT JOIN thetool.WorkorderCompany wc ON w.companyId = wc.id
+ WHERE $whereClause AND w.companyId IS NOT NULL GROUP BY wc.id, wc.name ORDER BY total DESC";
+
+ $result = $db->query($sql);
+ $performance = [];
+ while ($row = $result->fetch_assoc()) {
+ $performance[] = [
+ 'company' => $row['company'] ?? 'Nicht zugewiesen',
+ 'companyId' => (int)$row['companyId'],
+ 'completed' => (int)$row['completed'],
+ 'pending' => (int)$row['pending'],
+ 'issues' => (int)$row['issues'],
+ 'total' => (int)$row['total'],
+ ];
+ }
+ return $performance;
+ }
+
+ private function getTimeTrends($db, $tenantCampaignIds, $dateFrom, $dateTo, $companyIds): array
+ {
+ $where = ["p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ")"];
+ if ($dateFrom) $where[] = "w.`create` >= " . intval($dateFrom);
+ if ($dateTo) $where[] = "w.`create` <= " . intval($dateTo);
+ if (!empty($companyIds)) $where[] = "w.companyId IN (" . implode(',', array_map('intval', $companyIds)) . ")";
+
+ $sql = "SELECT DATE(FROM_UNIXTIME(w.`create`)) as date, COUNT(*) as created,
+ SUM(CASE WHEN w.status IN ('completed', 'charged') THEN 1 ELSE 0 END) as completed
+ FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+ WHERE " . implode(' AND ', $where) . " GROUP BY DATE(FROM_UNIXTIME(w.`create`)) ORDER BY date ASC";
+
+ $result = $db->query($sql);
+ $trends = [];
+ while ($row = $result->fetch_assoc()) {
+ $trends[] = ['date' => $row['date'], 'created' => (int)$row['created'], 'completed' => (int)$row['completed']];
+ }
+ return $trends;
+ }
+
+ private function getCompanyStatusCampaign($db, $whereClause): array
+ {
+ $sql = "SELECT wc.name as company, w.status, pc.name as campaign, COUNT(*) as count
+ FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+ JOIN thetool.Preordercampaign pc ON p.preordercampaign_id = pc.id
+ LEFT JOIN thetool.WorkorderCompany wc ON w.companyId = wc.id
+ WHERE $whereClause AND w.companyId IS NOT NULL
+ GROUP BY wc.name, w.status, pc.name ORDER BY wc.name, count DESC";
+
+ $result = $db->query($sql);
+ $data = [];
+ while ($row = $result->fetch_assoc()) {
+ $key = ($row['company'] ?? 'Nicht zugewiesen') . '|' . $row['status'];
+ if (!isset($data[$key])) {
+ $data[$key] = [
+ 'company' => $row['company'] ?? 'Nicht zugewiesen',
+ 'status' => $row['status'],
+ 'statusLabel' => $this->statusLabels[$row['status']] ?? $row['status'],
+ 'count' => 0,
+ 'campaigns' => [],
+ ];
+ }
+ $data[$key]['count'] += (int)$row['count'];
+ $data[$key]['campaigns'][] = ['name' => $row['campaign'], 'count' => (int)$row['count']];
+ }
+
+ $result = array_values($data);
+ usort($result, fn($a, $b) => $b['count'] - $a['count']);
+ return $result;
+ }
+
+ private function getInterventionRates($db, $whereClause): array
+ {
+ $sql = "SELECT wc.name as company, COUNT(*) as total,
+ SUM(CASE WHEN w.status = 'intervention_required' THEN 1 ELSE 0 END) as interventions,
+ SUM(CASE WHEN w.status = 'correction_requested' THEN 1 ELSE 0 END) as corrections
+ FROM thetool.Workorder w JOIN thetool.Preorder p ON w.preorderId = p.id
+ LEFT JOIN thetool.WorkorderCompany wc ON w.companyId = wc.id
+ WHERE $whereClause AND w.companyId IS NOT NULL GROUP BY wc.name
+ HAVING COUNT(*) >= 5 ORDER BY (SUM(CASE WHEN w.status IN ('intervention_required', 'correction_requested') THEN 1 ELSE 0 END) / COUNT(*)) DESC";
+
+ $result = $db->query($sql);
+ $rates = [];
+ while ($row = $result->fetch_assoc()) {
+ $total = (int)$row['total'];
+ $issueCount = (int)$row['interventions'] + (int)$row['corrections'];
+ $rates[] = [
+ 'company' => $row['company'] ?? 'Nicht zugewiesen',
+ 'total' => $total,
+ 'interventions' => (int)$row['interventions'],
+ 'corrections' => (int)$row['corrections'],
+ 'rate' => $total > 0 ? round(($issueCount / $total) * 100, 1) : 0,
+ ];
+ }
+ return $rates;
+ }
+
+ private function getStatusTransitions($db, $tenantCampaignIds, $dateFrom, $dateTo): array
+ {
+ $where = ["p.preordercampaign_id IN (" . implode(',', $tenantCampaignIds) . ")", "wj.statusChange IS NOT NULL"];
+ if ($dateFrom) $where[] = "wj.`create` >= " . intval($dateFrom);
+ if ($dateTo) $where[] = "wj.`create` <= " . intval($dateTo);
+
+ $sql = "SELECT wj.statusChange, COUNT(*) as count FROM thetool.WorkorderJournal wj
+ JOIN thetool.Workorder w ON wj.workorderId = w.id JOIN thetool.Preorder p ON w.preorderId = p.id
+ WHERE " . implode(' AND ', $where) . " GROUP BY wj.statusChange ORDER BY count DESC LIMIT 15";
+
+ $result = $db->query($sql);
+ $transitions = [];
+ while ($row = $result->fetch_assoc()) {
+ $transitions[] = ['transition' => $row['statusChange'], 'count' => (int)$row['count']];
+ }
+ return $transitions;
+ }
+
+ private function getEmptyDashboardData(): array
+ {
+ return [
+ 'kpis' => ['total' => 0, 'offen' => 0, 'terminisiert' => 0, 'issues' => 0, 'interventionRate' => 0, 'avgCompletionDays' => null],
+ 'statusDistribution' => [], 'companyPerformance' => [], 'timeTrends' => [],
+ 'companyStatusCampaign' => [], 'interventionRates' => [], 'statusTransitions' => [],
+ ];
+ }
+}
diff --git a/application/WorkorderMphAdmin/WorkorderMphAdminController.php b/application/WorkorderMphAdmin/WorkorderMphAdminController.php
index 416d01d6d..efe5aec14 100644
--- a/application/WorkorderMphAdmin/WorkorderMphAdminController.php
+++ b/application/WorkorderMphAdmin/WorkorderMphAdminController.php
@@ -375,4 +375,38 @@ class WorkorderMphAdminController extends WorkorderMphBaseController
self::returnJson(['success' => true, 'message' => 'Arbeitsauftrag wurde storniert.']);
}
+
+ protected function unassignWorkorderAction()
+ {
+ if (empty($this->postData['workorderId'])) self::sendError("Arbeitsauftrags-ID fehlt.");
+
+ $workorder = WorkorderMphModel::get($this->postData['workorderId']);
+ if (!$workorder) self::sendError("Arbeitsauftrag nicht gefunden.");
+
+ if ($workorder->status === 'new') self::sendError("Arbeitsauftrag ist nicht zugewiesen.");
+ if (in_array($workorder->status, ['completed', 'cancelled'])) self::sendError("Arbeitsauftrag kann nicht mehr geändert werden.");
+
+ $oldStatus = $workorder->status;
+ $oldCompany = $workorder->companyId ? WorkorderCompanyModel::get($workorder->companyId) : null;
+ $oldCompanyName = $oldCompany ? $oldCompany->name : 'Unbekannt';
+
+ $workorder->status = 'new';
+ $workorder->companyId = null;
+ $workorder->assignmentDate = null;
+ $workorder->deadlineDate = null;
+ $workorder->appointmentDate = null;
+ WorkorderMphModel::update((array)$workorder);
+
+ $reason = !empty($this->postData['reason']) ? " Grund: " . $this->postData['reason'] : '';
+
+ WorkorderMphJournalModel::create([
+ 'workorderMphId' => $workorder->id,
+ 'text' => "Zuweisung aufgehoben (vorher: $oldCompanyName).$reason",
+ 'statusChange' => $this->getStatusText($oldStatus) . " -> " . $this->getStatusText('new'),
+ 'create' => time(),
+ 'createBy' => $this->user->id,
+ ]);
+
+ self::returnJson(['success' => true, 'message' => 'Zuweisung wurde aufgehoben.']);
+ }
}
diff --git a/application/WorkorderTenantConfig/WorkorderTenantConfigController.php b/application/WorkorderTenantConfig/WorkorderTenantConfigController.php
index 8a7dc0099..064fd2787 100644
--- a/application/WorkorderTenantConfig/WorkorderTenantConfigController.php
+++ b/application/WorkorderTenantConfig/WorkorderTenantConfigController.php
@@ -20,6 +20,7 @@ class WorkorderTenantConfigController extends TTCrud {
$data['interventionTypes'] = json_encode($data['interventionTypes'] ?? []);
$data['workorderCreationFilters'] ??= '{}';
$data['workorderActiveFilters'] ??= '{}';
+ $data['autoCompleteFilter'] ??= null;
if (empty($data['id'])) {
$data['create'] = time();
diff --git a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
index bc917678b..723830a83 100644
--- a/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
+++ b/application/WorkorderTenantConfig/WorkorderTenantConfigModel.php
@@ -8,10 +8,13 @@ class WorkorderTenantConfigModel extends TTCrudBaseModel {
public string $documentationTypes; // JSON
public string $workorderCreationFilters; // JSON
public ?string $workorderActiveFilters; // JSON
+ public ?string $autoCompleteFilter; // JSON
public ?string $interventionTypes; // JSON
public int $civilEngineeringDocsRequired;
public int $requireCableLength;
public int $requireCableType;
+ public int $showTechnicalData = 0;
+ public int $tiefbauSeesNormalDocs = 0;
public int $enableWorkorder;
public int $enableWorkorderMph;
public int $create;
diff --git a/composer.json b/composer.json
index 151670a4a..f4603b66e 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
"stomp-php/stomp-php": "^5",
"phpmailer/phpmailer": "^6.9",
"pear2/net_routeros": "dev-develop@dev",
- "matthiasmullie/minify": "^1.3"
+ "matthiasmullie/minify": "^1.3",
+ "smalot/pdfparser": "^2.0"
}
}
diff --git a/db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php b/db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php
new file mode 100644
index 000000000..c2a09bfe7
--- /dev/null
+++ b/db/migrations/20260113120000_add_lock_exported_to_manualinvoice.php
@@ -0,0 +1,39 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("ManualInvoice");
+
+ $table->addColumn("lock", "integer", [
+ "null" => false,
+ "default" => 0,
+ "limit" => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,
+ "after" => "status"
+ ]);
+
+ $table->addColumn("exported", "integer", [
+ "null" => false,
+ "default" => 0,
+ "limit" => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,
+ "after" => "lock"
+ ]);
+
+ $table->save();
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $table = $this->table("ManualInvoice");
+ $table->removeColumn("lock")->save();
+ $table->removeColumn("exported")->save();
+ }
+ }
+}
diff --git a/db/migrations/20260113130000_create_warehouse_lagerbewegung.php b/db/migrations/20260113130000_create_warehouse_lagerbewegung.php
new file mode 100644
index 000000000..fea8726bf
--- /dev/null
+++ b/db/migrations/20260113130000_create_warehouse_lagerbewegung.php
@@ -0,0 +1,42 @@
+getEnvironment() == "thetool") {
+ $lagerbewegung = $this->table('WarehouseLagerbewegung');
+ $lagerbewegung
+ ->addColumn('movementNumber', 'string', ['limit' => 50, 'null' => true])
+ ->addColumn('movementType', 'enum', ['values' => ['IN', 'OUT', 'ADJUSTMENT']])
+ ->addColumn('articleId', 'integer', ['signed' => false])
+ ->addColumn('warehouseLocationId', 'integer', ['signed' => true])
+ ->addColumn('warehouseItemId', 'integer', ['null' => true, 'signed' => true])
+ ->addColumn('quantity', 'decimal', ['precision' => 10, 'scale' => 2])
+ ->addColumn('quantityBefore', 'decimal', ['precision' => 10, 'scale' => 2, 'null' => true])
+ ->addColumn('quantityAfter', 'decimal', ['precision' => 10, 'scale' => 2, 'null' => true])
+ ->addColumn('reasonCategory', 'string', ['limit' => 50])
+ ->addColumn('note', 'text', ['null' => true])
+ ->addColumn('userId', 'integer', ['signed' => false])
+ ->addColumn('createBy', 'integer', ['signed' => false])
+ ->addColumn('create', 'integer')
+ ->addIndex(['movementNumber'], ['unique' => true])
+ ->addIndex(['articleId'])
+ ->addIndex(['warehouseLocationId'])
+ ->addIndex(['movementType'])
+ ->addIndex(['userId'])
+ ->addIndex(['create'])
+ ->create();
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $this->table('WarehouseLagerbewegung')->drop()->save();
+ }
+ }
+}
diff --git a/db/migrations/20260113140000_rename_lagerbewegung_to_movement.php b/db/migrations/20260113140000_rename_lagerbewegung_to_movement.php
new file mode 100644
index 000000000..b368d3754
--- /dev/null
+++ b/db/migrations/20260113140000_rename_lagerbewegung_to_movement.php
@@ -0,0 +1,21 @@
+getEnvironment() == "thetool") {
+ $this->table('WarehouseLagerbewegung')->rename('WarehouseMovement')->save();
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $this->table('WarehouseMovement')->rename('WarehouseLagerbewegung')->save();
+ }
+ }
+}
diff --git a/db/migrations/20260115121818_preorder_ctag_add_ext_name.php b/db/migrations/20260115121818_preorder_ctag_add_ext_name.php
new file mode 100644
index 000000000..d225a7036
--- /dev/null
+++ b/db/migrations/20260115121818_preorder_ctag_add_ext_name.php
@@ -0,0 +1,35 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("PreorderCtag");
+ $table->renameColumn("ext_id", "ext_name");
+ $table->addColumn("ext_id", "string", ["null" => true, "default" => null, "length" => 255, "after" => "service_type"]);
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $table = $this->table("PreorderCtag");
+ $table->removeColumn("ext_id");
+ $table->renameColumn("ext_name", "ext_id");
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}
diff --git a/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php b/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php
new file mode 100644
index 000000000..f6e7381d7
--- /dev/null
+++ b/db/migrations/20260115165426_voicenumber_add_disable_reason_canceled.php
@@ -0,0 +1,33 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("Voicenumber");
+ $table->changeColumn("disabled", "integer", ["null" => false, "default" => 0]);
+ $table->changeColumn("disabled_reason", "enum", ["values" => "ported_out,ported_back,reserved,legacy,damaged,contract_cancelled", "null" => true, "default" => null]);
+ $table->addColumn("disabled_by", "integer", ["null" => true, "default" => null, "after" => "disabled_reason"]);
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}
diff --git a/db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php b/db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php
new file mode 100644
index 000000000..6ef69f1ae
--- /dev/null
+++ b/db/migrations/20260115184942_address_add_manual_invoice_sepa_limit.php
@@ -0,0 +1,31 @@
+getEnvironment() == "thetool") {
+ $table = $this->table('Address');
+ $table->addColumn("manual_invoice_sepa_limit", "decimal", ["null" => true, "default" => 500, "precision" => 9, "scale" => 2, "after" => "fibu_payment_skonto_rate"]);
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $this->table('Address')->removeColumn("manual_invoice_sepa_limit")->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}
diff --git a/db/migrations/20260116152525_order_product_add_preorder_data.php b/db/migrations/20260116152525_order_product_add_preorder_data.php
new file mode 100644
index 000000000..6afa39742
--- /dev/null
+++ b/db/migrations/20260116152525_order_product_add_preorder_data.php
@@ -0,0 +1,33 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("OrderProduct");
+ $table->addColumn("oaid", "string", ["null" => true, "default" => null, "limit" => 255, "after" => "termination_id"]);
+ $table->addColumn("preorder_id", "integer", ["null" => true, "default" => null, "after" => "oaid"]);
+ $table->addColumn("snopp_order_id", "integer", ["null" => true, "default" => null, "after" => "preorder_id"]);
+ $table->update();
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+
+ }
+
+ if($this->getEnvironment() == "addressdb") {
+
+ }
+ }
+}
diff --git a/db/migrations/20260117120000_add_shipping_note_number.php b/db/migrations/20260117120000_add_shipping_note_number.php
new file mode 100644
index 000000000..ba76c9224
--- /dev/null
+++ b/db/migrations/20260117120000_add_shipping_note_number.php
@@ -0,0 +1,50 @@
+getEnvironment() == "thetool") {
+ $table = $this->table('WarehouseShippingNote');
+ $table
+ ->addColumn('shippingNoteNumber', 'string', ['limit' => 20, 'null' => true, 'after' => 'id'])
+ ->addIndex(['shippingNoteNumber'], ['unique' => true])
+ ->update();
+
+ // Get all shipping notes ordered by create timestamp to assign numbers in chronological order
+ $rows = $this->fetchAll(
+ "SELECT id, YEAR(FROM_UNIXTIME(`create`)) as year
+ FROM WarehouseShippingNote
+ ORDER BY `create` ASC, id ASC"
+ );
+
+ // Group by year and assign sequential numbers
+ $yearCounters = [];
+ foreach ($rows as $row) {
+ $year = $row['year'];
+ if (!isset($yearCounters[$year])) {
+ $yearCounters[$year] = 0;
+ }
+ $yearCounters[$year]++;
+
+ $shippingNoteNumber = 'LS' . $year . '-X' . str_pad((string)$yearCounters[$year], 4, '0', STR_PAD_LEFT);
+
+ $this->execute(
+ "UPDATE WarehouseShippingNote SET shippingNoteNumber = '{$shippingNoteNumber}' WHERE id = {$row['id']}"
+ );
+ }
+
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $table = $this->table('WarehouseShippingNote');
+ $table->removeColumn('shippingNoteNumber')->update();
+ }
+ }
+}
diff --git a/db/migrations/20260117150000_add_order_movement_linking.php b/db/migrations/20260117150000_add_order_movement_linking.php
new file mode 100644
index 000000000..6a6d9a31b
--- /dev/null
+++ b/db/migrations/20260117150000_add_order_movement_linking.php
@@ -0,0 +1,43 @@
+getEnvironment() == "thetool") {
+ // Add columns to WarehouseOrder for linking to movements and delivery note files
+ $orderTable = $this->table('WarehouseOrder');
+ $orderTable
+ ->addColumn('linkedMovementIds', 'text', ['null' => true, 'after' => 'note'])
+ ->addColumn('deliveryNoteFileIds', 'text', ['null' => true, 'after' => 'linkedMovementIds'])
+ ->update();
+
+ // Add column to WarehouseMovement for linking back to orders
+ $movementTable = $this->table('WarehouseMovement');
+ $movementTable
+ ->addColumn('linkedOrderId', 'integer', ['null' => true, 'signed' => false, 'after' => 'note'])
+ ->addIndex(['linkedOrderId'], ['name' => 'idx_linkedOrderId'])
+ ->update();
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $orderTable = $this->table('WarehouseOrder');
+ $orderTable
+ ->removeColumn('linkedMovementIds')
+ ->removeColumn('deliveryNoteFileIds')
+ ->update();
+
+ $movementTable = $this->table('WarehouseMovement');
+ $movementTable
+ ->removeIndex(['linkedOrderId'])
+ ->removeColumn('linkedOrderId')
+ ->update();
+ }
+ }
+}
diff --git a/db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php b/db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php
new file mode 100644
index 000000000..4bd3e16c9
--- /dev/null
+++ b/db/migrations/20260118120000_add_show_technical_data_to_tenant_config.php
@@ -0,0 +1,26 @@
+getEnvironment() !== "thetool") return;
+
+ $table = $this->table('WorkorderTenantConfig');
+ if (!$table->hasColumn('showTechnicalData')) {
+ $table->addColumn('showTechnicalData', 'boolean', [
+ 'default' => false,
+ 'after' => 'requireCableType'
+ ])->update();
+ }
+ }
+
+ public function down() {
+ if ($this->getEnvironment() !== "thetool") return;
+
+ $table = $this->table('WorkorderTenantConfig');
+ if ($table->hasColumn('showTechnicalData')) {
+ $table->removeColumn('showTechnicalData')->update();
+ }
+ }
+}
diff --git a/db/migrations/20260119140000_asset_management_add_category.php b/db/migrations/20260119140000_asset_management_add_category.php
new file mode 100644
index 000000000..47dac3c34
--- /dev/null
+++ b/db/migrations/20260119140000_asset_management_add_category.php
@@ -0,0 +1,33 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("AssetManagement");
+ $table->addColumn('category', 'string', [
+ 'limit' => 255,
+ 'null' => true,
+ 'default' => null,
+ 'after' => 'description',
+ 'comment' => 'Free text category for the asset with autocomplete support',
+ ]);
+ $table->addIndex(['category'], ['name' => 'idx_category']);
+ $table->update();
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $table = $this->table("AssetManagement");
+ $table->removeIndex(['category']);
+ $table->removeColumn('category');
+ $table->update();
+ }
+ }
+}
diff --git a/db/migrations/20260119170000_add_metadata_to_workorder.php b/db/migrations/20260119170000_add_metadata_to_workorder.php
new file mode 100644
index 000000000..a24126bef
--- /dev/null
+++ b/db/migrations/20260119170000_add_metadata_to_workorder.php
@@ -0,0 +1,30 @@
+getEnvironment() == "thetool") {
+ $table = $this->table("Workorder");
+ $table
+ ->addColumn("metadata", "json", [
+ 'null' => true,
+ 'default' => null,
+ 'after' => 'cableType'
+ ])
+ ->update();
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $this->table("Workorder")
+ ->removeColumn("metadata")
+ ->save();
+ }
+ }
+}
diff --git a/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php b/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
new file mode 100644
index 000000000..0b1933697
--- /dev/null
+++ b/db/migrations/20260126120000_warehousearticle_rename_revenueaccount_to_vatgroupid.php
@@ -0,0 +1,33 @@
+getEnvironment() == "thetool") {
+ $this->execute("ALTER TABLE WarehouseArticle CHANGE revenueAccount vatgroup_id INT(11) NOT NULL DEFAULT 2");
+
+ $this->execute("UPDATE WarehouseArticle SET vatgroup_id = CASE
+ WHEN vatgroup_id = 0 THEN 2
+ WHEN vatgroup_id = 1 THEN 3
+ ELSE vatgroup_id
+ END");
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $this->execute("UPDATE WarehouseArticle SET vatgroup_id = CASE
+ WHEN vatgroup_id = 2 THEN 0
+ WHEN vatgroup_id = 3 THEN 1
+ ELSE vatgroup_id
+ END");
+
+ $this->execute("ALTER TABLE WarehouseArticle CHANGE vatgroup_id revenueAccount INT(11) NOT NULL DEFAULT 0");
+ }
+ }
+}
diff --git a/db/migrations/20260126130000_manualinvoice_column_cleanup.php b/db/migrations/20260126130000_manualinvoice_column_cleanup.php
new file mode 100644
index 000000000..4feef0ec7
--- /dev/null
+++ b/db/migrations/20260126130000_manualinvoice_column_cleanup.php
@@ -0,0 +1,58 @@
+getEnvironment() == "thetool") {
+ $position = $this->table("ManualInvoiceposition");
+ if ($position->hasColumn("billing_id")) {
+ $position->removeColumn("billing_id")->save();
+ }
+ if ($position->hasColumn("contract_id")) {
+ $position->removeColumn("contract_id")->save();
+ }
+ // ManualInvoiceposition: Rename columns
+ $this->execute("ALTER TABLE ManualInvoiceposition CHANGE product_id warehousearticle_id INT(11) NOT NULL");
+ $this->execute("ALTER TABLE ManualInvoiceposition CHANGE product_name warehousearticle_name VARCHAR(255) NOT NULL");
+
+ $invoice = $this->table("ManualInvoice");
+ if ($invoice->hasColumn("billing_delivery")) {
+ $invoice->removeColumn("billing_delivery")->save();
+ }
+
+ $this->execute("ALTER TABLE ManualInvoice CHANGE leistungszeitraum performance_period VARCHAR(255) NULL");
+ $this->execute("ALTER TABLE ManualInvoice CHANGE einleitender_text introductory_text TEXT NULL");
+ $this->execute("ALTER TABLE ManualInvoice CHANGE externe_referenz external_reference VARCHAR(255) NULL");
+ $this->execute("ALTER TABLE ManualInvoice CHANGE gesamtrabatt total_discount DECIMAL(6,2) NOT NULL DEFAULT 0.00");
+ }
+ }
+
+ public function down(): void
+ {
+ if($this->getEnvironment() == "thetool") {
+ $this->execute("ALTER TABLE ManualInvoice CHANGE performance_period leistungszeitraum VARCHAR(255) NULL");
+ $this->execute("ALTER TABLE ManualInvoice CHANGE introductory_text einleitender_text TEXT NULL");
+ $this->execute("ALTER TABLE ManualInvoice CHANGE external_reference externe_referenz VARCHAR(255) NULL");
+ $this->execute("ALTER TABLE ManualInvoice CHANGE total_discount gesamtrabatt DECIMAL(6,2) NOT NULL DEFAULT 0.00");
+
+ $invoice = $this->table("ManualInvoice");
+ $invoice->addColumn("billing_delivery", "enum", [
+ "null" => false,
+ "values" => ["email", "paper"],
+ "after" => "billing_type"
+ ])->save();
+
+ $this->execute("ALTER TABLE ManualInvoiceposition CHANGE warehousearticle_id product_id INT(11) NOT NULL");
+ $this->execute("ALTER TABLE ManualInvoiceposition CHANGE warehousearticle_name product_name VARCHAR(255) NOT NULL");
+
+ $position = $this->table("ManualInvoiceposition");
+ $position->addColumn("billing_id", "integer", ["null" => true, "after" => "position_group"]);
+ $position->addColumn("contract_id", "integer", ["null" => false, "after" => "billing_id"]);
+ $position->save();
+ }
+ }
+}
diff --git a/db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php b/db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php
new file mode 100644
index 000000000..c896f981a
--- /dev/null
+++ b/db/migrations/20260127120000_add_tiefbau_sees_normal_docs.php
@@ -0,0 +1,32 @@
+getEnvironment() == "thetool") {
+ $table = $this->table('WorkorderTenantConfig');
+
+ $table->addColumn('tiefbauSeesNormalDocs', 'boolean', [
+ 'default' => false,
+ 'null' => false,
+ 'after' => 'showTechnicalData',
+ 'comment' => 'Allow civil engineering status to see and use normal documentation steps'
+ ]);
+
+ $table->update();
+ }
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() == "thetool") {
+ $this->table('WorkorderTenantConfig')
+ ->removeColumn('tiefbauSeesNormalDocs')
+ ->save();
+ }
+ }
+}
diff --git a/db/migrations/20260128074700_add_auto_complete_filter.php b/db/migrations/20260128074700_add_auto_complete_filter.php
new file mode 100644
index 000000000..cb95ef5d5
--- /dev/null
+++ b/db/migrations/20260128074700_add_auto_complete_filter.php
@@ -0,0 +1,36 @@
+getEnvironment() !== 'thetool') {
+ return;
+ }
+
+ $workorderTenantConfigTable = $this->table('WorkorderTenantConfig');
+ if (!$workorderTenantConfigTable->hasColumn('autoCompleteFilter'))
+ $workorderTenantConfigTable->addColumn('autoCompleteFilter', 'text', [
+ 'null' => true,
+ 'default' => null,
+ 'limit' => \Phinx\Db\Adapter\MysqlAdapter::TEXT_LONG,
+ 'after' => 'workorderActiveFilters',
+ ])
+ ->save();
+ }
+
+ public function down(): void
+ {
+ if ($this->getEnvironment() !== 'thetool') {
+ return;
+ }
+
+ $workorderTenantConfigTable = $this->table('WorkorderTenantConfig');
+ if ($workorderTenantConfigTable->hasColumn('autoCompleteFilter'))
+ $workorderTenantConfigTable->removeColumn('autoCompleteFilter')->save();
+ }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index 2748ee516..c81fccc3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,8 +32,6 @@ services:
image: adminer
ports:
- "8088:8080"
- volumes:
- - ./docker/adminer/php.ini:/etc/php/7.4/cli/conf.d/php.local.ini
phpmyadmin:
image: phpmyadmin
@@ -41,11 +39,30 @@ services:
- "8081:80"
environment:
- PMA_HOST=db
- - PMA_UPLOAD_LIMIT=1G
- - UPLOAD_LIMIT=1G
- MYSQL_ROOT_PASSWORD=junghan5
depends_on:
- db
+ db-downloader:
+ build:
+ context: ./docker/db-downloader
+ dockerfile: Dockerfile
+ ports:
+ - "8082:8082"
+ # volumes:
+ # - ./docker/db-downloader/ssh-keys:/app/ssh-keys:ro
+ environment:
+ - SCP_HOST=thetool-dbbackup.xinon.at
+ - SCP_PORT=22
+ - SCP_USERNAME=xinon
+ - SCP_DEFAULT_PATH=/opt/backup/mysql
+ - DB_HOST=db
+ - DB_PORT=3306
+ - DB_USER=root
+ - DB_PASSWORD=junghan5
+ - DB_AVAILABLE=thetool,addressdb
+ depends_on:
+ - db
+
volumes:
vendor:
diff --git a/docker/db-downloader/Dockerfile b/docker/db-downloader/Dockerfile
new file mode 100644
index 000000000..760d57da8
--- /dev/null
+++ b/docker/db-downloader/Dockerfile
@@ -0,0 +1,25 @@
+FROM python:3.12-slim-bookworm
+
+RUN apt-get update && apt-get install -y \
+ mariadb-client \
+ openssh-client \
+ && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY app.py .
+COPY templates/ ./templates/
+COPY static/ ./static/
+
+RUN mkdir -p /app/downloads /app/ssh-keys
+
+ENV FLASK_APP=app:app
+ENV FLASK_ENV=production
+ENV PYTHONUNBUFFERED=1
+
+EXPOSE 8082
+
+CMD ["gunicorn", "--bind", "0.0.0.0:8082", "--workers", "2", "--threads", "4", "app:app"]
diff --git a/docker/db-downloader/app.py b/docker/db-downloader/app.py
new file mode 100644
index 000000000..d9988ee74
--- /dev/null
+++ b/docker/db-downloader/app.py
@@ -0,0 +1,444 @@
+import os
+import stat
+import uuid
+import gzip
+import struct
+import subprocess
+import threading
+import time
+from datetime import datetime
+from flask import Flask, render_template, request, jsonify, session
+import paramiko
+
+
+# =============================================================================
+# Configuration
+# =============================================================================
+class Config:
+ SCP_HOST = os.getenv('SCP_HOST', 'localhost')
+ SCP_PORT = int(os.getenv('SCP_PORT', 22))
+ SCP_USERNAME = os.getenv('SCP_USERNAME', 'root')
+ SCP_DEFAULT_PATH = os.getenv('SCP_DEFAULT_PATH', '/backups')
+
+ DB_HOST = os.getenv('DB_HOST', 'db')
+ DB_PORT = int(os.getenv('DB_PORT', 3306))
+ DB_USER = os.getenv('DB_USER', 'root')
+ DB_PASSWORD = os.getenv('DB_PASSWORD', '')
+ DB_AVAILABLE = os.getenv('DB_AVAILABLE', 'thetool,addressdb').split(',')
+
+ DOWNLOAD_PATH = '/app/downloads'
+ SSH_KEYS_PATH = '/app/ssh-keys'
+ SECRET_KEY = os.getenv('SECRET_KEY', os.urandom(24).hex())
+
+
+# =============================================================================
+# SFTP Client
+# =============================================================================
+class SFTPClient:
+ def __init__(self, host, port, username):
+ self.host = host
+ self.port = port
+ self.username = username
+ self.client = None
+ self.sftp = None
+
+ def connect_password(self, password):
+ self.client = paramiko.SSHClient()
+ self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+ self.client.connect(
+ hostname=self.host, port=self.port, username=self.username,
+ password=password, look_for_keys=False, allow_agent=False
+ )
+ self.sftp = self.client.open_sftp()
+
+ def connect_key(self, key_path, passphrase=None):
+ self.client = paramiko.SSHClient()
+ self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+ self.client.connect(
+ hostname=self.host, port=self.port, username=self.username,
+ key_filename=key_path, passphrase=passphrase,
+ look_for_keys=False, allow_agent=False
+ )
+ self.sftp = self.client.open_sftp()
+
+ def list_directory(self, path):
+ entries = []
+ for entry in self.sftp.listdir_attr(path):
+ is_dir = stat.S_ISDIR(entry.st_mode)
+ entries.append({
+ 'name': entry.filename,
+ 'size': entry.st_size,
+ 'size_human': self._human_size(entry.st_size),
+ 'mtime': entry.st_mtime,
+ 'mtime_human': datetime.fromtimestamp(entry.st_mtime).strftime('%Y-%m-%d %H:%M'),
+ 'is_dir': is_dir,
+ 'is_sql': entry.filename.endswith(('.sql', '.sql.gz')),
+ 'path': os.path.join(path, entry.filename)
+ })
+ return sorted(entries, key=lambda x: (not x['is_dir'], -x['mtime']))
+
+ def get_file_info(self, path):
+ entry = self.sftp.stat(path)
+ return {
+ 'name': os.path.basename(path),
+ 'size': entry.st_size,
+ 'size_human': self._human_size(entry.st_size),
+ 'mtime': entry.st_mtime,
+ 'mtime_human': datetime.fromtimestamp(entry.st_mtime).strftime('%Y-%m-%d %H:%M'),
+ 'path': path
+ }
+
+ def download_file(self, remote_path, local_path, callback=None):
+ self.sftp.get(remote_path, local_path, callback=callback)
+
+ def close(self):
+ if self.sftp:
+ self.sftp.close()
+ if self.client:
+ self.client.close()
+
+ @staticmethod
+ def _human_size(size):
+ for unit in ['B', 'KB', 'MB', 'GB', 'TB']:
+ if size < 1024:
+ return f"{size:.1f} {unit}"
+ size /= 1024
+ return f"{size:.1f} PB"
+
+
+# =============================================================================
+# Database Restore
+# =============================================================================
+class DatabaseRestore:
+ def __init__(self):
+ self.host = Config.DB_HOST
+ self.port = Config.DB_PORT
+ self.user = Config.DB_USER
+ self.password = Config.DB_PASSWORD
+ self.available_dbs = Config.DB_AVAILABLE
+ self.cancelled = False
+
+ def cancel(self):
+ self.cancelled = True
+
+ @staticmethod
+ def get_gzip_uncompressed_size(filepath):
+ with open(filepath, 'rb') as f:
+ f.seek(-4, 2)
+ return struct.unpack(' 0 else 0, 'downloaded': transferred, 'total': total})
+
+ client.download_file(remote_file, local_file, callback=download_progress)
+ client.close()
+
+ if jobs[job_id].get('cancelled'):
+ jobs[job_id].update({'status': 'cancelled', 'message': 'Restore cancelled by user'})
+ if os.path.exists(local_file):
+ os.remove(local_file)
+ return
+
+ jobs[job_id].update({'progress': 45, 'message': 'Download complete. Preparing restore...', 'status': 'restoring'})
+ jobs[job_id]['progress'] = 50
+ jobs[job_id]['message'] = f'Clearing database {target_db}...'
+
+ restorer = DatabaseRestore()
+ restorers[job_id] = restorer
+
+ uncompressed_size = restorer.get_gzip_uncompressed_size(local_file) if local_file.endswith('.gz') else os.path.getsize(local_file)
+
+ def restore_progress(bytes_processed):
+ if jobs[job_id].get('cancelled'):
+ restorer.cancel()
+ pct = 50 + min(45, int((bytes_processed / uncompressed_size) * 45)) if uncompressed_size > 0 else 50
+ jobs[job_id].update({'progress': pct, 'message': f'Restoring to {target_db}... ({bytes_processed // (1024*1024)} MB / {uncompressed_size // (1024*1024)} MB)'})
+
+ result = restorer.restore_from_file(local_file, target_db, progress_callback=restore_progress)
+
+ if os.path.exists(local_file):
+ os.remove(local_file)
+
+ jobs[job_id].update({
+ 'status': 'completed', 'progress': 100,
+ 'message': f'Restore complete! Dropped {result["tables_dropped"]} tables and imported {result["file"]}',
+ 'completed_at': time.time(), 'duration': time.time() - jobs[job_id]['started_at']
+ })
+
+ except Exception as e:
+ error_msg = str(e)
+ if 'cancelled' in error_msg.lower():
+ jobs[job_id].update({'status': 'cancelled', 'message': 'Restore cancelled by user'})
+ else:
+ jobs[job_id].update({'status': 'error', 'error': error_msg, 'message': f'Error: {error_msg}'})
+ if os.path.exists(local_file):
+ os.remove(local_file)
+ finally:
+ restorers.pop(job_id, None)
+
+
+@app.route('/api/status/')
+def status(job_id):
+ if job_id not in jobs:
+ return jsonify({'success': False, 'error': 'Job not found'}), 404
+ job = jobs[job_id].copy()
+ job['success'] = True
+ if 'started_at' in job:
+ elapsed = (job.get('completed_at') or time.time()) - job['started_at']
+ job['elapsed'] = f'{int(elapsed // 60)}m {int(elapsed % 60)}s'
+ return jsonify(job)
+
+
+@app.route('/api/jobs', methods=['GET'])
+def list_jobs():
+ return jsonify({'success': True, 'jobs': dict(jobs)})
+
+
+@app.route('/api/cancel/', methods=['POST'])
+def cancel(job_id):
+ if job_id not in jobs:
+ return jsonify({'success': False, 'error': 'Job not found'}), 404
+ if jobs[job_id]['status'] in ('completed', 'error', 'cancelled'):
+ return jsonify({'success': False, 'error': 'Job already finished'}), 400
+ jobs[job_id]['cancelled'] = True
+ if job_id in restorers:
+ restorers[job_id].cancel()
+ return jsonify({'success': True, 'message': 'Cancel signal sent'})
+
+
+if __name__ == '__main__':
+ app.run(host='0.0.0.0', port=8082, debug=True)
diff --git a/docker/db-downloader/requirements.txt b/docker/db-downloader/requirements.txt
new file mode 100644
index 000000000..973a9f474
--- /dev/null
+++ b/docker/db-downloader/requirements.txt
@@ -0,0 +1,5 @@
+flask==3.0.0
+gunicorn==21.2.0
+paramiko==3.4.0
+mysql-connector-python==8.2.0
+python-dotenv==1.0.0
diff --git a/docker/db-downloader/static/app.js b/docker/db-downloader/static/app.js
new file mode 100644
index 000000000..c949e1164
--- /dev/null
+++ b/docker/db-downloader/static/app.js
@@ -0,0 +1,457 @@
+// DB Restore Tool - Frontend JavaScript
+
+let currentPath = '';
+let selectedFile = null;
+let isConnected = false;
+let currentJobId = null;
+let pollInterval = null;
+
+// Initialize
+document.addEventListener('DOMContentLoaded', function() {
+ loadAvailableKeys();
+ setupEventListeners();
+});
+
+function setupEventListeners() {
+ // Auth type toggle
+ document.getElementById('auth-type').addEventListener('change', function() {
+ const passwordAuth = document.getElementById('password-auth');
+ const keyAuth = document.getElementById('key-auth');
+ if (this.value === 'password') {
+ passwordAuth.classList.remove('hidden');
+ keyAuth.classList.add('hidden');
+ } else {
+ passwordAuth.classList.add('hidden');
+ keyAuth.classList.remove('hidden');
+ }
+ });
+
+ // Connect form
+ document.getElementById('connect-form').addEventListener('submit', function(e) {
+ e.preventDefault();
+ connect();
+ });
+
+ // Disconnect button
+ document.getElementById('disconnect-btn').addEventListener('click', disconnect);
+
+ // Restore button
+ document.getElementById('restore-btn').addEventListener('click', startRestore);
+
+ // Cancel button
+ document.getElementById('cancel-btn').addEventListener('click', cancelRestore);
+}
+
+async function loadAvailableKeys() {
+ try {
+ const response = await fetch('/api/keys');
+ const data = await response.json();
+ const select = document.getElementById('key-file');
+ select.innerHTML = '';
+ data.keys.forEach(key => {
+ const option = document.createElement('option');
+ option.value = key;
+ option.textContent = key;
+ select.appendChild(option);
+ });
+ } catch (error) {
+ console.error('Failed to load keys:', error);
+ }
+}
+
+async function connect() {
+ const authType = document.getElementById('auth-type').value;
+ const password = document.getElementById('password').value;
+ const keyFile = document.getElementById('key-file').value;
+ const keyPassphrase = document.getElementById('key-passphrase').value;
+
+ const btn = document.getElementById('connect-btn');
+ btn.disabled = true;
+ btn.textContent = 'Connecting...';
+
+ try {
+ const response = await fetch('/api/connect', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ auth_type: authType,
+ password: password,
+ key_file: keyFile,
+ key_passphrase: keyPassphrase
+ })
+ });
+
+ const data = await response.json();
+
+ if (data.success) {
+ isConnected = true;
+ currentPath = data.path;
+ showStatus('Connected to ' + data.host, 'success');
+ renderFiles(data.files, data.path);
+ updateBreadcrumb(data.path);
+
+ // Toggle buttons
+ btn.classList.add('hidden');
+ document.getElementById('disconnect-btn').classList.remove('hidden');
+
+ // Clear password field for security
+ document.getElementById('password').value = '';
+ } else {
+ showStatus('Connection failed: ' + data.error, 'error');
+ }
+ } catch (error) {
+ showStatus('Connection error: ' + error.message, 'error');
+ } finally {
+ btn.disabled = false;
+ btn.textContent = 'Connect';
+ }
+}
+
+async function disconnect() {
+ try {
+ await fetch('/api/disconnect', { method: 'POST' });
+ } catch (e) {}
+
+ isConnected = false;
+ selectedFile = null;
+ currentPath = '';
+
+ // Reset UI
+ document.getElementById('connect-btn').classList.remove('hidden');
+ document.getElementById('disconnect-btn').classList.add('hidden');
+ document.getElementById('file-browser').innerHTML = `
+
+
+ Connect to browse remote files
+ No file selected ';
+ document.getElementById('restore-btn').disabled = true;
+
+ hideStatus();
+}
+
+async function browse(path) {
+ if (!isConnected) return;
+
+ try {
+ const response = await fetch('/api/browse', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ path: path })
+ });
+
+ const data = await response.json();
+
+ if (data.success) {
+ currentPath = data.path;
+ renderFiles(data.files, data.path);
+ updateBreadcrumb(data.path);
+ } else {
+ showStatus('Browse failed: ' + data.error, 'error');
+ }
+ } catch (error) {
+ showStatus('Browse error: ' + error.message, 'error');
+ }
+}
+
+function renderFiles(files, path) {
+ const container = document.getElementById('file-browser');
+
+ if (files.length === 0) {
+ container.innerHTML = 'Empty directory ';
+ return;
+ }
+
+ let html = '';
+
+ // Parent directory link
+ if (path !== '/') {
+ const parentPath = path.split('/').slice(0, -1).join('/') || '/';
+ html += `
+
+ `;
+ }
+
+ files.forEach(file => {
+ const isSelected = selectedFile && selectedFile.path === file.path;
+ const selectedClass = isSelected ? 'selected' : '';
+
+ if (file.is_dir) {
+ html += `
+
+ `;
+ } else if (file.is_sql) {
+ html += `
+
+
+ ${file.name}
+ ${file.size_human}
+ ${file.mtime_human}
+
+ `;
+ } else {
+ html += `
+
+
+ ${file.name}
+ ${file.size_human}
+
+ `;
+ }
+ });
+
+ html += ' ${file.name}
+ ${file.size_human} - ${file.mtime_human}
+ `;
+ document.getElementById('restore-btn').disabled = false;
+
+ // Auto-detect target database from filename
+ const filename = file.name.toLowerCase();
+ const targetDbSelect = document.getElementById('target-db');
+ const availableDbs = Array.from(targetDbSelect.options).map(o => o.value);
+
+ for (const db of availableDbs) {
+ if (filename.includes(db.toLowerCase())) {
+ targetDbSelect.value = db;
+ break;
+ }
+ }
+
+ // Re-render to show selection
+ browse(currentPath);
+}
+
+function updateBreadcrumb(path) {
+ const parts = path.split('/').filter(p => p);
+ let html = `/`;
+
+ let currentPathBuild = '';
+ parts.forEach((part, index) => {
+ currentPathBuild += '/' + part;
+ const isLast = index === parts.length - 1;
+ html += `
+ /
+ ${part}
+ `;
+ });
+
+ document.getElementById('breadcrumb').innerHTML = html;
+}
+
+async function startRestore() {
+ if (!selectedFile) return;
+
+ const targetDb = document.getElementById('target-db').value;
+
+ if (!confirm(`Are you sure you want to restore ${selectedFile.name} to database "${targetDb}"?\n\nThis will DROP ALL TABLES in the database!`)) {
+ return;
+ }
+
+ const btn = document.getElementById('restore-btn');
+ btn.disabled = true;
+ btn.textContent = 'Starting...';
+
+ try {
+ const response = await fetch('/api/restore', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ file: selectedFile.path,
+ database: targetDb
+ })
+ });
+
+ const data = await response.json();
+
+ if (data.success) {
+ currentJobId = data.job_id;
+ showProgressPanel();
+ startPolling();
+ } else {
+ showStatus('Restore failed: ' + data.error, 'error');
+ btn.disabled = false;
+ btn.textContent = 'Start Restore';
+ }
+ } catch (error) {
+ showStatus('Restore error: ' + error.message, 'error');
+ btn.disabled = false;
+ btn.textContent = 'Start Restore';
+ }
+}
+
+function showProgressPanel() {
+ document.getElementById('progress-panel').classList.remove('hidden');
+ document.getElementById('progress-bar').style.width = '0%';
+ document.getElementById('progress-bar').classList.remove('bg-green-600', 'bg-red-600', 'bg-yellow-600');
+ document.getElementById('progress-bar').classList.add('bg-blue-600');
+ document.getElementById('progress-percent').textContent = '0%';
+ document.getElementById('progress-status').textContent = 'Starting...';
+ document.getElementById('progress-message').textContent = 'Initializing...';
+ document.getElementById('cancel-btn').classList.remove('hidden');
+ document.getElementById('cancel-btn').disabled = false;
+ document.getElementById('cancel-btn').textContent = 'Cancel Restore';
+}
+
+function startPolling() {
+ if (pollInterval) clearInterval(pollInterval);
+
+ pollInterval = setInterval(async () => {
+ try {
+ const response = await fetch(`/api/status/${currentJobId}`);
+ const data = await response.json();
+
+ if (data.success) {
+ updateProgress(data);
+
+ if (data.status === 'completed' || data.status === 'error' || data.status === 'cancelled') {
+ stopPolling();
+ document.getElementById('restore-btn').disabled = false;
+ document.getElementById('restore-btn').textContent = 'Start Restore';
+
+ if (data.status === 'completed') {
+ showStatus('Restore completed successfully!', 'success');
+ } else if (data.status === 'cancelled') {
+ showStatus('Restore was cancelled', 'error');
+ } else {
+ showStatus('Restore failed: ' + data.error, 'error');
+ }
+ }
+ }
+ } catch (error) {
+ console.error('Polling error:', error);
+ }
+ }, 250);
+}
+
+function stopPolling() {
+ if (pollInterval) {
+ clearInterval(pollInterval);
+ pollInterval = null;
+ }
+}
+
+async function cancelRestore() {
+ if (!currentJobId) return;
+
+ if (!confirm('Are you sure you want to cancel the restore?')) {
+ return;
+ }
+
+ const btn = document.getElementById('cancel-btn');
+ btn.disabled = true;
+ btn.textContent = 'Cancelling...';
+
+ try {
+ const response = await fetch(`/api/cancel/${currentJobId}`, {
+ method: 'POST'
+ });
+
+ const data = await response.json();
+
+ if (data.success) {
+ showStatus('Cancellation requested...', 'error');
+ } else {
+ showStatus('Cancel failed: ' + data.error, 'error');
+ btn.disabled = false;
+ btn.textContent = 'Cancel Restore';
+ }
+ } catch (error) {
+ showStatus('Cancel error: ' + error.message, 'error');
+ btn.disabled = false;
+ btn.textContent = 'Cancel Restore';
+ }
+}
+
+function updateProgress(data) {
+ const bar = document.getElementById('progress-bar');
+ const percent = document.getElementById('progress-percent');
+ const status = document.getElementById('progress-status');
+ const message = document.getElementById('progress-message');
+ const elapsed = document.getElementById('progress-elapsed');
+ const cancelBtn = document.getElementById('cancel-btn');
+
+ bar.style.width = data.progress + '%';
+ percent.textContent = data.progress + '%';
+
+ // Update status label
+ const statusLabels = {
+ 'starting': 'Starting',
+ 'downloading': 'Downloading',
+ 'restoring': 'Restoring',
+ 'completed': 'Completed',
+ 'error': 'Error',
+ 'cancelled': 'Cancelled'
+ };
+ status.textContent = statusLabels[data.status] || data.status;
+
+ // Update color based on status
+ bar.classList.remove('bg-green-600', 'bg-red-600', 'bg-yellow-600');
+ if (data.status === 'completed') {
+ bar.classList.remove('bg-blue-600');
+ bar.classList.add('bg-green-600');
+ } else if (data.status === 'error') {
+ bar.classList.remove('bg-blue-600');
+ bar.classList.add('bg-red-600');
+ } else if (data.status === 'cancelled') {
+ bar.classList.remove('bg-blue-600');
+ bar.classList.add('bg-yellow-600');
+ }
+
+ // Show/hide cancel button based on job status
+ if (data.status === 'completed' || data.status === 'error' || data.status === 'cancelled') {
+ cancelBtn.classList.add('hidden');
+ } else {
+ cancelBtn.classList.remove('hidden');
+ cancelBtn.disabled = false;
+ cancelBtn.textContent = 'Cancel Restore';
+ }
+
+ message.textContent = data.message || '';
+ if (data.elapsed) {
+ elapsed.textContent = 'Elapsed: ' + data.elapsed;
+ }
+}
+
+function showStatus(message, type) {
+ const status = document.getElementById('connection-status');
+ status.classList.remove('hidden', 'bg-green-100', 'bg-red-100', 'text-green-800', 'text-red-800');
+
+ if (type === 'success') {
+ status.classList.add('bg-green-100', 'text-green-800');
+ } else if (type === 'error') {
+ status.classList.add('bg-red-100', 'text-red-800');
+ }
+
+ status.textContent = message;
+}
+
+function hideStatus() {
+ document.getElementById('connection-status').classList.add('hidden');
+}
diff --git a/docker/db-downloader/templates/index.html b/docker/db-downloader/templates/index.html
new file mode 100644
index 000000000..2ea9fed98
--- /dev/null
+++ b/docker/db-downloader/templates/index.html
@@ -0,0 +1,187 @@
+
+
+
+
+
+ DB Restore Tool
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Connection
+
+
+
+
+
+
+
+
+
+
+
+ Restore
+
+
+
+
+
+
+
+
+
+
+
+ Warning: This will DROP all tables in the selected database before restoring!
+
+
+
+
+
+
+
+
+
+
+
+
+ Remote Browser
+
+
+
+
+ Not connected
+
+
+
+
+
+
+ Connect to browse remote files
+
+
+
+
+
+
+
+
+ Restore Progress
+
+
+
+
+ Initializing...
+ 0%
+
+
+
+
+
+
+
+
+
+
+
+
+
|
@@ -274,6 +282,25 @@ const ADBNetzgebiet = {
+
+
+
+
+
+ Lade Log...
+
+
+
+ Kein Log vorhanden.
+
+ {{ rimoLogContent }}
+
+
+
+
+
`,
@@ -294,6 +321,16 @@ const ADBNetzgebiet = {
historyItems: [],
historyTitle: 'Verlauf',
expandedIds: {},
+
+ // RIMO Import
+ importStatus: {},
+ showRimoLogModal: false,
+ rimoLogContent: '',
+ rimoLogTitle: '',
+ rimoLogStatus: 'idle',
+ rimoLogInterval: null,
+ statusInterval: null,
+
freigabeLabels: { interest: 'Interest', provision: 'Provision', order: 'Order', reorder: 'Reorder' },
freigabeOptions: [
{ key: 'interest', label: 'Interest' },
@@ -367,9 +404,24 @@ const ADBNetzgebiet = {
filteredNetzgebiete() { if (this.currentPage > this.totalPages) this.currentPage = 1; }
},
- async mounted() { await this.fetchNetzgebiete(); },
+ async mounted() {
+ await this.fetchNetzgebiete();
+ this.fetchImportStatus();
+ this.statusInterval = setInterval(this.fetchImportStatus, 15000); // Poll every 15s
+ },
+
+ beforeDestroy() {
+ clearInterval(this.statusInterval);
+ clearInterval(this.rimoLogInterval);
+ },
methods: {
+ formatConsentName(name) {
+ if (name && name.startsWith('Glasfaserprojekt')) {
+ return name.replace('Glasfaserprojekt', 'Glasfaserprojekt
');
+ }
+ return name;
+ },
debouncedFilter() {
clearTimeout(this.filterDebounce);
this.filterDebounce = setTimeout(() => this.currentPage = 1, 300);
@@ -419,6 +471,25 @@ const ADBNetzgebiet = {
};
this.showEditModal = true;
},
+ async copyNetzgebiet(item) {
+ const n = item.netzgebiet;
+ let options = {};
+ try { options = JSON.parse(n.options || '{}'); } catch {}
+ let freigabeArr = [];
+ try { freigabeArr = JSON.parse(n.freigabe || '[]') || []; } catch {}
+ const freigabeObj = {};
+ ['interest', 'provision', 'order', 'reorder'].forEach(f => freigabeObj[f] = freigabeArr.includes(f));
+ this.editItem = {
+ id: null,
+ name: '',
+ extref: '',
+ source: n.source || '',
+ source_id: '',
+ freigabe: freigabeObj,
+ options: { ...this.defaultOptions, ...options }
+ };
+ this.showEditModal = true;
+ },
async saveNetzgebiet() {
if (!this.editItem?.name) return;
this.isSaving = true;
@@ -451,6 +522,96 @@ const ADBNetzgebiet = {
} catch { window.notify?.('error', 'Verlauf konnte nicht geladen werden.'); }
finally { this.historyLoading = false; }
},
+
+ // RIMO Import Methods
+ async fetchImportStatus() {
+ const rimoIds = this.netzgebiete
+ .filter(item => item.netzgebiet.source && item.netzgebiet.source.startsWith('rimo-'))
+ .map(item => item.netzgebiet.id);
+ if (!rimoIds.length) return;
+ try {
+ const response = await axios.post(window.TT_CONFIG.GET_RIMO_IMPORT_STATUS_URL, { ids: rimoIds });
+ if (response.data.success) {
+ this.importStatus = response.data.data;
+ }
+ } catch (error) {
+ console.error("Could not fetch RIMO import statuses.", error);
+ }
+ },
+ handleRimoImportClick(item) {
+ const status = this.importStatus[item.netzgebiet.id]?.status || 'idle';
+ if (status === 'running') {
+ this.openRimoLogModal(item);
+ } else if (status === 'cooldown') {
+ const remaining = this.importStatus[item.netzgebiet.id]?.remaining || 0;
+ window.notify?.('info', `Bitte warten Sie noch ${Math.ceil(remaining / 60)} Minuten.`);
+ this.openRimoLogModal(item);
+ } else {
+ this.startRimoImport(item);
+ }
+ },
+ getImportButtonTitle(id) {
+ const status = this.importStatus[id]?.status || 'idle';
+ if (status === 'running') return 'Import-Log anzeigen';
+ if (status === 'cooldown') return 'Manueller RIMO-Import (Abkühlphase)';
+ return 'Manuellen RIMO-Import starten';
+ },
+ getImportButtonDisabled(id) {
+ const status = this.importStatus[id]?.status || 'idle';
+ return false; // Never truly disabled, just changes action
+ },
+ getImportButtonIcon(id) {
+ const status = this.importStatus[id]?.status || 'idle';
+ if (status === 'running') return 'fa-spinner fa-spin';
+ if (status === 'cooldown') return 'fa-hourglass-half';
+ return 'fa-rocket';
+ },
+ async startRimoImport(item) {
+ try {
+ const response = await axios.get(window.TT_CONFIG.START_RIMO_IMPORT_URL + '?id=' + item.netzgebiet.id);
+ if (response.data.success) {
+ window.notify?.('success', 'RIMO Import gestartet.');
+ this.importStatus[item.netzgebiet.id] = { status: 'running' };
+ this.openRimoLogModal(item);
+ } else {
+ window.notify?.('error', response.data.message || 'Import konnte nicht gestartet werden.');
+ }
+ } catch (error) {
+ window.notify?.('error', 'Fehler beim Starten des Imports.');
+ console.error(error);
+ }
+ },
+ openRimoLogModal(item) {
+ this.rimoLogTitle = `RIMO Import: ${item.netzgebiet.name}`;
+ this.showRimoLogModal = true;
+ this.fetchRimoLog(item); // initial fetch
+ this.rimoLogInterval = setInterval(() => this.fetchRimoLog(item), 3000);
+ },
+ closeRimoLogModal() {
+ this.showRimoLogModal = false;
+ clearInterval(this.rimoLogInterval);
+ this.rimoLogContent = '';
+ this.rimoLogTitle = '';
+ this.rimoLogStatus = 'idle';
+ },
+ async fetchRimoLog(item) {
+ try {
+ const response = await axios.get(window.TT_CONFIG.GET_RIMO_IMPORT_LOG_URL + '?id=' + item.netzgebiet.id);
+ if (response.data.success) {
+ this.rimoLogContent = response.data.data.log;
+ this.rimoLogStatus = response.data.data.status;
+ // If no longer running, stop polling
+ if (this.rimoLogStatus !== 'running') {
+ clearInterval(this.rimoLogInterval);
+ this.fetchImportStatus(); // refresh overall status
+ }
+ }
+ } catch (error) {
+ console.error('Could not fetch RIMO log.', error);
+ clearInterval(this.rimoLogInterval);
+ }
+ },
+
translateAction(action) { return { create: 'Erstellt', update: 'Geändert', delete: 'Gelöscht' }[action] || action; },
translateField(field) {
return { name: 'Name', extref: 'ExtRef', source: 'Quelle', source_id: 'Source ID',
diff --git a/public/js/pages/AssetManagement/AssetManagement.js b/public/js/pages/AssetManagement/AssetManagement.js
index a26bd81d1..64ab588d0 100644
--- a/public/js/pages/AssetManagement/AssetManagement.js
+++ b/public/js/pages/AssetManagement/AssetManagement.js
@@ -454,6 +454,14 @@ Vue.component('asset-management-modal', {
+
@@ -488,9 +496,11 @@ Vue.component('asset-management-modal', {
`,
data(){
return {
+ categoryAutoCompleteUrl: window.TT_CONFIG.BASE_PATH + '/AssetManagement/getCategories',
asset: {
name: '',
description: '',
+ category: '',
assetNumber: '',
location: 'Liftkammer',
serviceDueDate: null,
diff --git a/public/js/pages/ManualInvoice/ManualInvoice.js b/public/js/pages/ManualInvoice/ManualInvoice.js
index 4ce7a72cd..2967d5712 100644
--- a/public/js/pages/ManualInvoice/ManualInvoice.js
+++ b/public/js/pages/ManualInvoice/ManualInvoice.js
@@ -52,27 +52,21 @@ Vue.component('manual-invoice', {
},
async handleSave(invoiceData) {
try {
- const positions = invoiceData.positions.map(p => {
- const amount = parseFloat(p.amount) || 0;
- const price = parseFloat(p.price) || 0;
- const discount = parseFloat(p.discount) || 0;
- const vatrate = parseFloat(p.vatrate) || 0;
- const priceAfterDiscount = amount * price * (1 - discount / 100);
- return {
- ...p, amount, price, discount, vatrate,
- unit: p.unit || 'Stk.',
- price_total: priceAfterDiscount,
- price_gross: priceAfterDiscount * (1 + vatrate / 100),
- product_id: p.product_id || 0,
- contract_id: p.contract_id || 0,
- billing_id: p.billing_id || null,
- matchcode: p.matchcode || null,
- fibu_cost_account: p.fibu_cost_account || null,
- fibu_cost_account_legacy: p.fibu_cost_account_legacy || null,
- fibu_taxcode: p.fibu_taxcode || null,
- options: p.options || null
- };
- });
+ const positions = invoiceData.positions.map(p => ({
+ ...p,
+ amount: parseFloat(p.amount) || 0,
+ price: parseFloat(p.price) || 0,
+ discount: parseFloat(p.discount) || 0,
+ vatrate: parseFloat(p.vatrate) || 0,
+ unit: p.unit || 'Stk.',
+ warehousearticle_id: p.warehousearticle_id || p.product_id || 0,
+ warehousearticle_name: p.warehousearticle_name || p.product_name || '',
+ matchcode: p.matchcode || null,
+ fibu_cost_account: p.fibu_cost_account || null,
+ fibu_cost_account_legacy: p.fibu_cost_account_legacy || null,
+ fibu_taxcode: p.fibu_taxcode || null,
+ options: p.options || null
+ }));
const payload = {
...invoiceData,
@@ -82,11 +76,13 @@ Vue.component('manual-invoice', {
customer_number: invoiceData.customer_number || 0,
country: invoiceData.country || 'Österreich',
billing_type: invoiceData.billing_type || 'invoice',
- billing_delivery: 'email',
fibu_payment_due: 14,
fibu_account_number: invoiceData.fibu_account_number || 0,
- vatgroup_id: 1,
- gesamtrabatt: parseFloat(invoiceData.gesamtrabatt) || 0
+ vatgroup_id: invoiceData.vatgroup_id || 1,
+ performance_period: invoiceData.performance_period || invoiceData.leistungszeitraum || '',
+ introductory_text: invoiceData.introductory_text || invoiceData.einleitender_text || '',
+ external_reference: invoiceData.external_reference || invoiceData.externe_referenz || '',
+ total_discount: parseFloat(invoiceData.total_discount || invoiceData.gesamtrabatt) || 0
};
const url = invoiceData.id ? window.TT_CONFIG.UPDATE_URL : window.TT_CONFIG.CREATE_URL;
@@ -161,20 +157,28 @@ Vue.component('manual-invoice-modal', {
Rechnungsdetails
-
@@ -197,41 +201,48 @@ Vue.component('manual-invoice-modal', {
pdfLoading: false,
pdfPreviewUrl: '',
previewDebounceTimer: null,
+ customerBillingInfo: {
+ billing_type: 'invoice',
+ manual_invoice_sepa_limit: null,
+ vatarea: 'domestic',
+ tax_text: ''
+ },
invoiceData: {
id: null, invoice_number: null, invoice_date: moment().format('YYYY-MM-DD'),
billingaddress_id: null, owner_id: null, customer_number: 0, fibu_account_number: 0,
company: '', firstname: '', lastname: '', street: '', zip: '', city: '', country: 'Österreich',
- uid: '', email: '', billing_type: 'invoice', tax_text: '',
- leistungszeitraum: '', einleitender_text: '', externe_referenz: '', gesamtrabatt: 0,
+ uid: '', email: '', billing_type: 'invoice', tax_text: '', vatgroup_id: 1,
+ performance_period: '', introductory_text: '', external_reference: '', total_discount: 0,
positions: [], total: 0, total_gross: 0
},
- billingTypeOptions: [{value: 'invoice', text: 'Rechnung'}, {value: 'sepa', text: 'SEPA'}],
positionsConfig: {
fields: {
- product_name: { type: 'input', label: 'Bezeichnung' },
+ article_id: {
+ type: 'input-article',
+ label: 'Artikel',
+ apiUrl: '/WarehouseArticle/autocomplete',
+ customFieldReference: 'WarehouseArticle',
+ emitDisplayValue: true
+ },
+ warehousearticle_name: { type: 'input', label: 'Bezeichnung' },
product_info: { type: 'input', label: 'Zusatzinfo' },
amount: { type: 'input', label: 'Menge', inputType: 'number' },
- unit: {
+ price_type: {
type: 'select',
- label: 'Einheit',
- options: [
- { value: 'Pau.', text: 'Pau.' },
- { value: 'Stk.', text: 'Stk.' },
- { value: 'h', text: 'h' },
- { value: 'm', text: 'm' }
- ]
+ label: 'Preistyp',
+ options: []
},
price: { type: 'input', label: 'Einzelpreis (€)', inputType: 'number' },
discount: { type: 'input', label: 'Rabatt (%)', inputType: 'number' },
- vatrate: { type: 'input', label: 'USt. (%)', inputType: 'number' },
},
validateForm: (d) => {
- if (!d.product_name) { window.notify('error', 'Bezeichnung ist erforderlich.'); return false; }
- if (!d.amount) { window.notify('error', 'Menge ist erforderlich.'); return false; }
+ if (!d.warehousearticle_name) { window.notify('error', 'Bezeichnung ist erforderlich.'); return false; }
+ if (d.amount == null || d.amount === '') { window.notify('error', 'Menge ist erforderlich.'); return false; }
if (d.price == null) { window.notify('error', 'Preis ist erforderlich.'); return false; }
return true;
}
- }
+ },
+ articlePrices: []
};
},
computed: {
@@ -246,34 +257,46 @@ Vue.component('manual-invoice-modal', {
subtotal += lineTotal;
});
- // Apply gesamtrabatt
- const gesamtrabatt = parseFloat(this.invoiceData.gesamtrabatt) || 0;
- const net = subtotal * (1 - gesamtrabatt / 100);
-
- // Calculate VAT
+ const totalDiscount = parseFloat(this.invoiceData.total_discount) || 0;
+ const net = subtotal * (1 - totalDiscount / 100);
let vat = {}, gross = 0;
(this.invoiceData.positions || []).forEach(p => {
const amount = parseFloat(p.amount) || 0;
const price = parseFloat(p.price) || 0;
const discount = parseFloat(p.discount) || 0;
const r = parseInt(p.vatrate) || 0;
- const lineNet = amount * price * (1 - discount / 100) * (1 - gesamtrabatt / 100);
+ const lineNet = amount * price * (1 - discount / 100) * (1 - totalDiscount / 100);
const lineVat = lineNet * (r / 100);
vat[r] = (vat[r] || 0) + lineVat;
gross += lineNet + lineVat;
});
return { subtotal, net, vat, gross };
+ },
+ effectiveBillingType() {
+ if (this.customerBillingInfo.billing_type !== 'sepa') return 'invoice';
+ if (this.customerBillingInfo.manual_invoice_sepa_limit === null) return 'sepa';
+ return this.totals.gross <= this.customerBillingInfo.manual_invoice_sepa_limit ? 'sepa' : 'invoice';
}
},
watch: {
'invoiceData': { handler() { this.debouncedPreviewUpdate(); }, deep: true },
+ effectiveBillingType: {
+ handler(newType) {
+ this.invoiceData.billing_type = newType;
+ },
+ immediate: true
+ },
'invoiceData.billingaddress_id': {
async handler(newId) {
- if (!newId) return Object.assign(this.invoiceData, {
- company: '', firstname: '', lastname: '', street: '', zip: '', city: '',
- country: 'Österreich', uid: '', email: '', customer_number: 0, fibu_account_number: 0, owner_id: 0
- });
+ if (!newId) {
+ Object.assign(this.invoiceData, {
+ company: '', firstname: '', lastname: '', street: '', zip: '', city: '',
+ country: 'Österreich', uid: '', email: '', customer_number: 0, fibu_account_number: 0, owner_id: 0
+ });
+ this.customerBillingInfo = { billing_type: 'invoice', manual_invoice_sepa_limit: null, vatarea: 'domestic', tax_text: '' };
+ return;
+ }
const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Address/api?do=getAddress&id=${newId}`);
if (data.status === 'OK' && data.result.address) {
@@ -285,6 +308,8 @@ Vue.component('manual-invoice-modal', {
fibu_account_number: a.fibu_account_number || 0, owner_id: newId
});
}
+
+ await this.fetchCustomerBillingInfo(newId);
}
}
},
@@ -321,15 +346,100 @@ Vue.component('manual-invoice-modal', {
methods: {
close() { this.$emit('close'); },
saveInvoice() {
+ this.invoiceData.invoice_date = moment().format('YYYY-MM-DD');
+ this.invoiceData.billing_type = this.effectiveBillingType;
+ this.invoiceData.tax_text = this.customerBillingInfo.tax_text;
if (!this.invoiceData.billingaddress_id) return window.notify('error', 'Bitte wählen Sie einen Kunden aus.');
if (!this.invoiceData.positions?.length) return window.notify('error', 'Bitte fügen Sie mindestens eine Position hinzu.');
this.$emit('save', this.invoiceData);
},
+ formatPrice(value) {
+ if (value === null || value === undefined) return '-';
+ return new Intl.NumberFormat('de-AT', { style: 'currency', currency: 'EUR' }).format(value);
+ },
+ async fetchCustomerBillingInfo(addressId) {
+ if (!addressId) return;
+ try {
+ const vatgroupId = this.invoiceData.vatgroup_id || 2;
+ const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getCustomerBillingInfo?address_id=${addressId}&vatgroup_id=${vatgroupId}`);
+ if (data.success) {
+ this.customerBillingInfo = {
+ billing_type: data.billing_type || 'invoice',
+ manual_invoice_sepa_limit: data.manual_invoice_sepa_limit,
+ vatarea: data.vatarea || 'domestic',
+ tax_text: data.tax_text || ''
+ };
+ this.invoiceData.tax_text = data.tax_text || '';
+ }
+ } catch (e) {
+ console.error('Error fetching customer billing info:', e);
+ }
+ },
handleResize() { this.isLargeScreen = window.innerWidth >= 1920; },
handleGlobalKeydown(e) {
if (e.ctrlKey && e.key === 'q') { e.preventDefault(); this.togglePreviewVisibility(); }
},
togglePreviewVisibility() { if (!this.isLargeScreen) this.showPreviewOnSmallScreen = !this.showPreviewOnSmallScreen; },
+ async onArticleSelected(articleId) {
+ if (!articleId) {
+ // Reset price type options when no article selected
+ this.articlePrices = [];
+ this.positionsConfig.fields.price_type.options = [];
+ return;
+ }
+ try {
+ const vatarea = this.customerBillingInfo.vatarea || 'domestic';
+ const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getArticleVatInfo?article_id=${articleId}&vatarea=${vatarea}`);
+ if (data.success && this.$refs.positionsManager) {
+ const pm = this.$refs.positionsManager;
+ if (data.article) {
+ pm.$set(pm.formData, 'warehousearticle_name', data.article.articleNumber + ' | ' + data.article.title);
+ pm.$set(pm.formData, 'product_info', data.article.description || '');
+ pm.$set(pm.formData, 'unit', data.article.unit || 'Stk.');
+ }
+ pm.$set(pm.formData, 'vatrate', parseFloat(data.vatrate) || 20);
+ pm.$set(pm.formData, 'fibu_cost_account', data.fibu_cost_account);
+ pm.$set(pm.formData, 'fibu_cost_account_legacy', data.fibu_cost_account_legacy);
+ pm.$set(pm.formData, 'fibu_taxcode', data.fibu_taxcode);
+ this.invoiceData.vatgroup_id = data.vatgroup_id;
+ await this.updateTaxText(data.vatgroup_id);
+
+ // Handle prices and price type selection
+ this.articlePrices = data.prices || [];
+ if (this.articlePrices.length > 0) {
+ const priceOptions = this.articlePrices.map(p => ({ value: p.title, text: `${p.title} (${this.formatPrice(p.price)})` }));
+ this.positionsConfig.fields.price_type.options = priceOptions;
+ // Set first price as default
+ pm.$set(pm.formData, 'price_type', this.articlePrices[0].title);
+ pm.$set(pm.formData, 'price', this.articlePrices[0].price);
+ } else {
+ this.positionsConfig.fields.price_type.options = [];
+ }
+ }
+ } catch (e) {
+ console.error('Error fetching article VAT info:', e);
+ }
+ },
+ onPriceTypeChanged(priceType) {
+ if (!priceType || !this.articlePrices.length) return;
+ const selectedPrice = this.articlePrices.find(p => p.title === priceType);
+ if (selectedPrice && this.$refs.positionsManager) {
+ this.$refs.positionsManager.$set(this.$refs.positionsManager.formData, 'price', selectedPrice.price);
+ }
+ },
+ async updateTaxText(vatgroupId) {
+ if (!vatgroupId) return;
+ try {
+ const vatarea = this.customerBillingInfo.vatarea || 'domestic';
+ const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/ManualInvoice/getTaxText?vatgroup_id=${vatgroupId}&vatarea=${vatarea}`);
+ if (data.success) {
+ this.customerBillingInfo.tax_text = data.tax_text || '';
+ this.invoiceData.tax_text = data.tax_text || '';
+ }
+ } catch (e) {
+ console.error('Error fetching tax text:', e);
+ }
+ },
debouncedPreviewUpdate() {
clearTimeout(this.previewDebounceTimer);
this.previewDebounceTimer = setTimeout(() => this.updatePdfPreview(), 2000);
@@ -338,7 +448,7 @@ Vue.component('manual-invoice-modal', {
this.pdfLoading = true;
try {
const positions = this.invoiceData.positions
- .filter(p => p.product_name && (parseFloat(p.amount) || 0) > 0) // Filter out empty positions
+ .filter(p => p.warehousearticle_name && (parseFloat(p.amount) || 0) !== 0)
.map(p => {
const amount = parseFloat(p.amount) || 0;
const price = parseFloat(p.price) || 0;
@@ -407,17 +517,17 @@ Vue.component('manual-invoice-modal', {
}
// Pre-fill external reference with shipping note reference
- this.invoiceData.externe_referenz = `Lieferschein #${shippingNoteData.shippingNoteId}`;
+ this.invoiceData.external_reference = `Lieferschein #${shippingNoteData.shippingNoteId}`;
// Add introductory text if shipping note has notes
if (shippingNoteData.note) {
- this.invoiceData.einleitender_text = shippingNoteData.note;
+ this.invoiceData.introductory_text = shippingNoteData.note;
}
// Add all positions (batch operation to avoid triggering watcher for each item)
if (shippingNoteData.positions && Array.isArray(shippingNoteData.positions)) {
const newPositions = shippingNoteData.positions.map(position => ({
- product_name: position.product_name || '',
+ warehousearticle_name: position.warehousearticle_name || position.product_name || '',
product_info: position.product_info || '',
amount: parseFloat(position.amount) || 0,
unit: position.unit || 'Stk.',
@@ -450,7 +560,7 @@ Vue.component('manual-invoice-modal', {
Vue.component('gutschrift-modal', {
props: ['invoiceId'],
template: `
-
+
Originalrechnung: {{ invoice.invoice_number }} - {{ invoice.customer_name }}
@@ -466,7 +576,7 @@ Vue.component('gutschrift-modal', {
|
- {{ pos.product_name }} {{ pos.product_info }} |
+ {{ pos.warehousearticle_name }} {{ pos.product_info }} |
{{ pos.original_amount }} | {{ pos.credited_amount }} |
{{ pos.available_amount }} |
|
@@ -507,7 +617,7 @@ Vue.component('gutschrift-modal', {
.map((p, i) => ({ p, i })).filter(({ i }) => this.selectedPositions[i])
.map(({ p, i }) => {
const amt = this.creditAmounts[i];
- if (amt > p.available_amount) throw new Error(`Menge zu hoch: ${p.product_name}`);
+ if (amt > p.available_amount) throw new Error(`Menge zu hoch: ${p.warehousearticle_name}`);
return amt > 0 ? { ...p, amount: amt } : null;
}).filter(Boolean);
@@ -527,7 +637,7 @@ Vue.component('gutschrift-modal', {
Vue.component('send-invoice-modal', {
props: ['invoiceId'],
template: `
-
+
Rechnung aussenden
@@ -543,11 +653,11 @@ Vue.component('send-invoice-modal', {
-
@@ -582,7 +692,6 @@ Vue.component('send-invoice-modal', {
if (data.success) {
this.invoice = data.invoice;
this.emailAddress = data.invoice.email || '';
- this.selectedAction = data.invoice.email ? 'email' : 'download';
} else {
window.notify('error', data.message || 'Fehler beim Laden der Rechnung');
this.close();
diff --git a/public/js/pages/PreorderLogistics/PreorderLogistics.css b/public/js/pages/PreorderLogistics/PreorderLogistics.css
index 6678ffa59..5513bac12 100644
--- a/public/js/pages/PreorderLogistics/PreorderLogistics.css
+++ b/public/js/pages/PreorderLogistics/PreorderLogistics.css
@@ -10,4 +10,33 @@
.col-form-label {
padding-top: 0 !important
+}
+
+/* Filter panel styles */
+.filter-panel {
+ padding: 1rem !important;
+}
+
+.filter-panel .header-title {
+ font-size: 1.1rem;
+ margin-bottom: 0.75rem !important;
+}
+
+.filter-panel .row.g-2 > [class*="col-"] {
+ padding-left: 0.5rem;
+ padding-right: 0.5rem;
+}
+
+.filter-panel .form-group {
+ margin-bottom: 0;
+}
+
+.filter-actions {
+ display: flex;
+ gap: 0.5rem;
+ flex-wrap: wrap;
+}
+
+.filter-actions .btn {
+ margin-right: 0;
}
\ No newline at end of file
diff --git a/public/js/pages/PreorderLogistics/PreorderLogistics.js b/public/js/pages/PreorderLogistics/PreorderLogistics.js
index 7bda1d003..41f82d9c6 100644
--- a/public/js/pages/PreorderLogistics/PreorderLogistics.js
+++ b/public/js/pages/PreorderLogistics/PreorderLogistics.js
@@ -2,35 +2,38 @@ Vue.component('preorder-logistics', {
template: `
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
+
+
-
-
-
+
+
i { font-size: 28px; color: var(--accent); flex-shrink: 0; }
.tt-scope .router-header-text { flex-grow: 1; min-height: 39px; }
+.tt-scope .refresh-btn { padding: 8px; border-radius: 6px; flex-shrink: 0; }
+.tt-scope .refresh-btn i { font-size: 16px; margin: 0; }
.tt-scope .router-title { font-size: 16px; font-weight: 800; color: var(--text); letter-spacing: 0.3px; line-height: 1.375; }
.tt-scope .router-subtitle { font-size: 12px; color: var(--muted); font-family: var(--mono); margin-top: 2px; line-height: 1.25; }
.tt-scope .router-info-grid { display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px; margin-bottom: 16px; margin-right: -8px; }
diff --git a/public/js/pages/Radius/Radius.js b/public/js/pages/Radius/Radius.js
index f7f97cd2a..14bbb860f 100644
--- a/public/js/pages/Radius/Radius.js
+++ b/public/js/pages/Radius/Radius.js
@@ -44,6 +44,9 @@ const Radius = {
+
`,
@@ -59,7 +62,8 @@ const Radius = {
const options = [
{ id: 'users', name: 'Benutzer', icon: 'fa-duotone fa-users' },
{ id: 'free', name: 'Freie Benutzer', icon: 'fa-duotone fa-user-plus' },
- { id: 'unused', name: 'Ungenutzte Benutzer', icon: 'fa-duotone fa-user-clock' }
+ { id: 'unused', name: 'Ungenutzte Benutzer', icon: 'fa-duotone fa-user-clock' },
+ { id: 'avmscanner', name: 'AVM Scanner', icon: 'fa-duotone fa-router' }
];
if (window.TT_CONFIG.CAN_BILLING === '1') {
@@ -84,6 +88,7 @@ const Radius = {
let refName = '';
if (v === 'free') refName = 'freeView';
else if (v === 'unused') refName = 'unusedView';
+ else if (v === 'avmscanner') refName = 'avmScannerView';
if (refName) {
this.$nextTick(() => {
diff --git a/public/js/pages/Radius/RadiusAVMScanner.js b/public/js/pages/Radius/RadiusAVMScanner.js
new file mode 100644
index 000000000..e8f1e944a
--- /dev/null
+++ b/public/js/pages/Radius/RadiusAVMScanner.js
@@ -0,0 +1,268 @@
+const RadiusAVMScanner = {
+ name: 'RadiusAVMScanner',
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Scan läuft...
+ {{ state.progress?.current || 0 }} / {{ state.progress?.total || 0 }}
+
+
+
+ Aktuell: {{ state.currentDevice.mac }}
+ ({{ state.currentDevice.ip }})
+
+
+
+
+
+
+
+
+
+ | MAC-Adresse |
+ IP-Adresse |
+ Kunde |
+ Gerätetyp |
+ Port |
+ Erledigt |
+ Gescannt |
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+ {{ item.mac }}
+ |
+
+
+
+ {{ item.ip }}
+
+ —
+ |
+
+
+ {{ item.customerId }}
+
+ {{ item.customerName }}
+ |
+
+ {{ item.deviceType }}
+ {{ item.error }}
+ —
+ Repeater
+ Gateway
+ |
+
+ {{ item.port }}
+ —
+ |
+
+
+ |
+
+ {{ formatDate(item.scannedAt) }}
+ |
+
+
+
+
+
+ {{ filteredDevices.length }} von {{ state.devices.length }} Geräten
+ (Scan läuft...)
+
+ Keine Geräte
+
+
+
+ `,
+ data: () => ({
+ window: window,
+ state: null,
+ isLoading: false,
+ polling: null,
+ deviceTypeFilter: '',
+ showErledigt: true
+ }),
+ computed: {
+ progressPercent() {
+ if (!this.state?.progress?.total) return 0;
+ return Math.round((this.state.progress.current / this.state.progress.total) * 100);
+ },
+ deviceTypes() {
+ if (!this.state?.devices) return [];
+ const types = new Set();
+ this.state.devices.forEach(d => {
+ if (d.deviceType) types.add(d.deviceType);
+ });
+ return Array.from(types).sort();
+ },
+ filteredDevices() {
+ if (!this.state?.devices) return [];
+ return this.state.devices.filter(d => {
+ if (this.deviceTypeFilter && d.deviceType !== this.deviceTypeFilter) return false;
+ if (!this.showErledigt && d.erledigt) return false;
+ return true;
+ });
+ }
+ },
+ methods: {
+ initIfNeeded() {
+ this.refreshState();
+ },
+ startPolling() {
+ if (this.polling) return;
+ this.polling = setInterval(() => {
+ this.refreshState(true);
+ }, 3000); // Poll every 3 seconds
+ },
+ stopPolling() {
+ if (this.polling) {
+ clearInterval(this.polling);
+ this.polling = null;
+ }
+ },
+ async refreshState(silent = false) {
+ if (!silent) this.isLoading = true;
+ try {
+ const { data } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerGetState`);
+ this.state = data;
+
+ // Start/stop polling based on scanning state
+ if (data.scanning && !this.polling) {
+ this.startPolling();
+ } else if (!data.scanning && this.polling) {
+ this.stopPolling();
+ }
+ } catch (e) {
+ console.error('Failed to fetch AVM scanner state:', e);
+ }
+ if (!silent) this.isLoading = false;
+ },
+ async startScan() {
+ try {
+ const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerStart`);
+ if (data.success) {
+ window.notify('success', `Scan gestartet für ${data.total} Geräte`);
+ this.startPolling(); // Start polling immediately
+ } else {
+ window.notify('warning', data.message || 'Scan konnte nicht gestartet werden');
+ }
+ this.refreshState();
+ } catch (e) {
+ console.error('Failed to start scan:', e);
+ window.notify('error', 'Fehler beim Starten des Scans');
+ }
+ },
+ async stopScan() {
+ try {
+ const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerStop`);
+ if (data.success) {
+ window.notify('info', 'Scan wird gestoppt...');
+ }
+ } catch (e) {
+ console.error('Failed to stop scan:', e);
+ window.notify('error', 'Fehler beim Stoppen des Scans');
+ }
+ },
+ async toggleErledigt(mac) {
+ try {
+ await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/avmScannerToggleErledigt`, { mac });
+ this.refreshState(true);
+ } catch (e) {
+ console.error('Failed to toggle erledigt:', e);
+ window.notify('error', 'Fehler beim Aktualisieren');
+ }
+ },
+ formatDate(dateStr) {
+ if (!dateStr) return '—';
+ const d = new Date(dateStr);
+ return d.toLocaleDateString('de-DE', { day: '2-digit', month: '2-digit', hour: '2-digit', minute: '2-digit' });
+ }
+ },
+ beforeUnmount() {
+ this.stopPolling();
+ }
+};
+
+if (window.VueApp) {
+ window.VueApp.component('radius-avm-scanner', RadiusAVMScanner);
+}
diff --git a/public/js/pages/Radius/RadiusRouterManager.js b/public/js/pages/Radius/RadiusRouterManager.js
index 47289255a..95c92c04d 100644
--- a/public/js/pages/Radius/RadiusRouterManager.js
+++ b/public/js/pages/Radius/RadiusRouterManager.js
@@ -32,6 +32,9 @@ const RadiusRouterManager = {
{{ routerDevice.username || userItem.username }}
+
@@ -40,7 +43,7 @@ const RadiusRouterManager = {
-
+
@@ -239,7 +242,8 @@ const RadiusRouterManager = {
showEventLogModal: false,
eventLogLoading: false,
- eventLogData: null
+ eventLogData: null,
+ refreshLoading: false
}),
watch: {
show: {
@@ -265,18 +269,12 @@ const RadiusRouterManager = {
this.speedtestLoading = false;
try {
- const { data: radacct } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/proxyUnsecureHTTPRequestToRadius`, {
- params: { action2: 'fetchRadacct', username: this.userItem.username }
+ const { data: deviceData } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/genieacsGetDeviceByMac`, {
+ params: { mac: this.userItem.username }
});
- if (radacct?.ip) {
- const { data: deviceData } = await axios.get(`${window.TT_CONFIG.BASE_PATH}/Radius/genieacsGetDeviceByIp`, {
- params: { ip: radacct.ip }
- });
-
- if (deviceData?.success) {
- this.routerDevice = deviceData;
- }
+ if (deviceData?.success) {
+ this.routerDevice = deviceData;
}
} catch (error) {
console.error('Error fetching router:', error);
@@ -284,6 +282,25 @@ const RadiusRouterManager = {
}
this.routerLoading = false;
},
+ async refreshDevice() {
+ if (!this.routerDevice?.deviceId) return;
+ this.refreshLoading = true;
+ try {
+ const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/Radius/genieacsRefreshDevice`, {
+ deviceId: this.routerDevice.deviceId
+ });
+ if (data?.success) {
+ this.routerDevice.deviceInfo = data.deviceInfo;
+ this.routerDevice.externalIp = data.externalIp;
+ this.routerDevice.managementIp = data.managementIp;
+ window.notify('success', 'Daten aktualisiert');
+ }
+ } catch (error) {
+ console.error('Error refreshing device:', error);
+ window.notify('error', 'Fehler beim Aktualisieren');
+ }
+ this.refreshLoading = false;
+ },
async rebootRouter() {
if (!this.routerDevice || !this.routerDevice.deviceId) return;
if (!confirm('Möchten Sie den Router wirklich neu starten?')) return;
diff --git a/public/js/pages/User/User.js b/public/js/pages/User/User.js
index b39a9b265..fe5cce0ab 100644
--- a/public/js/pages/User/User.js
+++ b/public/js/pages/User/User.js
@@ -3,14 +3,14 @@ Vue.component("User", {
-
+
-
+
@@ -438,8 +437,8 @@ Vue.component('warehouse-article-modal', {
@@ -539,7 +538,7 @@ Vue.component('warehouse-article-modal', {
category_id: null,
articleNumber: '',
unit: 'Stk.',
- revenueAccount: 0,
+ vatgroup_id: 2,
warningAmount: 0,
criticalAmount: 0,
isSerialDocumentation: false,
@@ -567,10 +566,10 @@ Vue.component('warehouse-article-modal', {
{ value: 'km', text: 'km' }
];
},
- revenueAccountOptions() {
+ vatgroupOptions() {
return [
- { value: 0, text: 'Dienstleistungen' },
- { value: 1, text: 'Handelswaren' }
+ { value: 2, text: 'Dienstleistungen' },
+ { value: 3, text: 'Handelswaren' }
];
},
isValid() {
@@ -608,7 +607,7 @@ Vue.component('warehouse-article-modal', {
category_id: data.category_id,
articleNumber: data.articleNumber || '',
unit: data.unit || 'Stk.',
- revenueAccount: data.revenueAccount || 0,
+ vatgroup_id: data.vatgroup_id || 2,
warningAmount: data.warningAmount || 0,
criticalAmount: data.criticalAmount || 0,
isSerialDocumentation: !!data.isSerialDocumentation,
@@ -638,7 +637,7 @@ Vue.component('warehouse-article-modal', {
category_id: null,
articleNumber: '',
unit: 'Stk.',
- revenueAccount: 0,
+ vatgroup_id: 2,
warningAmount: 0,
criticalAmount: 0,
isSerialDocumentation: false,
diff --git a/public/js/pages/WarehouseCategory/WarehouseCategory.js b/public/js/pages/WarehouseCategory/WarehouseCategory.js
new file mode 100644
index 000000000..adc23ef5e
--- /dev/null
+++ b/public/js/pages/WarehouseCategory/WarehouseCategory.js
@@ -0,0 +1,23 @@
+Vue.component('warehouse-category', {
+ //language=Vue
+ template: `
+
+
+
+
+
+ `, data() {
+ return {
+ window: window, historyModal: false, historyModalId: null,
+ }
+ },
+ methods: {
+ printLabels(event) {
+ const url = window.TT_CONFIG.BASE_PATH + "/WarehouseCategory/printLabels?id=" + event.id;
+ window.open(url, '_blank');
+ }
+ }
+})
diff --git a/public/js/pages/WarehouseOrder/WarehouseOrder.css b/public/js/pages/WarehouseOrder/WarehouseOrder.css
index b58b3475d..0f0211ca6 100644
--- a/public/js/pages/WarehouseOrder/WarehouseOrder.css
+++ b/public/js/pages/WarehouseOrder/WarehouseOrder.css
@@ -180,3 +180,411 @@ input:checked + .ios-switch-slider:before {
input:disabled + .ios-switch-slider {
cursor: not-allowed;
}
+
+/* ===== ORDER DETAIL REDESIGN ===== */
+
+.order-detail-container {
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+}
+
+.order-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 16px 20px;
+ background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%);
+ border-radius: 10px;
+ margin-bottom: 20px;
+ box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+}
+
+.order-info {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+}
+
+.order-number {
+ font-size: 1.25rem;
+ font-weight: 700;
+ color: #1a1a2e;
+}
+
+.order-meta {
+ font-size: 0.875rem;
+ color: #6c757d;
+}
+
+.order-meta span {
+ margin-right: 12px;
+}
+
+.order-actions {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+}
+
+.status-badge {
+ padding: 6px 14px;
+ border-radius: 20px;
+ font-size: 0.75rem;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+}
+
+.status-new { background: #e3f2fd; color: #1565c0; }
+.status-accepted { background: #e8f5e9; color: #2e7d32; }
+.status-ordered { background: #fff3e0; color: #ef6c00; }
+.status-sent { background: #fce4ec; color: #c2185b; }
+.status-partiallyDelivered { background: #fff8e1; color: #f9a825; }
+.status-fullyDelivered { background: #e8f5e9; color: #2e7d32; }
+.status-cancelled { background: #ffebee; color: #c62828; }
+
+/* Status Form */
+.status-form-container {
+ background: #fff;
+ border: 2px solid #e3f2fd;
+ border-radius: 10px;
+ padding: 20px;
+ margin-bottom: 20px;
+ box-shadow: 0 4px 12px rgba(0,0,0,0.08);
+}
+
+.status-form-header {
+ display: flex;
+ gap: 16px;
+ margin-bottom: 16px;
+ flex-wrap: wrap;
+}
+
+.status-form-header > div {
+ flex: 1;
+ min-width: 200px;
+}
+
+.delivery-table {
+ width: 100%;
+ border-collapse: collapse;
+ margin: 16px 0;
+}
+
+.delivery-table th {
+ text-align: left;
+ padding: 10px 12px;
+ background: #f8f9fa;
+ font-weight: 600;
+ font-size: 0.8rem;
+ text-transform: uppercase;
+ color: #6c757d;
+ border-bottom: 2px solid #dee2e6;
+}
+
+.delivery-table td {
+ padding: 12px;
+ border-bottom: 1px solid #e9ecef;
+}
+
+.delivery-table input[type="number"] {
+ width: 80px;
+ padding: 6px 10px;
+ border: 1px solid #ced4da;
+ border-radius: 6px;
+ text-align: center;
+}
+
+.delivery-table input[type="text"] {
+ width: 100%;
+ padding: 6px 10px;
+ border: 1px solid #ced4da;
+ border-radius: 6px;
+}
+
+.status-form-actions {
+ display: flex;
+ gap: 12px;
+ justify-content: flex-end;
+ margin-top: 16px;
+ padding-top: 16px;
+ border-top: 1px solid #e9ecef;
+}
+
+.file-upload-row {
+ display: flex;
+ gap: 16px;
+ flex-wrap: wrap;
+ margin-top: 16px;
+}
+
+.file-upload-item {
+ flex: 1;
+ min-width: 200px;
+}
+
+/* Section Titles */
+.section-title {
+ font-size: 0.875rem;
+ font-weight: 600;
+ text-transform: uppercase;
+ letter-spacing: 0.5px;
+ color: #6c757d;
+ margin: 24px 0 12px 0;
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.section-title i {
+ color: #1976d2;
+}
+
+/* Positions Table */
+.positions-container {
+ border-radius: 10px;
+ overflow: hidden;
+ box-shadow: 0 2px 8px rgba(0,0,0,0.08);
+ border: 1px solid #e0e0e0;
+ margin-bottom: 24px;
+ background: #fff;
+}
+
+.positions-table {
+ display: table !important;
+ width: 100%;
+ border-collapse: collapse;
+ background: #fff;
+}
+
+.positions-table thead {
+ display: table-header-group !important;
+}
+
+.positions-table tbody {
+ display: table-row-group !important;
+}
+
+.positions-table tfoot {
+ display: table-footer-group !important;
+}
+
+.positions-table tr {
+ display: table-row !important;
+}
+
+.positions-table th,
+.positions-table td {
+ display: table-cell !important;
+ vertical-align: middle;
+ position: static !important;
+}
+
+.positions-table th {
+ text-align: left;
+ padding: 14px 20px;
+ background: #f8f9fa;
+ font-weight: 600;
+ font-size: 0.8rem;
+ text-transform: uppercase;
+ letter-spacing: 0.3px;
+ color: #495057;
+ border-bottom: 2px solid #dee2e6;
+ position: static !important;
+}
+
+/* Right-align numeric columns (Menge, Einzelpreis, Summe) */
+.positions-table th:nth-child(2),
+.positions-table th:nth-child(3),
+.positions-table th:nth-child(4),
+.positions-table td:nth-child(2),
+.positions-table td:nth-child(3),
+.positions-table td:nth-child(4) {
+ text-align: right;
+}
+
+.positions-table td {
+ padding: 12px 20px;
+ border-bottom: 1px solid #e9ecef;
+ font-size: 0.95rem;
+ color: #333;
+}
+
+.positions-table tbody td:first-child {
+ font-weight: 500;
+ color: #1a1a2e;
+}
+
+.positions-table tbody tr:nth-child(even) {
+ background: #fafbfc;
+}
+
+.positions-table tbody tr:hover {
+ background: #f0f4f8;
+}
+
+/* Total row in tfoot */
+.positions-table tfoot .total-row {
+ background: #f0f0f0;
+}
+
+.positions-table tfoot .total-row td {
+ color: #333;
+ font-weight: 600;
+ font-size: 1rem;
+ padding: 14px 20px;
+ border-bottom: none;
+ border-top: 2px solid #dee2e6;
+}
+
+.positions-table tfoot .total-row td:first-child {
+ font-weight: 700;
+}
+
+/* Movements Table */
+.movements-table {
+ width: 100%;
+ border-collapse: collapse;
+ font-size: 0.9rem;
+}
+
+.movements-table th {
+ text-align: left;
+ padding: 8px 12px;
+ background: #f8f9fa;
+ font-weight: 600;
+ font-size: 0.75rem;
+ text-transform: uppercase;
+ color: #6c757d;
+}
+
+.movements-table td {
+ padding: 10px 12px;
+ border-bottom: 1px solid #e9ecef;
+}
+
+.movements-table a {
+ color: #1976d2;
+ text-decoration: none;
+ font-weight: 500;
+}
+
+.movements-table a:hover {
+ text-decoration: underline;
+}
+
+.movement-qty {
+ color: #2e7d32;
+ font-weight: 600;
+}
+
+/* Timeline */
+.timeline-container {
+ background: #fff;
+ border: 1px solid #e0e0e0;
+ border-radius: 10px;
+ padding: 20px;
+ margin-bottom: 20px;
+ box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+}
+
+.timeline {
+ position: relative;
+ padding-left: 24px;
+ margin-left: 8px;
+}
+
+.timeline::before {
+ content: '';
+ position: absolute;
+ left: 3px;
+ top: 6px;
+ bottom: 6px;
+ width: 2px;
+ background: #dee2e6;
+ border-radius: 1px;
+}
+
+.timeline-item {
+ position: relative;
+ padding-bottom: 20px;
+}
+
+.timeline-item:last-child {
+ padding-bottom: 0;
+}
+
+.timeline-marker {
+ position: absolute;
+ left: -21px;
+ top: 4px;
+ width: 10px;
+ height: 10px;
+ border-radius: 50%;
+ background: #fff;
+ border: 2px solid #1976d2;
+ z-index: 1;
+}
+
+.timeline-item.is-first .timeline-marker {
+ background: #1976d2;
+ width: 12px;
+ height: 12px;
+ left: -22px;
+ top: 3px;
+}
+
+.timeline-header {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-bottom: 4px;
+}
+
+.timeline-date {
+ font-size: 0.8rem;
+ color: #6c757d;
+ font-weight: 500;
+}
+
+.timeline-author {
+ font-size: 0.8rem;
+ color: #1976d2;
+ font-weight: 600;
+}
+
+.timeline-body {
+ font-size: 0.9rem;
+ color: #333;
+ line-height: 1.5;
+ white-space: pre-line;
+}
+
+.timeline-files {
+ margin-top: 8px;
+ display: flex;
+ flex-wrap: wrap;
+ gap: 8px;
+}
+
+.timeline-files a {
+ display: inline-flex;
+ align-items: center;
+ gap: 6px;
+ padding: 4px 10px;
+ background: #e3f2fd;
+ color: #1565c0;
+ border-radius: 4px;
+ font-size: 0.8rem;
+ text-decoration: none;
+}
+
+.timeline-files a:hover {
+ background: #bbdefb;
+}
+
+.loading-spinner {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 40px;
+}
diff --git a/public/js/pages/WarehouseOrder/WarehouseOrder.js b/public/js/pages/WarehouseOrder/WarehouseOrder.js
index 501439c38..8c1e73ae8 100644
--- a/public/js/pages/WarehouseOrder/WarehouseOrder.js
+++ b/public/js/pages/WarehouseOrder/WarehouseOrder.js
@@ -11,20 +11,32 @@ Vue.component('change-status-modal', {
note: '',
file: null,
uploadedFiles: [],
+ deliveryNoteFiles: [],
sendEmail: false,
sendEmailViewedPDF: false,
sendEmailMail: '',
submitLoading: false,
- deliveredPositions: {} // To track delivery details for each position
+ deliveredPositions: {}, // To track delivery details for each position
+ warehouseLocations: [],
+ selectedLocationId: null
};
},
async mounted() {
- const response = await axios.get(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getById`, {params: {id: this.orderId}});
- if (response.data.status === 'cancelled') {
+ const [orderResponse, locationsResponse] = await Promise.all([
+ axios.get(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getById`, {params: {id: this.orderId}}),
+ axios.get(`${window.TT_CONFIG["BASE_PATH"]}/WarehouseOrder/getLocations`)
+ ]);
+
+ if (orderResponse.data.status === 'cancelled') {
this.$emit('close');
window.notify('error', 'Bestellung wurde storniert');
}
- this.order = response.data;
+ this.order = orderResponse.data;
+ this.warehouseLocations = locationsResponse.data;
+
+ // Set default location to "K1 Fladnitz 150" if available
+ const defaultLocation = this.warehouseLocations.find(loc => loc.text === 'K1 Fladnitz 150');
+ this.selectedLocationId = defaultLocation ? defaultLocation.value : (this.warehouseLocations[0]?.value || null);
// Initialize deliveredPositions after fetching the order
if (this.order && this.order.positions) {
@@ -40,6 +52,10 @@ Vue.component('change-status-modal', {
}
},
computed: {
+ movementPreviewCount() {
+ if (!this.deliveredPositions) return 0;
+ return Object.values(this.deliveredPositions).filter(p => p.amount > 0).length;
+ },
availableStatuses() {
// This computed property remains unchanged
switch (this.order.status) {
@@ -86,8 +102,7 @@ Vue.component('change-status-modal', {
}
},
methods: {
- async handleFileUpload(event) {
- // This method remains unchanged
+ async handleFileUpload(event, isDeliveryNote = false) {
const files = event.target.files;
if (!files.length) return;
@@ -104,16 +119,21 @@ Vue.component('change-status-modal', {
});
if (response.data.success) {
- this.uploadedFiles.push({
+ const fileEntry = {
id: response.data.fileId,
name: file.name
- });
- window.notify('success', `File "${file.name}" uploaded successfully`);
+ };
+ if (isDeliveryNote) {
+ this.deliveryNoteFiles.push(fileEntry);
+ } else {
+ this.uploadedFiles.push(fileEntry);
+ }
+ window.notify('success', `Datei "${file.name}" erfolgreich hochgeladen`);
} else {
- window.notify('error', `File "${file.name}" upload failed: ${response.data.error || 'Unknown error'}`);
+ window.notify('error', `Datei "${file.name}" Upload fehlgeschlagen: ${response.data.error || 'Unbekannter Fehler'}`);
}
} catch (error) {
- window.notify('error', `Error uploading file "${file.name}"`);
+ window.notify('error', `Fehler beim Hochladen von "${file.name}"`);
}
}
event.target.value = '';
@@ -121,6 +141,9 @@ Vue.component('change-status-modal', {
removeFile(index) {
this.uploadedFiles.splice(index, 1)
},
+ removeDeliveryNoteFile(index) {
+ this.deliveryNoteFiles.splice(index, 1)
+ },
async submit() {
this.submitLoading = true;
if (this.newStatus === 'accepted' && this.sendEmail && !this.sendEmailMail) {
@@ -139,6 +162,7 @@ Vue.component('change-status-modal', {
}
const fileIds = this.uploadedFiles.map(file => file.id);
+ const deliveryNoteFileIds = this.deliveryNoteFiles.map(file => file.id);
// Prepare delivery data if the status is related to delivery
let deliveryData = null;
@@ -151,7 +175,9 @@ Vue.component('change-status-modal', {
status: this.newStatus,
note: this.note,
fileIds: JSON.stringify(fileIds),
- deliveryData: deliveryData // Send the new delivery data to the backend
+ deliveryData: deliveryData, // Send the new delivery data to the backend
+ locationId: this.selectedLocationId,
+ deliveryNoteFileIds: deliveryNoteFileIds
});
if (response.data.success) {
@@ -230,6 +256,12 @@ Vue.component('change-status-modal', {
+ Lagerstandort
+
+
Positionen Lieferung erfassen
Artikel
@@ -270,6 +302,32 @@ Vue.component('change-status-modal', {
+
+ Es werden {{ movementPreviewCount }} Lagerbewegung(en) erstellt.
+
+
+ Lieferschein Foto
+
+
+
+
+
+
+
+ -
+
+ {{ file.name }}
+
+
+
+
@@ -581,60 +639,399 @@ Vue.component('tt-file', {
Vue.component('warehouse-order-detail', {
template: `
-
- Bestellungsdetails für #{{ loading ? 'Laden...' : order.orderNumber }}
+
-
- Loading...
+
-
- Positionen
-
-
- {{ p.articleName }}
- {{ p.amount }}
- {{ p.buyPrice }}
- {{ p.distributorName }}
- {{ p.verwendung }}
- {{ p.amount * p.buyPrice }}
-
- Log
-
- {{ formatDate(log.create) }} ({{ getUserName(log.createBy) }}) | {{ log.message }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Positionen
+
+
+
+
+ | Artikel |
+ Menge |
+ Einzelpreis |
+ Summe |
+
+
+
+
+ | {{ p.articleName }} |
+ {{ p.amount }} Stk |
+ {{ formatCurrency(p.buyPrice) }} |
+ {{ formatCurrency(p.amount * p.buyPrice) }} |
+
+
+
+
+ | Gesamtsumme |
+ |
+ |
+ {{ formatCurrency(grandTotal) }} |
+
+
+
+ Lagerbewegungen
+
+
+
+ | Nummer |
+ Artikel |
+ Menge |
+ Lagerort |
+ Datum |
+
+
+
+
+ | {{ m.movementNumber }} |
+ {{ m.articleName }} |
+ +{{ m.quantity }} |
+ {{ m.locationName }} |
+ {{ formatDate(m.create) }} |
+
+
+
+
+
+
+
+ Aktivität
+
+
+
+
+
+
+ {{ log.message }}
+
+
+
+
- Lieferadresse
- {{ order[field] }}
- {{ order.delAddrPLZ }} {{ order.delAddrCity }}
-
+
-
+
- Tiefbau-Arbeiten
+ Tiefbau-Arbeiten
Schließen Sie den Tiefbau-Auftrag ab. Laden Sie Dokumente hoch, falls erforderlich.
+
+
+ Checkliste
+
+ -
+
+ {{ docType.text }}
+
+
+
+
-
- Bitte laden Sie mindestens ein Dokument hoch, um den Auftrag abzuschließen.
+
+ Bitte laden Sie mindestens ein Tiefbau-Dokument hoch, um den Auftrag abzuschließen.
+
+
+
+
+
+ -
+ {{ formatDate(log.create) }} ({{ log.createByName }}):
+
{{ log.text }}
+
+
+ Keine Journaleinträge.
+
+
+
+
-
+
Dokument hochladen
+
@@ -56,14 +87,21 @@ Vue.component('civil-engineering-manager', {
+
+ @delete-file="deleteDocumentation"
+ @update-file="updateDocumentation">
+
+
+
- Für diesen Auftraggeber ist keine Dokumentation für Tiefbau-Arbeiten erforderlich.
+
+
+ Für diesen Auftraggeber ist keine Dokumentation für Tiefbau-Arbeiten erforderlich.
+
`,
data: () => ({
- loading: true, uploading: false, completing: false, docsRequired: false,
- uploadedFiles: [], uploadData: { files: [], description: '' }, showCompleteModal: false
+ loading: true, uploading: false, completing: false,
+ docsRequired: false, tiefbauSeesNormalDocs: false, documentationTypes: [],
+ uploadedFiles: [], journals: [],
+ uploadData: { files: [], description: '', documentType: 'civil_engineering_photo' },
+ showCompleteModal: false,
+ newJournalMessage: '', addingJournalEntry: false
}),
computed: {
canComplete() {
+ if (this.tiefbauSeesNormalDocs) {
+ // When tiefbauSeesNormalDocs is enabled, can always complete (no strict requirements)
+ return true;
+ }
+ // Original logic: require at least one civil engineering doc if docsRequired
return !this.docsRequired || this.uploadedFiles.length > 0;
+ },
+ allDocTypes() {
+ return [...this.documentationTypes, { value: 'civil_engineering_photo', text: 'Tiefbau Foto' }, { value: 'other', text: 'Sonstiges' }];
}
},
methods: {
+ formatDate(timestamp) { return timestamp ? window.moment.unix(timestamp).format('DD.MM.YYYY HH:mm') : '–'; },
+ isUploaded(docType) {
+ return Array.isArray(this.uploadedFiles) && this.uploadedFiles.some(doc => doc.documentType === docType);
+ },
async fetchInitialData() {
this.loading = true;
try {
const configRes = await axios.get(`${window.TT_CONFIG.BASE_PATH}/WorkorderCompany/getTenantConfig`, { params: { workorderId: this.workorderId } });
this.docsRequired = configRes.data.civilEngineeringDocsRequired || false;
+ this.tiefbauSeesNormalDocs = configRes.data.tiefbauSeesNormalDocs || false;
+ this.documentationTypes = configRes.data.documentationTypes || [];
- if(this.docsRequired) {
- const docRes = await axios.get(`${window.TT_CONFIG.BASE_PATH}/${this.isAdmin ? 'WorkorderAdmin' : 'WorkorderCompany'}/getDocumentation`, { params: { workorderId: this.workorderId } });
- this.uploadedFiles = docRes.data.docs || [];
- }
+ // Always load docs and journals
+ const docRes = await axios.get(`${window.TT_CONFIG.BASE_PATH}/${this.isAdmin ? 'WorkorderAdmin' : 'WorkorderCompany'}/getDocumentation`, { params: { workorderId: this.workorderId } });
+ this.uploadedFiles = docRes.data.docs || [];
+ this.journals = docRes.data.journals || [];
} catch (e) {
window.notify('error', 'Konfiguration konnte nicht geladen werden.');
console.error(e);
@@ -104,7 +160,7 @@ Vue.component('civil-engineering-manager', {
this.uploading = true;
const formData = new FormData();
formData.append('workorderId', this.workorderId);
- formData.append('documentType', 'civil_engineering_photo');
+ formData.append('documentType', this.uploadData.documentType || 'civil_engineering_photo');
formData.append('description', this.uploadData.description);
for (const file of this.uploadData.files) formData.append('files[]', file);
try {
@@ -112,7 +168,7 @@ Vue.component('civil-engineering-manager', {
if (data.success) {
window.notify('success', data.message);
this.$refs.fileInput.value = '';
- this.uploadData = { files: [], description: '' };
+ this.uploadData = { files: [], description: '', documentType: this.tiefbauSeesNormalDocs ? this.documentationTypes[0]?.value : 'civil_engineering_photo' };
await this.fetchInitialData();
} else window.notify('error', data.error || 'Upload fehlgeschlagen.');
} catch (e) {
@@ -131,6 +187,29 @@ Vue.component('civil-engineering-manager', {
window.notify('error', 'Netzwerkfehler beim Löschen.');
}
},
+ async updateDocumentation(file) {
+ try {
+ const {data} = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WorkorderCompany/updateDocumentation`, { id: file.id, documentType: file.documentType });
+ if (data.success) {
+ window.notify('success', data.message);
+ await this.fetchInitialData();
+ } else window.notify('error', data.message || 'Update fehlgeschlagen.');
+ } catch (e) {
+ window.notify('error', 'Netzwerkfehler beim Update.');
+ }
+ },
+ async addJournalEntry() {
+ if (!this.newJournalMessage.trim()) return;
+ this.addingJournalEntry = true;
+ try {
+ const {data} = await axios.post(`${window.TT_CONFIG.BASE_PATH}/${this.isAdmin ? 'WorkorderAdmin' : 'WorkorderCompany'}/addJournal`, { workorderId: this.workorderId, text: this.newJournalMessage });
+ if (data.success) {
+ this.newJournalMessage = '';
+ this.journals = data.journals || [];
+ } else window.notify('error', data.message);
+ } catch (e) { window.notify('error', 'Netzwerkfehler'); }
+ finally { this.addingJournalEntry = false; }
+ },
async completeTask() {
this.completing = true;
try {
@@ -273,7 +352,65 @@ Vue.component('workorder-details-manager', {
/>
-
+
+
+
+
+
+
+
+
+
+ {{ technicalData.patchposition.equipmentName }}
+ Port {{ technicalData.patchposition.equipmentPort }}
+
+
+
+
+
+
+
+ {{ wo.rimoName }}
+ {{ wo.rimoStatus }}
+
+
+
+
+
+
+
+
+ | Kabel-ID | Typ | PLAN | IST | Status |
|---|
+
+
+
+ | {{ dk.cable_id }} |
+ {{ dk.type }} |
+ {{ dk.laenge_plan || '-' }} |
+ {{ dk.laenge_ist || '-' }} |
+ {{ dk.status || '-' }} |
+
+
+
+
+
+
+ ![]()
+
+
+
+
@@ -328,6 +465,10 @@ Vue.component('workorder-details-manager', {
requireCableLength: false,
requireCableType: false,
savingData: false,
+ // Technical data
+ showTechnicalData: false,
+ technicalData: null,
+ parsingAhaId: null,
// Admin state
selectedDocs: [], correctionText: '', correctionLoading: false, showAcceptModal: false, showRevertModal: false,
}),
@@ -377,6 +518,8 @@ Vue.component('workorder-details-manager', {
// FIX: Ensure docs and journals are always arrays
this.docs = docsJournalsRes.data.docs || [];
this.journals = docsJournalsRes.data.journals || [];
+ // Reload tenant config to get updated technical data (AHA may have been auto-parsed)
+ if (this.showTechnicalData) this.loadTenantConfig();
} catch (e) {
window.notify('error', 'Details konnten nicht geladen werden.');
this.docs = []; // Ensure it's an array on error
@@ -394,6 +537,8 @@ Vue.component('workorder-details-manager', {
this.interventionTypes = data.interventionTypes;
this.requireCableLength = data.requireCableLength || false;
this.requireCableType = data.requireCableType || false;
+ this.showTechnicalData = data.showTechnicalData || false;
+ this.technicalData = data.technicalData || null;
}
} catch (e) { console.error("Mandantenkonfiguration nicht geladen", e); }
finally { this.loadingConfig = false; }
@@ -534,6 +679,24 @@ Vue.component('workorder-details-manager', {
this.showAcceptModal = false;
},
getInterventionLabel(type) { return this.interventionTypes.find(t => t.value === type)?.text || type; },
+ async parseAha(wo) {
+ this.parsingAhaId = wo.id;
+ try {
+ const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/RimoWorkorder/parseAha`, { id: wo.id });
+ if (data.success) {
+ window.notify('success', `AHA-Daten geladen: ${data.dropkabel_count} Dropkabel${data.has_map ? ', Lageplan vorhanden' : ''}`);
+ // Reload technical data to show the parsed data
+ await this.loadTenantConfig();
+ } else {
+ window.notify('error', data.message || 'Fehler beim Laden der AHA-Daten');
+ }
+ } catch (e) {
+ window.notify('error', 'Netzwerkfehler beim Laden der AHA-Daten');
+ console.error(e);
+ } finally {
+ this.parsingAhaId = null;
+ }
+ },
async revertDocumentedStatus() {
// Optional: Add loading state if needed
try {
diff --git a/public/js/pages/WorkorderCompany/WorkorderCompany.js b/public/js/pages/WorkorderCompany/WorkorderCompany.js
index ed6e0ec46..a974eb9bc 100644
--- a/public/js/pages/WorkorderCompany/WorkorderCompany.js
+++ b/public/js/pages/WorkorderCompany/WorkorderCompany.js
@@ -65,6 +65,9 @@ Vue.component('workorder-company', {
+
–
@@ -157,6 +160,16 @@ Vue.component('workorder-company', {
this.rescheduleModalData = null;
} else window.notify('error', data.message || 'Ein Fehler ist aufgetreten.');
},
+ async clearAppointment(workorder) {
+ if (!confirm('Möchten Sie den Termin wirklich löschen?')) return;
+ const {data} = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WorkorderCompany/clearAppointment`, {
+ workorderId: workorder.id
+ });
+ if (data.success) {
+ window.notify('success', data.message);
+ this.$refs.table.$refs.table.refreshTable();
+ } else window.notify('error', data.message || 'Ein Fehler ist aufgetreten.');
+ },
startAdditionalInfoEdit(row) {
this.editingAdditionalInfoId = row.id;
this.tempAdditionalInfo = row.additionalInfo || '';
diff --git a/public/js/pages/WorkorderDashboard/WorkorderDashboard.css b/public/js/pages/WorkorderDashboard/WorkorderDashboard.css
new file mode 100644
index 000000000..7aad806cb
--- /dev/null
+++ b/public/js/pages/WorkorderDashboard/WorkorderDashboard.css
@@ -0,0 +1,135 @@
+.tt-scope.workorder-dashboard {
+ --wd-primary: #4f46e5; --wd-primary-light: #6366f1;
+ --wd-success: #10b981; --wd-success-light: #34d399;
+ --wd-warning: #f59e0b; --wd-warning-light: #fbbf24;
+ --wd-danger: #ef4444; --wd-danger-light: #f87171;
+ --wd-info: #06b6d4; --wd-info-light: #22d3ee;
+ --wd-gray: #6b7280; --wd-gray-light: #9ca3af;
+ --wd-card-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
+ --wd-card-shadow-hover: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
+ --wd-card-radius: 12px; --wd-card-radius-sm: 8px;
+ padding: 0; min-height: 100vh;
+ background: linear-gradient(135deg, #f5f7fa 0%, #e4e8ec 100%);
+}
+
+.tt-scope.workorder-dashboard .filter-bar {
+ background: white; padding: 1rem 1.5rem; border-bottom: 1px solid #e5e7eb;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); position: sticky; top: 0; z-index: 100;
+}
+.tt-scope.workorder-dashboard .filter-bar__inner { display: flex; flex-wrap: wrap; gap: 1rem; align-items: flex-end; }
+.tt-scope.workorder-dashboard .filter-bar__inner > .form-group { margin-bottom: 0; }
+.tt-scope.workorder-dashboard .filter-bar .tt-select { min-width: 200px; }
+.tt-scope.workorder-dashboard .filter-bar .tt-select:first-child { min-width: 220px; }
+.tt-scope.workorder-dashboard .filter-bar .form-group input[type="text"] { min-width: 240px; }
+.tt-scope.workorder-dashboard .filter-bar .refresh-btn { height: 31px; margin-bottom: 0; align-self: flex-end; }
+
+.tt-scope.workorder-dashboard .refresh-btn {
+ display: flex; align-items: center; gap: 0.5rem; padding: 0.5rem 1rem;
+ background: linear-gradient(135deg, var(--wd-primary), var(--wd-primary-light));
+ border: none; border-radius: var(--wd-card-radius-sm); color: white; font-weight: 500;
+ transition: transform 0.2s, box-shadow 0.2s;
+}
+.tt-scope.workorder-dashboard .refresh-btn:hover:not(:disabled) { transform: translateY(-1px); box-shadow: 0 4px 12px rgba(79, 70, 229, 0.4); }
+.tt-scope.workorder-dashboard .refresh-btn:disabled { opacity: 0.6; cursor: not-allowed; }
+
+.tt-scope.workorder-dashboard .dashboard-content { padding: 1.5rem; display: flex; flex-direction: column; gap: 1.5rem; }
+
+.tt-scope.workorder-dashboard .kpi-row { display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 1rem; }
+.tt-scope.workorder-dashboard .kpi-card {
+ display: flex; align-items: center; gap: 1rem; padding: 1.25rem;
+ border-radius: var(--wd-card-radius); box-shadow: var(--wd-card-shadow);
+ color: white; transition: transform 0.2s, box-shadow 0.2s;
+}
+.tt-scope.workorder-dashboard .kpi-card:hover { transform: translateY(-2px); box-shadow: var(--wd-card-shadow-hover); }
+.tt-scope.workorder-dashboard .kpi-card--primary { background: linear-gradient(135deg, var(--wd-primary), var(--wd-primary-light)); }
+.tt-scope.workorder-dashboard .kpi-card--success { background: linear-gradient(135deg, var(--wd-success), var(--wd-success-light)); }
+.tt-scope.workorder-dashboard .kpi-card--warning { background: linear-gradient(135deg, var(--wd-warning), var(--wd-warning-light)); }
+.tt-scope.workorder-dashboard .kpi-card--danger { background: linear-gradient(135deg, var(--wd-danger), var(--wd-danger-light)); }
+.tt-scope.workorder-dashboard .kpi-card--info { background: linear-gradient(135deg, var(--wd-info), var(--wd-info-light)); }
+.tt-scope.workorder-dashboard .kpi-card__icon {
+ width: 48px; height: 48px; display: flex; align-items: center; justify-content: center;
+ background: rgba(255, 255, 255, 0.2); border-radius: 50%; font-size: 1.25rem;
+}
+.tt-scope.workorder-dashboard .kpi-card__content { flex: 1; }
+.tt-scope.workorder-dashboard .kpi-card__value { font-size: 1.75rem; font-weight: 700; line-height: 1.2; }
+.tt-scope.workorder-dashboard .kpi-card__title { font-size: 0.875rem; font-weight: 500; opacity: 0.9; }
+.tt-scope.workorder-dashboard .kpi-card__subtitle { font-size: 0.75rem; opacity: 0.75; margin-top: 0.25rem; }
+
+.tt-scope.workorder-dashboard .charts-row { display: grid; grid-template-columns: 1fr 2fr; gap: 1.5rem; }
+.tt-scope.workorder-dashboard .analytics-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1.5rem; }
+@media (max-width: 1024px) { .tt-scope.workorder-dashboard .charts-row, .tt-scope.workorder-dashboard .analytics-row { grid-template-columns: 1fr; } }
+
+.tt-scope.workorder-dashboard .chart-card {
+ background: white; border-radius: var(--wd-card-radius); box-shadow: var(--wd-card-shadow);
+ padding: 1.5rem; transition: box-shadow 0.2s;
+}
+.tt-scope.workorder-dashboard .chart-card:hover { box-shadow: var(--wd-card-shadow-hover); }
+.tt-scope.workorder-dashboard .chart-card--wide { grid-column: span 1; }
+.tt-scope.workorder-dashboard .chart-card--full { width: 100%; }
+.tt-scope.workorder-dashboard .chart-card__title {
+ display: flex; align-items: center; gap: 0.5rem; font-size: 1rem; font-weight: 600;
+ color: #1f2937; margin: 0 0 1rem 0; padding-bottom: 0.75rem; border-bottom: 1px solid #f3f4f6;
+}
+.tt-scope.workorder-dashboard .chart-card__title i { color: var(--wd-primary); }
+
+.tt-scope.workorder-dashboard .chart-wrapper { height: 250px; position: relative; }
+.tt-scope.workorder-dashboard .chart-wrapper--large { height: 300px; }
+.tt-scope.workorder-dashboard .chart-wrapper--wide { height: 200px; }
+
+.tt-scope.workorder-dashboard .detail-table-wrapper { overflow-x: auto; max-height: 400px; overflow-y: auto; }
+.tt-scope.workorder-dashboard .detail-table { width: 100%; border-collapse: collapse; font-size: 0.875rem; }
+.tt-scope.workorder-dashboard .detail-table th {
+ position: sticky; top: 0; background: #f9fafb; padding: 0.75rem 1rem;
+ text-align: left; font-weight: 600; color: #374151; border-bottom: 2px solid #e5e7eb;
+}
+.tt-scope.workorder-dashboard .detail-table td { padding: 0.75rem 1rem; border-bottom: 1px solid #f3f4f6; vertical-align: top; }
+.tt-scope.workorder-dashboard .detail-table tr:hover td { background: #f9fafb; }
+.tt-scope.workorder-dashboard .company-cell { font-weight: 500; color: #1f2937; }
+.tt-scope.workorder-dashboard .count-cell { font-weight: 600; color: var(--wd-primary); }
+.tt-scope.workorder-dashboard .campaigns-cell { display: flex; flex-wrap: wrap; gap: 0.5rem; }
+.tt-scope.workorder-dashboard .campaign-tag { display: inline-block; padding: 0.25rem 0.5rem; background: #f3f4f6; border-radius: 4px; font-size: 0.75rem; color: #4b5563; }
+
+.tt-scope.workorder-dashboard .status-badge {
+ display: inline-block; padding: 0.25rem 0.75rem; border-radius: 9999px;
+ font-size: 0.75rem; font-weight: 500; text-transform: uppercase; letter-spacing: 0.025em;
+}
+.tt-scope.workorder-dashboard .status-badge--completed, .tt-scope.workorder-dashboard .status-badge--charged { background: rgba(16, 185, 129, 0.1); color: #059669; }
+.tt-scope.workorder-dashboard .status-badge--assigned, .tt-scope.workorder-dashboard .status-badge--new { background: rgba(59, 130, 246, 0.1); color: #2563eb; }
+.tt-scope.workorder-dashboard .status-badge--scheduled, .tt-scope.workorder-dashboard .status-badge--in_progress { background: rgba(245, 158, 11, 0.1); color: #d97706; }
+.tt-scope.workorder-dashboard .status-badge--intervention_required, .tt-scope.workorder-dashboard .status-badge--correction_requested { background: rgba(239, 68, 68, 0.1); color: #dc2626; }
+.tt-scope.workorder-dashboard .status-badge--documented, .tt-scope.workorder-dashboard .status-badge--problem_solved { background: rgba(20, 184, 166, 0.1); color: #0d9488; }
+.tt-scope.workorder-dashboard .status-badge--archived, .tt-scope.workorder-dashboard .status-badge--cancelled { background: rgba(107, 114, 128, 0.1); color: #4b5563; }
+
+.tt-scope.workorder-dashboard .intervention-rates { display: flex; flex-direction: column; gap: 0.375rem; max-height: 300px; overflow-y: auto; }
+.tt-scope.workorder-dashboard .intervention-rate-item { display: flex; align-items: center; gap: 0.75rem; padding: 0.375rem 0.5rem; background: #f9fafb; border-radius: var(--wd-card-radius-sm); }
+.tt-scope.workorder-dashboard .intervention-rate-item .company-name { flex: 0 0 120px; font-weight: 500; font-size: 0.8125rem; color: #1f2937; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar { flex: 1; height: 6px; background: #e5e7eb; border-radius: 3px; overflow: hidden; min-width: 60px; }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill { height: 100%; border-radius: 3px; transition: width 0.5s ease; }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill.rate--success { background: var(--wd-success); }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill.rate--warning { background: var(--wd-warning); }
+.tt-scope.workorder-dashboard .intervention-rate-item__bar .bar-fill.rate--danger { background: var(--wd-danger); }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value { flex: 0 0 50px; font-weight: 600; font-size: 0.8125rem; text-align: right; }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value.rate--success { color: var(--wd-success); }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value.rate--warning { color: var(--wd-warning); }
+.tt-scope.workorder-dashboard .intervention-rate-item .rate-value.rate--danger { color: var(--wd-danger); }
+.tt-scope.workorder-dashboard .intervention-rate-item__details { flex: 0 0 auto; display: flex; gap: 0.5rem; font-size: 0.6875rem; color: var(--wd-gray); }
+
+.tt-scope.workorder-dashboard .transitions-list { display: flex; flex-direction: column; gap: 0.5rem; max-height: 300px; overflow-y: auto; }
+.tt-scope.workorder-dashboard .transition-item { display: flex; justify-content: space-between; align-items: center; padding: 0.5rem 0.75rem; background: #f9fafb; border-radius: var(--wd-card-radius-sm); font-size: 0.875rem; }
+.tt-scope.workorder-dashboard .transition-label { color: #374151; }
+.tt-scope.workorder-dashboard .transition-count { font-weight: 600; color: var(--wd-primary); background: rgba(79, 70, 229, 0.1); padding: 0.25rem 0.5rem; border-radius: 4px; }
+
+.tt-scope.workorder-dashboard .loading-overlay { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 4rem; color: var(--wd-gray); }
+.tt-scope.workorder-dashboard .spinner { width: 48px; height: 48px; border: 3px solid #e5e7eb; border-top-color: var(--wd-primary); border-radius: 50%; animation: spin 1s linear infinite; margin-bottom: 1rem; }
+@keyframes spin { to { transform: rotate(360deg); } }
+.tt-scope.workorder-dashboard .empty-state { display: flex; flex-direction: column; align-items: center; justify-content: center; padding: 4rem; text-align: center; color: var(--wd-gray); }
+.tt-scope.workorder-dashboard .empty-state i { font-size: 4rem; margin-bottom: 1rem; opacity: 0.3; }
+.tt-scope.workorder-dashboard .empty-state h3 { margin: 0 0 0.5rem 0; color: #374151; }
+.tt-scope.workorder-dashboard .empty-state p { margin: 0; }
+.tt-scope.workorder-dashboard .no-data { text-align: center; padding: 2rem; color: var(--wd-gray); font-style: italic; }
+
+@media (max-width: 768px) {
+ .tt-scope.workorder-dashboard .filter-bar__inner { flex-direction: column; align-items: stretch; }
+ .tt-scope.workorder-dashboard .kpi-row { grid-template-columns: 1fr 1fr; }
+ .tt-scope.workorder-dashboard .kpi-card { flex-direction: column; text-align: center; }
+}
diff --git a/public/js/pages/WorkorderDashboard/WorkorderDashboard.js b/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
new file mode 100644
index 000000000..5a9adb5f5
--- /dev/null
+++ b/public/js/pages/WorkorderDashboard/WorkorderDashboard.js
@@ -0,0 +1,276 @@
+Vue.component('wd-kpi-card', {
+ props: {
+ title: { type: String, required: true },
+ value: { type: [Number, String], required: true },
+ icon: { type: String, default: 'fas fa-chart-bar' },
+ color: { type: String, default: 'primary' },
+ suffix: { type: String, default: '' },
+ subtitle: { type: String, default: '' }
+ },
+ template: `
+
+
+
+ {{ value }}{{ suffix }}
+ {{ title }}
+ {{ subtitle }}
+
+
+ `
+});
+
+Vue.component('wd-status-chart', {
+ props: { data: { type: Array, required: true } },
+ template: ' ',
+ data() { return { chart: null }; },
+ mounted() { this.renderChart(); },
+ watch: { data: { handler() { this.renderChart(); }, deep: true } },
+ methods: {
+ renderChart() {
+ if (this.chart) this.chart.destroy();
+ if (!this.data || this.data.length === 0) return;
+ this.chart = new Chart(this.$refs.chart.getContext('2d'), {
+ type: 'doughnut',
+ data: {
+ labels: this.data.map(d => d.label),
+ datasets: [{ data: this.data.map(d => d.count), backgroundColor: this.data.map(d => d.color), borderWidth: 2, borderColor: '#fff' }]
+ },
+ options: {
+ responsive: true, maintainAspectRatio: false, cutout: '60%',
+ plugins: {
+ legend: { position: 'right', labels: { padding: 15, usePointStyle: true, font: { size: 11 } } },
+ tooltip: { callbacks: { label: (ctx) => `${ctx.label}: ${ctx.raw} (${((ctx.raw / ctx.dataset.data.reduce((a, b) => a + b, 0)) * 100).toFixed(1)}%)` } }
+ }
+ }
+ });
+ }
+ }
+});
+
+Vue.component('wd-company-chart', {
+ props: { data: { type: Array, required: true } },
+ template: ' ',
+ data() { return { chart: null }; },
+ mounted() { this.renderChart(); },
+ watch: { data: { handler() { this.renderChart(); }, deep: true } },
+ methods: {
+ renderChart() {
+ if (this.chart) this.chart.destroy();
+ if (!this.data || this.data.length === 0) return;
+ this.chart = new Chart(this.$refs.chart.getContext('2d'), {
+ type: 'bar',
+ data: {
+ labels: this.data.map(d => d.company),
+ datasets: [
+ { label: 'Abgeschlossen', data: this.data.map(d => d.completed), backgroundColor: '#10b981', borderRadius: 4 },
+ { label: 'In Bearbeitung', data: this.data.map(d => d.pending), backgroundColor: '#f59e0b', borderRadius: 4 },
+ { label: 'Probleme', data: this.data.map(d => d.issues), backgroundColor: '#ef4444', borderRadius: 4 }
+ ]
+ },
+ options: {
+ responsive: true, maintainAspectRatio: false, indexAxis: 'y',
+ plugins: { legend: { position: 'top', labels: { usePointStyle: true } } },
+ scales: { x: { stacked: true, grid: { display: false } }, y: { stacked: true, grid: { display: false } } }
+ }
+ });
+ }
+ }
+});
+
+Vue.component('wd-trends-chart', {
+ props: { data: { type: Array, required: true } },
+ template: ' ',
+ data() { return { chart: null }; },
+ mounted() { this.renderChart(); },
+ watch: { data: { handler() { this.renderChart(); }, deep: true } },
+ methods: {
+ renderChart() {
+ if (this.chart) this.chart.destroy();
+ if (!this.data || this.data.length === 0) return;
+ this.chart = new Chart(this.$refs.chart.getContext('2d'), {
+ type: 'line',
+ data: {
+ labels: this.data.map(d => d.date),
+ datasets: [
+ { label: 'Erstellt', data: this.data.map(d => d.created), borderColor: '#3b82f6', backgroundColor: 'rgba(59, 130, 246, 0.1)', fill: true, tension: 0.3, pointRadius: 4, pointHoverRadius: 6 },
+ { label: 'Abgeschlossen', data: this.data.map(d => d.completed), borderColor: '#10b981', backgroundColor: 'rgba(16, 185, 129, 0.1)', fill: true, tension: 0.3, pointRadius: 4, pointHoverRadius: 6 }
+ ]
+ },
+ options: {
+ responsive: true, maintainAspectRatio: false,
+ plugins: { legend: { position: 'top', labels: { usePointStyle: true } } },
+ scales: {
+ x: { type: 'time', time: { unit: 'day', displayFormats: { day: 'DD.MM' } }, grid: { display: false } },
+ y: { beginAtZero: true, grid: { color: 'rgba(0,0,0,0.05)' } }
+ }
+ }
+ });
+ }
+ }
+});
+
+Vue.component('wd-intervention-rates', {
+ props: { data: { type: Array, required: true } },
+ template: `
+
+
+ {{ item.company }}
+
+ {{ item.rate }}%
+ {{ item.total }} Ges.
+
+ Keine Daten verfügbar
+
+ `,
+ methods: {
+ getRateClass(rate) { return rate >= 20 ? 'rate--danger' : rate >= 10 ? 'rate--warning' : 'rate--success'; }
+ }
+});
+
+Vue.component('workorder-dashboard', {
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+ Dashboard wird geladen...
+
+
+ Bitte wählen Sie einen Mandanten aus
+ Wählen Sie oben einen Mandanten, um das Dashboard anzuzeigen.
+
+
+
+
+
+
+
+
+
+
+
+ Status-Verteilung
+
+
+
+ Firmen-Performance
+
+
+
+
+ Zeitlicher Verlauf
+
+
+
+ Firma → Status → Kampagne (Detailansicht)
+
+
+ | Firma | Status | Anzahl | Kampagnen-Aufschlüsselung |
|---|
+
+
+ | {{ row.company }} |
+ {{ row.statusLabel }} |
+ {{ row.count }} |
+ {{ c.name }}: {{ c.count }} |
+
+ | Keine Daten verfügbar |
+
+
+
+
+
+
+ Problemquote pro Firma
+
+
+
+ Häufigste Status-Übergänge
+
+
+ {{ t.transition }}
+ {{ t.count }}
+
+ Keine Daten verfügbar
+
+
+
+
+
+ `,
+ data() {
+ return {
+ selectedTenant: '', dateRange: null, selectedCompany: '', selectedStatus: '', selectedCampaign: '',
+ filterOptions: { tenants: [], companies: [], statuses: [], campaigns: [] },
+ kpis: null, statusDistribution: [], companyPerformance: [], timeTrends: [],
+ companyStatusCampaign: [], interventionRates: [], statusTransitions: [],
+ loading: false
+ };
+ },
+ async mounted() {
+ const today = new Date();
+ today.setHours(23, 59, 59, 0);
+ const threeMonthsAgo = new Date(today);
+ threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3);
+ threeMonthsAgo.setHours(0, 0, 0, 0);
+ this.dateRange = { from: Math.floor(threeMonthsAgo.getTime() / 1000), to: Math.floor(today.getTime() / 1000) };
+ await this.fetchFilterOptions();
+ },
+ methods: {
+ async fetchFilterOptions() {
+ try {
+ const response = await axios.get(`${window.TT_CONFIG['BASE_URL']}/getFilterOptions`);
+ this.filterOptions.tenants = response.data.tenants;
+ this.filterOptions.companies = response.data.companies;
+ this.filterOptions.statuses = response.data.statuses;
+ } catch (error) { console.error('Error fetching filter options:', error); }
+ },
+ async onTenantChange(tenantId) {
+ this.selectedTenant = tenantId;
+ this.selectedCampaign = '';
+ if (tenantId) {
+ try {
+ const response = await axios.post(`${window.TT_CONFIG['BASE_URL']}/getCampaignsForTenant`, { tenantId });
+ this.filterOptions.campaigns = response.data;
+ } catch (error) { console.error('Error fetching campaigns:', error); }
+ await this.fetchDashboardData();
+ }
+ },
+ onDateRangeChange(range) { this.dateRange = range; this.onFilterChange(); },
+ onFilterChange() { if (this.selectedTenant) this.fetchDashboardData(); },
+ async fetchDashboardData() {
+ if (!this.selectedTenant) return;
+ this.loading = true;
+ try {
+ const response = await axios.post(`${window.TT_CONFIG['BASE_URL']}/getDashboardData`, {
+ tenantId: this.selectedTenant,
+ dateFrom: this.dateRange?.from || null,
+ dateTo: this.dateRange?.to || null,
+ companyIds: this.selectedCompany ? [this.selectedCompany] : [],
+ statuses: this.selectedStatus ? [this.selectedStatus] : [],
+ campaignIds: this.selectedCampaign ? [this.selectedCampaign] : []
+ });
+ this.kpis = response.data.kpis;
+ this.statusDistribution = response.data.statusDistribution;
+ this.companyPerformance = response.data.companyPerformance;
+ this.timeTrends = response.data.timeTrends;
+ this.companyStatusCampaign = response.data.companyStatusCampaign;
+ this.interventionRates = response.data.interventionRates;
+ this.statusTransitions = response.data.statusTransitions;
+ } catch (error) {
+ console.error('Error fetching dashboard data:', error);
+ alert('Fehler beim Laden der Dashboard-Daten.');
+ } finally { this.loading = false; }
+ }
+ }
+});
diff --git a/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js b/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js
index 72191b6e8..be5226746 100644
--- a/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js
+++ b/public/js/pages/WorkorderMphAdmin/WorkorderMphAdmin.js
@@ -30,10 +30,13 @@ Vue.component('workorder-mph-admin', {
{{ row.companyName || 'N/A' }}
-
+
+
@@ -101,6 +104,13 @@ Vue.component('workorder-mph-admin', {
Soll der Auftrag #{{ cancelWorkorderModalData.id }} wirklich storniert werden?
+
+
+ Soll die Zuweisung für Auftrag #{{ unassignWorkorderModalData.id }} aufgehoben werden?
+ Aktuell zugewiesen an: {{ unassignWorkorderModalData.companyName }}
+
+
`,
data() {
@@ -113,6 +123,7 @@ Vue.component('workorder-mph-admin', {
companies: [],
companiesLoading: false,
cancelWorkorderModalData: null,
+ unassignWorkorderModalData: null,
crudConfig: {
...window.TT_CONFIG.CRUD_CONFIG,
selectable: false,
@@ -237,6 +248,20 @@ Vue.component('workorder-mph-admin', {
} else {
window.notify('error', data.message || 'Stornierung fehlgeschlagen.');
}
+ },
+ async unassignWorkorder() {
+ const { id, reason } = this.unassignWorkorderModalData;
+ const { data } = await axios.post(`${window.TT_CONFIG.BASE_PATH}/WorkorderMphAdmin/unassignWorkorder`, {
+ workorderId: id,
+ reason: reason
+ });
+ if (data.success) {
+ window.notify('success', data.message);
+ this.$refs.table.$refs.table.refreshTable();
+ this.unassignWorkorderModalData = null;
+ } else {
+ window.notify('error', data.message || 'Aufheben der Zuweisung fehlgeschlagen.');
+ }
}
}
});
\ No newline at end of file
diff --git a/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js b/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
index 681f3bca6..4eaba32cb 100644
--- a/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
+++ b/public/js/pages/WorkorderTenantConfig/WorkorderTenantConfig.js
@@ -89,6 +89,10 @@ Vue.component('workorder-tenant-config', {
v-model="editableItem.requireCableLength" sm/>
+
+
Workorder: {{ config.enableWorkorder ? 'Aktiviert' : 'Deaktiviert' }}
@@ -97,6 +101,8 @@ Vue.component('workorder-tenant-config', {
Tiefbau-Doku: {{ config.civilEngineeringDocsRequired ? 'Ja' : 'Nein' }}
Kabellänge-Doku: {{ config.requireCableLength ? 'Ja' : 'Nein' }}
Kabeltyp-Doku: {{ config.requireCableType ? 'Ja' : 'Nein' }}
+ Technische Daten: {{ config.showTechnicalData ? 'Ja' : 'Nein' }}
+ Tiefbau sieht Doku: {{ config.tiefbauSeesNormalDocs ? 'Ja' : 'Nein' }}
@@ -333,6 +339,8 @@ Vue.component('workorder-tenant-config', {
civilEngineeringDocsRequired: 0,
requireCableLength: 0,
requireCableType: 0,
+ showTechnicalData: 0,
+ tiefbauSeesNormalDocs: 0,
enableWorkorder: 1,
enableWorkorderMph: 1
}
diff --git a/public/mobile/app.js b/public/mobile/app.js
new file mode 100644
index 000000000..2442bc899
--- /dev/null
+++ b/public/mobile/app.js
@@ -0,0 +1,850 @@
+import { authState, checkAuth, login, logout } from '/mobile/shared/auth.js';
+import LoginScreen from '/mobile/components/LoginScreen.js';
+import MainMenu from '/mobile/components/MainMenu.js';
+import LagerModule from '/mobile/modules/lager/LagerModule.js';
+import ShippingNoteModule from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+import WorkorderModule from '/mobile/modules/workorder/WorkorderModule.js';
+import OfflineIndicator from '/mobile/components/OfflineIndicator.js';
+import SyncStatus from '/mobile/components/SyncStatus.js';
+import { initDatabase, clearAllData, getStorageEstimate } from '/mobile/shared/db.js';
+import offlineSettings from '/mobile/shared/offlineSettings.js';
+import SyncManager from '/mobile/shared/syncManager.js';
+
+const { createApp, ref, computed, onMounted, onUnmounted, watch } = Vue;
+
+const isPWAInstalled = () => {
+ if (window.matchMedia('(display-mode: standalone)').matches) return true;
+ if (window.navigator.standalone === true) return true;
+ if (document.referrer.includes('android-app://')) return true;
+ return false;
+};
+
+const shouldRequirePWA = () => {
+ return window.location.hostname === 'thetool.xinon.at';
+};
+
+const parseInitialRoute = () => {
+ const initialPath = window.TT_CONFIG?.INITIAL_PATH || '/MobileApp';
+ const parts = initialPath.replace('/MobileApp', '').split('/').filter(Boolean);
+ return {
+ module: parts[0] || null,
+ submodule: parts[1] || null
+ };
+};
+
+const App = {
+ components: {
+ LoginScreen,
+ MainMenu,
+ LagerModule,
+ ShippingNoteModule,
+ WorkorderModule,
+ OfflineIndicator,
+ SyncStatus
+ },
+
+ setup() {
+ const currentView = ref('loading');
+ const user = ref(null);
+ const toast = ref({ show: false, message: '', type: 'success' });
+ const theme = ref('system');
+ const showSettings = ref(false);
+ const lagerSimpleMode = ref(false);
+ const currentModule = ref(null);
+ const currentSubmodule = ref(null);
+ const lastWorkflow = ref(null);
+ const showContinuePrompt = ref(false);
+ const showInstallPrompt = ref(false);
+ const deferredInstallPrompt = ref(null);
+ const isIOS = ref(/iPad|iPhone|iPod/.test(navigator.userAgent));
+ const isAndroid = ref(/Android/.test(navigator.userAgent));
+ const canGoBack = computed(() => currentModule.value !== null || workorderDetailOpen.value);
+ const workorderDetailOpen = ref(false);
+ const workorderRef = ref(null);
+
+ // Offline mode state
+ const offlineModeEnabled = ref(false);
+ const offlineAutoSync = ref(true);
+ const offlinePendingCount = ref(0);
+ const offlinePendingOps = ref(0);
+ const offlinePendingPhotos = ref(0);
+ const offlineFailedCount = ref(0);
+ const offlineIsSyncing = ref(false);
+ const offlineLastSyncText = ref('Nie synchronisiert');
+ const offlineFreshness = ref('unknown');
+ const offlineSyncProgress = ref(null);
+ const offlineStorageUsed = ref(0);
+ const isOnline = ref(navigator.onLine);
+
+ const applyTheme = () => {
+ const isDark = localStorage.theme === 'dark' ||
+ (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
+ document.documentElement.classList.toggle('dark', isDark);
+
+ const metaThemeColor = document.querySelector('meta[name="theme-color"]');
+ if (metaThemeColor) {
+ metaThemeColor.setAttribute('content', isDark ? '#0f172a' : '#005384');
+ }
+ };
+
+ const setTheme = (newTheme) => {
+ theme.value = newTheme;
+ if (newTheme === 'system') {
+ localStorage.removeItem('theme');
+ } else {
+ localStorage.setItem('theme', newTheme);
+ }
+ applyTheme();
+ };
+
+ const handleInstallPrompt = (e) => {
+ e.preventDefault();
+ deferredInstallPrompt.value = e;
+ };
+
+ const triggerInstall = async () => {
+ if (!deferredInstallPrompt.value) return;
+ deferredInstallPrompt.value.prompt();
+ const { outcome } = await deferredInstallPrompt.value.userChoice;
+ if (outcome === 'accepted') {
+ showInstallPrompt.value = false;
+ window.location.reload();
+ }
+ deferredInstallPrompt.value = null;
+ };
+
+ const loadLagerSettings = () => {
+ try {
+ const saved = localStorage.getItem('movement_settings');
+ if (saved) {
+ const settings = JSON.parse(saved);
+ lagerSimpleMode.value = settings.simpleMode || false;
+ }
+ } catch (e) {}
+ };
+
+ const setLagerSimpleMode = (value) => {
+ lagerSimpleMode.value = value;
+ try {
+ const saved = localStorage.getItem('movement_settings');
+ const settings = saved ? JSON.parse(saved) : {};
+ settings.simpleMode = value;
+ localStorage.setItem('movement_settings', JSON.stringify(settings));
+ } catch (e) {}
+ };
+
+ // Offline mode functions
+ const loadOfflineSettings = () => {
+ const settings = offlineSettings.load();
+ offlineModeEnabled.value = settings.enabled;
+ offlineAutoSync.value = settings.autoSync;
+ offlineLastSyncText.value = offlineSettings.getLastSyncText();
+ offlineFreshness.value = offlineSettings.getFreshness();
+ };
+
+ const toggleOfflineMode = async () => {
+ if (offlineModeEnabled.value) {
+ offlineSettings.disable();
+ offlineModeEnabled.value = false;
+ } else {
+ offlineSettings.enable();
+ offlineModeEnabled.value = true;
+ // Initialize database
+ try {
+ await initDatabase();
+ SyncManager.init();
+ } catch (error) {
+ console.error('Failed to initialize offline mode:', error);
+ showToast('Offline-Modus konnte nicht aktiviert werden', 'error');
+ offlineSettings.disable();
+ offlineModeEnabled.value = false;
+ }
+ }
+ };
+
+ const setOfflineAutoSync = (value) => {
+ offlineAutoSync.value = value;
+ offlineSettings.setAutoSync(value);
+ };
+
+ const triggerManualSync = async () => {
+ if (!navigator.onLine) {
+ showToast('Keine Internetverbindung', 'error');
+ return;
+ }
+ const result = await SyncManager.sync();
+ if (result.success) {
+ showToast('Synchronisation abgeschlossen', 'success');
+ } else {
+ showToast(result.error || 'Synchronisation fehlgeschlagen', 'error');
+ }
+ };
+
+ const clearOfflineData = async () => {
+ try {
+ await clearAllData();
+ offlineSettings.clear();
+ offlineModeEnabled.value = false;
+ offlinePendingCount.value = 0;
+ showToast('Offline-Daten gelöscht', 'success');
+ } catch (error) {
+ showToast('Fehler beim Löschen', 'error');
+ }
+ };
+
+ const updateOfflineStatus = async () => {
+ if (offlineModeEnabled.value) {
+ const summary = await SyncManager.getPendingSummary();
+ offlinePendingCount.value = summary.total;
+ offlinePendingOps.value = summary.operations;
+ offlinePendingPhotos.value = summary.photos;
+ offlineFailedCount.value = summary.failed;
+ offlineLastSyncText.value = offlineSettings.getLastSyncText();
+ offlineFreshness.value = offlineSettings.getFreshness();
+ const storage = await getStorageEstimate();
+ offlineStorageUsed.value = storage.usage;
+ }
+ };
+
+ const handleSyncEvent = (event, data) => {
+ switch (event) {
+ case 'sync-start':
+ offlineIsSyncing.value = true;
+ offlineSyncProgress.value = null;
+ break;
+ case 'sync-progress':
+ offlineSyncProgress.value = data;
+ break;
+ case 'sync-complete':
+ offlineIsSyncing.value = false;
+ offlineSyncProgress.value = null;
+ updateOfflineStatus();
+ if (data.reassigned?.length > 0) {
+ for (const wo of data.reassigned) {
+ showToast(`Arbeitsauftrag #${wo.id} wurde neu zugewiesen`, 'warning');
+ }
+ }
+ break;
+ case 'sync-error':
+ offlineIsSyncing.value = false;
+ offlineSyncProgress.value = null;
+ break;
+ }
+ };
+
+ const handleOnlineStatusChange = () => {
+ isOnline.value = navigator.onLine;
+ };
+
+ const saveLastWorkflow = (module, submodule) => {
+ if (module) {
+ const workflow = { module, submodule: submodule || null, timestamp: Date.now() };
+ localStorage.setItem('lastWorkflow', JSON.stringify(workflow));
+ lastWorkflow.value = workflow;
+ }
+ };
+
+ const loadLastWorkflow = () => {
+ try {
+ const saved = localStorage.getItem('lastWorkflow');
+ if (saved) {
+ const workflow = JSON.parse(saved);
+ if (Date.now() - workflow.timestamp < 24 * 60 * 60 * 1000) {
+ return workflow;
+ }
+ }
+ } catch (e) {}
+ return null;
+ };
+
+ const navigate = (module, submodule = null) => {
+ currentModule.value = module;
+ currentSubmodule.value = submodule;
+ showContinuePrompt.value = false;
+ saveLastWorkflow(module, submodule);
+ let path = '/MobileApp';
+ if (module) path += '/' + module;
+ if (submodule) path += '/' + submodule;
+ history.pushState({ module, submodule }, '', path);
+ };
+
+ const continueLastWorkflow = () => {
+ if (lastWorkflow.value) {
+ navigate(lastWorkflow.value.module, lastWorkflow.value.submodule);
+ }
+ };
+
+ const dismissContinuePrompt = () => {
+ showContinuePrompt.value = false;
+ };
+
+ const goHome = () => {
+ navigate(null, null);
+ };
+
+ const goBack = () => {
+ if (workorderDetailOpen.value && workorderRef.value?.closeDetail) {
+ workorderRef.value.closeDetail();
+ return;
+ }
+ if (currentSubmodule.value) {
+ navigate(currentModule.value, null);
+ } else if (currentModule.value) {
+ navigate(null, null);
+ }
+ };
+
+ const handleWorkorderDetailOpen = (workorderId) => {
+ workorderDetailOpen.value = true;
+ };
+
+ const handleWorkorderDetailClose = () => {
+ workorderDetailOpen.value = false;
+ };
+
+ const handlePopstate = (event) => {
+ if (workorderDetailOpen.value && workorderRef.value?.closeDetail) {
+ workorderRef.value.closeDetail();
+ return;
+ }
+ if (event.state) {
+ currentModule.value = event.state.module;
+ currentSubmodule.value = event.state.submodule;
+ } else {
+ currentModule.value = null;
+ currentSubmodule.value = null;
+ }
+ };
+
+ const handleLogin = async (credentials) => {
+ if (credentials._2faSuccess) {
+ user.value = credentials.user;
+ currentView.value = 'app';
+ showToast('Erfolgreich angemeldet', 'success');
+ return { success: true };
+ }
+
+ const result = await login(credentials);
+ if (result.success) {
+ user.value = result.user;
+ currentView.value = 'app';
+ showToast('Erfolgreich angemeldet', 'success');
+ }
+ return result;
+ };
+
+ const handleLogout = async () => {
+ await logout();
+ user.value = null;
+ currentModule.value = null;
+ currentSubmodule.value = null;
+ currentView.value = 'login';
+ showToast('Abgemeldet', 'success');
+ };
+
+ const showToast = (message, type = 'success') => {
+ toast.value = { show: true, message, type };
+ setTimeout(() => { toast.value.show = false; }, 3000);
+ };
+
+ const currentComponent = computed(() => {
+ if (currentView.value !== 'app') return null;
+ if (!currentModule.value) return 'MainMenu';
+ if (currentModule.value.toLowerCase() === 'lieferschein') return 'ShippingNoteModule';
+ if (currentModule.value.toLowerCase() === 'lager') return 'LagerModule';
+ if (currentModule.value.toLowerCase() === 'workorder') return 'WorkorderModule';
+ return 'MainMenu';
+ });
+
+ const breadcrumbs = computed(() => {
+ const crumbs = [{ label: 'Home', module: null, submodule: null }];
+ if (currentModule.value) {
+ crumbs.push({ label: currentModule.value, module: currentModule.value, submodule: null });
+ }
+ if (currentSubmodule.value) {
+ crumbs.push({ label: currentSubmodule.value, module: currentModule.value, submodule: currentSubmodule.value });
+ }
+ return crumbs;
+ });
+
+ const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+
+ onMounted(async () => {
+ const savedTheme = localStorage.getItem('theme');
+ if (savedTheme) theme.value = savedTheme;
+ applyTheme();
+ mediaQuery.addEventListener('change', applyTheme);
+ window.addEventListener('popstate', handlePopstate);
+ window.addEventListener('beforeinstallprompt', handleInstallPrompt);
+ window.addEventListener('online', handleOnlineStatusChange);
+ window.addEventListener('offline', handleOnlineStatusChange);
+ loadLagerSettings();
+ loadOfflineSettings();
+
+ // Initialize offline mode if enabled
+ if (offlineModeEnabled.value) {
+ try {
+ await initDatabase();
+ SyncManager.init();
+ SyncManager.subscribe(handleSyncEvent);
+ await updateOfflineStatus();
+ } catch (error) {
+ console.error('Failed to initialize offline mode:', error);
+ }
+ }
+
+ if (shouldRequirePWA() && !isPWAInstalled()) {
+ showInstallPrompt.value = true;
+ currentView.value = 'install';
+ return;
+ }
+
+ const result = await checkAuth();
+ if (result.authenticated) {
+ user.value = result.user;
+ currentView.value = 'app';
+ const initialRoute = parseInitialRoute();
+ currentModule.value = initialRoute.module;
+ currentSubmodule.value = initialRoute.submodule;
+ history.replaceState(
+ { module: initialRoute.module, submodule: initialRoute.submodule },
+ '',
+ window.location.pathname
+ );
+ if (!initialRoute.module && !initialRoute.submodule) {
+ const saved = loadLastWorkflow();
+ if (saved) {
+ lastWorkflow.value = saved;
+ showContinuePrompt.value = true;
+ }
+ }
+ } else {
+ currentView.value = 'login';
+ }
+ });
+
+ onUnmounted(() => {
+ mediaQuery.removeEventListener('change', applyTheme);
+ window.removeEventListener('popstate', handlePopstate);
+ window.removeEventListener('beforeinstallprompt', handleInstallPrompt);
+ window.removeEventListener('online', handleOnlineStatusChange);
+ window.removeEventListener('offline', handleOnlineStatusChange);
+ if (offlineModeEnabled.value) {
+ SyncManager.destroy();
+ }
+ });
+
+ return {
+ currentView,
+ user,
+ toast,
+ theme,
+ showSettings,
+ currentModule,
+ currentSubmodule,
+ currentComponent,
+ canGoBack,
+ breadcrumbs,
+ handleLogin,
+ handleLogout,
+ navigate,
+ goHome,
+ goBack,
+ showToast,
+ setTheme,
+ lagerSimpleMode,
+ setLagerSimpleMode,
+ showInstallPrompt,
+ deferredInstallPrompt,
+ isIOS,
+ isAndroid,
+ triggerInstall,
+ lastWorkflow,
+ showContinuePrompt,
+ continueLastWorkflow,
+ dismissContinuePrompt,
+ workorderRef,
+ handleWorkorderDetailOpen,
+ handleWorkorderDetailClose,
+ // Offline mode
+ offlineModeEnabled,
+ offlineAutoSync,
+ offlinePendingCount,
+ offlinePendingOps,
+ offlinePendingPhotos,
+ offlineFailedCount,
+ offlineIsSyncing,
+ offlineLastSyncText,
+ offlineFreshness,
+ offlineSyncProgress,
+ offlineStorageUsed,
+ isOnline,
+ toggleOfflineMode,
+ setOfflineAutoSync,
+ triggerManualSync,
+ clearOfflineData,
+ };
+ },
+
+ template: `
+
+
+
+
+
+ Lädt...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ App installieren
+
+ Für die beste Erfahrung installiere die App auf deinem Gerät.
+
+
+
+
+
+
+
+
+
+ So installierst du die App:
+
+ -
+ 1
+ Tippe auf das Teilen-Symbol
+
+
+
+ -
+ 2
+ Scrolle und wähle "Zum Home-Bildschirm"
+
+ -
+ 3
+ Tippe auf "Hinzufügen"
+
+
+
+
+
+
+
+ So installierst du die App:
+
+ -
+ 1
+ Tippe auf das Menü (⋮) oben rechts
+
+ -
+ 2
+ Wähle "App installieren" oder "Zum Startbildschirm hinzufügen"
+
+ -
+ 3
+ Bestätige mit "Installieren"
+
+
+
+
+
+
+
+
+ Hinweis: Diese App ist für mobile Geräte optimiert. Bitte öffne diese Seite auf deinem Smartphone und installiere die App.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fortsetzen
+
+ {{ lastWorkflow?.module }} › {{ lastWorkflow.submodule }}
+
+
+
+
+
+
+
+
+
+
+ Einstellungen
+
+
+
+
+ {{ user?.name }}
+ {{ user?.username }}
+
+
+
+ Farbschema
+
+
+
+
+
+
+
+
+ Lager
+
+
+ Simpel Modus
+ Weniger Optionen
+
+
+
+
+
+
+ Offline-Modus (Workorder)
+
+
+
+ Offline-Modus
+ Arbeitsaufträge offline verfügbar
+
+
+
+
+
+
+
+ Auto-Sync
+ Automatisch synchronisieren
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ toast.message }}
+
+
+
+ `
+};
+
+createApp(App).mount('#app');
diff --git a/public/mobile/components/LoginScreen.js b/public/mobile/components/LoginScreen.js
new file mode 100644
index 000000000..8e1fd7075
--- /dev/null
+++ b/public/mobile/components/LoginScreen.js
@@ -0,0 +1,621 @@
+import { login, verify2FA, resend2FA } from '/mobile/shared/auth.js';
+
+export default {
+ name: 'LoginScreen',
+ emits: ['login', 'set-theme'],
+ props: {
+ theme: {
+ type: String,
+ default: 'system'
+ }
+ },
+
+ setup(props, { emit }) {
+ const { ref, onMounted, onUnmounted, nextTick } = Vue;
+
+ const username = ref('');
+ const password = ref('');
+ const rememberMe = ref(true);
+ const showPassword = ref(false);
+ const show2FA = ref(false);
+ const otpCode = ref('');
+ const otpDigits = ref(['', '', '', '', '']);
+ const deliveryMethod = ref('');
+ const maskedTarget = ref('');
+ const resendCooldown = ref(0);
+ const error = ref('');
+ const success = ref('');
+ const loading = ref(false);
+ const showThemePicker = ref(false);
+ let otpInputRefs = [];
+ let otpAbortController = null;
+ let resendTimer = null;
+
+ const handleSubmit = async () => {
+ if (!username.value || !password.value) {
+ error.value = 'Bitte Benutzername und Passwort eingeben';
+ return;
+ }
+
+ loading.value = true;
+ error.value = '';
+
+ try {
+ const result = await login({
+ username: username.value,
+ password: password.value,
+ rememberMe: rememberMe.value
+ });
+
+ if (result.requires2FA) {
+ // Show 2FA verification screen
+ show2FA.value = true;
+ deliveryMethod.value = result.deliveryMethod;
+ maskedTarget.value = result.maskedTarget;
+ success.value = result.message;
+ error.value = '';
+
+ // Start resend cooldown
+ startResendCooldown();
+
+ // Focus first OTP input after render
+ await nextTick();
+ focusOtpInput(0);
+
+ // Try Web OTP API for SMS
+ if (result.deliveryMethod === 'sms') {
+ startWebOTP();
+ }
+ } else if (result.success) {
+ // Direct login success (no 2FA) - notify parent
+ emit('login', { _2faSuccess: true, user: result.user });
+ } else {
+ error.value = result.message || 'Login fehlgeschlagen';
+ }
+ } catch (e) {
+ error.value = 'Ein Fehler ist aufgetreten';
+ } finally {
+ loading.value = false;
+ }
+ };
+
+ // Handle 2FA verification
+ const handleVerify2FA = async () => {
+ const code = otpDigits.value.join('');
+
+ if (code.length !== 5) {
+ error.value = 'Bitte gib den 5-stelligen Code ein';
+ return;
+ }
+
+ loading.value = true;
+ error.value = '';
+ success.value = '';
+
+ try {
+ const result = await verify2FA(code);
+
+ if (result.success) {
+ // Emit the successful result to parent (which handles navigation)
+ emit('login', { _2faSuccess: true, user: result.user });
+ } else {
+ error.value = result.message || 'Ungültiger Code';
+
+ if (result.expired || result.codeExpired) {
+ // Session or code expired - go back to login
+ resetTo2FA();
+ }
+ }
+ } catch (e) {
+ error.value = 'Ein Fehler ist aufgetreten';
+ } finally {
+ loading.value = false;
+ }
+ };
+
+ // Handle resend 2FA code
+ const handleResend = async () => {
+ if (resendCooldown.value > 0) return;
+
+ loading.value = true;
+ error.value = '';
+
+ try {
+ const result = await resend2FA();
+
+ if (result.success) {
+ success.value = result.message || 'Neuer Code wurde gesendet';
+ startResendCooldown();
+
+ // Clear OTP inputs
+ otpDigits.value = ['', '', '', '', ''];
+ focusOtpInput(0);
+
+ // Restart Web OTP if SMS
+ if (deliveryMethod.value === 'sms') {
+ startWebOTP();
+ }
+ } else {
+ error.value = result.message || 'Code konnte nicht gesendet werden';
+
+ if (result.expired) {
+ resetTo2FA();
+ }
+ }
+ } catch (e) {
+ error.value = 'Ein Fehler ist aufgetreten';
+ } finally {
+ loading.value = false;
+ }
+ };
+
+ const backToLogin = () => {
+ show2FA.value = false;
+ otpDigits.value = ['', '', '', '', ''];
+ otpInputRefs = [];
+ error.value = '';
+ success.value = '';
+ abortWebOTP();
+ };
+
+ const resetTo2FA = () => {
+ show2FA.value = false;
+ password.value = '';
+ otpDigits.value = ['', '', '', '', ''];
+ otpInputRefs = [];
+ error.value = 'Sitzung abgelaufen. Bitte erneut anmelden.';
+ };
+
+ // Start resend cooldown (30 seconds)
+ const startResendCooldown = () => {
+ resendCooldown.value = 30;
+ if (resendTimer) clearInterval(resendTimer);
+ resendTimer = setInterval(() => {
+ resendCooldown.value--;
+ if (resendCooldown.value <= 0) {
+ clearInterval(resendTimer);
+ }
+ }, 1000);
+ };
+
+ const focusOtpInput = (index) => {
+ if (otpInputRefs.length === 0) {
+ otpInputRefs = Array.from(document.querySelectorAll('.otp-input'));
+ }
+ if (otpInputRefs[index]) {
+ otpInputRefs[index].focus();
+ }
+ };
+
+ const handleOtpInput = (index, event) => {
+ const value = event.target.value;
+
+ // Only allow digits
+ if (!/^\d*$/.test(value)) {
+ event.target.value = otpDigits.value[index];
+ return;
+ }
+
+ // Handle paste of full code
+ if (value.length > 1) {
+ const digits = value.replace(/\D/g, '').slice(0, 5).split('');
+ digits.forEach((digit, i) => {
+ if (i < 5) otpDigits.value[i] = digit;
+ });
+ focusOtpInput(Math.min(digits.length, 4));
+
+ // Auto-submit if complete
+ if (otpDigits.value.join('').length === 5) {
+ handleVerify2FA();
+ }
+ return;
+ }
+
+ otpDigits.value[index] = value;
+
+ // Move to next input
+ if (value && index < 4) {
+ focusOtpInput(index + 1);
+ }
+
+ // Auto-submit when complete
+ if (otpDigits.value.join('').length === 5) {
+ handleVerify2FA();
+ }
+ };
+
+ const handleOtpKeydown = (index, event) => {
+ // Handle backspace
+ if (event.key === 'Backspace' && !otpDigits.value[index] && index > 0) {
+ focusOtpInput(index - 1);
+ }
+ };
+
+ const handleOtpPaste = (event) => {
+ event.preventDefault();
+ const pastedData = event.clipboardData.getData('text');
+ const digits = pastedData.replace(/\D/g, '').slice(0, 5).split('');
+
+ digits.forEach((digit, i) => {
+ if (i < 5) otpDigits.value[i] = digit;
+ });
+
+ focusOtpInput(Math.min(digits.length, 4));
+
+ // Auto-submit if complete
+ if (otpDigits.value.join('').length === 5) {
+ handleVerify2FA();
+ }
+ };
+
+ // Web OTP API for automatic SMS code detection (Android)
+ const startWebOTP = async () => {
+ if (!('OTPCredential' in window)) {
+ console.log('Web OTP API not supported');
+ return;
+ }
+
+ abortWebOTP();
+ otpAbortController = new AbortController();
+
+ try {
+ const otp = await navigator.credentials.get({
+ otp: { transport: ['sms'] },
+ signal: otpAbortController.signal
+ });
+
+ if (otp && otp.code) {
+ // Extract 5-digit code from SMS
+ const code = otp.code.replace(/\D/g, '').slice(0, 5);
+ if (code.length === 5) {
+ code.split('').forEach((digit, i) => {
+ otpDigits.value[i] = digit;
+ });
+ // Auto-submit
+ handleVerify2FA();
+ }
+ }
+ } catch (err) {
+ if (err.name !== 'AbortError') {
+ console.log('Web OTP error:', err);
+ }
+ }
+ };
+
+ const abortWebOTP = () => {
+ if (otpAbortController) {
+ otpAbortController.abort();
+ otpAbortController = null;
+ }
+ };
+
+ // Theme picker
+ const selectTheme = (newTheme) => {
+ emit('set-theme', newTheme);
+ showThemePicker.value = false;
+ };
+
+ // Cleanup
+ onUnmounted(() => {
+ abortWebOTP();
+ if (resendTimer) clearInterval(resendTimer);
+ });
+
+ return {
+ // Login state
+ username,
+ password,
+ rememberMe,
+ showPassword,
+
+ // 2FA state
+ show2FA,
+ otpDigits,
+ deliveryMethod,
+ maskedTarget,
+ resendCooldown,
+
+ // General state
+ error,
+ success,
+ loading,
+ showThemePicker,
+
+ // Methods
+ handleSubmit,
+ handleVerify2FA,
+ handleResend,
+ backToLogin,
+ handleOtpInput,
+ handleOtpKeydown,
+ handleOtpPaste,
+ selectTheme
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Willkommen!
+ Wähle dein bevorzugtes Farbschema.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Verifizierung
+
+
+ Code wurde gesendet an
+ {{ maskedTarget }}
+
+
+
+
+
+
+ Code ist 5 Minuten gültig
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/components/MainMenu.js b/public/mobile/components/MainMenu.js
new file mode 100644
index 000000000..823e5b83a
--- /dev/null
+++ b/public/mobile/components/MainMenu.js
@@ -0,0 +1,85 @@
+/**
+ * MainMenu Component
+ *
+ * Displays the main module menu for the MobileApp.
+ * Shows available modules like "Lager" that the user can access.
+ */
+
+export default {
+ name: 'MainMenu',
+ emits: ['navigate'],
+ props: {
+ user: Object
+ },
+
+ setup(props, { emit }) {
+ // Available modules
+ const modules = [
+ {
+ id: 'Workorder',
+ name: 'Aufträge',
+ icon: 'clipboard-check',
+ color: 'bg-sky-500',
+ iconColor: 'text-sky-500'
+ },
+ {
+ id: 'Lieferschein',
+ name: 'Lieferschein',
+ icon: 'document',
+ color: 'bg-purple-500',
+ iconColor: 'text-purple-500'
+ },
+ {
+ id: 'Lager',
+ name: 'Lager',
+ icon: 'warehouse',
+ color: 'bg-blue-500',
+ iconColor: 'text-blue-500'
+ }
+ ];
+
+ const openModule = (moduleId) => {
+ emit('navigate', moduleId, null);
+ };
+
+ return {
+ modules,
+ openModule
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/components/OfflineIndicator.js b/public/mobile/components/OfflineIndicator.js
new file mode 100644
index 000000000..f47d311ff
--- /dev/null
+++ b/public/mobile/components/OfflineIndicator.js
@@ -0,0 +1,211 @@
+/**
+ * Offline Indicator Component
+ *
+ * Displays network status and sync state in the header.
+ * Shows: Online, Offline, Syncing states with appropriate colors.
+ */
+
+const { ref, computed, onMounted, onUnmounted, watch } = Vue;
+
+export default {
+ name: 'OfflineIndicator',
+
+ props: {
+ // Whether offline mode is enabled in settings
+ offlineModeEnabled: {
+ type: Boolean,
+ default: false
+ },
+ // Number of pending changes
+ pendingCount: {
+ type: Number,
+ default: 0
+ },
+ // Whether sync is currently running
+ isSyncing: {
+ type: Boolean,
+ default: false
+ },
+ // Data freshness level: 'fresh', 'stale', 'old', 'unknown'
+ freshness: {
+ type: String,
+ default: 'unknown'
+ }
+ },
+
+ emits: ['sync-click'],
+
+ setup(props, { emit }) {
+ const isOnline = ref(navigator.onLine);
+
+ // Update online status
+ const updateOnlineStatus = () => {
+ isOnline.value = navigator.onLine;
+ };
+
+ onMounted(() => {
+ window.addEventListener('online', updateOnlineStatus);
+ window.addEventListener('offline', updateOnlineStatus);
+ });
+
+ onUnmounted(() => {
+ window.removeEventListener('online', updateOnlineStatus);
+ window.removeEventListener('offline', updateOnlineStatus);
+ });
+
+ // Computed display state
+ const displayState = computed(() => {
+ if (!props.offlineModeEnabled) {
+ return isOnline.value ? 'online' : 'offline-no-cache';
+ }
+
+ if (props.isSyncing) {
+ return 'syncing';
+ }
+
+ if (!isOnline.value) {
+ return 'offline';
+ }
+
+ if (props.pendingCount > 0) {
+ return 'pending';
+ }
+
+ return 'online';
+ });
+
+ // Status text
+ const statusText = computed(() => {
+ switch (displayState.value) {
+ case 'syncing':
+ return 'Synchronisiere...';
+ case 'offline':
+ return 'Offline';
+ case 'offline-no-cache':
+ return 'Keine Verbindung';
+ case 'pending':
+ return `${props.pendingCount} ausstehend`;
+ case 'online':
+ return props.offlineModeEnabled ? 'Synchronisiert' : '';
+ default:
+ return '';
+ }
+ });
+
+ // Status icon
+ const statusIcon = computed(() => {
+ switch (displayState.value) {
+ case 'syncing':
+ return 'sync';
+ case 'offline':
+ case 'offline-no-cache':
+ return 'cloud-off';
+ case 'pending':
+ return 'cloud-upload';
+ case 'online':
+ return 'cloud-check';
+ default:
+ return 'cloud';
+ }
+ });
+
+ // Status color classes
+ const statusClasses = computed(() => {
+ switch (displayState.value) {
+ case 'syncing':
+ return 'bg-blue-100 text-blue-700 dark:bg-blue-900 dark:text-blue-300';
+ case 'offline':
+ return 'bg-orange-100 text-orange-700 dark:bg-orange-900 dark:text-orange-300';
+ case 'offline-no-cache':
+ return 'bg-red-100 text-red-700 dark:bg-red-900 dark:text-red-300';
+ case 'pending':
+ return 'bg-yellow-100 text-yellow-700 dark:bg-yellow-900 dark:text-yellow-300';
+ case 'online':
+ return 'bg-green-100 text-green-700 dark:bg-green-900 dark:text-green-300';
+ default:
+ return 'bg-gray-100 text-gray-700 dark:bg-gray-800 dark:text-gray-300';
+ }
+ });
+
+ // Freshness indicator color
+ const freshnessColor = computed(() => {
+ switch (props.freshness) {
+ case 'fresh':
+ return 'bg-green-500';
+ case 'stale':
+ return 'bg-yellow-500';
+ case 'old':
+ return 'bg-red-500';
+ default:
+ return 'bg-gray-400';
+ }
+ });
+
+ // Click handler
+ const handleClick = () => {
+ if (isOnline.value && props.pendingCount > 0) {
+ emit('sync-click');
+ }
+ };
+
+ // Should show (only show if offline mode enabled or offline)
+ const shouldShow = computed(() => {
+ return props.offlineModeEnabled || !isOnline.value;
+ });
+
+ return {
+ isOnline,
+ displayState,
+ statusText,
+ statusIcon,
+ statusClasses,
+ freshnessColor,
+ handleClick,
+ shouldShow
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ statusText }}
+
+
+
+
+ `
+};
diff --git a/public/mobile/components/SyncStatus.js b/public/mobile/components/SyncStatus.js
new file mode 100644
index 000000000..bef0db9cd
--- /dev/null
+++ b/public/mobile/components/SyncStatus.js
@@ -0,0 +1,225 @@
+/**
+ * Sync Status Component
+ *
+ * Shows detailed sync status including pending count,
+ * last sync time, and manual sync button.
+ */
+
+const { ref, computed } = Vue;
+
+export default {
+ name: 'SyncStatus',
+
+ props: {
+ // Number of pending operations
+ pendingOperations: {
+ type: Number,
+ default: 0
+ },
+ // Number of pending photos
+ pendingPhotos: {
+ type: Number,
+ default: 0
+ },
+ // Number of failed operations
+ failedCount: {
+ type: Number,
+ default: 0
+ },
+ // Last sync timestamp text
+ lastSyncText: {
+ type: String,
+ default: 'Nie synchronisiert'
+ },
+ // Whether sync is running
+ isSyncing: {
+ type: Boolean,
+ default: false
+ },
+ // Whether device is online
+ isOnline: {
+ type: Boolean,
+ default: true
+ },
+ // Sync progress info
+ syncProgress: {
+ type: Object,
+ default: null
+ }
+ },
+
+ emits: ['sync', 'retry-failed'],
+
+ setup(props, { emit }) {
+ // Total pending count
+ const totalPending = computed(() => {
+ return props.pendingOperations + props.pendingPhotos;
+ });
+
+ // Status summary text
+ const summaryText = computed(() => {
+ const parts = [];
+
+ if (props.pendingOperations > 0) {
+ parts.push(`${props.pendingOperations} Änderung${props.pendingOperations === 1 ? '' : 'en'}`);
+ }
+
+ if (props.pendingPhotos > 0) {
+ parts.push(`${props.pendingPhotos} Foto${props.pendingPhotos === 1 ? '' : 's'}`);
+ }
+
+ if (parts.length === 0) {
+ return 'Keine ausstehenden Änderungen';
+ }
+
+ return parts.join(', ') + ' ausstehend';
+ });
+
+ // Progress text during sync
+ const progressText = computed(() => {
+ if (!props.syncProgress) return '';
+
+ const { phase, current, total, fileName } = props.syncProgress;
+
+ if (phase === 'operations') {
+ return `Synchronisiere ${current}/${total} Änderungen...`;
+ }
+
+ if (phase === 'photos') {
+ return fileName
+ ? `Lade ${current}/${total} hoch: ${fileName}`
+ : `Lade ${current}/${total} Fotos hoch...`;
+ }
+
+ return 'Synchronisiere...';
+ });
+
+ // Handle sync button click
+ const handleSync = () => {
+ if (!props.isSyncing && props.isOnline) {
+ emit('sync');
+ }
+ };
+
+ // Handle retry failed click
+ const handleRetryFailed = () => {
+ if (!props.isSyncing) {
+ emit('retry-failed');
+ }
+ };
+
+ return {
+ totalPending,
+ summaryText,
+ progressText,
+ handleSync,
+ handleRetryFailed
+ };
+ },
+
+ template: `
+
+
+
+
+
+ Synchronisation
+
+
+
+
+ {{ isOnline ? 'Online' : 'Offline' }}
+
+
+
+
+
+
+ {{ progressText }}
+ {{ Math.round((syncProgress.current / syncProgress.total) * 100) }}%
+
+
+
+
+
+
+
+
+ Ausstehend
+
+ {{ summaryText }}
+
+
+
+
+
+ Fehlgeschlagen
+
+
+
+
+
+ Letzte Synchronisation
+ {{ lastSyncText }}
+
+
+
+
+
+
+
+
+ Änderungen werden synchronisiert, sobald Sie wieder online sind.
+
+
+ `
+};
diff --git a/public/mobile/manifest.json b/public/mobile/manifest.json
new file mode 100644
index 000000000..bb27a9f6e
--- /dev/null
+++ b/public/mobile/manifest.json
@@ -0,0 +1,38 @@
+{
+ "name": "Xinon Mobile",
+ "short_name": "Xinon",
+ "description": "Mobile-optimierte Tools für Xinon",
+ "start_url": "/MobileApp",
+ "scope": "/MobileApp",
+ "display": "standalone",
+ "orientation": "portrait",
+ "background_color": "#f1f5f9",
+ "theme_color": "#005384",
+ "icons": [
+ {
+ "src": "/assets/images/xinon-sm-192.png",
+ "sizes": "192x192",
+ "type": "image/png",
+ "purpose": "any"
+ },
+ {
+ "src": "/assets/images/xinon-sm-192.png",
+ "sizes": "192x192",
+ "type": "image/png",
+ "purpose": "maskable"
+ },
+ {
+ "src": "/assets/images/xinon-sm-512.png",
+ "sizes": "512x512",
+ "type": "image/png",
+ "purpose": "any"
+ },
+ {
+ "src": "/assets/images/xinon-sm-512.png",
+ "sizes": "512x512",
+ "type": "image/png",
+ "purpose": "maskable"
+ }
+ ],
+ "categories": ["business", "productivity"]
+}
diff --git a/public/mobile/modules/lager/LagerModule.js b/public/mobile/modules/lager/LagerModule.js
new file mode 100644
index 000000000..5e25a0c35
--- /dev/null
+++ b/public/mobile/modules/lager/LagerModule.js
@@ -0,0 +1,166 @@
+/**
+ * Lager Module
+ *
+ * Main module for warehouse management.
+ * Shows submodules: Inventur (stocktake)
+ */
+
+import StocktakeList from '/mobile/modules/lager/inventur/StocktakeList.js';
+import Scanner from '/mobile/modules/lager/inventur/Scanner.js';
+import MovementForm from '/mobile/modules/lager/movement/MovementForm.js';
+
+export default {
+ name: 'LagerModule',
+ emits: ['navigate', 'toast'],
+ props: {
+ user: Object,
+ submodule: String,
+ simpleMode: Boolean
+ },
+ components: {
+ StocktakeList,
+ Scanner,
+ MovementForm
+ },
+
+ setup(props, { emit }) {
+ const { ref, computed, watch } = Vue;
+
+ // Submodules available in Lager
+ const submodules = [
+ {
+ id: 'Inventur',
+ name: 'Inventur',
+ icon: 'clipboard',
+ color: 'bg-green-500'
+ },
+ {
+ id: 'Movement',
+ name: 'Lagerbewegung',
+ icon: 'arrows',
+ color: 'bg-blue-500'
+ }
+ ];
+
+ // Scanner state
+ const selectedStocktake = ref(null);
+ const showScanner = ref(false);
+
+ // Current view based on submodule
+ const currentView = computed(() => {
+ if (!props.submodule) return 'menu';
+ if (props.submodule.toLowerCase() === 'inventur') {
+ return showScanner.value ? 'scanner' : 'inventur';
+ }
+ if (props.submodule.toLowerCase() === 'movement') {
+ return 'movement';
+ }
+ return 'menu';
+ });
+
+ // Watch for submodule changes
+ watch(() => props.submodule, (newVal) => {
+ if (!newVal) {
+ showScanner.value = false;
+ selectedStocktake.value = null;
+ }
+ });
+
+ const openSubmodule = (submoduleId) => {
+ emit('navigate', 'Lager', submoduleId);
+ };
+
+ const goBack = () => {
+ if (showScanner.value) {
+ showScanner.value = false;
+ selectedStocktake.value = null;
+ }
+ };
+
+ const openScanner = (stocktake) => {
+ selectedStocktake.value = stocktake;
+ showScanner.value = true;
+ };
+
+ const closeScanner = () => {
+ showScanner.value = false;
+ selectedStocktake.value = null;
+ };
+
+ const showToast = (message, type) => {
+ emit('toast', message, type);
+ };
+
+ return {
+ submodules,
+ selectedStocktake,
+ showScanner,
+ currentView,
+ openSubmodule,
+ goBack,
+ openScanner,
+ closeScanner,
+ showToast
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/inventur/Scanner.js b/public/mobile/modules/lager/inventur/Scanner.js
new file mode 100644
index 000000000..0ef5909e7
--- /dev/null
+++ b/public/mobile/modules/lager/inventur/Scanner.js
@@ -0,0 +1,402 @@
+import { createModuleApi, debounce } from '/mobile/shared/api.js';
+
+const inventurApi = createModuleApi('Lager/Inventur');
+
+export default {
+ name: 'Scanner',
+ emits: ['close', 'toast'],
+ props: {
+ stocktake: { type: Object, required: true },
+ user: { type: Object, required: true }
+ },
+
+ setup(props, { emit }) {
+ const { ref, onMounted, onUnmounted, nextTick, computed } = Vue;
+
+ const currentTab = ref('scan');
+ const isLoading = ref(false);
+ const scanner = ref(null);
+ const isScannerActive = ref(false);
+ const scannerError = ref('');
+ const scannedArticle = ref(null);
+ const quantity = ref('1');
+ const rack = ref('');
+ const shelf = ref('');
+ const searchQuery = ref('');
+ const searchResults = ref([]);
+ const categories = ref([]);
+ const selectedCategory = ref(0);
+ const isSearching = ref(false);
+ const recentScans = ref([]);
+ const isLoadingHistory = ref(false);
+ const alreadyScannedWarning = ref(null);
+ const showKeypad = ref(false);
+
+ const canSubmit = computed(() => {
+ return scannedArticle.value && parseFloat(quantity.value) > 0 && !isLoading.value;
+ });
+
+ const startScanner = async () => {
+ scannerError.value = '';
+ try {
+ scanner.value = new Html5Qrcode('qr-reader');
+ await scanner.value.start(
+ { facingMode: 'environment' },
+ { fps: 10, qrbox: { width: 250, height: 250 }, aspectRatio: 1.0 },
+ onScanSuccess,
+ () => {}
+ );
+ isScannerActive.value = true;
+ } catch (err) {
+ scannerError.value = 'Kamera konnte nicht gestartet werden. Bitte Berechtigungen prüfen.';
+ }
+ };
+
+ const stopScanner = async () => {
+ if (scanner.value && isScannerActive.value) {
+ try { await scanner.value.stop(); } catch (e) {}
+ isScannerActive.value = false;
+ }
+ };
+
+ const onScanSuccess = async (decodedText) => {
+ await stopScanner();
+ await lookupArticle(decodedText);
+ };
+
+ const lookupArticle = async (code) => {
+ isLoading.value = true;
+ alreadyScannedWarning.value = null;
+
+ try {
+ const result = await inventurApi.get(`getArticle?code=${encodeURIComponent(code)}`);
+
+ if (result.success) {
+ scannedArticle.value = result.article;
+ const checkResult = await inventurApi.get(
+ `checkAlreadyScanned?stocktakeId=${props.stocktake.id}&articleId=${result.article.id}`
+ );
+ if (checkResult.success && checkResult.alreadyScanned) {
+ alreadyScannedWarning.value = checkResult.existingItem;
+ }
+ quantity.value = '1';
+ } else {
+ emit('toast', result.message || 'Artikel nicht gefunden', 'error');
+ await startScanner();
+ }
+ } catch (e) {
+ emit('toast', 'Fehler beim Laden des Artikels', 'error');
+ await startScanner();
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ const submitScan = async (overwrite = false) => {
+ if (!canSubmit.value) return;
+ isLoading.value = true;
+
+ try {
+ const payload = {
+ stocktakeId: props.stocktake.id,
+ articleId: scannedArticle.value.id,
+ quantity: parseFloat(quantity.value),
+ rack: rack.value || null,
+ shelf: shelf.value || null,
+ overwrite: overwrite,
+ overwriteItemId: overwrite && alreadyScannedWarning.value ? alreadyScannedWarning.value.id : 0
+ };
+
+ const result = await inventurApi.post('submitScan', payload);
+
+ if (result.success) {
+ navigator.vibrate?.([100]);
+ emit('toast', result.message, 'success');
+ scannedArticle.value = null;
+ quantity.value = '1';
+ rack.value = '';
+ shelf.value = '';
+ alreadyScannedWarning.value = null;
+ await startScanner();
+ } else {
+ emit('toast', result.message || 'Fehler beim Speichern', 'error');
+ }
+ } catch (e) {
+ emit('toast', 'Netzwerkfehler', 'error');
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ const loadCategories = async () => {
+ const result = await inventurApi.get('getCategories');
+ if (result.success) categories.value = result.categories;
+ };
+
+ const doSearch = async () => {
+ if (searchQuery.value.length < 2 && !selectedCategory.value) {
+ searchResults.value = [];
+ return;
+ }
+ isSearching.value = true;
+ try {
+ const params = new URLSearchParams();
+ if (searchQuery.value) params.set('query', searchQuery.value);
+ if (selectedCategory.value) params.set('categoryId', selectedCategory.value);
+ const result = await inventurApi.get(`searchArticles?${params}`);
+ if (result.success) searchResults.value = result.articles;
+ } catch (e) {} finally {
+ isSearching.value = false;
+ }
+ };
+
+ const searchArticles = debounce(doSearch, 300);
+
+ const selectSearchResult = async (article) => {
+ await stopScanner();
+ scannedArticle.value = article;
+ quantity.value = '1';
+ currentTab.value = 'scan';
+
+ const checkResult = await inventurApi.get(
+ `checkAlreadyScanned?stocktakeId=${props.stocktake.id}&articleId=${article.id}`
+ );
+ if (checkResult.success && checkResult.alreadyScanned) {
+ alreadyScannedWarning.value = checkResult.existingItem;
+ }
+ };
+
+ const loadHistory = async () => {
+ isLoadingHistory.value = true;
+ try {
+ const result = await inventurApi.get(`getMyScans?stocktakeId=${props.stocktake.id}`);
+ if (result.success) recentScans.value = result.items;
+ } catch (e) {} finally {
+ isLoadingHistory.value = false;
+ }
+ };
+
+ const appendDigit = (digit) => {
+ if (digit === '.' && quantity.value.includes('.')) return;
+ if (quantity.value === '0' && digit !== '.') {
+ quantity.value = digit;
+ } else {
+ quantity.value += digit;
+ }
+ };
+
+ const deleteDigit = () => {
+ quantity.value = quantity.value.length > 1 ? quantity.value.slice(0, -1) : '0';
+ };
+
+ const clearQuantity = () => { quantity.value = '0'; };
+
+ const handleClose = async () => {
+ await stopScanner();
+ emit('close');
+ };
+
+ const switchTab = async (tab) => {
+ currentTab.value = tab;
+ if (tab === 'scan' && !scannedArticle.value) {
+ await nextTick();
+ await startScanner();
+ } else if (tab === 'search') {
+ await stopScanner();
+ await loadCategories();
+ } else if (tab === 'history') {
+ await stopScanner();
+ await loadHistory();
+ }
+ };
+
+ const cancelScan = async () => {
+ scannedArticle.value = null;
+ alreadyScannedWarning.value = null;
+ quantity.value = '1';
+ await startScanner();
+ };
+
+ onMounted(async () => { await startScanner(); });
+ onUnmounted(async () => { await stopScanner(); });
+
+ return {
+ currentTab, isLoading, isScannerActive, scannerError,
+ scannedArticle, quantity, rack, shelf,
+ searchQuery, searchResults, categories, selectedCategory, isSearching,
+ recentScans, isLoadingHistory,
+ alreadyScannedWarning, showKeypad, canSubmit,
+ startScanner, stopScanner, submitScan, searchArticles, selectSearchResult,
+ loadHistory, appendDigit, deleteDigit, clearQuantity,
+ handleClose, switchTab, cancelScan
+ };
+ },
+
+ template: `
+
+
+ {{ stocktake.title || 'Inventur #' + stocktake.stocktakeNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scannerError }}
+
+
+ QR-Code scannen oder Artikel suchen
+
+
+
+
+
+
+
+ Bereits gescannt
+
+ Menge: {{ alreadyScannedWarning.countedQuantity }}
+ Von: {{ alreadyScannedWarning.scannedBy }}
+ Am: {{ alreadyScannedWarning.scannedAt }}
+
+
+
+
+
+
+ {{ scannedArticle.title }}
+ Art.-Nr.: {{ scannedArticle.articleNumber }}
+ Kategorie: {{ scannedArticle.categoryName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ quantity }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ searchQuery.length < 2 ? 'Mindestens 2 Zeichen eingeben' : 'Keine Artikel gefunden' }}
+
+
+
+
+ {{ article.title }}
+ {{ article.articleNumber }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ scan.articleTitle }}
+ {{ scan.articleNumber }}
+
+
+ {{ scan.countedQuantity }} {{ scan.unit }}
+ {{ scan.scannedAt }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ quantity }}
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/inventur/StocktakeList.js b/public/mobile/modules/lager/inventur/StocktakeList.js
new file mode 100644
index 000000000..31f0de4c2
--- /dev/null
+++ b/public/mobile/modules/lager/inventur/StocktakeList.js
@@ -0,0 +1,136 @@
+import { createModuleApi } from '/mobile/shared/api.js';
+
+const inventurApi = createModuleApi('Lager/Inventur');
+
+export default {
+ name: 'StocktakeList',
+ emits: ['select'],
+ props: {
+ user: Object
+ },
+
+ setup(props, { emit }) {
+ const { ref, onMounted } = Vue;
+
+ const stocktakes = ref([]);
+ const isLoading = ref(true);
+ const error = ref('');
+
+ const fetchStocktakes = async () => {
+ isLoading.value = true;
+ error.value = '';
+
+ try {
+ const result = await inventurApi.get('getActiveStocktakes');
+
+ if (result.success) {
+ stocktakes.value = result.stocktakes;
+ } else {
+ error.value = result.error || 'Fehler beim Laden';
+ }
+ } catch (e) {
+ error.value = 'Netzwerkfehler';
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ const selectStocktake = (stocktake) => {
+ emit('select', stocktake);
+ };
+
+ onMounted(() => {
+ fetchStocktakes();
+ });
+
+ return {
+ stocktakes,
+ isLoading,
+ error,
+ fetchStocktakes,
+ selectStocktake
+ };
+ },
+
+ template: `
+
+
+
+ Aktive Inventuren
+
+
+
+
+
+
+
+
+
+
+
+ {{ error }}
+
+
+
+
+
+
+ Keine aktiven Inventuren
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/movement/MovementForm.js b/public/mobile/modules/lager/movement/MovementForm.js
new file mode 100644
index 000000000..949afe1bc
--- /dev/null
+++ b/public/mobile/modules/lager/movement/MovementForm.js
@@ -0,0 +1,1578 @@
+import { createModuleApi, debounce } from '/mobile/shared/api.js';
+
+const movementApi = createModuleApi('Lager/Movement');
+
+
+const BottomSheetSelect = {
+ name: 'BottomSheetSelect',
+ emits: ['update:modelValue'],
+ props: {
+ modelValue: [String, Number],
+ options: { type: Array, default: () => [] },
+ label: { type: String, default: '' },
+ placeholder: { type: String, default: 'Auswählen...' },
+ valueKey: { type: String, default: 'value' },
+ labelKey: { type: String, default: 'text' },
+ icon: { type: String, default: null },
+ position: { type: String, default: 'bottom' } // 'bottom' or 'top'
+ },
+ setup(props, { emit }) {
+ const isOpen = Vue.ref(false);
+
+ const selectedLabel = Vue.computed(() => {
+ const option = props.options.find(o =>
+ (typeof o === 'object' ? o[props.valueKey] : o) === props.modelValue
+ );
+ if (!option) return props.placeholder;
+ return typeof option === 'object' ? option[props.labelKey] : option;
+ });
+
+ const select = (option) => {
+ const value = typeof option === 'object' ? option[props.valueKey] : option;
+ emit('update:modelValue', value);
+ isOpen.value = false;
+ };
+
+ return { isOpen, selectedLabel, select };
+ },
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ label }}
+
+
+
+
+
+
+
+
+
+ `
+};
+
+export default {
+ name: 'MovementForm',
+ emits: ['toast'],
+ props: {
+ user: { type: Object, required: true },
+ simpleMode: { type: Boolean, default: false }
+ },
+ components: {
+ BottomSheetSelect
+ },
+
+ setup(props, { emit }) {
+ const { ref, onMounted, onUnmounted, nextTick, computed, watch } = Vue;
+
+ // ==================== CONSTANTS ====================
+ const STORAGE_KEY = 'movement_settings';
+ const LOCATION_COORDS = {
+ office: { lat: 46.99552810791587, lng: 15.7751923956463, name: 'K1 Fladnitz 150' },
+ aussenlager: { lat: 46.99909466636262, lng: 15.77571245012429, name: 'Aussenlager-Extern' }
+ };
+ const GPS_ACCURACY_THRESHOLD = 100; // meters
+
+ // ==================== CONFIG ====================
+ const locations = ref([]);
+ const movementTypes = [
+ { value: 'IN', text: 'Einbuchung', icon: 'plus', color: 'green', defaultReason: 'Warenlieferung' },
+ { value: 'OUT', text: 'Ausbuchung', icon: 'minus', color: 'red', defaultReason: 'Verbrauch' },
+ { value: 'ADJUSTMENT', text: 'Korrektur', icon: 'edit', color: 'yellow', defaultReason: 'Inventurkorrektur' }
+ ];
+ const reasonCategories = ref({});
+
+ // ==================== SELECTION STATE ====================
+ const selectedLocation = ref(null);
+ const selectedType = ref('IN');
+
+ // ==================== GPS STATE ====================
+ const detectedLocation = ref(null);
+ const gpsStatus = ref('idle'); // 'idle', 'detecting', 'detected', 'error'
+ const gpsDistance = ref(null);
+
+ // ==================== MODE TOGGLES ====================
+ const turboMode = ref(false);
+ const batchMode = ref(false);
+
+ // ==================== BATCH CART ====================
+ const cartItems = ref([]);
+ const showCart = ref(false);
+
+ // ==================== TABS ====================
+ const currentTab = ref('scan');
+
+ // ==================== LOADING ====================
+ const isLoading = ref(false);
+ const isInitialized = ref(false);
+
+ // ==================== SCANNER ====================
+ const scanner = ref(null);
+ const isScannerActive = ref(false);
+ const scannerError = ref('');
+
+ // ==================== ARTICLE ====================
+ const scannedArticle = ref(null);
+ const currentStock = ref(0);
+ const quantity = ref('1');
+ const selectedReason = ref('');
+ const note = ref('');
+
+ // ==================== SEARCH ====================
+ const searchQuery = ref('');
+ const searchResults = ref([]);
+ const isSearching = ref(false);
+
+ // ==================== HISTORY ====================
+ const recentMovements = ref([]);
+ const isLoadingHistory = ref(false);
+
+ // ==================== ORDER RECEIVING ====================
+ const pendingOrders = ref([]);
+ const isLoadingOrders = ref(false);
+ const selectedOrder = ref(null);
+ const orderPositions = ref([]);
+ const deliveryNotePhoto = ref(null);
+ const isSubmittingOrder = ref(false);
+
+ // ==================== KEYPAD ====================
+ const showKeypad = ref(false);
+ const showNote = ref(false);
+
+ // ==================== UNDO STATE ====================
+ const lastMovement = ref(null);
+ const showUndo = ref(false);
+ let undoTimeout = null;
+
+ // ==================== COMPUTED ====================
+ const canSubmit = computed(() => {
+ return scannedArticle.value &&
+ selectedLocation.value &&
+ selectedType.value &&
+ parseFloat(quantity.value) > 0 &&
+ selectedReason.value &&
+ !isLoading.value;
+ });
+
+ const typeColor = computed(() => {
+ const type = movementTypes.find(t => t.value === selectedType.value);
+ return type ? type.color : 'blue';
+ });
+
+ const reasonOptions = computed(() => {
+ const reasons = reasonCategories.value[selectedType.value];
+ if (!reasons) return [];
+ return Object.entries(reasons).map(([key, label]) => ({
+ value: key,
+ text: label
+ }));
+ });
+
+ const cartTotal = computed(() => cartItems.value.length);
+
+ // Filtered movement types (hide ADJUSTMENT in simple mode)
+ const filteredMovementTypes = computed(() => {
+ if (props.simpleMode) {
+ return movementTypes.filter(t => t.value !== 'ADJUSTMENT');
+ }
+ return movementTypes;
+ });
+
+ // GPS distance formatting and color
+ const formattedGpsDistance = computed(() => {
+ if (gpsDistance.value === null) return '';
+ if (gpsDistance.value >= 1000) {
+ return (gpsDistance.value / 1000).toFixed(1) + 'km';
+ }
+ return gpsDistance.value + 'm';
+ });
+
+ const gpsDistanceColor = computed(() => {
+ if (gpsDistance.value === null) return 'text-slate-400';
+ // Green: within 200m (auto-selected range)
+ if (gpsDistance.value <= 200) return 'text-green-500';
+ // Yellow: 200m - 500m (getting far)
+ if (gpsDistance.value <= 500) return 'text-yellow-500';
+ // Red: over 500m (probably wrong location)
+ return 'text-red-500';
+ });
+
+ // ==================== LOCALSTORAGE PERSISTENCE ====================
+ const saveSettings = () => {
+ const settings = {
+ locationId: selectedLocation.value,
+ type: selectedType.value,
+ turboMode: turboMode.value,
+ batchMode: batchMode.value
+ };
+ localStorage.setItem(STORAGE_KEY, JSON.stringify(settings));
+ };
+
+ const loadSettings = () => {
+ try {
+ const saved = localStorage.getItem(STORAGE_KEY);
+ if (saved) {
+ return JSON.parse(saved);
+ }
+ } catch (e) {}
+ return null;
+ };
+
+ // Load settings IMMEDIATELY (synchronously) before anything else
+ const savedSettings = loadSettings();
+ if (savedSettings) {
+ if (savedSettings.type) selectedType.value = savedSettings.type;
+ if (savedSettings.turboMode !== undefined) turboMode.value = savedSettings.turboMode;
+ if (savedSettings.batchMode !== undefined) batchMode.value = savedSettings.batchMode;
+ // locationId will be applied after locations are loaded
+ }
+
+ // ==================== GPS DETECTION ====================
+ const calculateDistance = (lat1, lng1, lat2, lng2) => {
+ const R = 6371e3; // Earth's radius in meters
+ const φ1 = lat1 * Math.PI / 180;
+ const φ2 = lat2 * Math.PI / 180;
+ const Δφ = (lat2 - lat1) * Math.PI / 180;
+ const Δλ = (lng2 - lng1) * Math.PI / 180;
+ const a = Math.sin(Δφ/2) * Math.sin(Δφ/2) +
+ Math.cos(φ1) * Math.cos(φ2) *
+ Math.sin(Δλ/2) * Math.sin(Δλ/2);
+ const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+ return R * c;
+ };
+
+ const detectLocation = () => {
+ if (!navigator.geolocation) {
+ gpsStatus.value = 'error';
+ return;
+ }
+
+ gpsStatus.value = 'detecting';
+
+ navigator.geolocation.getCurrentPosition(
+ (position) => {
+ const { latitude, longitude, accuracy } = position.coords;
+
+ // Calculate distances to both locations
+ const distToOffice = calculateDistance(latitude, longitude, LOCATION_COORDS.office.lat, LOCATION_COORDS.office.lng);
+ const distToAussen = calculateDistance(latitude, longitude, LOCATION_COORDS.aussenlager.lat, LOCATION_COORDS.aussenlager.lng);
+
+ // Find closest location
+ const closest = distToOffice < distToAussen
+ ? { name: 'office', distance: distToOffice }
+ : { name: 'aussenlager', distance: distToAussen };
+
+ gpsDistance.value = Math.round(closest.distance);
+
+ // Only auto-select if accuracy is good and we're reasonably close
+ if (accuracy <= GPS_ACCURACY_THRESHOLD && closest.distance < 500) {
+ // Find matching location in our locations list
+ const matchingLoc = locations.value.find(loc =>
+ loc.title.toLowerCase() === LOCATION_COORDS[closest.name].name.toLowerCase()
+ );
+ if (matchingLoc) {
+ detectedLocation.value = matchingLoc.id;
+ // Only auto-set if user hasn't saved a preference
+ if (!savedSettings?.locationId) {
+ selectedLocation.value = matchingLoc.id;
+ }
+ gpsStatus.value = 'detected';
+ }
+ } else {
+ gpsStatus.value = 'detected';
+ }
+ },
+ (error) => {
+ gpsStatus.value = 'error';
+ },
+ { enableHighAccuracy: true, timeout: 10000, maximumAge: 60000 }
+ );
+ };
+
+ // ==================== QUICK ACTIONS ====================
+ const quickAction = async (type, reason) => {
+ selectedType.value = type;
+ await nextTick();
+ selectedReason.value = reason;
+ saveSettings();
+ currentTab.value = 'scan';
+ if (!scannedArticle.value) {
+ await startScanner();
+ }
+ };
+
+ // ==================== LOAD INITIAL DATA ====================
+ const loadInitialData = async () => {
+ try {
+ const [locResult, reasonResult] = await Promise.all([
+ movementApi.get('getLocations'),
+ movementApi.get('getReasonCategories')
+ ]);
+
+ if (locResult.success) {
+ locations.value = locResult.locations;
+
+ // Try to restore saved location (from already-loaded settings), otherwise use first
+ if (savedSettings?.locationId && locations.value.find(l => l.id === savedSettings.locationId)) {
+ selectedLocation.value = savedSettings.locationId;
+ } else if (locations.value.length > 0) {
+ selectedLocation.value = locations.value[0].id;
+ }
+
+ // Start GPS detection after locations are loaded
+ detectLocation();
+ }
+
+ if (reasonResult.success) {
+ reasonCategories.value = reasonResult.categories;
+ updateReasonOptions();
+ }
+
+ isInitialized.value = true;
+ } catch (e) {
+ emit('toast', 'Fehler beim Laden der Konfiguration', 'error');
+ }
+ };
+
+ // ==================== REASON OPTIONS ====================
+ const updateReasonOptions = () => {
+ const reasons = reasonCategories.value?.[selectedType.value];
+ if (reasons && typeof reasons === 'object') {
+ const keys = Object.keys(reasons);
+ if (keys.length > 0) {
+ selectedReason.value = keys[0];
+ }
+ } else {
+ // Fallback defaults
+ const defaults = { 'IN': 'Warenlieferung', 'OUT': 'Verbrauch', 'ADJUSTMENT': 'Inventurkorrektur' };
+ if (defaults[selectedType.value]) {
+ selectedReason.value = defaults[selectedType.value];
+ }
+ }
+ };
+
+ // ==================== WATCHERS ====================
+ watch(selectedType, () => {
+ updateReasonOptions();
+ saveSettings();
+ });
+
+ watch(selectedLocation, () => {
+ saveSettings();
+ if (scannedArticle.value) {
+ loadCurrentStock();
+ }
+ });
+
+ // Ensure location is always selected when locations are loaded
+ watch(locations, (newLocations) => {
+ if (newLocations.length > 0 && !selectedLocation.value) {
+ // Try saved settings first
+ if (savedSettings?.locationId && newLocations.find(l => l.id === savedSettings.locationId)) {
+ selectedLocation.value = savedSettings.locationId;
+ } else {
+ selectedLocation.value = newLocations[0].id;
+ }
+ }
+ }, { immediate: true });
+
+ watch(() => props.simpleMode, (newVal) => {
+ if (newVal) {
+ // Reset to IN/OUT if ADJUSTMENT was selected
+ if (selectedType.value === 'ADJUSTMENT') {
+ selectedType.value = 'OUT';
+ }
+ // Switch away from history tab
+ if (currentTab.value === 'history') {
+ currentTab.value = 'scan';
+ }
+ // Disable turbo/batch modes in simple mode
+ turboMode.value = false;
+ batchMode.value = false;
+ }
+ });
+
+ watch(turboMode, () => {
+ saveSettings();
+ });
+
+ watch(batchMode, () => {
+ saveSettings();
+ });
+
+ // Also update reason when categories are loaded
+ watch(reasonCategories, () => {
+ updateReasonOptions();
+ }, { deep: true });
+
+ // ==================== SCANNER FUNCTIONS ====================
+ let scannerRestarting = false;
+
+ const startScanner = async (delay = 0) => {
+ if (scannerRestarting) return;
+ scannerError.value = '';
+
+ // Add delay for turbo mode restarts to let camera fully release
+ if (delay > 0) {
+ scannerRestarting = true;
+ await new Promise(resolve => setTimeout(resolve, delay));
+ scannerRestarting = false;
+ }
+
+ try {
+ // Ensure previous instance is cleared
+ if (scanner.value) {
+ try { await scanner.value.stop(); } catch (e) {}
+ scanner.value = null;
+ }
+ await nextTick();
+
+ scanner.value = new Html5Qrcode('qr-reader-movement');
+ await scanner.value.start(
+ { facingMode: 'environment' },
+ { fps: 10, qrbox: { width: 250, height: 250 }, aspectRatio: 1.0 },
+ onScanSuccess,
+ () => {}
+ );
+ isScannerActive.value = true;
+ } catch (err) {
+ scannerError.value = 'Kamera konnte nicht gestartet werden. Bitte Berechtigungen prüfen.';
+ }
+ };
+
+ const stopScanner = async () => {
+ if (scanner.value && isScannerActive.value) {
+ try { await scanner.value.stop(); } catch (e) {}
+ isScannerActive.value = false;
+ }
+ };
+
+ const onScanSuccess = async (decodedText) => {
+ await stopScanner();
+ await lookupArticle(decodedText);
+ };
+
+ // Article lookup
+ const lookupArticle = async (code) => {
+ isLoading.value = true;
+
+ try {
+ const result = await movementApi.get(`getArticle?code=${encodeURIComponent(code)}`);
+
+ if (result.success) {
+ scannedArticle.value = result.article;
+ await loadCurrentStock();
+ quantity.value = '1';
+
+ // Ensure reason is set
+ if (!selectedReason.value) {
+ updateReasonOptions();
+ }
+
+ // TURBO MODE: Auto-submit with qty=1 and default reason
+ if (turboMode.value && !batchMode.value) {
+ await turboSubmit(result.article);
+ return;
+ }
+
+ // BATCH MODE: Add to cart and continue scanning
+ if (batchMode.value) {
+ addToCart(result.article);
+ return;
+ }
+ } else {
+ emit('toast', result.message || 'Artikel nicht gefunden', 'error');
+ await startScanner();
+ }
+ } catch (e) {
+ emit('toast', 'Fehler beim Laden des Artikels', 'error');
+ await startScanner();
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ // ==================== TURBO MODE ====================
+ const turboSubmit = async (article) => {
+ const typeConfig = movementTypes.find(t => t.value === selectedType.value);
+ const defaultReason = typeConfig?.defaultReason || selectedReason.value;
+
+ try {
+ const payload = {
+ movementType: selectedType.value,
+ articleId: article.id,
+ locationId: selectedLocation.value,
+ quantity: 1,
+ reasonCategory: defaultReason,
+ note: null
+ };
+
+ const result = await movementApi.post('submitMovement', payload);
+
+ if (result.success) {
+ // Haptic feedback on success
+ navigator.vibrate?.([100]);
+
+ // Store for undo
+ lastMovement.value = result.movement;
+ showUndo.value = true;
+ if (undoTimeout) clearTimeout(undoTimeout);
+ undoTimeout = setTimeout(() => { showUndo.value = false; }, 5000);
+
+ // Show quick toast
+ const typeLabel = selectedType.value === 'IN' ? '+' : selectedType.value === 'OUT' ? '-' : '±';
+ emit('toast', `${typeLabel}1 ${article.title}`, 'success');
+
+ // Reset and restart scanner with delay for camera to release
+ scannedArticle.value = null;
+ currentStock.value = 0;
+ await startScanner(300);
+ } else {
+ emit('toast', result.message || 'Fehler', 'error');
+ // Fall back to normal mode
+ scannedArticle.value = article;
+ }
+ } catch (e) {
+ emit('toast', 'Netzwerkfehler', 'error');
+ scannedArticle.value = article;
+ }
+ };
+
+ // ==================== BATCH/CART MODE ====================
+ const addToCart = (article) => {
+ // Check if already in cart
+ const existing = cartItems.value.find(item => item.article.id === article.id);
+ if (existing) {
+ existing.quantity += 1;
+ emit('toast', `${article.title} (${existing.quantity}x)`, 'success');
+ } else {
+ cartItems.value.push({
+ article: article,
+ quantity: 1,
+ stock: currentStock.value
+ });
+ emit('toast', `+ ${article.title}`, 'success');
+ }
+
+ // Reset and restart scanner with small delay
+ scannedArticle.value = null;
+ currentStock.value = 0;
+ startScanner(200);
+ };
+
+ const updateCartQuantity = (index, qty) => {
+ if (qty <= 0) {
+ cartItems.value.splice(index, 1);
+ } else {
+ cartItems.value[index].quantity = qty;
+ }
+ };
+
+ const removeFromCart = (index) => {
+ cartItems.value.splice(index, 1);
+ };
+
+ const clearCart = () => {
+ cartItems.value = [];
+ showCart.value = false;
+ };
+
+ const submitCart = async () => {
+ if (cartItems.value.length === 0) return;
+ isLoading.value = true;
+
+ const typeConfig = movementTypes.find(t => t.value === selectedType.value);
+ const defaultReason = typeConfig?.defaultReason || selectedReason.value;
+ let successCount = 0;
+ let errorCount = 0;
+
+ for (const item of cartItems.value) {
+ try {
+ const payload = {
+ movementType: selectedType.value,
+ articleId: item.article.id,
+ locationId: selectedLocation.value,
+ quantity: item.quantity,
+ reasonCategory: defaultReason,
+ note: null
+ };
+
+ const result = await movementApi.post('submitMovement', payload);
+ if (result.success) {
+ successCount++;
+ } else {
+ errorCount++;
+ }
+ } catch (e) {
+ errorCount++;
+ }
+ }
+
+ isLoading.value = false;
+
+ if (errorCount === 0) {
+ // Haptic feedback on success
+ navigator.vibrate?.([100, 50, 100]);
+ emit('toast', `${successCount} Bewegungen erfolgreich`, 'success');
+ clearCart();
+ } else {
+ emit('toast', `${successCount} OK, ${errorCount} Fehler`, 'error');
+ }
+ };
+
+ // Load current stock for article at location
+ const loadCurrentStock = async () => {
+ if (!scannedArticle.value || !selectedLocation.value) {
+ currentStock.value = 0;
+ return;
+ }
+
+ try {
+ const result = await movementApi.get(
+ `getCurrentStock?articleId=${scannedArticle.value.id}&locationId=${selectedLocation.value}`
+ );
+ currentStock.value = result.success ? result.currentStock : 0;
+ } catch (e) {
+ currentStock.value = 0;
+ }
+ };
+
+ // Submit movement
+ const submitMovement = async () => {
+ if (!canSubmit.value) return;
+ isLoading.value = true;
+
+ try {
+ const payload = {
+ movementType: selectedType.value,
+ articleId: scannedArticle.value.id,
+ locationId: selectedLocation.value,
+ quantity: parseFloat(quantity.value),
+ reasonCategory: selectedReason.value,
+ note: note.value || null
+ };
+
+ const result = await movementApi.post('submitMovement', payload);
+
+ if (result.success) {
+ // Haptic feedback on success
+ navigator.vibrate?.([100]);
+ emit('toast', result.message, 'success');
+ // Reset form
+ scannedArticle.value = null;
+ currentStock.value = 0;
+ quantity.value = '1';
+ note.value = '';
+ showNote.value = false;
+ await startScanner();
+ } else {
+ emit('toast', result.message || 'Fehler beim Speichern', 'error');
+ }
+ } catch (e) {
+ emit('toast', 'Netzwerkfehler', 'error');
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ const doSearch = async () => {
+ if (searchQuery.value.length < 2) {
+ searchResults.value = [];
+ return;
+ }
+ isSearching.value = true;
+ try {
+ const result = await movementApi.get(`searchArticles?query=${encodeURIComponent(searchQuery.value)}`);
+ if (result.success) searchResults.value = result.articles;
+ } catch (e) {} finally {
+ isSearching.value = false;
+ }
+ };
+
+ const searchArticles = debounce(doSearch, 300);
+
+ const selectSearchResult = async (article) => {
+ await stopScanner();
+ scannedArticle.value = article;
+ await loadCurrentStock();
+ quantity.value = '1';
+ showNote.value = false;
+ // Ensure reason is set
+ if (!selectedReason.value) {
+ updateReasonOptions();
+ }
+ currentTab.value = 'scan';
+ };
+
+ // History
+ const loadHistory = async () => {
+ isLoadingHistory.value = true;
+ try {
+ const params = selectedLocation.value ? `?locationId=${selectedLocation.value}` : '';
+ const result = await movementApi.get(`getMyMovements${params}`);
+ if (result.success) recentMovements.value = result.movements;
+ } catch (e) {} finally {
+ isLoadingHistory.value = false;
+ }
+ };
+
+ // ==================== ORDER RECEIVING FUNCTIONS ====================
+ const loadPendingOrders = async () => {
+ isLoadingOrders.value = true;
+ try {
+ const result = await movementApi.get('getPendingOrders');
+ if (result.success) {
+ pendingOrders.value = result.orders;
+ }
+ } catch (e) {
+ emit('toast', 'Fehler beim Laden der Bestellungen', 'error');
+ } finally {
+ isLoadingOrders.value = false;
+ }
+ };
+
+ const selectOrderForReceiving = async (order) => {
+ isLoadingOrders.value = true;
+ try {
+ const result = await movementApi.get(`getOrderForReceiving?orderId=${order.id}`);
+ if (result.success) {
+ selectedOrder.value = result.order;
+ orderPositions.value = result.positions;
+ deliveryNotePhoto.value = null;
+ }
+ } catch (e) {
+ emit('toast', 'Fehler beim Laden der Bestellung', 'error');
+ } finally {
+ isLoadingOrders.value = false;
+ }
+ };
+
+ const cancelOrderReceiving = () => {
+ selectedOrder.value = null;
+ orderPositions.value = [];
+ deliveryNotePhoto.value = null;
+ };
+
+ const submitOrderReceiving = async () => {
+ if (!selectedOrder.value || !selectedLocation.value) return;
+
+ // Collect positions with quantity > 0
+ const positionsToSubmit = orderPositions.value
+ .filter(p => p.receivingQty > 0)
+ .map(p => ({
+ articleId: p.articleId,
+ quantity: p.receivingQty
+ }));
+
+ if (positionsToSubmit.length === 0) {
+ emit('toast', 'Bitte mindestens eine Menge eingeben', 'error');
+ return;
+ }
+
+ isSubmittingOrder.value = true;
+ try {
+ const result = await movementApi.post('submitOrderReceiving', {
+ orderId: selectedOrder.value.id,
+ locationId: selectedLocation.value,
+ positions: positionsToSubmit,
+ deliveryNoteFileId: deliveryNotePhoto.value,
+ note: null
+ });
+
+ if (result.success) {
+ navigator.vibrate?.([100, 50, 100]);
+ emit('toast', result.message, 'success');
+ // Reset and reload orders
+ cancelOrderReceiving();
+ await loadPendingOrders();
+ } else {
+ emit('toast', result.message || 'Fehler beim Speichern', 'error');
+ }
+ } catch (e) {
+ emit('toast', 'Netzwerkfehler', 'error');
+ } finally {
+ isSubmittingOrder.value = false;
+ }
+ };
+
+ const setAllReceivingQty = () => {
+ orderPositions.value.forEach(p => {
+ p.receivingQty = p.remainingQty;
+ });
+ };
+
+ const clearAllReceivingQty = () => {
+ orderPositions.value.forEach(p => {
+ p.receivingQty = 0;
+ });
+ };
+
+ // Keypad
+ const appendDigit = (digit) => {
+ if (digit === '.' && quantity.value.includes('.')) return;
+ if (quantity.value === '0' && digit !== '.') {
+ quantity.value = digit;
+ } else {
+ quantity.value += digit;
+ }
+ };
+
+ const deleteDigit = () => {
+ quantity.value = quantity.value.length > 1 ? quantity.value.slice(0, -1) : '0';
+ };
+
+ const clearQuantity = () => { quantity.value = '0'; };
+
+ // Navigation
+ const switchTab = async (tab) => {
+ currentTab.value = tab;
+ if (tab === 'scan' && !scannedArticle.value) {
+ await nextTick();
+ await startScanner();
+ } else if (tab === 'search') {
+ await stopScanner();
+ } else if (tab === 'history') {
+ await stopScanner();
+ await loadHistory();
+ } else if (tab === 'orders') {
+ await stopScanner();
+ await loadPendingOrders();
+ }
+ };
+
+ const cancelScan = async () => {
+ scannedArticle.value = null;
+ currentStock.value = 0;
+ quantity.value = '1';
+ note.value = '';
+ showNote.value = false;
+ await startScanner();
+ };
+
+ // Get type badge classes
+ const getTypeBadgeClass = (type) => {
+ const colors = {
+ 'IN': 'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-400',
+ 'OUT': 'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-400',
+ 'ADJUSTMENT': 'bg-yellow-100 text-yellow-800 dark:bg-yellow-900/30 dark:text-yellow-400'
+ };
+ return colors[type] || 'bg-slate-100 text-slate-800';
+ };
+
+ onMounted(async () => {
+ await loadInitialData();
+ await startScanner();
+ });
+
+ onUnmounted(async () => {
+ await stopScanner();
+ });
+
+ return {
+ // Config
+ locations, movementTypes, reasonCategories, reasonOptions,
+ selectedLocation, selectedType,
+ // GPS
+ detectedLocation, gpsStatus, gpsDistance, detectLocation, formattedGpsDistance, gpsDistanceColor,
+ // Mode toggles
+ turboMode, batchMode, filteredMovementTypes,
+ // Cart
+ cartItems, cartTotal, showCart,
+ addToCart, updateCartQuantity, removeFromCart, clearCart, submitCart,
+ // Quick actions
+ quickAction,
+ // Undo
+ lastMovement, showUndo,
+ // Tabs & Loading
+ currentTab, isLoading, isInitialized,
+ isScannerActive, scannerError,
+ // Article
+ scannedArticle, currentStock, quantity, selectedReason, note,
+ // Search
+ searchQuery, searchResults, isSearching,
+ // History
+ recentMovements, isLoadingHistory,
+ // Order Receiving
+ pendingOrders, isLoadingOrders, selectedOrder, orderPositions,
+ deliveryNotePhoto, isSubmittingOrder,
+ loadPendingOrders, selectOrderForReceiving, cancelOrderReceiving,
+ submitOrderReceiving, setAllReceivingQty, clearAllReceivingQty,
+ // UI
+ showKeypad, showNote, canSubmit, typeColor,
+ // Functions
+ startScanner, stopScanner, submitMovement,
+ searchArticles, selectSearchResult, loadHistory,
+ appendDigit, deleteDigit, clearQuantity,
+ switchTab, cancelScan, getTypeBadgeClass
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+ {{ formattedGpsDistance }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scannerError }}
+
+
+ QR-Code scannen oder Artikel suchen
+
+
+
+
+
+
+
+
+ {{ scannedArticle.title }}
+ {{ scannedArticle.articleNumber }}
+
+
+
+ {{ currentStock }}
+
+ {{ scannedArticle.unit || 'Stk.' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ selectedType === 'OUT' ? '-' : selectedType === 'IN' ? '+' : '' }}{{ quantity }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ searchQuery.length < 2 ? 'Mindestens 2 Zeichen eingeben' : 'Keine Artikel gefunden' }}
+
+
+
+
+ {{ article.title }}
+ {{ article.articleNumber }}
+
+
+
+
+
+
+ Noch keine Bewegungen
+
+
+
+
+
+
+
+
+ {{ movement.movementType === 'IN' ? 'Einbuchung' : movement.movementType === 'OUT' ? 'Ausbuchung' : 'Korrektur' }}
+
+ {{ movement.locationTitle }}
+
+ {{ movement.articleTitle }}
+ {{ movement.articleNumber }}
+
+
+
+ {{ movement.movementType === 'IN' ? '+' : movement.movementType === 'OUT' ? '-' : '' }}{{ movement.quantity }} {{ movement.unit }}
+
+ {{ movement.create }}
+
+
+
+
+
+
+
+
+
+
+
+
+ Keine offenen Bestellungen
+ Alle Lieferungen wurden empfangen
+
+ {{ pendingOrders.length }} Bestellung(en) warten auf Wareneingang:
+
+
+
+
+ {{ order.orderNumber }}
+
+ {{ order.statusLabel }}
+
+
+ {{ order.distributorName }}
+
+ {{ order.positionCount }} Position(en) · {{ order.totalItems }} Artikel gesamt
+
+
+
+ {{ order.create }}
+
+ {{ order.daysSinceSent }} Tag(e)
+
+
+
+
+
+ Wareneingang erfassen
+
+
+
+
+
+
+
+
+
+
+ {{ selectedOrder.orderNumber }}
+ {{ selectedOrder.distributorName }}
+
+
+
+ Bestellt: {{ selectedOrder.create }}
+
+
+
+
+
+
+
+
+
+
+ {{ pos.articleTitle }}
+ {{ pos.articleNumber }}
+
+
+ Bestellt: {{ pos.orderedQty }}
+ Erhalten: {{ pos.deliveredQty }}
+
+
+
+ Empfangen:
+
+
+
+
+
+ / {{ pos.remainingQty }} {{ pos.unit }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ quantity }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Sammelkorb ({{ cartTotal }})
+
+
+
+
+
+
+
+ Korb ist leer
+
+
+
+ {{ item.article.title }}
+ {{ item.article.articleNumber }}
+
+
+
+
+ {{ item.quantity }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ TURBO: Scan = Sofort buchen (1x)
+
+
+
+
+
+
+ {{ lastMovement?.articleTitle }} gebucht
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/DatePicker.js b/public/mobile/modules/lager/shippingnote/DatePicker.js
new file mode 100644
index 000000000..325f50704
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/DatePicker.js
@@ -0,0 +1,282 @@
+/**
+ * DatePicker Component
+ *
+ * Beautiful mobile date picker with bottom sheet modal.
+ * Features quick buttons (Heute, Gestern) and calendar grid.
+ */
+
+export default {
+ name: 'DatePicker',
+ emits: ['update:modelValue', 'close'],
+ props: {
+ modelValue: {
+ type: String,
+ default: null
+ },
+ show: {
+ type: Boolean,
+ default: false
+ }
+ },
+
+ setup(props, { emit }) {
+ const { ref, computed, watch } = Vue;
+
+ // Current calendar view month/year
+ const viewDate = ref(new Date());
+
+ // Initialize view date when opened
+ watch(() => props.show, (newVal) => {
+ if (newVal && props.modelValue) {
+ viewDate.value = new Date(props.modelValue);
+ } else if (newVal) {
+ viewDate.value = new Date();
+ }
+ });
+
+ // German weekday names (short)
+ const weekDays = ['Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So'];
+
+ // German month names
+ const monthNames = [
+ 'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
+ 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'
+ ];
+
+ const shortMonthNames = [
+ 'Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun',
+ 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'
+ ];
+
+ const weekDayNames = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
+
+ // Format date for display
+ const formatDisplayDate = (dateStr) => {
+ if (!dateStr) return 'Datum wählen';
+ const date = new Date(dateStr);
+ const dayName = weekDayNames[date.getDay()];
+ const day = date.getDate();
+ const month = shortMonthNames[date.getMonth()];
+ const year = date.getFullYear();
+ return `${dayName}, ${day}. ${month} ${year}`;
+ };
+
+ // Current month/year display
+ const currentMonthYear = computed(() => {
+ const month = monthNames[viewDate.value.getMonth()];
+ const year = viewDate.value.getFullYear();
+ return `${month} ${year}`;
+ });
+
+ // Get calendar days for current view
+ const calendarDays = computed(() => {
+ const year = viewDate.value.getFullYear();
+ const month = viewDate.value.getMonth();
+
+ // First day of month
+ const firstDay = new Date(year, month, 1);
+ // Last day of month
+ const lastDay = new Date(year, month + 1, 0);
+
+ // Day of week for first day (0=Sun, convert to 0=Mon)
+ let startDay = firstDay.getDay() - 1;
+ if (startDay < 0) startDay = 6;
+
+ const days = [];
+
+ // Add empty slots for days before first of month
+ for (let i = 0; i < startDay; i++) {
+ days.push({ day: null, date: null });
+ }
+
+ // Add days of month
+ for (let d = 1; d <= lastDay.getDate(); d++) {
+ const date = new Date(year, month, d);
+ const dateStr = formatDateISO(date);
+ days.push({
+ day: d,
+ date: dateStr,
+ isToday: isToday(date),
+ isSelected: dateStr === props.modelValue
+ });
+ }
+
+ return days;
+ });
+
+ // Check if date is today
+ const isToday = (date) => {
+ const today = new Date();
+ return date.toDateString() === today.toDateString();
+ };
+
+ // Format date as ISO string (YYYY-MM-DD)
+ const formatDateISO = (date) => {
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ return `${year}-${month}-${day}`;
+ };
+
+ // Quick date helpers
+ const getToday = () => formatDateISO(new Date());
+ const getYesterday = () => {
+ const d = new Date();
+ d.setDate(d.getDate() - 1);
+ return formatDateISO(d);
+ };
+
+ // Navigation
+ const prevMonth = () => {
+ viewDate.value = new Date(viewDate.value.getFullYear(), viewDate.value.getMonth() - 1, 1);
+ };
+
+ const nextMonth = () => {
+ viewDate.value = new Date(viewDate.value.getFullYear(), viewDate.value.getMonth() + 1, 1);
+ };
+
+ // Selection
+ const selectDate = (dateStr) => {
+ if (!dateStr) return;
+ emit('update:modelValue', dateStr);
+ emit('close');
+ };
+
+ const selectToday = () => selectDate(getToday());
+ const selectYesterday = () => selectDate(getYesterday());
+
+ const close = () => {
+ emit('close');
+ };
+
+ return {
+ viewDate,
+ weekDays,
+ currentMonthYear,
+ calendarDays,
+ formatDisplayDate,
+ prevMonth,
+ nextMonth,
+ selectDate,
+ selectToday,
+ selectYesterday,
+ close,
+ getToday,
+ getYesterday
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Datum wählen
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentMonthYear }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/EmployeeSelector.js b/public/mobile/modules/lager/shippingnote/EmployeeSelector.js
new file mode 100644
index 000000000..df440c853
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/EmployeeSelector.js
@@ -0,0 +1,189 @@
+/**
+ * EmployeeSelector Component
+ *
+ * Bottom sheet modal for searching and selecting employees.
+ * Supports lazy word search (e.g., "fab her" matches "Fabian Herbst").
+ */
+
+export default {
+ name: 'EmployeeSelector',
+ emits: ['select', 'close'],
+ props: {
+ show: {
+ type: Boolean,
+ default: false
+ },
+ excludeIds: {
+ type: Array,
+ default: () => []
+ }
+ },
+
+ setup(props, { emit }) {
+ const { ref, computed, watch } = Vue;
+
+ const searchQuery = ref('');
+ const employees = ref([]);
+ const isLoading = ref(false);
+ const searchTimeout = ref(null);
+
+ // Filter out already selected employees
+ const filteredEmployees = computed(() => {
+ return employees.value.filter(emp => !props.excludeIds.includes(emp.id));
+ });
+
+ // Search employees when query changes
+ watch(searchQuery, (newVal) => {
+ if (searchTimeout.value) {
+ clearTimeout(searchTimeout.value);
+ }
+
+ // Debounce search
+ searchTimeout.value = setTimeout(() => {
+ searchEmployees(newVal);
+ }, 300);
+ });
+
+ // Load employees when modal opens
+ watch(() => props.show, (newVal) => {
+ if (newVal) {
+ searchQuery.value = '';
+ searchEmployees('');
+ }
+ });
+
+ const searchEmployees = async (query) => {
+ isLoading.value = true;
+ try {
+ const params = new URLSearchParams();
+ if (query) params.append('query', query);
+
+ const response = await fetch(`/MobileApp/Lager/ShippingNote/searchEmployees?${params}`, {
+ credentials: 'include'
+ });
+ const data = await response.json();
+
+ if (data.success) {
+ employees.value = data.employees;
+ }
+ } catch (error) {
+ console.error('Error searching employees:', error);
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ const selectEmployee = (employee) => {
+ emit('select', employee);
+ emit('close');
+ };
+
+ const close = () => {
+ emit('close');
+ };
+
+ return {
+ searchQuery,
+ filteredEmployees,
+ isLoading,
+ selectEmployee,
+ close
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Mitarbeiter auswählen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Keine Mitarbeiter gefunden
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/SearchSelectModal.js b/public/mobile/modules/lager/shippingnote/SearchSelectModal.js
new file mode 100644
index 000000000..ecb8c9a17
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/SearchSelectModal.js
@@ -0,0 +1,254 @@
+/**
+ * SearchSelectModal Component
+ *
+ * Reusable bottom sheet modal for searching and selecting items.
+ * Works correctly with iPhone Dynamic Island by using bottom sheet pattern.
+ *
+ * Usage:
+ *
+ *
+ * {{ item.name }}
+ *
+ *
+ */
+
+export default {
+ name: 'SearchSelectModal',
+ emits: ['select', 'close', 'update:modelValue'],
+ props: {
+ show: {
+ type: Boolean,
+ default: false
+ },
+ title: {
+ type: String,
+ default: 'Auswählen'
+ },
+ searchable: {
+ type: Boolean,
+ default: false
+ },
+ searchPlaceholder: {
+ type: String,
+ default: 'Suchen...'
+ },
+ modelValue: {
+ type: String,
+ default: ''
+ },
+ items: {
+ type: Array,
+ default: () => []
+ },
+ loading: {
+ type: Boolean,
+ default: false
+ },
+ emptyText: {
+ type: String,
+ default: 'Keine Ergebnisse gefunden'
+ },
+ emptyIcon: {
+ type: String,
+ default: 'search' // search, users, box, list
+ },
+ selectedId: {
+ type: [String, Number],
+ default: null
+ },
+ itemKey: {
+ type: String,
+ default: 'id'
+ },
+ showNoneOption: {
+ type: Boolean,
+ default: false
+ },
+ noneOptionText: {
+ type: String,
+ default: 'Keine Auswahl'
+ }
+ },
+
+ setup(props, { emit, slots }) {
+ const { ref, computed, watch } = Vue;
+
+ const searchInput = ref(null);
+
+ // Focus search input when modal opens
+ watch(() => props.show, (newVal) => {
+ if (newVal && props.searchable) {
+ setTimeout(() => {
+ searchInput.value?.focus();
+ }, 100);
+ }
+ });
+
+ const updateSearch = (event) => {
+ emit('update:modelValue', event.target.value);
+ };
+
+ const selectItem = (item) => {
+ emit('select', item);
+ };
+
+ const selectNone = () => {
+ emit('select', null);
+ };
+
+ const close = () => {
+ emit('close');
+ };
+
+ const isSelected = (item) => {
+ if (props.selectedId === null || props.selectedId === undefined) return false;
+ return item[props.itemKey] === props.selectedId;
+ };
+
+ // Icons for empty states
+ const emptyIcons = {
+ search: ` `,
+ users: ` `,
+ box: ` `,
+ list: ` `
+ };
+
+ const getEmptyIcon = computed(() => {
+ return emptyIcons[props.emptyIcon] || emptyIcons.search;
+ });
+
+ return {
+ searchInput,
+ updateSearch,
+ selectItem,
+ selectNone,
+ close,
+ isSelected,
+ getEmptyIcon
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
new file mode 100644
index 000000000..c0735ea9a
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteForm.js
@@ -0,0 +1,1075 @@
+/**
+ * ShippingNote Form Component - Redesigned
+ *
+ * Features:
+ * - GPS-based customer auto-detection with smart collapsed card
+ * - Multi-employee support with individual hours
+ * - Custom date picker
+ * - Reorganized field layout by importance
+ */
+
+import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+import DatePicker from '/mobile/modules/lager/shippingnote/DatePicker.js';
+import EmployeeSelector from '/mobile/modules/lager/shippingnote/EmployeeSelector.js';
+import SearchSelectModal from '/mobile/modules/lager/shippingnote/SearchSelectModal.js';
+
+export default {
+ name: 'ShippingNoteForm',
+ emits: ['created', 'createAndSign', 'toast'],
+ props: {
+ user: Object
+ },
+ components: {
+ DatePicker,
+ EmployeeSelector,
+ SearchSelectModal
+ },
+
+ setup(props, { emit }) {
+ const { ref, reactive, computed, onMounted, watch } = Vue;
+
+ // GPS detection state
+ const gpsState = ref('detecting'); // detecting | customer_found | no_customer | manual | error
+ const gpsPosition = ref(null);
+ const detectedCustomer = ref(null);
+ const gpsAddress = ref(null);
+ const gpsDistance = ref(null);
+
+ // Customer card state - collapsed when customer found
+ const customerCardExpanded = ref(false);
+
+ // Form data
+ const form = reactive({
+ customerId: null,
+ customerName: '',
+ billingAddressId: null,
+ deliveryAddressName: '',
+ deliveryAddressLine: '',
+ deliveryAddressPLZ: '',
+ deliveryAddressCity: '',
+ deliveryAddressEMail: '',
+ note: '',
+ type: 'V'
+ });
+
+ // Hours entries - supports multiple employees
+ const hoursEntries = ref([createNewHoursEntry()]);
+
+ // Active entry index for date picker
+ const activeEntryIndex = ref(0);
+ const showDatePicker = ref(false);
+ const showEmployeeSelector = ref(false);
+
+ // Positions
+ const positions = ref([]);
+
+ // UI state
+ const loading = ref(false);
+ const showCustomerSearch = ref(false);
+ const customerSearchQuery = ref('');
+ const customerSearchResults = ref([]);
+ const customerSearchLoading = ref(false);
+
+ const showArticleSearch = ref(false);
+ const articleSearchQuery = ref('');
+ const articleSearchResults = ref([]);
+ const articleSearchLoading = ref(false);
+
+ const showCarSelect = ref(false);
+ const carSelectEntryIndex = ref(0);
+ const allCars = ref([]);
+
+ const showHourTypeSelect = ref(false);
+ const hourTypeSelectEntryIndex = ref(0);
+ const hourTypes = ref([]);
+
+ const showPositionsSection = ref(false);
+
+ // User's car
+ const userCar = ref(null);
+
+ // Quick work type chips
+ const quickWorkTypes = ['Spleißen', 'Jetten', 'Inbetriebnahme'];
+ const selectedWorkType = ref(null);
+
+ // Select quick work type
+ const selectWorkType = (type) => {
+ if (selectedWorkType.value === type) {
+ // Deselect if already selected
+ selectedWorkType.value = null;
+ form.note = '';
+ } else {
+ selectedWorkType.value = type;
+ form.note = type;
+ }
+ navigator.vibrate?.([20]);
+ };
+
+ // Watch for manual note changes to clear chip selection
+ watch(() => form.note, (newVal) => {
+ if (newVal && !quickWorkTypes.includes(newVal)) {
+ selectedWorkType.value = null;
+ }
+ });
+
+ // Create new hours entry - default to 1h (most common)
+ function createNewHoursEntry(userId = null, userName = '') {
+ return {
+ id: Date.now() + Math.random(),
+ userId: userId || props.user?.id || null,
+ userName: userName || props.user?.name || '',
+ date: new Date().toISOString().split('T')[0],
+ hourCount: 1,
+ hourType: '',
+ hourTypeName: 'Normal',
+ carId: null,
+ carName: '',
+ kilometerCount: 0,
+ comment: '',
+ expanded: true
+ };
+ }
+
+ // Validation
+ const isValid = computed(() => {
+ return form.customerName.trim() !== '' &&
+ form.deliveryAddressLine.trim() !== '' &&
+ form.deliveryAddressCity.trim() !== '' &&
+ form.note.trim() !== '';
+ });
+
+ // Format distance for display
+ const formatDistance = (distance) => {
+ if (distance === null || distance === undefined || isNaN(distance)) {
+ return '';
+ }
+ return Math.round(distance) + 'm';
+ };
+
+ // Format date for display - German style
+ const formatDateDisplay = (dateStr) => {
+ if (!dateStr) return 'Datum wählen';
+ const date = new Date(dateStr);
+ const weekDays = ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'];
+ const months = ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'];
+ const dayName = weekDays[date.getDay()];
+ const day = date.getDate();
+ const month = months[date.getMonth()];
+ const year = date.getFullYear();
+ return `${dayName}, ${day}. ${month} ${year}`;
+ };
+
+ // Format hours display as "1h 15m"
+ const formatHoursValue = (hours) => {
+ const h = Math.floor(hours);
+ const m = Math.round((hours - h) * 60);
+ return { h, m };
+ };
+
+ // Get selected employee IDs (to exclude from selector)
+ const selectedEmployeeIds = computed(() => {
+ return hoursEntries.value.map(e => e.userId).filter(id => id !== null);
+ });
+
+ onMounted(async () => {
+ await loadInitializationData();
+ detectGPS();
+ });
+
+ const loadInitializationData = async () => {
+ try {
+ const data = await shippingNoteApi.get('initialize');
+ if (data.success) {
+ if (data.userCar) {
+ userCar.value = data.userCar;
+ if (hoursEntries.value[0]) {
+ hoursEntries.value[0].carId = data.userCar.id;
+ hoursEntries.value[0].carName = data.userCar.name;
+ }
+ }
+ allCars.value = data.allCars || [];
+ hourTypes.value = data.hourTypes || [];
+ }
+ } catch (e) {
+ console.error('Failed to load initialization data:', e);
+ }
+ };
+
+ // GPS Detection
+ const detectGPS = () => {
+ gpsState.value = 'detecting';
+
+ if (!navigator.geolocation) {
+ gpsState.value = 'error';
+ return;
+ }
+
+ navigator.geolocation.getCurrentPosition(
+ async (position) => {
+ gpsPosition.value = {
+ lat: position.coords.latitude,
+ lng: position.coords.longitude
+ };
+ await findNearbyCustomer();
+ await calculateDistance();
+ },
+ (error) => {
+ console.error('GPS error:', error);
+ gpsState.value = 'error';
+ },
+ { enableHighAccuracy: true, timeout: 15000, maximumAge: 0 }
+ );
+ };
+
+ // Find nearby customer
+ const findNearbyCustomer = async () => {
+ if (!gpsPosition.value) return;
+
+ try {
+ const data = await shippingNoteApi.get(
+ `getCustomerByLocation?lat=${gpsPosition.value.lat}&lng=${gpsPosition.value.lng}`
+ );
+
+ if (data.success && data.customer) {
+ detectedCustomer.value = data.customer;
+ gpsDistance.value = data.customer.distance;
+ gpsState.value = 'customer_found';
+ fillFromCustomer(data.customer);
+ customerCardExpanded.value = false; // Collapse card when customer found
+ navigator.vibrate?.([100, 50, 100]);
+ } else {
+ gpsState.value = 'no_customer';
+ customerCardExpanded.value = true; // Expand card when no customer
+ await reverseGeocode();
+ }
+ } catch (e) {
+ console.error('Customer detection failed:', e);
+ gpsState.value = 'no_customer';
+ customerCardExpanded.value = true;
+ await reverseGeocode();
+ }
+ };
+
+ // Reverse geocode GPS position
+ const reverseGeocode = async () => {
+ if (!gpsPosition.value) return;
+
+ try {
+ const data = await shippingNoteApi.get(
+ `reverseGeocode?lat=${gpsPosition.value.lat}&lng=${gpsPosition.value.lng}`
+ );
+
+ if (data.success && data.address) {
+ gpsAddress.value = data.address;
+ form.deliveryAddressLine = data.address.street || '';
+ form.deliveryAddressPLZ = data.address.zip || '';
+ form.deliveryAddressCity = data.address.city || '';
+ }
+ } catch (e) {
+ console.error('Reverse geocode failed:', e);
+ }
+ };
+
+ // Calculate distance from office
+ const calculateDistance = async () => {
+ if (!gpsPosition.value) return;
+
+ try {
+ const data = await shippingNoteApi.get(
+ `calculateDistance?lat=${gpsPosition.value.lat}&lng=${gpsPosition.value.lng}`
+ );
+
+ if (data.success && data.distanceRoundTrip) {
+ if (hoursEntries.value[0]) {
+ hoursEntries.value[0].kilometerCount = Math.round(data.distanceRoundTrip);
+ }
+ }
+ } catch (e) {
+ console.error('Distance calculation failed:', e);
+ }
+ };
+
+ // Fill form from customer
+ const fillFromCustomer = (customer) => {
+ form.customerId = customer.id;
+ form.customerName = customer.displayName || customer.company || customer.name || '';
+ form.billingAddressId = customer.id;
+ form.deliveryAddressName = customer.displayName || customer.company || customer.name || '';
+ form.deliveryAddressLine = customer.street || '';
+ form.deliveryAddressPLZ = customer.zip || '';
+ form.deliveryAddressCity = customer.city || '';
+ form.deliveryAddressEMail = customer.email || '';
+ };
+
+ // Customer search
+ const searchCustomers = async () => {
+ if (customerSearchQuery.value.length < 1) {
+ customerSearchResults.value = [];
+ return;
+ }
+
+ customerSearchLoading.value = true;
+ try {
+ const data = await shippingNoteApi.get(
+ `searchCustomers?query=${encodeURIComponent(customerSearchQuery.value)}`
+ );
+ customerSearchResults.value = data.customers || [];
+ } catch (e) {
+ console.error('Customer search failed:', e);
+ } finally {
+ customerSearchLoading.value = false;
+ }
+ };
+
+ // Select customer from search
+ const selectCustomer = async (customer) => {
+ fillFromCustomer(customer);
+ gpsState.value = 'manual';
+ customerCardExpanded.value = false;
+ showCustomerSearch.value = false;
+ customerSearchQuery.value = '';
+ customerSearchResults.value = [];
+
+ // Calculate distance if customer has GPS coordinates
+ if (customer.gpsLat && customer.gpsLong) {
+ try {
+ const data = await shippingNoteApi.get(
+ `calculateDistance?lat=${customer.gpsLat}&lng=${customer.gpsLong}`
+ );
+ if (data.success && data.distanceRoundTrip) {
+ if (hoursEntries.value[0]) {
+ hoursEntries.value[0].kilometerCount = Math.round(data.distanceRoundTrip);
+ }
+ }
+ } catch (e) {
+ console.error('Distance calculation failed:', e);
+ }
+ }
+ };
+
+ // Article search
+ const searchArticles = async () => {
+ if (articleSearchQuery.value.length < 1) {
+ articleSearchResults.value = [];
+ return;
+ }
+
+ articleSearchLoading.value = true;
+ try {
+ const data = await shippingNoteApi.get(
+ `searchArticles?query=${encodeURIComponent(articleSearchQuery.value)}`
+ );
+ articleSearchResults.value = data.articles || [];
+ } catch (e) {
+ console.error('Article search failed:', e);
+ } finally {
+ articleSearchLoading.value = false;
+ }
+ };
+
+ // Add article to positions
+ const addArticle = (article) => {
+ const existing = positions.value.find(p => p.articleId === article.id);
+ if (existing) {
+ existing.amount++;
+ } else {
+ positions.value.push({
+ articleId: article.id,
+ articleNumber: article.articleNumber,
+ articleName: article.title,
+ amount: 1,
+ isEnergieMaterial: false
+ });
+ }
+ showArticleSearch.value = false;
+ articleSearchQuery.value = '';
+ articleSearchResults.value = [];
+ navigator.vibrate?.([50]);
+ };
+
+ // Remove position
+ const removePosition = (index) => {
+ positions.value.splice(index, 1);
+ };
+
+ // Toggle Beigestelltes Material
+ const toggleEnergieMaterial = (pos) => {
+ pos.isEnergieMaterial = !pos.isEnergieMaterial;
+ navigator.vibrate?.([20]);
+ };
+
+ // Hours functions for specific entry
+ const setHours = (entryIndex, hours) => {
+ if (hoursEntries.value[entryIndex]) {
+ hoursEntries.value[entryIndex].hourCount = hours;
+ navigator.vibrate?.([30]);
+ }
+ };
+
+ const adjustHours = (entryIndex, delta) => {
+ if (hoursEntries.value[entryIndex]) {
+ const newVal = Math.max(0, hoursEntries.value[entryIndex].hourCount + delta);
+ hoursEntries.value[entryIndex].hourCount = Math.round(newVal * 4) / 4;
+ navigator.vibrate?.([20]);
+ }
+ };
+
+ // Date picker
+ const openDatePicker = (entryIndex) => {
+ activeEntryIndex.value = entryIndex;
+ showDatePicker.value = true;
+ };
+
+ const updateEntryDate = (dateStr) => {
+ if (hoursEntries.value[activeEntryIndex.value]) {
+ hoursEntries.value[activeEntryIndex.value].date = dateStr;
+ }
+ };
+
+ // Employee selector
+ const openEmployeeSelector = () => {
+ showEmployeeSelector.value = true;
+ };
+
+ const addEmployee = (employee) => {
+ const newEntry = createNewHoursEntry(employee.id, employee.name);
+ // Copy date and km from first entry
+ if (hoursEntries.value[0]) {
+ newEntry.date = hoursEntries.value[0].date;
+ newEntry.kilometerCount = hoursEntries.value[0].kilometerCount;
+ }
+ hoursEntries.value.push(newEntry);
+ navigator.vibrate?.([50]);
+ };
+
+ const removeHoursEntry = (entryIndex) => {
+ if (hoursEntries.value.length > 1) {
+ hoursEntries.value.splice(entryIndex, 1);
+ navigator.vibrate?.([30]);
+ }
+ };
+
+ // Select car for specific entry
+ const openCarSelect = (entryIndex) => {
+ carSelectEntryIndex.value = entryIndex;
+ showCarSelect.value = true;
+ };
+
+ const selectCar = (car) => {
+ if (hoursEntries.value[carSelectEntryIndex.value]) {
+ hoursEntries.value[carSelectEntryIndex.value].carId = car?.id || null;
+ hoursEntries.value[carSelectEntryIndex.value].carName = car?.name || '';
+ }
+ showCarSelect.value = false;
+ navigator.vibrate?.([30]);
+ };
+
+ // Select hour type for specific entry
+ const openHourTypeSelect = (entryIndex) => {
+ hourTypeSelectEntryIndex.value = entryIndex;
+ showHourTypeSelect.value = true;
+ };
+
+ const selectHourType = (hourType) => {
+ if (hoursEntries.value[hourTypeSelectEntryIndex.value]) {
+ hoursEntries.value[hourTypeSelectEntryIndex.value].hourType = hourType.id;
+ hoursEntries.value[hourTypeSelectEntryIndex.value].hourTypeName = hourType.name;
+ }
+ showHourTypeSelect.value = false;
+ navigator.vibrate?.([30]);
+ };
+
+ // Customer card expand/collapse
+ const toggleCustomerCard = () => {
+ customerCardExpanded.value = !customerCardExpanded.value;
+ };
+
+ // Switch to manual mode
+ const switchToManual = () => {
+ gpsState.value = 'manual';
+ showCustomerSearch.value = true;
+ };
+
+ // Refresh GPS
+ const refreshGPS = () => {
+ detectGPS();
+ };
+
+ // Mock customer found (for screenshots/demo)
+ const mockCustomerFound = () => {
+ detectedCustomer.value = {
+ id: 999,
+ displayName: 'Frau im Zentrum GmbH',
+ company: 'Frau im Zentrum GmbH',
+ street: 'Schmiedgasse 14',
+ zip: '8010',
+ city: 'Graz',
+ email: 'office@frauzentrum.at'
+ };
+ gpsDistance.value = 42;
+ gpsState.value = 'customer_found';
+ fillFromCustomer(detectedCustomer.value);
+ customerCardExpanded.value = false;
+ if (hoursEntries.value[0]) {
+ hoursEntries.value[0].kilometerCount = 84;
+ }
+ navigator.vibrate?.([100, 50, 100]);
+ };
+
+ // Submit form
+ const submit = async (andSign = false) => {
+ if (!isValid.value) {
+ emit('toast', 'Bitte alle Pflichtfelder ausfüllen', 'error');
+ return;
+ }
+
+ loading.value = true;
+
+ try {
+ const payload = {
+ billingAddressId: form.billingAddressId,
+ deliveryAddressName: form.deliveryAddressName,
+ deliveryAddressLine: form.deliveryAddressLine,
+ deliveryAddressPLZ: form.deliveryAddressPLZ,
+ deliveryAddressCity: form.deliveryAddressCity,
+ deliveryAddressEMail: form.deliveryAddressEMail,
+ note: form.note,
+ type: form.type,
+ positions: positions.value.map(p => ({
+ article: p.articleId,
+ amount: p.amount,
+ isEnergieMaterial: p.isEnergieMaterial
+ })),
+ hoursEntries: hoursEntries.value.filter(h => h.hourCount > 0).map(h => ({
+ userId: h.userId,
+ date: h.date,
+ hourCount: h.hourCount,
+ hourType: h.hourType,
+ carId: h.carId,
+ kilometerCount: h.kilometerCount,
+ comment: h.comment
+ }))
+ };
+
+ const data = await shippingNoteApi.post('create', payload);
+
+ if (data.success) {
+ if (andSign) {
+ emit('createAndSign', data.shippingNote);
+ } else {
+ emit('created', data.shippingNote);
+ }
+ resetForm();
+ } else {
+ emit('toast', data.error || 'Fehler beim Erstellen', 'error');
+ }
+ } catch (e) {
+ console.error('Submit failed:', e);
+ emit('toast', 'Netzwerkfehler', 'error');
+ } finally {
+ loading.value = false;
+ }
+ };
+
+ // Reset form
+ const resetForm = () => {
+ form.customerId = null;
+ form.customerName = '';
+ form.billingAddressId = null;
+ form.deliveryAddressName = '';
+ form.deliveryAddressLine = '';
+ form.deliveryAddressPLZ = '';
+ form.deliveryAddressCity = '';
+ form.deliveryAddressEMail = '';
+ form.note = '';
+ positions.value = [];
+ hoursEntries.value = [createNewHoursEntry()];
+ if (userCar.value) {
+ hoursEntries.value[0].carId = userCar.value.id;
+ hoursEntries.value[0].carName = userCar.value.name;
+ }
+ detectGPS();
+ };
+
+ // Debounced search watchers
+ let customerSearchTimeout = null;
+ watch(customerSearchQuery, () => {
+ clearTimeout(customerSearchTimeout);
+ customerSearchTimeout = setTimeout(searchCustomers, 300);
+ });
+
+ let articleSearchTimeout = null;
+ watch(articleSearchQuery, () => {
+ clearTimeout(articleSearchTimeout);
+ articleSearchTimeout = setTimeout(searchArticles, 300);
+ });
+
+ return {
+ gpsState, gpsPosition, detectedCustomer, gpsAddress, gpsDistance,
+ customerCardExpanded, form, hoursEntries, positions, loading,
+ showCustomerSearch, customerSearchQuery, customerSearchResults, customerSearchLoading,
+ showArticleSearch, articleSearchQuery, articleSearchResults, articleSearchLoading,
+ showCarSelect, carSelectEntryIndex, allCars,
+ showHourTypeSelect, hourTypeSelectEntryIndex, hourTypes,
+ showPositionsSection, showDatePicker, activeEntryIndex,
+ showEmployeeSelector, selectedEmployeeIds,
+ userCar, isValid,
+ quickWorkTypes, selectedWorkType, selectWorkType,
+ formatDistance, formatDateDisplay, formatHoursValue,
+ detectGPS, refreshGPS, mockCustomerFound, switchToManual, selectCustomer,
+ toggleCustomerCard, addArticle, removePosition, toggleEnergieMaterial,
+ setHours, adjustHours, openDatePicker, updateEntryDate,
+ openEmployeeSelector, addEmployee, removeHoursEntry,
+ openCarSelect, selectCar, openHourTypeSelect, selectHourType,
+ submit, resetForm
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+ Kunde erkannt
+ {{ formatDistance(gpsDistance) }}
+
+ {{ form.customerName }}
+ {{ form.deliveryAddressLine }}, {{ form.deliveryAddressPLZ }} {{ form.deliveryAddressCity }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Standort wird ermittelt...
+
+
+
+
+ GPS Kunde erkannt
+
+
+
+
+ Kein Kunde in der Nähe
+
+
+
+
+ Manuell
+
+
+
+
+ GPS nicht verfügbar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Art der Arbeit *
+
+
+
+
+
+
+
+
+
+
+
+
+ Arbeitszeit
+
+
+
+
+
+
+
+
+
+
+ {{ entry.userName.charAt(0).toUpperCase() }}
+
+ {{ entry.userName }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatHoursValue(entry.hourCount).h }}
+ h
+ {{ formatHoursValue(entry.hourCount).m }}
+ m
+
+
+
+
+
+
+
+
+
+
+
+
+
+ km
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ pos.articleName }}
+ {{ pos.articleNumber }}
+
+
+
+
+
+
+ {{ pos.amount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (customer.displayName || customer.company || '?').charAt(0).toUpperCase() }}
+
+
+
+ {{ customer.displayName }}
+ {{ customer.company }}
+ {{ customer.street }}, {{ customer.zip }} {{ customer.city }}
+ KNr: {{ customer.customerNumber }}
+
+
+
+
+
+
+
+ {{ article.title }}
+ {{ article.articleNumber }}
+
+
+
+
+
+
+
+ {{ car.name }}
+ {{ car.plate }}
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteList.js b/public/mobile/modules/lager/shippingnote/ShippingNoteList.js
new file mode 100644
index 000000000..284e7ada8
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteList.js
@@ -0,0 +1,227 @@
+/**
+ * ShippingNoteList Component
+ *
+ * Lists unsigned shipping notes for the current user.
+ * Features:
+ * - Pull to refresh
+ * - Tap to open signature modal
+ * - Shows customer, date, note preview
+ */
+
+import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+
+export default {
+ name: 'ShippingNoteList',
+ emits: ['sign', 'toast'],
+ props: {
+ user: Object
+ },
+
+ setup(props, { emit }) {
+ const { ref, onMounted } = Vue;
+
+ // Data
+ const shippingNotes = ref([]);
+ const loading = ref(true);
+ const refreshing = ref(false);
+ const error = ref(null);
+
+ // Load shipping notes
+ const loadShippingNotes = async (isRefresh = false) => {
+ if (isRefresh) {
+ refreshing.value = true;
+ } else {
+ loading.value = true;
+ }
+ error.value = null;
+
+ try {
+ const data = await shippingNoteApi.get('getMyShippingNotes');
+
+ if (data.success) {
+ shippingNotes.value = data.shippingNotes || [];
+ } else {
+ error.value = data.error || 'Fehler beim Laden';
+ }
+ } catch (e) {
+ console.error('Failed to load shipping notes:', e);
+ error.value = 'Netzwerkfehler';
+ } finally {
+ loading.value = false;
+ refreshing.value = false;
+ }
+ };
+
+ // Pull to refresh
+ let touchStartY = 0;
+ let isPulling = false;
+
+ const handleTouchStart = (e) => {
+ const scrollTop = e.currentTarget.scrollTop;
+ if (scrollTop === 0) {
+ touchStartY = e.touches[0].clientY;
+ isPulling = true;
+ }
+ };
+
+ const handleTouchMove = (e) => {
+ if (!isPulling) return;
+ const deltaY = e.touches[0].clientY - touchStartY;
+ if (deltaY > 80 && !refreshing.value) {
+ loadShippingNotes(true);
+ isPulling = false;
+ }
+ };
+
+ const handleTouchEnd = () => {
+ isPulling = false;
+ };
+
+ // Open signature for a shipping note
+ const openSignature = (shippingNote) => {
+ emit('sign', shippingNote);
+ navigator.vibrate?.([50]);
+ };
+
+ // Format date
+ const formatDate = (dateStr) => {
+ if (!dateStr) return '';
+ const date = new Date(dateStr);
+ return date.toLocaleDateString('de-AT', {
+ day: '2-digit',
+ month: '2-digit',
+ year: 'numeric'
+ });
+ };
+
+ // Initialize
+ onMounted(() => {
+ loadShippingNotes();
+ });
+
+ return {
+ shippingNotes,
+ loading,
+ refreshing,
+ error,
+ loadShippingNotes,
+ handleTouchStart,
+ handleTouchMove,
+ handleTouchEnd,
+ openSignature,
+ formatDate
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+ Lade Lieferscheine...
+
+
+
+
+
+ {{ error }}
+
+
+
+
+
+
+ Alles unterschrieben!
+
+ Keine offenen Lieferscheine zum Unterschreiben.
+
+
+
+
+
+
+ {{ shippingNotes.length }} {{ shippingNotes.length === 1 ? 'Lieferschein' : 'Lieferscheine' }} zum Unterschreiben
+
+
+
+
+
+
+
+ Ziehen zum Aktualisieren
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/ShippingNoteModule.js b/public/mobile/modules/lager/shippingnote/ShippingNoteModule.js
new file mode 100644
index 000000000..b5667a8ce
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/ShippingNoteModule.js
@@ -0,0 +1,164 @@
+import { createModuleApi } from '/mobile/shared/api.js';
+import ShippingNoteForm from '/mobile/modules/lager/shippingnote/ShippingNoteForm.js';
+import ShippingNoteList from '/mobile/modules/lager/shippingnote/ShippingNoteList.js';
+import SignaturePad from '/mobile/modules/lager/shippingnote/SignaturePad.js';
+
+const shippingNoteApi = createModuleApi('Lager/ShippingNote');
+
+export { shippingNoteApi };
+
+export default {
+ name: 'ShippingNoteModule',
+ emits: ['navigate', 'toast'],
+ props: {
+ user: Object,
+ submodule: String
+ },
+ components: {
+ ShippingNoteForm,
+ ShippingNoteList,
+ SignaturePad
+ },
+
+ setup(props, { emit }) {
+ const { ref, computed, watch, onMounted } = Vue;
+
+ // Current view: 'create' | 'list' | 'sign'
+ const currentTab = ref('create');
+
+ // Signature modal state
+ const showSignatureModal = ref(false);
+ const signatureShippingNoteId = ref(null);
+ const signatureShippingNote = ref(null);
+
+ // Last created shipping note (for immediate signing)
+ const lastCreatedId = ref(null);
+
+ // Open signature modal for a shipping note
+ const openSignature = (shippingNote) => {
+ signatureShippingNoteId.value = shippingNote.id;
+ signatureShippingNote.value = shippingNote;
+ showSignatureModal.value = true;
+ };
+
+ // Close signature modal
+ const closeSignature = () => {
+ showSignatureModal.value = false;
+ signatureShippingNoteId.value = null;
+ signatureShippingNote.value = null;
+ };
+
+ // Handle successful signature
+ const handleSignatureComplete = () => {
+ closeSignature();
+ emit('toast', 'Unterschrift gespeichert', 'success');
+ // Haptic feedback
+ navigator.vibrate?.([100, 50, 100]);
+ };
+
+ // Handle shipping note created
+ const handleCreated = (shippingNote) => {
+ lastCreatedId.value = shippingNote.id;
+ emit('toast', 'Lieferschein erstellt', 'success');
+ // Haptic feedback
+ navigator.vibrate?.([100]);
+ };
+
+ // Handle immediate sign after create
+ const handleCreateAndSign = (shippingNote) => {
+ handleCreated(shippingNote);
+ // Open signature modal immediately
+ openSignature(shippingNote);
+ };
+
+ // Show toast
+ const showToast = (message, type) => {
+ emit('toast', message, type);
+ };
+
+ // Switch tab
+ const switchTab = (tab) => {
+ currentTab.value = tab;
+ };
+
+ return {
+ currentTab,
+ showSignatureModal,
+ signatureShippingNoteId,
+ signatureShippingNote,
+ lastCreatedId,
+ openSignature,
+ closeSignature,
+ handleSignatureComplete,
+ handleCreated,
+ handleCreateAndSign,
+ showToast,
+ switchTab
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/lager/shippingnote/SignaturePad.js b/public/mobile/modules/lager/shippingnote/SignaturePad.js
new file mode 100644
index 000000000..e1b5310df
--- /dev/null
+++ b/public/mobile/modules/lager/shippingnote/SignaturePad.js
@@ -0,0 +1,300 @@
+/**
+ * SignaturePad Component
+ *
+ * Full-screen signature capture for shipping notes.
+ * Features:
+ * - Canvas-based signature drawing
+ * - Customer name input
+ * - Clear/retry functionality
+ * - Base64 PNG export
+ */
+
+import { shippingNoteApi } from '/mobile/modules/lager/shippingnote/ShippingNoteModule.js';
+
+export default {
+ name: 'SignaturePad',
+ emits: ['close', 'signed', 'toast'],
+ props: {
+ shippingNoteId: [Number, String],
+ shippingNote: Object
+ },
+
+ setup(props, { emit }) {
+ const { ref, onMounted, onUnmounted, nextTick } = Vue;
+
+ // Refs
+ const canvasRef = ref(null);
+ const signatureName = ref('');
+ const loading = ref(false);
+ const hasSignature = ref(false);
+
+ // Canvas context
+ let ctx = null;
+ let isDrawing = false;
+ let lastX = 0;
+ let lastY = 0;
+
+ // Initialize canvas
+ onMounted(async () => {
+ await nextTick();
+ initCanvas();
+ window.addEventListener('resize', handleResize);
+ });
+
+ onUnmounted(() => {
+ window.removeEventListener('resize', handleResize);
+ });
+
+ const initCanvas = () => {
+ const canvas = canvasRef.value;
+ if (!canvas) return;
+
+ // Set canvas size to container
+ const container = canvas.parentElement;
+ canvas.width = container.clientWidth;
+ canvas.height = container.clientHeight;
+
+ ctx = canvas.getContext('2d');
+ ctx.strokeStyle = '#000000';
+ ctx.lineWidth = 3;
+ ctx.lineCap = 'round';
+ ctx.lineJoin = 'round';
+
+ // Fill with white background
+ ctx.fillStyle = '#ffffff';
+ ctx.fillRect(0, 0, canvas.width, canvas.height);
+ };
+
+ const handleResize = () => {
+ // Save current signature
+ const canvas = canvasRef.value;
+ if (!canvas) return;
+
+ const imageData = canvas.toDataURL();
+
+ // Resize canvas
+ initCanvas();
+
+ // Restore signature
+ if (hasSignature.value) {
+ const img = new Image();
+ img.onload = () => {
+ ctx.drawImage(img, 0, 0);
+ };
+ img.src = imageData;
+ }
+ };
+
+ // Get position from touch/mouse event
+ const getPosition = (e) => {
+ const canvas = canvasRef.value;
+ const rect = canvas.getBoundingClientRect();
+
+ if (e.touches && e.touches.length > 0) {
+ return {
+ x: e.touches[0].clientX - rect.left,
+ y: e.touches[0].clientY - rect.top
+ };
+ }
+ return {
+ x: e.clientX - rect.left,
+ y: e.clientY - rect.top
+ };
+ };
+
+ // Start drawing
+ const startDrawing = (e) => {
+ e.preventDefault();
+ isDrawing = true;
+ const pos = getPosition(e);
+ lastX = pos.x;
+ lastY = pos.y;
+ };
+
+ // Draw
+ const draw = (e) => {
+ if (!isDrawing) return;
+ e.preventDefault();
+
+ const pos = getPosition(e);
+
+ ctx.beginPath();
+ ctx.moveTo(lastX, lastY);
+ ctx.lineTo(pos.x, pos.y);
+ ctx.stroke();
+
+ lastX = pos.x;
+ lastY = pos.y;
+ hasSignature.value = true;
+ };
+
+ // Stop drawing
+ const stopDrawing = () => {
+ isDrawing = false;
+ };
+
+ // Clear canvas
+ const clearCanvas = () => {
+ const canvas = canvasRef.value;
+ if (!canvas || !ctx) return;
+
+ ctx.fillStyle = '#ffffff';
+ ctx.fillRect(0, 0, canvas.width, canvas.height);
+ hasSignature.value = false;
+ navigator.vibrate?.([30]);
+ };
+
+ // Submit signature
+ const submitSignature = async () => {
+ if (!hasSignature.value) {
+ emit('toast', 'Bitte unterschreiben', 'error');
+ return;
+ }
+
+ if (!signatureName.value.trim()) {
+ emit('toast', 'Bitte Namen eingeben', 'error');
+ return;
+ }
+
+ loading.value = true;
+
+ try {
+ const canvas = canvasRef.value;
+ const signatureData = canvas.toDataURL('image/png');
+
+ const data = await shippingNoteApi.post(`sign?id=${props.shippingNoteId}`, {
+ signature: signatureData,
+ signatureName: signatureName.value.trim()
+ });
+
+ if (data.success) {
+ emit('signed', data);
+ } else {
+ emit('toast', data.error || 'Fehler beim Speichern', 'error');
+ }
+ } catch (e) {
+ console.error('Signature submit failed:', e);
+ emit('toast', 'Netzwerkfehler', 'error');
+ } finally {
+ loading.value = false;
+ }
+ };
+
+ // Close handler
+ const handleClose = () => {
+ emit('close');
+ };
+
+ return {
+ canvasRef,
+ signatureName,
+ loading,
+ hasSignature,
+ startDrawing,
+ draw,
+ stopDrawing,
+ clearCanvas,
+ submitSignature,
+ handleClose
+ };
+ },
+
+ template: `
+
+
+
+
+ Unterschrift
+
+
+
+
+
+ Lieferschein Nr.
+ {{ shippingNote.number || shippingNote.id }}
+
+ {{ shippingNote.customerName }}
+
+
+
+
+
+
+
+
+
+ Hier unterschreiben
+
+
+
+
+
+ Mit Finger unterschreiben
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/modules/workorder/WorkorderModule.js b/public/mobile/modules/workorder/WorkorderModule.js
new file mode 100644
index 000000000..512625d1d
--- /dev/null
+++ b/public/mobile/modules/workorder/WorkorderModule.js
@@ -0,0 +1,1643 @@
+/**
+ * Workorder Module (Aufträge)
+ *
+ * Main module for workorder management in MobileApp.
+ * Provides list view and full-screen detail view with collapsible cards.
+ * Supports offline mode via WorkorderOfflineService.
+ */
+
+import workorderService from '/mobile/shared/workorderOfflineService.js';
+import photoQueue from '/mobile/shared/photoQueue.js';
+import { isOfflineModeEnabled } from '/mobile/shared/offlineSettings.js';
+
+export default {
+ name: 'WorkorderModule',
+ emits: ['navigate', 'toast', 'detail-open', 'detail-close'],
+ props: {
+ user: Object,
+ submodule: String
+ },
+
+ setup(props, { emit }) {
+ const { ref, computed, watch, onMounted, nextTick } = Vue;
+
+ // =====================
+ // STATE
+ // =====================
+ const isLoading = ref(true);
+ const workorders = ref([]);
+ const searchTerm = ref('');
+ const selectedFcp = ref('all');
+ const showFcpFilter = ref(false);
+
+ // Detail view state
+ const selectedWorkorder = ref(null);
+ const isDetailLoading = ref(false);
+ const documentation = ref({ docs: [], journals: [] });
+ const tenantConfig = ref(null);
+ const checklist = ref([]);
+ const technicalData = ref(null);
+
+ // Expanded cards state
+ const expandedCards = ref({
+ customer: true,
+ checklist: true,
+ documentation: false,
+ notes: false,
+ journal: false,
+ cableData: false,
+ technical: true
+ });
+
+ // Edit states
+ const isEditingNotes = ref(false);
+ const tempNotes = ref('');
+ const newJournalText = ref('');
+ const cableDataForm = ref({ cableLength: '', cableType: '' });
+
+ // Bottom sheets
+ const showDocUploadSheet = ref(false);
+ const showProblemSheet = ref(false);
+ const showCompleteSheet = ref(false);
+ const showPdfViewer = ref(false);
+ const pdfViewerUrl = ref('');
+ const pdfViewerTitle = ref('');
+ const showImageViewer = ref(false);
+ const imageViewerUrl = ref('');
+
+ // Upload state
+ const uploadDocType = ref('');
+ const isUploading = ref(false);
+ const fileInputRef = ref(null);
+ const pendingChecklistUpload = ref(null); // For auto-advance camera
+
+ // Problem form
+ const problemType = ref('');
+ const problemComment = ref('');
+
+ const swipeStartX = ref(0);
+ const swipeCardId = ref(null);
+ const swipeOffset = ref({});
+ const swipeTriggered = ref(false);
+
+ // =====================
+ // COMPUTED
+ // =====================
+ const fcpOptions = computed(() => {
+ if (!workorders.value.length) return [{ value: 'all', text: 'Alle FCPs' }];
+ const fcps = [...new Set(workorders.value.map(wo => wo.fcpName).filter(Boolean))].sort();
+ return [{ value: 'all', text: 'Alle FCPs' }, ...fcps.map(fcp => ({ value: fcp, text: fcp }))];
+ });
+
+ const filteredWorkorders = computed(() => {
+ let filtered = workorders.value;
+
+ // FCP filter
+ if (selectedFcp.value !== 'all') {
+ filtered = filtered.filter(wo => wo.fcpName === selectedFcp.value);
+ }
+
+ // Search filter
+ if (searchTerm.value.length > 2) {
+ const term = searchTerm.value.toLowerCase();
+ filtered = filtered.filter(wo =>
+ wo.id.toString().includes(term) ||
+ (wo.oaid && wo.oaid.toLowerCase().includes(term)) ||
+ (wo.fcpName && wo.fcpName.toLowerCase().includes(term)) ||
+ (wo.customerName && wo.customerName.toLowerCase().includes(term)) ||
+ (wo.customerAddress && wo.customerAddress.toLowerCase().includes(term))
+ );
+ }
+
+ // Sort by status priority
+ const getStatusRank = (status) => {
+ switch (status) {
+ case 'scheduled':
+ case 'civil_engineering_completed': return 0;
+ case 'assigned':
+ case 'new':
+ case 'problem_solved': return 1;
+ case 'in_progress': return 2;
+ case 'intervention_required':
+ case 'correction_requested': return 3;
+ case 'documented':
+ case 'completed': return 4;
+ default: return 99;
+ }
+ };
+
+ return filtered.sort((a, b) => {
+ const rankA = getStatusRank(a.status);
+ const rankB = getStatusRank(b.status);
+ if (rankA !== rankB) return rankA - rankB;
+ return (a.appointmentDate || Infinity) - (b.appointmentDate || Infinity);
+ });
+ });
+
+ const checklistProgress = computed(() => {
+ if (!checklist.value.length) return { completed: 0, total: 0, text: '0/0' };
+ const completed = checklist.value.filter(c => c.completed).length;
+ const total = checklist.value.length;
+ return { completed, total, text: `${completed}/${total}` };
+ });
+
+ const isChecklistComplete = computed(() => {
+ // Check required items are completed (if any are marked as required)
+ const requiredItems = checklist.value.filter(c => c.required);
+ if (requiredItems.length > 0) {
+ const allRequiredComplete = requiredItems.every(c => c.completed);
+ if (!allRequiredComplete) return false;
+ } else if (checklist.value.length > 0) {
+ const allCompleted = checklist.value.every(c => c.completed);
+ if (!allCompleted) return false;
+ }
+
+ if (tenantConfig.value?.requireCableLength && !cableDataForm.value.cableLength?.trim()) {
+ return false;
+ }
+ if (tenantConfig.value?.requireCableType && !cableDataForm.value.cableType?.trim()) {
+ return false;
+ }
+
+ return true;
+ });
+
+ const incompleteItems = computed(() => {
+ const items = [];
+ checklist.value.filter(c => !c.completed).forEach(c => {
+ items.push(c.text);
+ });
+ if (tenantConfig.value?.requireCableLength && !cableDataForm.value.cableLength?.trim()) {
+ items.push('Kabellänge');
+ }
+ if (tenantConfig.value?.requireCableType && !cableDataForm.value.cableType?.trim()) {
+ items.push('Kabeltyp');
+ }
+ return items;
+ });
+
+ const googleMapsLink = computed(() => {
+ if (!selectedWorkorder.value?.customer) return '#';
+ const c = selectedWorkorder.value.customer;
+ const address = encodeURIComponent(`${c.street}, ${c.zip} ${c.city}`);
+ return `https://maps.google.com/maps?q=${address}`;
+ });
+
+ // =====================
+ // METHODS
+ // =====================
+ const fetchWorkorders = async () => {
+ isLoading.value = true;
+ try {
+ const data = await workorderService.getWorkorders({ pagination: { page: 1, per_page: 500 } });
+ if (data.success) {
+ workorders.value = data.workorders;
+ if (data.fromCache) {
+ console.log('[WorkorderModule] Loaded from cache');
+ }
+ } else if (data.offline) {
+ emit('toast', 'Offline - Daten aus Cache', 'info');
+ }
+ } catch (error) {
+ console.error('Error fetching workorders:', error);
+ emit('toast', 'Fehler beim Laden der Aufträge', 'error');
+ } finally {
+ isLoading.value = false;
+ }
+ };
+
+ const openDetail = async (workorder) => {
+ selectedWorkorder.value = workorder;
+ isDetailLoading.value = true;
+ expandedCards.value = { customer: true, checklist: true, documentation: false, notes: false, journal: false, cableData: false, technical: true };
+ emit('detail-open', workorder.id);
+
+ try {
+ // Fetch all workorder details via offline service
+ const data = await workorderService.getWorkorderDetail(workorder.id);
+
+ if (data.success) {
+ selectedWorkorder.value = data.workorder;
+ cableDataForm.value = {
+ cableLength: data.workorder.cableLength || '',
+ cableType: data.workorder.cableType || ''
+ };
+ documentation.value = data.documentation || { docs: [], journals: [] };
+ tenantConfig.value = data.tenantConfig;
+ checklist.value = data.checklist || [];
+ technicalData.value = data.technicalData || null;
+ if (data.fromCache) {
+ console.log('[WorkorderModule] Detail loaded from cache');
+ }
+ } else if (data.offline) {
+ emit('toast', 'Offline - keine gecachten Details', 'error');
+ closeDetail();
+ } else {
+ emit('toast', data.message || 'Fehler beim Laden', 'error');
+ }
+ } catch (error) {
+ console.error('Error loading detail:', error);
+ emit('toast', 'Fehler beim Laden der Details', 'error');
+ } finally {
+ isDetailLoading.value = false;
+ }
+ };
+
+ const closeDetail = () => {
+ selectedWorkorder.value = null;
+ documentation.value = { docs: [], journals: [] };
+ tenantConfig.value = null;
+ checklist.value = [];
+ technicalData.value = null;
+ isEditingNotes.value = false;
+ emit('detail-close');
+ };
+
+ const toggleCard = (cardId) => {
+ expandedCards.value[cardId] = !expandedCards.value[cardId];
+ };
+
+ // Notes editing
+ const startEditNotes = () => {
+ tempNotes.value = selectedWorkorder.value.additionalInfo || '';
+ isEditingNotes.value = true;
+ };
+
+ const cancelEditNotes = () => {
+ isEditingNotes.value = false;
+ tempNotes.value = '';
+ };
+
+ const saveNotes = async () => {
+ try {
+ const data = await workorderService.updateNotes(selectedWorkorder.value.id, tempNotes.value);
+ if (data.success) {
+ selectedWorkorder.value.additionalInfo = tempNotes.value;
+ isEditingNotes.value = false;
+ if (data.queued) {
+ emit('toast', 'Notiz wird synchronisiert', 'info');
+ } else {
+ emit('toast', 'Notiz gespeichert', 'success');
+ // Refresh detail to get updated journals
+ const detailData = await workorderService.getWorkorderDetail(selectedWorkorder.value.id);
+ if (detailData.success && detailData.documentation) {
+ documentation.value.journals = detailData.documentation.journals || [];
+ }
+ }
+ }
+ } catch (error) {
+ emit('toast', 'Fehler beim Speichern', 'error');
+ }
+ };
+
+ // Journal
+ const addJournalEntry = async () => {
+ if (!newJournalText.value.trim()) return;
+ try {
+ const data = await workorderService.addJournal(selectedWorkorder.value.id, newJournalText.value);
+ if (data.success) {
+ if (data.queued) {
+ // Add pending journal entry to local display
+ documentation.value.journals.unshift({
+ id: 'pending-' + data.localId,
+ text: newJournalText.value,
+ create: Math.floor(Date.now() / 1000),
+ _pending: true
+ });
+ emit('toast', 'Eintrag wird synchronisiert', 'info');
+ } else if (data.journals) {
+ documentation.value.journals = data.journals;
+ emit('toast', 'Eintrag hinzugefügt', 'success');
+ }
+ newJournalText.value = '';
+ }
+ } catch (error) {
+ emit('toast', 'Fehler beim Hinzufügen', 'error');
+ }
+ };
+
+ // Cable data
+ const saveCableData = async () => {
+ try {
+ const data = await workorderService.updateCableData(
+ selectedWorkorder.value.id,
+ cableDataForm.value.cableLength,
+ cableDataForm.value.cableType
+ );
+ if (data.success) {
+ if (data.queued) {
+ emit('toast', 'Daten werden synchronisiert', 'info');
+ } else {
+ emit('toast', 'Daten gespeichert', 'success');
+ }
+ }
+ } catch (error) {
+ emit('toast', 'Fehler beim Speichern', 'error');
+ }
+ };
+
+ // Documentation upload
+ const openDocUpload = () => {
+ if (tenantConfig.value?.documentationTypes?.length) {
+ uploadDocType.value = tenantConfig.value.documentationTypes[0].value;
+ }
+ showDocUploadSheet.value = true;
+ };
+
+ const triggerFileInput = () => {
+ if (fileInputRef.value) {
+ fileInputRef.value.click();
+ }
+ };
+
+ const handleFileSelect = async (event) => {
+ const files = event.target.files;
+ if (!files || !files.length) return;
+
+ isUploading.value = true;
+ const wasFromChecklist = pendingChecklistUpload.value !== null;
+
+ // Check if offline mode is enabled and we're offline
+ const offlineEnabled = isOfflineModeEnabled();
+ const isOffline = !navigator.onLine;
+
+ if (offlineEnabled && isOffline) {
+ // Queue files for later upload
+ try {
+ for (let i = 0; i < files.length; i++) {
+ const result = await photoQueue.queue(
+ selectedWorkorder.value.id,
+ files[i],
+ uploadDocType.value,
+ ''
+ );
+ if (result.success) {
+ // Add pending doc to local display
+ documentation.value.docs.push({
+ id: 'pending-' + result.localId,
+ documentType: uploadDocType.value,
+ fileName: files[i].name,
+ _pending: true
+ });
+ }
+ }
+ triggerHaptic('light');
+ emit('toast', 'Foto wird bei Verbindung hochgeladen', 'info');
+ showDocUploadSheet.value = false;
+ } catch (error) {
+ emit('toast', 'Fehler beim Speichern', 'error');
+ } finally {
+ isUploading.value = false;
+ if (fileInputRef.value) fileInputRef.value.value = '';
+ pendingChecklistUpload.value = null;
+ }
+ return;
+ }
+
+ // Online upload
+ const formData = new FormData();
+ formData.append('workorderId', selectedWorkorder.value.id);
+ formData.append('documentType', uploadDocType.value);
+
+ for (let i = 0; i < files.length; i++) {
+ formData.append('files[]', files[i]);
+ }
+
+ try {
+ const response = await fetch('/MobileApp/Workorder/Workorder/uploadDocumentation', {
+ method: 'POST',
+ credentials: 'include',
+ body: formData
+ });
+ const data = await response.json();
+ if (data.success) {
+ triggerHaptic('light');
+ emit('toast', 'Dokument hochgeladen', 'success');
+ showDocUploadSheet.value = false;
+
+ // Refresh documentation and checklist
+ const detailData = await workorderService.getWorkorderDetail(selectedWorkorder.value.id);
+ if (detailData.success) {
+ documentation.value = detailData.documentation || { docs: [], journals: [] };
+ checklist.value = detailData.checklist || [];
+ }
+
+ // Auto-advance: If upload was from checklist, open camera for next item
+ if (wasFromChecklist) {
+ pendingChecklistUpload.value = null;
+ await nextTick();
+ const nextItem = getNextUncompletedItem();
+ if (nextItem) {
+ // Short delay so user sees the check mark
+ setTimeout(() => {
+ quickUploadForItem(nextItem);
+ }, 500);
+ }
+ }
+ }
+ } catch (error) {
+ // If upload fails and offline mode is enabled, queue for later
+ if (offlineEnabled) {
+ for (let i = 0; i < files.length; i++) {
+ await photoQueue.queue(selectedWorkorder.value.id, files[i], uploadDocType.value, '');
+ }
+ emit('toast', 'Foto wird bei Verbindung hochgeladen', 'info');
+ } else {
+ emit('toast', 'Upload fehlgeschlagen', 'error');
+ }
+ } finally {
+ isUploading.value = false;
+ if (fileInputRef.value) fileInputRef.value.value = '';
+ }
+ };
+
+ // Problem reporting
+ const openProblemSheet = () => {
+ problemType.value = tenantConfig.value?.interventionTypes?.[0]?.value || '';
+ problemComment.value = '';
+ showProblemSheet.value = true;
+ };
+
+ const submitProblem = async () => {
+ if (!problemType.value && !problemComment.value) {
+ emit('toast', 'Bitte Grund angeben', 'error');
+ return;
+ }
+
+ const typeText = tenantConfig.value?.interventionTypes?.find(t => t.value === problemType.value)?.text || problemType.value;
+
+ try {
+ const data = await workorderService.requestIntervention(
+ selectedWorkorder.value.id,
+ typeText,
+ problemComment.value || typeText
+ );
+ if (data.success) {
+ if (data.queued) {
+ emit('toast', 'Problem wird bei Verbindung gemeldet', 'info');
+ } else {
+ emit('toast', 'Problem gemeldet', 'success');
+ }
+ showProblemSheet.value = false;
+ closeDetail();
+ fetchWorkorders();
+ } else {
+ emit('toast', data.message || 'Fehler', 'error');
+ }
+ } catch (error) {
+ emit('toast', 'Fehler beim Melden', 'error');
+ }
+ };
+
+ // Complete workorder
+ const openCompleteSheet = () => {
+ showCompleteSheet.value = true;
+ };
+
+ const submitComplete = async () => {
+ try {
+ const data = await workorderService.completeWorkorder(selectedWorkorder.value.id);
+ if (data.success) {
+ triggerHaptic('success');
+ emit('toast', 'Auftrag abgeschlossen', 'success');
+ showCompleteSheet.value = false;
+ closeDetail();
+ fetchWorkorders();
+ } else if (data.blocked) {
+ // Completion blocked when offline
+ emit('toast', data.message || 'Bitte zuerst synchronisieren', 'warning');
+ } else {
+ emit('toast', data.message || 'Fehler', 'error');
+ }
+ } catch (error) {
+ emit('toast', 'Fehler beim Abschließen', 'error');
+ }
+ };
+
+ const formatDate = (timestamp, format = 'date') => {
+ if (!timestamp) return '–';
+ const date = new Date(timestamp * 1000);
+ if (format === 'datetime') {
+ return date.toLocaleDateString('de-DE') + ' ' + date.toLocaleTimeString('de-DE', { hour: '2-digit', minute: '2-digit' });
+ }
+ return date.toLocaleDateString('de-DE');
+ };
+
+ const getStatusColor = (color) => {
+ const colors = {
+ primary: 'bg-blue-500',
+ info: 'bg-sky-500',
+ warning: 'bg-amber-500',
+ danger: 'bg-red-500',
+ success: 'bg-green-500',
+ secondary: 'bg-slate-500',
+ orange: 'bg-orange-500',
+ purple: 'bg-purple-500',
+ muted: 'bg-gray-400'
+ };
+ return colors[color] || 'bg-gray-500';
+ };
+
+ // Get left border color for status indicator on cards
+ const getStatusBorderColor = (status) => {
+ const borderColors = {
+ 'new': 'border-l-blue-500',
+ 'assigned': 'border-l-sky-500',
+ 'scheduled': 'border-l-amber-500',
+ 'in_progress': 'border-l-amber-500',
+ 'correction_requested': 'border-l-red-500',
+ 'intervention_required': 'border-l-red-500',
+ 'civil_engineering_required': 'border-l-orange-500',
+ 'civil_engineering_completed': 'border-l-green-500',
+ 'problem_solved': 'border-l-green-500',
+ 'documented': 'border-l-green-500',
+ 'completed': 'border-l-slate-500',
+ 'charged': 'border-l-purple-500',
+ 'cancelled': 'border-l-red-500',
+ 'archived': 'border-l-gray-400'
+ };
+ return borderColors[status] || 'border-l-gray-400';
+ };
+
+ // Quick camera upload for checklist item
+ const quickUploadForItem = (item) => {
+ uploadDocType.value = item.type;
+ pendingChecklistUpload.value = item.type;
+ nextTick(() => {
+ if (fileInputRef.value) {
+ fileInputRef.value.click();
+ }
+ });
+ };
+
+ // Get next uncompleted checklist item
+ const getNextUncompletedItem = () => {
+ return checklist.value.find(item => !item.completed);
+ };
+
+ // Haptic feedback
+ const triggerHaptic = (type = 'success') => {
+ if ('vibrate' in navigator) {
+ if (type === 'success') {
+ navigator.vibrate([50, 50, 100]);
+ } else {
+ navigator.vibrate(50);
+ }
+ }
+ };
+
+ const scrollIntoViewOnFocus = (e) => {
+ setTimeout(() => {
+ e.target.scrollIntoView({ behavior: 'smooth', block: 'center' });
+ }, 300);
+ };
+
+ const handleTouchStart = (e, wo) => {
+ swipeStartX.value = e.touches[0].clientX;
+ swipeCardId.value = wo.id;
+ swipeTriggered.value = false;
+ };
+
+ const handleTouchMove = (e, wo) => {
+ if (swipeCardId.value !== wo.id) return;
+ const currentX = e.touches[0].clientX;
+ const diff = swipeStartX.value - currentX;
+
+ if (diff > 0) {
+ swipeOffset.value = { ...swipeOffset.value, [wo.id]: Math.min(diff, 100) };
+ if (diff > 10) {
+ swipeTriggered.value = true;
+ }
+ } else {
+ swipeOffset.value = { ...swipeOffset.value, [wo.id]: 0 };
+ }
+ };
+
+ const handleTouchEnd = (e, wo) => {
+ if (swipeCardId.value !== wo.id) return;
+ const offset = swipeOffset.value[wo.id] || 0;
+
+ if (offset > 60 && wo.customerAddress) {
+ swipeTriggered.value = true;
+ triggerHaptic('light');
+ const address = encodeURIComponent(wo.customerAddress);
+ window.open(`https://maps.google.com/maps?q=${address}`, '_blank');
+ }
+
+ swipeOffset.value = { ...swipeOffset.value, [wo.id]: 0 };
+ swipeCardId.value = null;
+ };
+
+ const handleCardClick = (wo) => {
+ if (swipeTriggered.value) {
+ swipeTriggered.value = false;
+ return;
+ }
+ openDetail(wo);
+ };
+
+ const getSwipeStyle = (woId) => {
+ const offset = swipeOffset.value[woId] || 0;
+ return {
+ transform: `translateX(-${offset}px)`,
+ transition: swipeCardId.value === woId ? 'none' : 'transform 0.3s ease-out'
+ };
+ };
+
+ // Open navigation directly
+ const openNavigation = () => {
+ if (selectedWorkorder.value?.customer) {
+ const c = selectedWorkorder.value.customer;
+ const address = encodeURIComponent(`${c.street}, ${c.zip} ${c.city}`);
+ window.open(`https://maps.google.com/maps?q=${address}`, '_blank');
+ }
+ };
+
+ // Call customer directly
+ const callCustomer = () => {
+ if (selectedWorkorder.value?.customer?.phone) {
+ window.location.href = `tel:${selectedWorkorder.value.customer.phone}`;
+ }
+ };
+
+ // Smart complete - show confirmation sheet
+ const handleComplete = () => {
+ if (isChecklistComplete.value) {
+ showCompleteSheet.value = true;
+ }
+ // Button is disabled when not complete, so this won't be called
+ };
+
+ // Open PDF in viewer
+ const openPdfViewer = (url, title) => {
+ pdfViewerUrl.value = url;
+ pdfViewerTitle.value = title || 'PDF';
+ showPdfViewer.value = true;
+ };
+
+ // Open image in fullscreen viewer with zoom
+ const openImageViewer = (url) => {
+ imageViewerUrl.value = url;
+ showImageViewer.value = true;
+ };
+ const closeImageViewer = () => {
+ showImageViewer.value = false;
+ imageViewerUrl.value = '';
+ };
+
+ // Initialize
+ onMounted(() => {
+ fetchWorkorders();
+ });
+
+ return {
+ // State
+ isLoading,
+ workorders,
+ searchTerm,
+ selectedFcp,
+ showFcpFilter,
+ fcpOptions,
+ filteredWorkorders,
+ selectedWorkorder,
+ isDetailLoading,
+ documentation,
+ tenantConfig,
+ checklist,
+ technicalData,
+ expandedCards,
+ isEditingNotes,
+ tempNotes,
+ newJournalText,
+ cableDataForm,
+ showDocUploadSheet,
+ showProblemSheet,
+ showCompleteSheet,
+ showPdfViewer,
+ pdfViewerUrl,
+ pdfViewerTitle,
+ uploadDocType,
+ isUploading,
+ fileInputRef,
+ problemType,
+ problemComment,
+ checklistProgress,
+ isChecklistComplete,
+ incompleteItems,
+ googleMapsLink,
+
+ // Methods
+ fetchWorkorders,
+ openDetail,
+ closeDetail,
+ toggleCard,
+ startEditNotes,
+ cancelEditNotes,
+ saveNotes,
+ addJournalEntry,
+ saveCableData,
+ openDocUpload,
+ triggerFileInput,
+ handleFileSelect,
+ openProblemSheet,
+ submitProblem,
+ openCompleteSheet,
+ submitComplete,
+ formatDate,
+ getStatusColor,
+ getStatusBorderColor,
+ quickUploadForItem,
+ openNavigation,
+ callCustomer,
+ handleComplete,
+ openPdfViewer,
+ openImageViewer,
+ closeImageViewer,
+ showImageViewer,
+ imageViewerUrl,
+ handleTouchStart,
+ handleTouchMove,
+ handleTouchEnd,
+ handleCardClick,
+ getSwipeStyle,
+ swipeOffset,
+ scrollIntoViewOnFocus
+ };
+ },
+
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Keine Aufträge gefunden
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ wo.oaid }}
+ #{{ wo.id }}
+ {{ wo.fcpName }}
+
+ {{ wo.customerName || 'Unbekannt' }}
+ {{ wo.customerAddress }}
+
+
+
+ {{ wo.statusText }}
+
+
+ {{ wo.appointmentFormatted }}
+
+
+ Frist: {{ wo.deadlineFormatted }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ selectedWorkorder.oaid }}
+ #{{ selectedWorkorder.id }}
+ {{ selectedWorkorder.fcpName }}
+
+
+ {{ selectedWorkorder.statusText }}
+
+
+
+
+
+
+
+
+
+
+ {{ selectedWorkorder.customer.name }}
+
+ {{ selectedWorkorder.customer.street }}, {{ selectedWorkorder.customer.zip }} {{ selectedWorkorder.customer.city }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Equipment: {{ technicalData.patchposition.equipmentName }}
+ Port: {{ technicalData.patchposition.equipmentPort }}
+
+
+ Cluster: {{ technicalData.patchposition.cluster }}
+ Shelf: {{ technicalData.patchposition.shelf }}
+ Module: {{ technicalData.patchposition.module }}
+
+
+
+
+
+
+
+ Dropkabel
+ {{ technicalData.dropcable.entries.length }}
+
+
+
+
+ {{ dk.cable_id }}
+ {{ dk.status || '-' }}
+
+
+ {{ dk.type }}
+
+ Plan: {{ dk.laenge_plan || '-' }}
+ Ist: {{ dk.laenge_ist || '-' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ wo.rimoName }}
+ {{ wo.rimoStatus }}
+
+
+
+
+
+
+
+
+
+
+ Keine Checkliste vorhanden
+
+
+ -
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+ Keine Dokumente vorhanden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ selectedWorkorder.additionalInfo || 'Keine Notiz vorhanden.' }}
+
+
+
+
+
+
+
+
+
+
+ Keine Einträge
+
+
+
+ {{ entry.text }}
+ {{ entry.createFormatted }} - {{ entry.createByName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dokumentation hochladen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Problem melden
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Auftrag abschließen
+
+
+
+
+
+ Alle Anforderungen erfüllt!
+ Der Auftrag kann abgeschlossen werden.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ pdfViewerTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![Lageplan]()
+
+
+
+ Pinch zum Zoomen • Doppeltippen für 2x
+
+
+
+
+
+ `
+};
diff --git a/public/mobile/shared/api.js b/public/mobile/shared/api.js
new file mode 100644
index 000000000..b3481f9ff
--- /dev/null
+++ b/public/mobile/shared/api.js
@@ -0,0 +1,18 @@
+export function createModuleApi(modulePath) {
+ return {
+ get: (endpoint) => fetch(`/MobileApp/${modulePath}/${endpoint}`).then(r => r.json()),
+ post: (endpoint, data) => fetch(`/MobileApp/${modulePath}/${endpoint}`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(data)
+ }).then(r => r.json())
+ };
+}
+
+export const debounce = (fn, delay) => {
+ let timeout;
+ return (...args) => {
+ clearTimeout(timeout);
+ timeout = setTimeout(() => fn(...args), delay);
+ };
+};
diff --git a/public/mobile/shared/auth.js b/public/mobile/shared/auth.js
new file mode 100644
index 000000000..57ce12eef
--- /dev/null
+++ b/public/mobile/shared/auth.js
@@ -0,0 +1,199 @@
+/**
+ * MobileApp Shared Authentication Module
+ *
+ * Provides authentication utilities for all mobile PWAs:
+ * - checkAuth() - Check if user is authenticated
+ * - login() - Authenticate user
+ * - logout() - Clear session
+ * - api - Generic API helper
+ */
+
+// Base API path for all MobileApp endpoints
+const API_BASE = '/MobileApp';
+
+// Shared auth state (can be imported by components)
+export const authState = {
+ user: null,
+ isAuthenticated: false
+};
+
+/**
+ * Check if user is currently authenticated
+ * @returns {Promise<{authenticated: boolean, user?: object}>}
+ */
+export async function checkAuth() {
+ try {
+ const res = await fetch(`${API_BASE}/auth/check`, {
+ credentials: 'same-origin'
+ });
+ const data = await res.json();
+
+ authState.isAuthenticated = data.authenticated;
+ authState.user = data.user || null;
+
+ return data;
+ } catch (e) {
+ console.error('Auth check failed:', e);
+ authState.isAuthenticated = false;
+ authState.user = null;
+ return { authenticated: false };
+ }
+}
+
+/**
+ * Authenticate user with credentials
+ * @param {object} credentials - { username, password, rememberMe }
+ * @returns {Promise<{success: boolean, user?: object, message?: string}>}
+ */
+export async function login({ username, password, rememberMe = true }) {
+ try {
+ const res = await fetch(`${API_BASE}/auth/login`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ credentials: 'same-origin',
+ body: JSON.stringify({ username, password, rememberMe })
+ });
+
+ const data = await res.json();
+
+ if (data.success) {
+ authState.isAuthenticated = true;
+ authState.user = data.user;
+ }
+
+ return data;
+ } catch (e) {
+ console.error('Login failed:', e);
+ return { success: false, message: 'Netzwerkfehler' };
+ }
+}
+
+/**
+ * Verify 2FA code
+ * @param {string} code - 5-digit verification code
+ * @returns {Promise<{success: boolean, user?: object, message?: string}>}
+ */
+export async function verify2FA(code) {
+ try {
+ const res = await fetch(`${API_BASE}/auth/verify2fa`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ credentials: 'same-origin',
+ body: JSON.stringify({ code })
+ });
+
+ const data = await res.json();
+
+ if (data.success) {
+ authState.isAuthenticated = true;
+ authState.user = data.user;
+ }
+
+ return data;
+ } catch (e) {
+ console.error('2FA verification failed:', e);
+ return { success: false, message: 'Netzwerkfehler' };
+ }
+}
+
+/**
+ * Resend 2FA code
+ * @returns {Promise<{success: boolean, message?: string}>}
+ */
+export async function resend2FA() {
+ try {
+ const res = await fetch(`${API_BASE}/auth/resend2fa`, {
+ method: 'POST',
+ credentials: 'same-origin'
+ });
+
+ return await res.json();
+ } catch (e) {
+ console.error('Resend 2FA failed:', e);
+ return { success: false, message: 'Netzwerkfehler' };
+ }
+}
+
+/**
+ * Logout current user
+ * @returns {Promise<{success: boolean}>}
+ */
+export async function logout() {
+ try {
+ await fetch(`${API_BASE}/auth/logout`, {
+ method: 'POST',
+ credentials: 'same-origin'
+ });
+ } catch (e) {
+ console.error('Logout request failed:', e);
+ }
+
+ authState.isAuthenticated = false;
+ authState.user = null;
+
+ return { success: true };
+}
+
+/**
+ * Generic API helper for app-specific endpoints
+ * Usage: api.get('WarehouseStocktake/getActiveStocktakes')
+ * api.post('WarehouseStocktake/submitScan', { ... })
+ */
+export const api = {
+ /**
+ * GET request
+ * @param {string} endpoint - Endpoint path (e.g., 'WarehouseStocktake/getArticle?code=123')
+ * @returns {Promise | | |