DGNum/gestioCOF
15
2
Fork 2
Code Issues 79 Pull requests 21 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 +6 -10
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f57c292184 - Show all commits

9
kfet/templates/kfet/account_read.html
View file

@ -102,18 +102,15 @@
$(document).ready(function() { $(document).ready(function() {
'use strict'; 'use strict';
// Lock to avoid multiple requests var khistory = new KHistory({'remove_props': ['trigramme']});
window.lock = 0;
var history = new KHistory({'remove_props': ['trigramme']});
// ----- // -----
// Synchronization // Synchronization
// ----- // -----
OperationWebSocket.add_handler((data) => history.update_data(data)); OperationWebSocket.add_handler((data) => khistory.update_data(data));
Config.reset(() => history.fetch({'accounts': [{{account.pk}}]})); Config.reset(() => khistory.fetch({'accounts': [{{account.pk}}]}));
}); });
</script> </script>

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

@ -64,8 +64,7 @@
$(document).ready(function() { $(document).ready(function() {
'use strict'; 'use strict';
var khistory = new KHistory();
var history = new KHistory();
var $from_date = $('#from_date'); var $from_date = $('#from_date');
var $to_date = $('#to_date'); var $to_date = $('#to_date');
@ -95,7 +94,7 @@ $(document).ready(function() {
data['accounts'] = accounts; data['accounts'] = accounts;
// Update history // Update history
history.fetch(data); khistory.fetch(data);
} }
$('#from_date').datetimepicker({ $('#from_date').datetimepicker({
@ -134,7 +133,7 @@ $(document).ready(function() {
// Synchronization // Synchronization
// ----- // -----
OperationWebSocket.add_handler(data => history.update_data(data)); OperationWebSocket.add_handler(data => khistory.update_data(data));