Merge branch 'fronkdev' into 'master'
Setting preorder status triggers status update on hausnummer and See merge request fronk/thetool!115
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
</tr><tr>
|
||||
<th>Status:</th>
|
||||
<td class="text-monospace">
|
||||
<span id="preorder-detail-status-<?=$preorder->id?>-text"><span id="preorder-detail-status-<?=$preorder->id?>-statustext"><?=$preorder->status->code?> - <?=$preorder->status->name?></span> <a href="#" onclick="return toggleStatusControl(<?=$preorder->id?>, <?=$preorder->status_id?>)"><i class="fas fa-fw fa-edit"></i></a></span>
|
||||
<span id="preorder-detail-status-<?=$preorder->id?>-text" data-status-id="<?=$preorder->status_id?>"><span id="preorder-detail-status-<?=$preorder->id?>-statustext"><?=$preorder->status->code?> - <?=$preorder->status->name?></span> <a href="#" onclick="return toggleStatusControl(<?=$preorder->id?>)"><i class="fas fa-fw fa-edit"></i></a></span>
|
||||
<div class="input-group" id="preorder-detail-status-<?=$preorder->id?>-input" style="display:none">
|
||||
<select class="form-control">
|
||||
<?php foreach(PreorderstatusModel::getAll() as $status): ?>
|
||||
@@ -172,7 +172,8 @@
|
||||
<td class="text-monospace text-pink"><?=$preorder->adb_hausnummer->oaid?></td>
|
||||
</tr><tr>
|
||||
<th>Status</th>
|
||||
<td class="text-monospace"><?=$preorder->adb_hausnummer->status->code?> - <?=$preorder->adb_hausnummer->status->name?></td>
|
||||
<td id="preorder-detail-building-status-<?=$preorder->id?>" class="text-monospace"><?=$preorder->adb_hausnummer->status->code?> - <?=$preorder->adb_hausnummer->status->name?></td>
|
||||
|
||||
</tr><tr>
|
||||
<th>Extref</th>
|
||||
<td class="text-monospace"><?=$preorder->adb_hausnummer->extref?></td>
|
||||
@@ -195,7 +196,7 @@
|
||||
<td class="text-monospace"><?=($preorder->adb_wohneinheit_id) ? $preorder->adb_wohneinheit_id : ""?></td>
|
||||
</tr><tr>
|
||||
<th>Status</th>
|
||||
<td class="text-monospace"><?=$preorder->adb_wohneinheit->status->code?> - <?=$preorder->adb_wohneinheit->status->name?></td>
|
||||
<td id="preorder-detail-unit-status-<?=$preorder->id?>" class="text-monospace"><?=$preorder->adb_wohneinheit->status->code?> - <?=$preorder->adb_wohneinheit->status->name?></td>
|
||||
</tr><tr>
|
||||
<th>OAID</th>
|
||||
<td class="text-monospace text-pink"><?=$preorder->adb_wohneinheit->oaid?></td>
|
||||
@@ -345,7 +346,10 @@
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
function toggleStatusControl(pid, sid) {
|
||||
$("#preorder-detail-status-" + pid + "-input select").val(sid);
|
||||
// set select to current status id
|
||||
$("#preorder-detail-status-" + pid + "-input select").val($("#preorder-detail-status-" + pid + "-text").data("status-id"));
|
||||
|
||||
// toggle controls
|
||||
$("#preorder-detail-status-" + pid + "-text").toggle();
|
||||
$("#preorder-detail-status-" + pid + "-input").toggle();
|
||||
|
||||
@@ -367,15 +371,31 @@
|
||||
},
|
||||
function(success) {
|
||||
if(success.status == "OK") {
|
||||
$("#preorder-detail-status-" + pid + "-statustext").text(success.result.status_code + " - " + success.result.status_text);
|
||||
var update = success.result.update;
|
||||
if("preorder" in update) {
|
||||
// update detail status text
|
||||
$("#preorder-detail-status-" + pid + "-statustext").text(update.preorder.status.code + " - " + update.preorder.status.text);
|
||||
$("#preorder-detail-status-" + pid + "-text").addClass("text-success");
|
||||
setTimeout(() => { $("#preorder-detail-status-" + pid + "-text").removeClass("text-success") }, 1500);
|
||||
|
||||
// update list status text
|
||||
$("#preorder-" + pid + " .status").text(update.preorder.status.code + " - " + update.preorder.status.text);
|
||||
$("#preorder-" + pid + " .status").addClass("text-success");
|
||||
setTimeout(() => { $("#preorder-" + pid + " .status").removeClass("text-success") }, 1500);
|
||||
|
||||
// update status id data attribute
|
||||
$("#preorder-detail-status-" + pid + "-text").data("status-id", update.preorder.status.id);
|
||||
}
|
||||
|
||||
$("#preorder-detail-status-" + pid + "-text").addClass("text-success");
|
||||
setTimeout(() => { $("#preorder-detail-status-" + pid + "-text").removeClass("text-success") }, 1500);
|
||||
if("building" in update) {
|
||||
$("#preorder-detail-building-status-" + pid).text(update.building.status.code + " - " + update.building.status.text);
|
||||
}
|
||||
if("unit" in update) {
|
||||
$("#preorder-detail-unit-status-" + pid).text(update.unit.status.code + " - " + update.unit.status.text);
|
||||
}
|
||||
|
||||
$("#preorder-" + pid + " .status").text(success.result.status_code + " - " + success.result.status_text);
|
||||
$("#preorder-" + pid + " .status").addClass("text-success");
|
||||
setTimeout(() => { $("#preorder-" + pid + " .status").removeClass("text-success") }, 1500);
|
||||
toggleStatusControl(pid);
|
||||
|
||||
}
|
||||
},
|
||||
'json');
|
||||
|
||||
Reference in New Issue
Block a user