Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

added new fields

Browse Source
This commit is contained in:
Luca Haid
2025-08-29 12:30:14 +02:00
parent ebc6183779
commit 1a5f7bfa2d
6 changed files with 892 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
application/RMLWorkorder/RMLWorkorderModel.php
View File

@@ -1,7 +1,8 @@
<?php
// RMLWorkorderModel.php
class RMLWorkorderModel extends TTCrudBaseModel {
class RMLWorkorderModel extends TTCrudBaseModel
{
public int $id;
public int $preorderId;
public ?int $companyId;
@@ -10,93 +11,48 @@ class RMLWorkorderModel extends TTCrudBaseModel {
public ?int $assignmentDate;
public ?int $deadlineDate;
public ?int $appointmentDate;
public ?string $additionalInfo;
public int $create;
public int $createBy;
// This method remains unchanged as requested.
public static function getWorkordersByUrgency(string $urgency, ?int $companyId = null): array {
$db = self::getDB();
$table = self::getFullyQualifiedTable();
$whereClause = "WHERE status IN ('assigned', 'scheduled', 'correction_requested')";
if ($companyId) {
$whereClause .= " AND companyId = " . intval($companyId);
}
switch ($urgency) {
case 'red': // Less than 1 week left or overdue
$redDate = strtotime('+1 week');
$whereClause .= " AND deadlineDate IS NOT NULL AND deadlineDate < $redDate";
break;
case 'yellow': // Between 1 and 3 weeks left
$yellowDateStart = strtotime('+1 week');
$yellowDateEnd = strtotime('+3 weeks');
$whereClause .= " AND deadlineDate BETWEEN $yellowDateStart AND $yellowDateEnd";
break;
case 'green': // More than 3 weeks left
$greenDate = strtotime('+3 weeks');
$whereClause .= " AND deadlineDate > $greenDate";
break;
default:
return [];
}
$sql = "SELECT * FROM $table $whereClause ORDER BY deadlineDate ASC";
$result = $db->query($sql);
$orders = [];
while ($row = $result->fetch_assoc()) {
$orders[] = new self($row);
}
return $orders;
}
// --- REFACTORED METHODS ---
private static function buildWhereClause(array $filters, array $allowedCampaignIds): string {
if (empty($allowedCampaignIds)) {
return " WHERE 1=0";
}
private static function buildWhereClause(array $filters, array $allowedCampaignIds): string
{
if (empty($allowedCampaignIds)) return " WHERE 1=0";
$sql = Helper::generateFilterCondition(array_map('intval', $allowedCampaignIds), 'p.preordercampaign_id');
if (!empty($filters['id'])) {
$sql .= Helper::generateFilterCondition($filters['id'], 'w.id', true);
}
if (!empty($filters['status'])) {
if (empty($filters['status'])) {
$sql .= " AND w.status NOT IN ('completed', 'cancelled')";
} else {
$sql .= Helper::generateFilterCondition($filters['status'], 'w.status', true);
}
if (!empty($filters['preordercampaign_id'])) {
$sql .= Helper::generateFilterCondition($filters['preordercampaign_id'], 'p.preordercampaign_id');
}
if (!empty($filters['companyName'])) {
$sql .= Helper::generateFilterCondition($filters['companyName'], 'c.name');
}
if (!empty($filters['deadlineDate'])) {
$sql .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
}
if (!empty($filters['id'])) $sql .= Helper::generateFilterCondition($filters['id'], 'w.id', true);
if (!empty($filters['preordercampaign_id'])) $sql .= Helper::generateFilterCondition($filters['preordercampaign_id'], 'p.preordercampaign_id');
if (!empty($filters['companyName'])) $sql .= Helper::generateFilterCondition($filters['companyName'], 'c.name');
if (!empty($filters['deadlineDate'])) $sql .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
if (!empty($filters['preorderInfo'])) {
$searchColumns = "p.firstname|p.lastname|p.company|p.oaid|p.street|p.housenumber|p.zip|p.city|str.name|ort.name";
$searchColumns = "p.firstname|p.lastname|p.company|p.oaid|p.street|p.housenumber|p.zip|p.city|str.name|ort.name|w.additionalInfo";
$sql .= Helper::generateFilterCondition($filters['preorderInfo'], $searchColumns);
} if (!empty($filters['rimo_fcp_name'])) {
$searchColumns = "hn.rimo_fcp_name";
$sql .= Helper::generateFilterCondition($filters['rimo_fcp_name'], $searchColumns);
}
if (!empty($filters['rimo_fcp_name'])) $sql .= Helper::generateFilterCondition($filters['rimo_fcp_name'], "hn.rimo_fcp_name");
if (!empty($filters['additionalInfo'])) $sql .= Helper::generateFilterCondition($filters['additionalInfo'], 'w.additionalInfo');
return "WHERE " . ltrim(trim($sql), 'AND');
}
public static function getAdminWorkorders(array $filters, ?int $limit, int $offset, array $order, array $allowedCampaignIds): array {
public static function getAdminWorkorders(array $filters, ?int $limit, int $offset, array $order, array $allowedCampaignIds): array
{
$db = self::getDB();
$fronkDbName = FRONKDB_DBNAME;
$addressDbName = defined('ADDRESSDB_DBNAME') ? ADDRESSDB_DBNAME : 'addressdb';
$sql = "
SELECT
w.id, w.status, w.deadlineDate, w.companyId, p.preordercampaign_id, hn.rimo_fcp_name,
n.owner_id as tenantId,
CONCAT_WS(' ', p.firstname, p.lastname) as customerName, p.ucode,
p.company as customerCompany, p.oaid, c.name as companyName,
str.name as street, hn.hausnummer, hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city
w.id, w.status, w.deadlineDate, w.companyId, w.additionalInfo, p.preordercampaign_id, hn.rimo_fcp_name,
n.owner_id as tenantId, p.ucode, CONCAT_WS(' ', p.firstname, p.lastname) as customerName,
p.company as customerCompany, p.oaid, c.name as companyName, str.name as street, hn.hausnummer,
hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city
FROM `$fronkDbName`.`RMLWorkorder` w
JOIN `$fronkDbName`.`Preorder` p ON w.preorderId = p.id
LEFT JOIN `$fronkDbName`.`Preordercampaign` pc ON p.preordercampaign_id = pc.id
@@ -111,74 +67,56 @@ class RMLWorkorderModel extends TTCrudBaseModel {
$sql .= self::buildWhereClause($filters, $allowedCampaignIds);
$sql .= " ORDER BY CASE WHEN w.deadlineDate IS NULL THEN 1 ELSE 0 END, w.deadlineDate ASC";
$orderBy = "";
if (!empty($order['key'])) {
$sortableColumns = ['id', 'status', 'deadlineDate', 'companyName', 'clusterName'];
$sortableColumns = ['id', 'status', 'deadlineDate', 'companyName', 'rimo_fcp_name', 'additionalInfo'];
if (in_array($order['key'], $sortableColumns)) {
$sortOrder = (strtoupper($order['order']) === 'DESC') ? 'DESC' : 'ASC';
$sql .= ", " . $db->real_escape_string($order['key']) . " " . $sortOrder;
$orderBy = " ORDER BY " . $db->real_escape_string($order['key']) . " " . $sortOrder;
}
}
if (empty($orderBy)) $orderBy = " ORDER BY CASE WHEN w.deadlineDate IS NULL THEN 1 ELSE 0 END, w.deadlineDate ASC";
$sql .= $orderBy;
if ($limit !== null) $sql .= " LIMIT " . intval($limit) . " OFFSET " . intval($offset);
if ($limit !== null) {
$sql .= " LIMIT " . intval($limit) . " OFFSET " . intval($offset);
}
$result = $db->query($sql);
return $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
}
public static function countAdminWorkorders(array $filters, array $allowedCampaignIds): int {
public static function countAdminWorkorders(array $filters, array $allowedCampaignIds): int
{
$db = self::getDB();
$fronkDbName = FRONKDB_DBNAME;
$addressDbName = defined('ADDRESSDB_DBNAME') ? ADDRESSDB_DBNAME : 'addressdb';
$sql = "
SELECT COUNT(w.id) as count
FROM `$fronkDbName`.`RMLWorkorder` w
SELECT COUNT(w.id) as count FROM `$fronkDbName`.`RMLWorkorder` w
JOIN `$fronkDbName`.`Preorder` p ON w.preorderId = p.id
LEFT JOIN `$fronkDbName`.`Preordercampaign` pc ON p.preordercampaign_id = pc.id
LEFT JOIN `$fronkDbName`.`Network` n ON pc.network_id = n.id
LEFT JOIN `$fronkDbName`.`RMLWorkorderCompany` c ON w.companyId = c.id
LEFT JOIN `$addressDbName`.`Hausnummer` hn ON p.adb_hausnummer_id = hn.id
LEFT JOIN `$addressDbName`.`Strasse` str ON hn.strasse_id = str.id
LEFT JOIN `$addressDbName`.`Plz` plz ON hn.plz_id = plz.id
LEFT JOIN `$addressDbName`.`Ortschaft` ort ON hn.ortschaft_id = ort.id
";
$sql .= self::buildWhereClause($filters, $allowedCampaignIds);
$result = $db->query($sql);
if ($result === false) return 0;
$row = $result->fetch_assoc();
return $row['count'] ?? 0;
return $result ? $result->fetch_assoc()['count'] : 0;
}
private static function buildCompanyWhereClause(array $filters, int $companyId): string
{
$sql = "w.companyId = " . $companyId;
if (!empty($filters['id'])) {
$sql .= Helper::generateFilterCondition($filters['id'], 'w.id', true);
}
if (!empty($filters['status'])) {
$sql .= Helper::generateFilterCondition($filters['status'], 'w.status');
}
if (!empty($filters['deadlineDate'])) {
$sql .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
}
if (!empty($filters['appointmentDate'])) {
$sql .= Helper::generateFilterCondition($filters['appointmentDate'], 'w.appointmentDate');
}
if (!empty($filters['id'])) $sql .= Helper::generateFilterCondition($filters['id'], 'w.id', true);
if (!empty($filters['status'])) $sql .= Helper::generateFilterCondition($filters['status'], 'w.status');
if (!empty($filters['deadlineDate'])) $sql .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
if (!empty($filters['appointmentDate'])) $sql .= Helper::generateFilterCondition($filters['appointmentDate'], 'w.appointmentDate');
if (!empty($filters['preorderInfo'])) {
$searchColumns = "p.firstname|p.lastname|p.company|p.oaid|p.street|p.housenumber|p.zip|p.city|str.name|ort.name|p.phone|p.email";
$searchColumns = "p.firstname|p.lastname|p.company|p.oaid|p.street|p.housenumber|p.zip|p.city|str.name|ort.name|p.phone|p.email|w.additionalInfo";
$sql .= Helper::generateFilterCondition($filters['preorderInfo'], $searchColumns);
} if (!empty($filters['rimo_fcp_name'])) {
$searchColumns = "hn.rimo_fcp_name";
$sql .= Helper::generateFilterCondition($filters['rimo_fcp_name'], $searchColumns);
}
}
if (!empty($filters['rimo_fcp_name'])) $sql .= Helper::generateFilterCondition($filters['rimo_fcp_name'], "hn.rimo_fcp_name");
if (!empty($filters['additionalInfo'])) $sql .= Helper::generateFilterCondition($filters['additionalInfo'], 'w.additionalInfo');
return "WHERE " . $sql;
}
@@ -187,13 +125,10 @@ class RMLWorkorderModel extends TTCrudBaseModel {
$db = self::getDB();
$fronkDbName = FRONKDB_DBNAME;
$addressDbName = defined('ADDRESSDB_DBNAME') ? ADDRESSDB_DBNAME : 'addressdb';
$sql = "
SELECT
w.id, w.status, w.deadlineDate, w.appointmentDate, hn.rimo_fcp_name,
CONCAT_WS(' ', p.firstname, p.lastname) as customerName,
p.company as customerCompany, p.oaid, p.phone, p.email,
str.name as street, hn.hausnummer, hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city
SELECT w.id, w.status, w.deadlineDate, w.appointmentDate, w.additionalInfo, hn.rimo_fcp_name,
CONCAT_WS(' ', p.firstname, p.lastname) as customerName, p.company as customerCompany, p.oaid,
p.phone, p.email, str.name as street, hn.hausnummer, hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city
FROM `$fronkDbName`.`RMLWorkorder` w
JOIN `$fronkDbName`.`Preorder` p ON w.preorderId = p.id
LEFT JOIN `$addressDbName`.`Hausnummer` hn ON p.adb_hausnummer_id = hn.id
@@ -202,22 +137,22 @@ class RMLWorkorderModel extends TTCrudBaseModel {
LEFT JOIN `$addressDbName`.`Ortschaft` ort ON hn.ortschaft_id = ort.id
LEFT JOIN `$addressDbName`.`Wohneinheit` we ON p.adb_wohneinheit_id = we.id
";
$sql .= self::buildCompanyWhereClause($filters, $companyId);
$orderBy = " ORDER BY CASE WHEN w.deadlineDate IS NULL THEN 1 ELSE 0 END, w.deadlineDate ASC";
$orderBy = "";
if (!empty($order['key'])) {
$sortableColumns = ['id', 'status', 'deadlineDate', 'appointmentDate'];
$sortableColumns = ['id', 'status', 'deadlineDate', 'appointmentDate', 'additionalInfo'];
if (in_array($order['key'], $sortableColumns)) {
$sortOrder = (strtoupper($order['order']) === 'DESC') ? 'DESC' : 'ASC';
$orderBy = " ORDER BY " . $db->real_escape_string($order['key']) . " " . $sortOrder;
}
}
if (empty($orderBy)) $orderBy = " ORDER BY CASE WHEN w.deadlineDate IS NULL THEN 1 ELSE 0 END, w.deadlineDate ASC";
$sql .= $orderBy;
if ($limit !== null) {
$sql .= " LIMIT " . intval($limit) . " OFFSET " . intval($offset);
}
if ($limit !== null) $sql .= " LIMIT " . intval($limit) . " OFFSET " . intval($offset);
$result = $db->query($sql);
return $result ? $result->fetch_all(MYSQLI_ASSOC) : [];
}
@@ -227,24 +162,16 @@ class RMLWorkorderModel extends TTCrudBaseModel {
$db = self::getDB();
$fronkDbName = FRONKDB_DBNAME;
$addressDbName = defined('ADDRESSDB_DBNAME') ? ADDRESSDB_DBNAME : 'addressdb';
$sql = "
SELECT COUNT(w.id) as count
FROM `$fronkDbName`.`RMLWorkorder` w
SELECT COUNT(w.id) as count FROM `$fronkDbName`.`RMLWorkorder` w
JOIN `$fronkDbName`.`Preorder` p ON w.preorderId = p.id
LEFT JOIN `$addressDbName`.`Hausnummer` hn ON p.adb_hausnummer_id = hn.id
LEFT JOIN `$addressDbName`.`Strasse` str ON hn.strasse_id = str.id
LEFT JOIN `$addressDbName`.`Plz` plz ON hn.plz_id = plz.id
LEFT JOIN `$addressDbName`.`Ortschaft` ort ON hn.ortschaft_id = ort.id
";
$sql .= self::buildCompanyWhereClause($filters, $companyId);
$result = $db->query($sql);
if ($result === false) {
return 0;
}
$row = $result->fetch_assoc();
return $row['count'] ?? 0;
return $result ? $result->fetch_assoc()['count'] : 0;
}
}