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

added units used to Preorder

Browse Source
This commit is contained in:
Frank Schubert
2022-05-11 13:23:47 +02:00
parent 6e29312363
commit 11ede6a5b7
6 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Layout/default/Preorder/Form.php
View File

@@ -65,7 +65,7 @@
<th>Straße</th>
<th>PLZ</th>
<th>Ort</th>
<th>Wohneinheiten</th>
<th>Wohneinheiten belegt</th>
<th>Code</th>
<th>OAN ID</th>
</tr>
@@ -95,7 +95,7 @@
<td class="label">
<strong><?=$preorder->building->street?></strong><br />
<strong><?=$preorder->building->zip?> <?=$preorder->building->city?></strong><br />
Wohneinheiten: <?=($preorder->building->units) ? $preorder->building->units : 1?>
Belegte Wohneinheiten: <?=$preorder->building->getUsedTerminationCount(true)?> von <?=($preorder->building->units) ? $preorder->building->units : 1?>
<?php if($preorder->building->code): ?>
<br /><?=$preorder->building->code?>
<?php endif; ?>
@@ -348,11 +348,13 @@
data.buildings.forEach(function(b) {
var line = '<tr class="result result-' + b.id + ' pointer" onclick="selectBuilding(' + b.id + ')">';
line += '<td><input type="checkbox" readonly="readonly" onclick="selectBuilding(' + b.id + ')" name="building_result_check" value="' + b.id + '" data-zip="' + b.zip + '" data-city="' + b.city + '" data-street="' + b.street + '" data-code="' + b.code + '" data-oanid="' + b.oan_id + '" data-units="' + b.units + '" /></td>';
line += "<td>" + b.street + "</td>";
line += '<td><input type="checkbox" readonly="readonly" onclick="selectBuilding(' + b.id + ')" name="building_result_check" value="' + b.id + '"';
line += 'data-zip="' + b.zip + '" data-city="' + b.city + '" data-street="' + b.street + '" data-code="' + b.code + '" data-oanid="' + b.oan_id + '" data-units="' + b.units + '" data-units-used="' + b.units_used + '" /></td>';
line += "<td>" + b.street + "</td>";
line += "<td>" + b.zip + "</td>";
line += "<td>" + b.city + "</td>";
line += "<td>" + b.units + "</td>";
line += "<td>" + b.units_used + " / " + b.units + "</td>";
line += "<td>" + b.code + "</td>";
line += "<td>" + b.oan_id + "</td>";
@@ -396,6 +398,7 @@
var code = $('input[name=building_result_check][value=' + id + ']').data("code");
var oan_id = $('input[name=building_result_check][value=' + id + ']').data("oanid");
var units = $('input[name=building_result_check][value=' + id + ']').data("units");
var units_used = $('input[name=building_result_check][value=' + id + ']').data("units-used");
$('input[name=street]').val(street);
$('input[name=zip]').val(zip);
@@ -403,7 +406,7 @@
var label = street + "<br />" + zip + " " + city;
label += "<br /><div style='font-weight: normal;'>Wohneinheiten: " + units;
label += "<br /><div style='font-weight: normal;'>Belegte Wohneinheiten: " + units_used + " von " + units;
if(code || oan_id) {
if(code) {
label += "<br />Code: " + code;

19
application/Building/Building.php
View File

@@ -80,6 +80,25 @@ class Building extends mfBaseModel {
return $code;
}
public function getUsedTerminationCount($includePreorders = false) {
if(!$this->id) {
return false;
}
$count = 0;
$orders = OrderModel::search(['building_id' => $this->id]);
$count += count($orders);
if($includePreorders) {
$preorders = PreorderModel::search(['building_id' => $this->id]);
$count += count($preorders);
}
return $count;
}
public function loadWorkflowItems() {
$item_ids = [];

9
application/Building/BuildingController.php
View File

@@ -294,10 +294,10 @@ class BuildingController extends mfBaseController {
$data['email'] = $building->email;
}
/*
// no more lineworker_id in Termination
if($building->lineworker_id) {
$data['lineworker_id'] = $building->lineworker_id;
}*/
// no more lineworker_id in Termination
if($building->lineworker_id) {
$data['lineworker_id'] = $building->lineworker_id;
}*/
if($building->oan_id) {
$data['oan_id'] = $building->oan_id. "." . sprintf("%03d", $i);
}
@@ -418,6 +418,7 @@ class BuildingController extends mfBaseController {
$u['oan_id'] = $building->oan_id;
$u['code'] = $building->code;
$u['units'] = ($building->units) ? $building->units : 1;
$u['units_used'] = $building->getUsedTerminationCount(true);
$u['status'] = $building->status->name;
$unsorted[$building->street."-".$building->id] = $u;
}

6
application/Dashboard/DashboardController.php
View File

@@ -29,9 +29,15 @@ class DashboardController extends mfBaseController {
var_dump($a->generateServicePin());exit;
*/
/*
$t = new Termination(45);
$ports = $t->getLineworkportPairs();
var_dump($ports);exit;
*
*/
$b = new Building(12);
echo $b->getUsedTerminationCount(true);exit;
}
protected function pdfAction() {

11
application/Order/OrderModel.php
View File

@@ -332,6 +332,17 @@ class OrderModel {
}
}
if(array_key_exists("building_id", $filter)) {
$building_id = $filter['building_id'];
if(is_numeric($building_id)) {
$where .= " AND Building.id=$building_id";
} elseif(is_array($building_id)) {
$where .= " AND Building.id IN (".implode(",",$building_id).")";
} elseif($building_id === null) {
$where .= " AND Building.id IS NULL";
}
}
if(array_key_exists("termination_id", $filter)) {
$termination_id = $filter['termination_id'];
if(is_numeric($termination_id)) {

11
application/Preorder/PreorderModel.php
View File

@@ -118,6 +118,17 @@ class PreorderModel {
}
}
if(array_key_exists("building_id", $filter)) {
$building_id = $filter['building_id'];
if(is_numeric($building_id)) {
$where .= " AND building_id=$building_id";
} elseif(is_array($building_id)) {
$where .= " AND building_id IN (".implode(",",$building_id).")";
} elseif($building_id === null) {
$where .= " AND building_id IS NULL";
}
}
//var_dump($filter, $where);exit;