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 +15 -15
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ec9f47274a - Show all commits

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

@ -135,7 +135,7 @@ $(document).ready(function() {
// Synchronization
// -----
OperationWebSocket.add_handler(history.update_data);
OperationWebSocket.add_handler(data => history.update_data(data));

27
kfet/templates/kfet/kpsul.html
View file

@ -667,19 +667,6 @@ $(document).ready(function() {
}
// -----
// Synchronization
// -----
OperationWebSocket.add_handler(kpsul.history.update_data);
OperationWebSocket.add_handler(kpsul.article_manager.update_data);
OperationWebSocket.add_handler(function(data) {
if (data['addcost']) {
Config.set('addcost_for', data['addcost']['for']);
Config.set('addcost_amount', data['addcost']['amount']);
displayAddcost();
}
});
// -----
// General
@ -789,6 +776,20 @@ $(document).ready(function() {
window.kpsul = new KPsulManager(env);
// -----
// Synchronization
// -----
OperationWebSocket.add_handler(data => kpsul.history.update_data(data));
OperationWebSocket.add_handler(data => kpsul.article_manager.update_data(data));
OperationWebSocket.add_handler(function(data) {
if (data['addcost']) {
Config.set('addcost_for', data['addcost']['for']);
Config.set('addcost_amount', data['addcost']['amount']);
displayAddcost();
}
});
hardReset();
});

1
kfet/templates/kfet/transfers.html
View file

@ -11,7 +11,6 @@
<script type="text/javascript" src="{% static 'kfet/js/moment-fr.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
<script type="text/javascript" src="{% url 'js_reverse' %}"></script>
<script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/js/kfet.api.js' %}"></script>
<script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
{% endblock %}