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

OAID / Rimo Workorder update:

Browse Source 
- OAIDs are now auto assigned to preorders/wohneinheiten on save
- OAIDs can be exported to rimo via Preorder Admin functions
- Preorder admin function createWorkorder automatically creates, exports and assigns OAIDs
This commit is contained in:
Frank Schubert
2023-08-09 09:02:44 +02:00
parent 85ab465862
commit 9f051b4cf3
27 changed files with 1150 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/Building/BuildingController.php
View File

@@ -204,7 +204,7 @@ class BuildingController extends mfBaseController {
$data['lineworker_id'] = ($r->lineworker_id) ? $r->lineworker_id : null;
$data['networksection_id'] = ($r->networksection_id) ? $r->networksection_id : null;
$data['oan_id'] = trim($r->oan_id);
$data['oaid'] = trim($r->oaid);
$data['street'] = trim($r->street);
$data['zip'] = trim($r->zip);
$data['city'] = trim($r->city);
@@ -299,8 +299,8 @@ class BuildingController extends mfBaseController {
if($building->lineworker_id) {
$data['lineworker_id'] = $building->lineworker_id;
}*/
if($building->oan_id) {
$data['oan_id'] = $building->oan_id. "." . sprintf("%03d", $i);
if($building->oaid) {
$data['oaid'] = $building->oaid. "." . sprintf("%03d", $i);
}
$term = TerminationModel::create($data);
@@ -440,7 +440,7 @@ class BuildingController extends mfBaseController {
foreach(BuildingModel::search(['network_id' => $network_id, 'code' => $search]) as $b) {
$buildings[$b->id] = $b;
}
foreach(BuildingModel::search(['network_id' => $network_id, 'oan_id' => $search]) as $b) {
foreach(BuildingModel::search(['network_id' => $network_id, 'oaid' => $search]) as $b) {
$buildings[$b->id] = $b;
}
foreach(BuildingModel::search(['network_id' => $network_id, 'zip' => $search]) as $b) {
@@ -458,7 +458,7 @@ class BuildingController extends mfBaseController {
$u['street'] = $building->street;
$u['zip'] = $building->zip;
$u['city'] = $building->city;
$u['oan_id'] = $building->oan_id;
$u['oaid'] = $building->oaid;
$u['code'] = $building->code;
$u['units'] = ($building->units) ? $building->units : 1;
$u['units_used'] = $building->getUsedTerminationCount(true);

10
application/Building/BuildingModel.php
View File

@@ -9,7 +9,7 @@ class BuildingModel {
public $lineworker_id = null;
public $networksection_id = null;
public $code = null;
public $oan_id = null;
public $oaid = null;
public $street = null;
public $zip = null;
public $city = null;
@@ -215,10 +215,10 @@ class BuildingModel {
}
}
if(array_key_exists("oan_id", $filter)) {
$oan_id = FronkDB::singleton()->escape($filter['oan_id']);
if($oan_id) {
$where .= " AND Building.`oan_id` like '%$oan_id%'";
if(array_key_exists("oaid", $filter)) {
$oaid = FronkDB::singleton()->escape($filter['oaid']);
if($oaid) {
$where .= " AND Building.`oaid` like '%$oaid%'";
}
}