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

Merge branch 'fronkdev' into 'master'

Browse Source 
Showing unit OAID & preorder count in Preorder/Form

See merge request fronk/thetool!805
This commit is contained in:
Frank Schubert
2024-12-11 12:05:55 +00:00
parent bc97bcb9a9 2154b326c2
commit a20d7b9d34
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@
<div class="col-lg-10">
<select class="form-control" name="adb_wohneinheit_id" id="adb_wohneinheit_id" <?=($preorder && $preorder->adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)) ? "disabled='disabled'" : ""?>>
<?php if($preorder->adb_wohneinheit_id): ?>
<option value="<?=$preorder->adb_wohneinheit_id?>" selected="selected"><?=$preorder->adb_hausnummer->strasse->name?> <?=$preorder->adb_hausnummer->hausnummer?> <?=$preorder->adb_wohneinheit?><?=($preorder->adb_wohneinheit->extref) ? " (".$preorder->adb_wohneinheit->extref.")" : ""?></option>
<option value="<?=$preorder->adb_wohneinheit_id?>" selected="selected"><?=$preorder->adb_hausnummer->strasse->name?> <?=$preorder->adb_hausnummer->hausnummer?> <?=$preorder->adb_wohneinheit?><?=($preorder->adb_wohneinheit->extref) ? " (".$preorder->adb_wohneinheit->extref.")" : ""?><?=($preorder->adb_wohneinheit->oaid) ?: ""?><?=(count($preorder->adb_wohneinheit->preorders)) ? " [".count($preorder->adb_wohneinheit->preorders)." Bestellungen]" : ""?></option>
<?php endif; ?>
</select>
<?php if($preorder && $preorder->adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)): ?>
@@ -597,6 +597,8 @@
opt += " " + unit.extra;
}
if(unit.extref) opt += " (" + unit.extref + ")";
if(unit.oaid) opt += " - " + unit.oaid;
if(unit.preorder_count) opt += " - " + unit.preorder_count + " Bestellung";
/*let extras = new Array();
if(unit.block) extras.push("Block " + unit.block);
@@ -626,7 +628,9 @@
.data("stiege", unit.stiege)
.data("stock", unit.stock)
.data("tuer", unit.tuer)
.data("zusatz", unit.zusatz);
.data("zusatz", unit.zusatz)
.data("oaid", unit.oaid)
.data["preorder_count"];
afterHausnummerChange();