DGNum/gestioCOF
16
2
Fork 2
Code Issues 78 Pull requests 15 Projects Releases 12 Packages Wiki Activity

WIP: Aureplop/kpsul js refactor #501

Draft
delobell wants to merge 215 commits from aureplop/kpsul_js_refactor into master
pull from: aureplop/kpsul_js_refactor
merge into: DGNum:master
Conversation 55 Commits 215 Files changed 19 +1 -4
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit db94a8904c - Show all commits

5
kfet/templates/kfet/history.html
View file

@ -239,10 +239,7 @@ $(document).ready(function() {
data = $.extend({}, websocket_msg_default, JSON.parse(e.data)); data = $.extend({}, websocket_msg_default, JSON.parse(e.data));
for (var i=0; i<data['opegroups'].length; i++) { for (var i=0; i<data['opegroups'].length; i++) {
if (data['opegroups'][i]['add'] && if (data['opegroups'][i]['cancellation']) {
moment(data['opegroups'][i]['at']).isBefore(moment($to_date.val()).add(15, 'minutes'))) {
khistory.addOpeGroup(data['opegroups'][i]);
} else if (data['opegroups'][i]['cancellation']) {
khistory.cancelOpeGroup(data['opegroups'][i]); khistory.cancelOpeGroup(data['opegroups'][i]);
} }
} }