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

overhauled workorder module

Browse Source
This commit is contained in:
Luca Haid
2025-10-08 13:18:48 +02:00
parent 200226a4bd
commit 2ce870746b
9 changed files with 314 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
application/Workorder/WorkorderModel.php
View File

@@ -24,7 +24,7 @@ class WorkorderModel extends TTCrudBaseModel
$sql = Helper::generateFilterCondition(array_map('intval', $allowedCampaignIds), 'p.preordercampaign_id');
if (empty($filters['status'])) {
$sql .= " AND w.status NOT IN ('completed', 'cancelled')";
$sql .= " AND w.status NOT IN ('completed', 'cancelled', 'charged', 'archived')";
} else {
$sql .= Helper::generateFilterCondition($filters['status'], 'w.status', true);
}
@@ -114,12 +114,16 @@ class WorkorderModel extends TTCrudBaseModel
private static function buildCompanyWhereClause(array $filters, int $companyId): string
{
$sql = "(w.companyId = " . $companyId . " OR w.civilEngineeringCompanyId = " . $companyId . ")";
$sql = "(w.companyId = " . $companyId . " OR w.civilEngineeringCompanyId = " . $companyId . ") AND w.status != 'charged'";
if (empty($filters['status'])) {
$sql .= " AND w.status NOT IN ('completed', 'cancelled', 'archived')";
} else {
$sql .= Helper::generateFilterCondition($filters['status'], 'w.status', true);
}
if (empty($filters['status'])) $sql .= " AND w.status NOT IN ('completed', 'cancelled')";
else $sql .= Helper::generateFilterCondition($filters['status'], 'w.status', true);
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['preordercampaign_id'])) $sql .= Helper::generateFilterCondition($filters['preordercampaign_id'], 'p.preordercampaign_id');
if (!empty($filters['deadlineDate'])) $sql .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
if (!empty($filters['networkOwnerName'])) $sql .= Helper::generateFilterCondition($filters['networkOwnerName'], 'owner_addr.company');
if (!empty($filters['appointmentDate'])) $sql .= Helper::generateFilterCondition($filters['appointmentDate'], 'w.appointmentDate');
@@ -157,7 +161,7 @@ class WorkorderModel extends TTCrudBaseModel
$orderBy = "";
if (!empty($order['key'])) {
$sortableColumns = ['id', 'status', 'deadlineDate', 'appointmentDate', 'additionalInfo'];
$sortableColumns = ['id', 'status', 'deadlineDate', 'appointmentDate', 'additionalInfo', 'preordercampaign_id'];
if (in_array($order['key'], $sortableColumns)) {
$sortOrder = (strtoupper($order['order']) === 'DESC') ? 'DESC' : 'ASC';
$orderBy = " ORDER BY " . $db->real_escape_string($order['key']) . " " . $sortOrder;
@@ -193,4 +197,4 @@ class WorkorderModel extends TTCrudBaseModel
$result = $db->query($sql);
return $result ? $result->fetch_assoc()['count'] : 0;
}
}
}