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

fixed workorder company view for status filter

Browse Source
This commit is contained in:
Luca
2025-09-11 08:02:01 +02:00
parent 90e40567b1
commit 0a23692519
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Workorder/WorkorderModel.php
+3 -1
View File
@@ -115,7 +115,9 @@ class WorkorderModel extends TTCrudBaseModel
private static function buildCompanyWhereClause(array $filters, int $companyId): string 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 . ")";
$sql .= " AND w.status NOT IN ('completed', 'cancelled')";
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['id'])) $sql .= Helper::generateFilterCondition($filters['id'], 'w.id', true);
if (!empty($filters['status'])) $sql .= Helper::generateFilterCondition($filters['status'], 'w.status'); 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['deadlineDate'])) $sql .= Helper::generateFilterCondition($filters['deadlineDate'], 'w.deadlineDate');
application/WorkorderCompany/WorkorderCompanyController.php
+3 -12
View File
@@ -30,11 +30,6 @@ class WorkorderCompanyController extends WorkorderBaseController {
$this->additionalJSVariables['COMPANY_ID'] = $company ? $company->id : 0; $this->additionalJSVariables['COMPANY_ID'] = $company ? $company->id : 0;
} }
//region ACTIONS
public function indexAction() {
parent::indexAction();
}
protected function logout() { protected function logout() {
mfLoginController::staticLogout(); mfLoginController::staticLogout();
$this->redirect('/WorkorderCompany/Mobile'); $this->redirect('/WorkorderCompany/Mobile');
@@ -43,15 +38,11 @@ class WorkorderCompanyController extends WorkorderBaseController {
public function mobileAction() { public function mobileAction() {
$company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]); $company = WorkorderCompanyModel::getFirst(['addressId' => $this->user->address_id]);
$vue_config = [ $this->layout()->setTemplate("VueViews/WorkorderCompanyPWA");
$this->layout()->set("JSGlobals", [
'BASE_PATH' => '/WorkorderCompany', 'BASE_PATH' => '/WorkorderCompany',
'COMPANY_ID' => $company ? $company->id : 0, 'COMPANY_ID' => $company ? $company->id : 0,
// You can add more global variables for your Vue app here ]);
];
// This tells the framework to use your new PWA layout file
$this->layout()->setTemplate("VueViews/WorkorderCompanyPWA");
$this->layout()->set("JSGlobals", $vue_config);
} }
protected function getAction() { protected function getAction() {