diff --git a/public/js/client_waip.js b/public/js/client_waip.js
index 3a20945..08a86f5 100644
--- a/public/js/client_waip.js
+++ b/public/js/client_waip.js
@@ -483,6 +483,93 @@ $('#send_response').on('click', function() {
socket.emit('response',waip_id,respo);
});
+
+
+var counter_tmld = [];
+
+function add_resp_progressbar(p_id, p_type, p_agt, p_start, p_end) {
+ // Split timestamp into [ Y, M, D, h, m, s ]
+ //var t1 = zeitstempel.split(/[- :]/),
+ //t2 = ablaufzeit.split(/[- :]/);
+
+ //var start = new Date(t1[0], t1[1] - 1, t1[2], t1[3], t1[4], t1[5]),
+ //end = new Date(t2[0], t2[1] - 1, t2[2], t2[3], t2[4], t2[5]);
+
+ // Progressbar erstellen falls nicht existiert
+
+ //
+ //
+ var bar_background = '';
+ var bar_border = '';
+ if (p_agt) {
+ bar_border = 'border border-warning';
+ };
+ switch (p_type) {
+ case 'ek':
+ bar_background = 'bg-success';
+ break;
+ case 'ma':
+ bar_background = 'bg-info';
+ break;
+ case 'fk':
+ bar_background = 'bg-light';
+ break;
+ default:
+ bar_background = '';
+ break;
+ };
+
+ $( '#pg-' + p_type ).append( ''); //+ ' >' );
+
+ $( '#pg-'+ p_id ).append( '' );
+ $( '#pg-bar'+ p_id ).append('');
+
+
+
+
+ clearInterval(counter_tmld[p_id]);
+ counter_tmld[p_id] = 0;
+
+ counter_tmld[p_id] = setInterval(function() {
+ do_rmld_bar(p_id, p_start, p_end);
+ }, 1000);
+};
+
+
+ function do_rmld_bar(p_id, start, end) {
+ //console.log(p_id);
+ today = new Date();
+ // restliche Zeit ermitteln
+ //var current_progress = Math.round(100 / (end.getTime() - start.getTime()) * (end.getTime() - today.getTime()));
+ var current_progress = Math.round(100 / (start.getTime() - end.getTime()) * (start.getTime() - today.getTime()));
+
+ var diff = Math.abs(end - today);
+ var minutesDifference = Math.floor(diff / 1000 / 60);
+ diff -= minutesDifference * 1000 * 60;
+ var secondsDifference = Math.floor(diff / 1000);
+ if (secondsDifference <= 9) {
+ secondsDifference = '0' + secondsDifference;
+ };
+ var minutes = minutesDifference + ':' + secondsDifference;
+
+
+ // Progressbar anpassen
+ if (current_progress >= 100) {
+ $("#pg-bar"+p_id)
+ .css("width", "100%")
+ .attr("aria-valuenow", 100)
+ .addClass("ion-md-checkmark-circle");
+ $("#pg-text"+p_id).text("");
+ clearInterval(counter_ID[p_id]);
+ } else {
+ $("#pg-bar"+p_id)
+ .css("width", current_progress + "%")
+ .attr("aria-valuenow", current_progress);
+ $("#pg-text"+p_id).text(minutes);
+ };
+ };
+
socket.on('io.response', function(data) {
console.log(data);
// neue Rückmeldungen hinterlegen
@@ -502,5 +589,48 @@ socket.on('io.response', function(data) {
};
$('#rueckmeldung').append('' + data[i] + ' ' + i + '');
};*/
+
+
+ data.forEach(function (arrayItem) {
+ //var x = arrayItem.prop1 + 2;
+ //console.log(x);
+ var item_content = '';
+ var item_classname = '';
+ var item_type = "";
+if (arrayItem.einsatzkraft){
+item_content = 'Einsatzkraft';
+item_classname = 'ek';
+item_type = 'ek';
+};
+if (arrayItem.maschinist){
+item_content = 'Maschinist';
+item_classname = 'ma';
+item_type = 'ma';
+};
+if (arrayItem.fuehrungskraft){
+item_content = 'Führungskraft';
+item_classname = 'fk'
+item_type = 'fk';
+};
+if (arrayItem.agt){
+item_content = item_content + (' (AGT)');
+item_classname = item_classname + ('-agt');
+};
+//var item_id = Math.floor(Math.random() * 100) + Math.floor(Math.random() * 100);
+
+
+ add_resp_progressbar(arrayItem.rmld_uuid, item_type, arrayItem.agt, new Date(arrayItem.set_time), new Date(arrayItem.arrival_time));
+
+ var tmp_count = parseInt( $( '#'+item_type+'-counter' ).text() );
+ $( '#'+item_type+'-counter' ).text(tmp_count + 1 );
+
+ if (arrayItem.agt){
+ var tmp_agt = parseInt( $( '#agt-counter' ).text() );
+ $( '#agt-counter' ).text(tmp_agt + 1 );
+ };
+
+});
+
+
resize_text();
});
diff --git a/server/sql_qry.js b/server/sql_qry.js
index 65cbd7c..dbcd215 100644
--- a/server/sql_qry.js
+++ b/server/sql_qry.js
@@ -723,22 +723,22 @@ module.exports = function(db, async, app_cfg) {
if (item.einsatzkraft == 1) {
item.einsatzkraft = true;
} else {
- item.einsatzkraft = true;
+ item.einsatzkraft = false;
};
if (item.maschinist == 1) {
item.maschinist = true;
} else {
- item.maschinist = true;
+ item.maschinist = false;
};
if (item.fuehrungskraft == 1) {
item.fuehrungskraft = true;
} else {
- item.fuehrungskraft = true;
+ item.fuehrungskraft = false;
};
if (item.agt == 1) {
item.agt = true;
} else {
- item.agt = true;
+ item.agt = false;
};
// response_wache aufsummieren
all_responses.push(item)