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

Change termination order

Browse Source
This commit is contained in:
Frank Schubert
2022-06-16 14:20:12 +02:00
parent ec4b1d07d6
commit 9b57b70aab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/Linework/Index.php
View File

@@ -718,7 +718,7 @@ function validateWorkflowItem(id) {
$('#export-button-label').hide();
$('#progress-bar').show();
setTimeout(updateExportProgress, 200);
$('#export-button').addClass("bg-secondary");
$('#export-button').addClass("bg-dark");
$('#export-button').prop("onclick", null).off("click");
//$('#export-button').prop("disabled", true);
} else {
@@ -776,7 +776,7 @@ function validateWorkflowItem(id) {
$('#progress-bar').addClass("bg-primary").removeClass("bg-success");
$('#export-button').prop("disabled", false);
$('#progress-bar').hide();
$('#export-button').removeClass("bg-secondary");
$('#export-button').removeClass("bg-dark");
$('#export-button').click(exportButtonClick);
$('#export-button-label').show();
}

2
application/Termination/TerminationModel.php
View File

@@ -104,7 +104,7 @@ class TerminationModel {
LEFT JOIN Building ON (Building.id = Termination.building_id)
LEFT JOIN Terminationstatus ON (Terminationstatus.id = Termination.status_id)
WHERE $where
ORDER BY Building.network_id, Building.networksection_id, Building.code, code
ORDER BY Building.network_id, Building.zip, Building.city, Building.networksection_id, Building.street, Building.code, code
";
if(is_array($limit) && count($limit)) {