mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Mo 2. Mär 10:31:01 CET 2020

Browse Source
This commit is contained in:
Robert Richter 2020-03-02 10:31:01 +01:00
parent ba758ac782
commit 7ce52c8be9
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/js/client_dbrd.js
View File

@ -68,10 +68,10 @@ function add_resp_progressbar(p_id, p_type, p_agt, p_start, p_end) {
break; break;
}; };
$( '#pg-' + p_type ).append( '<div class="progress mt-1 '+bar_border+'" id="pg-' + p_id + '" style="height: 0.9375rem; font-size: 0.9375rem;"></div>'); //+ ' ></div>' ); $( '#pg-' + p_type ).append( '<div class="progress mt-1 position-relative '+bar_border+'" id="pg-' + p_id + '" style="height: 15px; font-size: 14px;"></div>'); //+ ' ></div>' );
$( '#pg-'+ p_id ).append( '<div id="pg-bar'+ p_id +'" class="progress-bar progress-bar-striped '+ bar_background +'" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>' ); $( '#pg-'+ p_id ).append( '<div id="pg-bar'+ p_id +'" class="progress-bar progress-bar-striped '+ bar_background +'" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>' );
$( '#pg-bar'+ p_id ).append('<small id="pg-text'+ p_id +'" class="justify-content-center d-flex position-absolute w-100"></small>');
@ -107,14 +107,14 @@ function add_resp_progressbar(p_id, p_type, p_agt, p_start, p_end) {
$("#pg-bar"+p_id) $("#pg-bar"+p_id)
.css("width", "100%") .css("width", "100%")
.attr("aria-valuenow", 100) .attr("aria-valuenow", 100)
.text("")
.addClass("ion-md-checkmark-circle"); .addClass("ion-md-checkmark-circle");
$("#pg-text"+p_id).text("");
clearInterval(counter_ID[p_id]); clearInterval(counter_ID[p_id]);
} else { } else {
$("#pg-bar"+p_id) $("#pg-bar"+p_id)
.css("width", current_progress + "%") .css("width", current_progress + "%")
.attr("aria-valuenow", current_progress) .attr("aria-valuenow", current_progress);
.text(minutes + " min"); $("#pg-text"+p_id).text(minutes);
}; };
}; };
@ -131,9 +131,9 @@ function add_resp_progressbar(p_id, p_type, p_agt, p_start, p_end) {
var names = ["CB FW Cottbus 1", "CB FW Madlow", "Lee", "Grant"]; var names = ["CB FW Cottbus 1", "CB FW Madlow", "Lee", "Grant"];
var groupCount = 2; var groupCount = 2;
var groups = new vis.DataSet(); var groups = new vis.DataSet();
for (var g = 0; g < groupCount; g++) { //for (var g = 0; g < groupCount; g++) {
groups.add({ id: g, content: names[g] }); // groups.add({ id: g, content: names[g] });
}; //};
var date = new Date(); var date = new Date();
date.setMinutes(date.getMinutes() - 0,1 ); date.setMinutes(date.getMinutes() - 0,1 );
@ -351,6 +351,8 @@ if (arrayItem.agt){
add_resp_progressbar(arrayItem.resp_uuid, item_type, arrayItem.agt, new Date(arrayItem.set_time), new Date(arrayItem.arrival_time)); add_resp_progressbar(arrayItem.resp_uuid, item_type, arrayItem.agt, new Date(arrayItem.set_time), new Date(arrayItem.arrival_time));
items.update(new_item); items.update(new_item);
groups.update({ id: arrayItem.wache_id, content: arrayItem.wache_name }); groups.update({ id: arrayItem.wache_id, content: arrayItem.wache_name });
$( '#'+item_type+'-counter' ).text('x')
}); });
console.log(items.get()); console.log(items.get());

32
views/includes/master_dashboard.pug
View File

@ -228,30 +228,38 @@ style(type='text/css').
.text-info.font-weight-bold Einsatzrückmeldungen .text-info.font-weight-bold Einsatzrückmeldungen
.card-body.p-2 .card-body.p-2
.d-flex.fustify-content-between.font-weight-bold .d-flex.fustify-content-between.font-weight-bold
#rueckmeldung.list-group.list-group-horizontal.text-center.w-100 .list-group.list-group-horizontal.text-center.w-100
a.list-group-item.bg-secondary.flex-fill.text-success 3 EK .list-group-item.flex-fill.text-success
a.list-group-item.bg-secondary.flex-fill.text-info 2 MA a#ek-counter 0
a.list-group-item.bg-secondary.flex-fill.text-light 1 FK a &nbsp;EK
#rueckmeldung.list-group.list-group-horizontal.text-center .list-group-item.flex-fill.text-info
a.list-group-item.bg-warning.flex-fill.text-dark 2&nbsp;AGT a#ma-counter 0
a &nbsp;MA
.list-group-item.flex-fill.text-light
a#fk-counter 0
a &nbsp;FK
.list-group.text-center
.list-group-item.border.border-warning.flex-fill.text-warning
a#agt-counter 0
a &nbsp;AGT
//a.badge.badge-warning 2&nbsp;AGT //a.badge.badge-warning 2&nbsp;AGT
.row .row
.col-4#pg-ek .col-4#pg-ek
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') .progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100')
a(style='') 2min a(style='') 2min
.progress.mt-1.border.border-warning(style='height: 20px;') //.progress.mt-1.border.border-warning(style='height: 20px;')
.progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') .progress-bar.progress-bar-striped.bg-success(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100')
h 2min h 2min
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-success.ion-md-checkmark-circle(role='progressbar', style='width: 100%', aria-valuenow='100', aria-valuemin='0', aria-valuemax='100') .progress-bar.progress-bar-striped.bg-success.ion-md-checkmark-circle(role='progressbar', style='width: 100%', aria-valuenow='100', aria-valuemin='0', aria-valuemax='100')
.col-4#pg-ma .col-4#pg-ma
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 3min .progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 3min
.progress.mt-1 //.progress.mt-1
.progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 1min .progress-bar.progress-bar-striped.bg-info(role='progressbar', style='width: 25%', aria-valuenow='25', aria-valuemin='0', aria-valuemax='100') 1min
.col-4#pg-fk .col-4#pg-fk
.progress.mt-1.border.border-warning //.progress.mt-1.border.border-warning
.progress-bar.progress-bar-striped.bg-light(role='progressbar', style='width: 50%', aria-valuenow='50', aria-valuemin='0', aria-valuemax='100') 10min .progress-bar.progress-bar-striped.bg-light(role='progressbar', style='width: 50%', aria-valuenow='50', aria-valuemin='0', aria-valuemax='100') 10min
.card-body.p-2 .card-body.p-2
#visualization.border.rounded(style='background-color:white') #visualization.border.rounded(style='background-color:white')