From 6be2f086df4cb9a9d602e19dc23c720b3e12c047 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 00:20:28 -0300
Subject: [PATCH 01/13] Add generic functions for confirm dialogs

---
 kfet/static/kfet/js/kfet.js | 134 ++++++++++++++++++++++++++++--------
 1 file changed, 106 insertions(+), 28 deletions(-)

diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index 0fb5c0e1..7a32ce15 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -89,8 +89,60 @@ function isValidTrigramme(trigramme) {
     return trigramme.match(pattern);
 }
 
+/**
+ * Dialogs with user via jconfirm
+ */
+
+class UserDialog {
+
+    static get default_data() {
+        return {'title': '', 'content': '', 'callback_as_dict': false};
+    }
+    
+    constructor(data) {
+        $.extend(this, this.constructor.default_data, data);
+    }
+
+    open(callback, errors, next_focus) {
+        var that = this;
+        $.confirm({
+            title: this.title,
+            content: errors + this.content,
+            backgroundDismiss: true,
+            animation:'top',
+            closeAnimation:'bottom',
+            keyboardEnabled: true,
+            confirm: function() {
+                if (that.callback_as_dict) {
+                    var inputs = {};
+                    this.$content.find('input').each(function () {
+                        inputs[$(this).attr('name')] = $(this).val();
+                    });
+                    return callback(inputs);
+                } else {
+                    var input_values = this.$content.find('input').map(function () { 
+                        return $(this).val();
+                    }).get();
+                    return callback.apply(null, input_values);
+                }
+            },
+            onOpen: function() {
+                var that = this
+                this.$content.find('input').on('keydown', function(e) {
+                    if (e.keyCode == 13) {
+                        e.preventDefault();
+                        that.$confirmButton.click();
+                    }
+                });
+            },
+            onClose: function() { if (next_focus) { this._lastFocused = next_focus; } }
+        });
+    }
+}
+
 function getErrorsHtml(data) {
     var content = '';
+    console.log(data);
     if ('operation_group' in data['errors']) {
         content += 'Général';
         content += '<ul>';
@@ -128,27 +180,60 @@ function getErrorsHtml(data) {
     return content;
 }
 
-function requestAuth(data, callback, focus_next = null) {
-    var content = getErrorsHtml(data);
-    content += '<div class="capslock"><span class="glyphicon glyphicon-lock"></span><input type="password" name="password" autofocus><div>',
-    $.confirm({
-        title: 'Authentification requise',
-        content: content,
-        backgroundDismiss: true,
-        animation:'top',
-        closeAnimation:'bottom',
-        keyboardEnabled: true,
-        confirm: function() {
-            var password = this.$content.find('input').val();
-            callback(password);
-        },
-        onOpen: function() {
-            var that = this;
-            var capslock = -1 ; // 1 -> caps on ; 0 -> caps off ; -1 or 2 -> unknown
-            this.$content.find('input').on('keypress', function(e) {
-                if (e.keyCode == 13)
-                    that.$confirmButton.click();
+var authDialog = new UserDialog({
+    'title': 'Authentification requise',
+    'content': '<div class="capslock"><span class="glyphicon glyphicon-lock"></span><input type="password" name="password" autofocus><div>',
+});
 
+function api_with_auth(settings, password) {
+    if (window.lock == 1)
+        return false;
+    window.lock = 1;
+
+    var url = settings.url;
+    if (!url)
+        return false;
+    var data = settings.data || {} ;
+    var on_success = settings.on_success || $.noop ;
+    var on_400 = settings.on_400 || $.noop ;
+
+    $.ajax({
+        dataType: "json",
+        url: url,
+        method: "POST",
+        data: data,
+        beforeSend: function ($xhr) {
+            $xhr.setRequestHeader("X-CSRFToken", csrftoken);
+            if (password)
+                $xhr.setRequestHeader("KFetPassword", password);
+        },
+    })
+    .done(function(data) {
+        on_success(data);
+        window.lock = 0 ;
+    })
+    .fail(function($xhr) {
+        var response = $xhr.responseJSON;
+        switch ($xhr.status) {
+            case 403:
+                authDialog.open(
+                    function(password) {
+                        api_with_auth(settings, password)
+                    },
+                    getErrorsHtml(response),
+                    settings.next_focus
+                );
+                break;
+            case 400:
+                on_400(response);
+                break;
+        }
+        window.lock = 0 ;
+    });
+}
+
+/* TODO: add capslock to all needed password inputs
+ *
                 var s = String.fromCharCode(e.which);
                 if ((s.toUpperCase() === s && s.toLowerCase() !== s && !e.shiftKey)|| //caps on, shift off
                     (s.toUpperCase() !== s && s.toLowerCase() === s && e.shiftKey)) { //caps on, shift on
@@ -172,11 +257,4 @@ function requestAuth(data, callback, focus_next = null) {
                 else if (capslock == 0)
                     $('.capslock .glyphicon').hide() ;
             });
-        },
-        onClose: function() {
-            if (focus_next)
-                this._lastFocused = focus_next;
-        }
-
-    });
-}
+*/

From 87943ea7b9bb1d9668f971291179f2087a4dc543 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 00:20:47 -0300
Subject: [PATCH 02/13] Adapt kpsul to new functions

---
 kfet/templates/kfet/kpsul.html | 261 ++++++++++-----------------------
 1 file changed, 78 insertions(+), 183 deletions(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 15f83076..1506f6a5 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -182,7 +182,7 @@ $(document).ready(function() {
     // -----
 
     // Lock to avoid multiple requests
-    var lock = 0;
+    window.lock = 0;
 
     // -----
     // Auth
@@ -190,26 +190,18 @@ $(document).ready(function() {
 
     function askComment(callback) {
         var comment = $('#id_comment').val();
-        $.confirm({
+        var commentDialog = new UserDialog({
             title: 'Commentaire requis',
             content: '<input type="text" name="comment_opegroup" value="'+comment+'" autofocus>',
-            backgroundDismiss: true,
-            animation: 'top',
-            closeAnimation: 'bottom',
-            keyboardEnabled: true,
-            confirm: function() {
-                $('#id_comment').val(this.$content.find('input').val());
-                callback();
-            },
-            onOpen: function() {
-                var that = this;
-                this.$content.find('input').on('keydown', function(e) {
-                    if (e.keyCode == 13)
-                        that.$confirmButton.click();
-                });
-            },
-            onClose: function() { this._lastFocused = articleSelect; }
+
         });
+
+        function confirm_callback(comment) {
+            $('#id_comment').val(comment);
+            callback();
+        }
+
+        commentDialog.open(confirm_callback, '', articleSelect);
     }
 
     function resetComment() {
@@ -239,42 +231,22 @@ $(document).ready(function() {
     var operationGroup = $('#operationgroup_form');
     var operations     = $('#operation_formset');
 
-    function performOperations(password = '') {
-        if (lock == 1)
-            return false;
-        lock = 1;
+    function performOperations() {
         var data = operationGroup.serialize() + '&' + operations.serialize();
-        $.ajax({
-            dataType: "json",
-            url     : "{% url 'kfet.kpsul.perform_operations' %}",
-            method  : "POST",
-            data    : data,
-            beforeSend: function ($xhr) {
-                $xhr.setRequestHeader("X-CSRFToken", csrftoken);
-                if (password != '')
-                    $xhr.setRequestHeader("KFetPassword", password);
+        api_with_auth({
+            url: Urls['kfet.kpsul.perform_operations'](),
+            data: data,
+            on_success: function(data) {
+                updatePreviousOp();
+                coolReset();
             },
-        })
-        .done(function(data) {
-            updatePreviousOp();
-            coolReset();
-            lock = 0;
-        })
-        .fail(function($xhr) {
-            var data = $xhr.responseJSON;
-            switch ($xhr.status) {
-                case 403:
-                    requestAuth(data, performOperations, articleSelect);
-                    break;
-                case 400:
-                    if ('need_comment' in data['errors']) {
-                        askComment(performOperations);
-                    } else {
-                        displayErrors(getErrorsHtml(data));
-                    }
-                    break;
-            }
-            lock = 0;
+            on_400: function(data) {
+                if ('need_comment' in data['errors'])
+                    askComment(performOperations);
+                else
+                    displayErrors(data);
+            },
+            next_focus: articleSelect,
         });
     }
 
@@ -290,40 +262,18 @@ $(document).ready(function() {
     var cancelButton = $('#cancel_operations');
     var cancelForm   = $('#cancel_form');
 
-    function cancelOperations(opes_array, password = '') {
-        if (lock == 1)
-            return false
-        lock = 1;
+    function cancelOperations(opes_array) {
         var data = { 'operations' : opes_array }
-        $.ajax({
-            dataType: "json",
-            url     : "{% url 'kfet.kpsul.cancel_operations' %}",
-            method  : "POST",
-            data    : data,
-            beforeSend: function ($xhr) {
-                $xhr.setRequestHeader("X-CSRFToken", csrftoken);
-                if (password != '')
-                    $xhr.setRequestHeader("KFetPassword", password);
+        api_with_auth({
+            url: Urls['kfet.kpsul.cancel_operations'](),
+            data: data,
+            on_success: function(data) {
+                coolReset();
             },
-
-        })
-        .done(function(data) {
-            coolReset();
-            lock = 0;
-        })
-        .fail(function($xhr) {
-            var data = $xhr.responseJSON;
-            switch ($xhr.status) {
-                case 403:
-                    requestAuth(data, function(password) {
-                        cancelOperations(opes_array, password);
-                    }, account_manager._$input_trigramme);
-                    break;
-                case 400:
-                    displayErrors(getErrorsHtml(data));
-                    break;
-            }
-            lock = 0;
+            on_400: function(data) {
+                displayErrors(data);
+            },
+            next_focus: kpsul.account_manager,
         });
     }
 
@@ -546,7 +496,7 @@ $(document).ready(function() {
 
     function amountEuroPurchase(article_data, nb) {
         var amount_euro = - article_data[3] * nb ;
-        if (Config.get('addcost_for') && Config.get('addcost_amount') && account_manager.account.trigramme != Config.get('addcost_for'))
+        if (Config.get('addcost_for') && Config.get('addcost_amount') && kpsul.account_manager.account.trigramme != Config.get('addcost_for'))
             amount_euro -= Config.get('addcost_amount') * nb;
         var reduc_divisor = 1;
         if (kpsul.account_manager.account.is_cof)
@@ -691,59 +641,38 @@ $(document).ready(function() {
     // Ask deposit or withdraw
     // -----
 
+
     function askDeposit(is_checkout=1) {
-        var title = is_checkout ? 'Montant de la charge' : "Montant de l'édition";
-        $.confirm({
-            title: title,
+        var depositDialog = new UserDialog({
+            title: is_checkout ? 'Montant de la charge' : "Montant de l'édition",
             content: '<input type="number" lang="en" step="0.01" min="0.01" on autofocus placeholder="€">',
-            backgroundDismiss: true,
-            animation:'top',
-            closeAnimation:'bottom',
-            keyboardEnabled: true,
-            confirm: function() {
-                var amount = this.$content.find('input').val();
-                if (!$.isNumeric(amount) || amount <= 0)
-                    return false;
-                addDeposit(amount, is_checkout);
-            },
-            onOpen: function() {
-                var that = this
-                this.$content.find('input').on('keydown', function(e) {
-                    if (e.keyCode == 13) {
-                        e.preventDefault();
-                        that.$confirmButton.click();
-                    }
-                });
-            },
-            onClose: function() { this._lastFocused = (articleSelect.val() ? articleNb : articleSelect) ; }
         });
+
+        function callback(amount) {
+            if (!$.isNumeric(amount) || amount <= 0)
+                return false;
+            addDeposit(amount, is_checkout);
+
+        }
+        var next_focus = articleSelect.val() ? articleNb : articleSelect ;
+
+        depositDialog.open(callback, '', next_focus);
     }
 
     function askWithdraw() {
-        $.confirm({
-            title: 'Montant du retrait',
-            content: '<input type="number" lang="en" step="0.01" min="0.01" on autofocus placeholder="€">',
-            backgroundDismiss: true,
-            animation:'top',
-            closeAnimation:'bottom',
-            keyboardEnabled: true,
-            confirm: function() {
-                var amount = this.$content.find('input').val();
-                if (!$.isNumeric(amount) || amount <= 0)
-                    return false;
-                addWithdraw(amount);
-            },
-            onOpen: function() {
-                var that = this
-                this.$content.find('input').on('keydown', function(e) {
-                    if (e.keyCode == 13) {
-                        e.preventDefault();
-                        that.$confirmButton.click();
-                    }
-                });
-            },
-            onClose: function() { this._lastFocused = articleSelect; }
+        var withdrawDialog = new UserDialog({
+            'title': 'Montant du retrait',
+            'content': '<input type="number" lang="en" step="0.01" min="0.01" on autofocus placeholder="€">',
         });
+
+        function callback(amount) {
+            if (!$.isNumeric(amount) || amount <= 0)
+                return false;
+            addWithdraw(amount, is_checkout);
+
+        }
+
+        withdrawDialog.open(callback, '', articleSelect);
     }
 
     // Event
@@ -862,65 +791,31 @@ $(document).ready(function() {
             addcost_html
                 .find('.addcost_for').text(Config.get('addcost_for')).end()
                 .find('.addcost_amount').text(Config.get('addcost_amount').toFixed(2)).end();
-            checkout_container.prepend(addcost_html);
+            kpsul.checkout_manager._$container.prepend(addcost_html);
             $('body').css('animation', 'colorchange 3s infinite');
         }
     }
-    function sendAddcost(trigramme, amount, password='') {
-        var data = {
-            trigramme: trigramme,
-            amount: amount,
-        }
-        $.ajax({
-            dataType: "json",
-            url     : "{% url 'kfet.kpsul.update_addcost' %}",
-            method  : "POST",
-            data    : data,
-            beforeSend: function ($xhr) {
-                $xhr.setRequestHeader("X-CSRFToken", csrftoken);
-                if (password != '')
-                    $xhr.setRequestHeader("KFetPassword", password);
-            },
-        })
-        .fail(function($xhr) {
-            var data = $xhr.responseJSON;
-            switch ($xhr.status) {
-                case 403:
-                    requestAuth(data, function(password) {
-                        sendAddcost(trigramme, amount, password);
-                    }, account_manager._$input_trigramme);
-                    break;
-                case 400:
-                    askAddcost(getErrorsHtml(data));
-                    break;
-            }
-        });
-    }
+
+    var addcostDialog = new UserDialog({
+        'title': 'Majoration',
+        'content': '<input type="text" placeholder="Trigramme" autocomplete="off" name="trigramme" spellcheck="false" style="text-transform:uppercase" autofocus><input type="number" lang="en" step="0.01" min="0.01" placeholder="€" name="amount">',
+    });
 
     function askAddcost(errors = '') {
-        $.confirm({
-            title: 'Majoration',
-            content: errors + '<input type="text" placeholder="Trigramme" autocomplete="off" name="trigramme" spellcheck="false" style="text-transform:uppercase" autofocus><input type="number" lang="en" step="0.01" min="0.01" placeholder="€" name="amount">',
-            backgroundDismiss: true,
-            animation:'top',
-            closeAnimation:'bottom',
-            keyboardEnabled: true,
-            confirm: function() {
-                var trigramme = this.$content.find('input[name=trigramme]').val().toUpperCase();
-                var amount = this.$content.find('input[name=amount]').val();
-                sendAddcost(trigramme, amount);
-            },
-            onOpen: function() {
-                var that = this
-                this.$content.find('input[name=amount]').on('keydown', function(e) {
-                    if (e.keyCode == 13) {
-                        e.preventDefault();
-                        that.$confirmButton.click();
-                    }
+        addcostDialog.open(
+            function(data) {
+                api_with_auth({
+                    url: Urls['kfet.kpsul.update_addcost'](),
+                    data: data,
+                    on_400: function(data) {
+                        askAddcost(getErrorsHtml(data));
+                    },
+                    next_focus: kpsul.account_manager,
                 });
             },
-            onClose: function() { this._lastFocused = account_manager._$input_trigramme; }
-        });
+            errors,
+            kpsul.account_manager
+       );
     }
 
 

From dbcfc6df46087b42aaf5985ec265da8c34913fb3 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 00:21:17 -0300
Subject: [PATCH 03/13] Remove duplicate kfet.js import

---
 kfet/templates/kfet/kpsul.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 1506f6a5..369aba56 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -13,7 +13,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/history.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/kfet.api.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/kpsul.js' %}"></script>

From 3f07bf56faed44cbfce8b7aa3b561efd55b0632e Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 00:25:51 -0300
Subject: [PATCH 04/13] Remove console log

---
 kfet/static/kfet/js/kfet.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index 7a32ce15..844a5958 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -142,7 +142,6 @@ class UserDialog {
 
 function getErrorsHtml(data) {
     var content = '';
-    console.log(data);
     if ('operation_group' in data['errors']) {
         content += 'Général';
         content += '<ul>';

From 3bf7a066a254a43b1e7233933dafb4ee05a96c12 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 00:33:33 -0300
Subject: [PATCH 05/13] Adapt history.html to new functions

---
 kfet/templates/kfet/history.html | 86 ++++++--------------------------
 kfet/templates/kfet/kpsul.html   |  2 +-
 2 files changed, 15 insertions(+), 73 deletions(-)

diff --git a/kfet/templates/kfet/history.html b/kfet/templates/kfet/history.html
index 091b4f2f..6d9dfa5c 100644
--- a/kfet/templates/kfet/history.html
+++ b/kfet/templates/kfet/history.html
@@ -13,8 +13,9 @@
 <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="{% static 'kfet/js/bootstrap-datetimepicker.min.js' %}"></script>
+<script type="text/javascript" src="{% url 'js_reverse' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/multiple-select.js' %}"></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 %}
 
@@ -60,6 +61,9 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
+    // Lock to avoid multiple requests
+    window.lock = 0;
+
     settings = { 'subvention_cof': parseFloat({{ settings.subvention_cof|unlocalize }})}
 
     khistory = new KHistory();
@@ -179,79 +183,17 @@ $(document).ready(function() {
         });
     }
 
-    function requestAuth(data, callback) {
-        var content = getErrorsHtml(data);
-        content += '<input type="password" name="password" autofocus>',
-        $.confirm({
-            title: 'Authentification requise',
-            content: content,
-            backgroundDismiss: true,
-            animation:'top',
-            closeAnimation:'bottom',
-            keyboardEnabled: true,
-            confirm: function() {
-                var password = this.$content.find('input').val();
-                callback(password);
-            },
-            onOpen: function() {
-                var that = this;
-                this.$content.find('input').on('keypress', function(e) {
-                    if (e.keyCode == 13)
-                        that.$confirmButton.click();
-                });
-            },
-        });
-    }
-
-    function getErrorsHtml(data) {
-        var content = '';
-        if ('missing_perms' in data['errors']) {
-            content += 'Permissions manquantes';
-            content += '<ul>';
-            for (var i=0; i<data['errors']['missing_perms'].length; i++)
-                content += '<li>'+data['errors']['missing_perms'][i]+'</li>';
-            content += '</ul>';
-        }
-        if ('negative' in data['errors']) {
-            var url_base = "{% url 'kfet.account.update' LIQ}";
-            url_base = base_url(0, url_base.length-8);
-            for (var i=0; i<data['errors']['negative'].length; i++) {
-                content += '<a class="btn btn-primary" href="'+url_base+data['errors']['negative'][i]+'/edit" target="_blank">Autorisation de négatif requise pour '+data['errors']['negative'][i]+'</a>';
-            }
-        }
-        return content;
-    }
-
-    function cancelOperations(opes_array, password = '') {
+    function cancelOperations(opes_array) {
         var data = { 'operations' : opes_array }
-        $.ajax({
-            dataType: "json",
-            url     : "{% url 'kfet.kpsul.cancel_operations' %}",
-            method  : "POST",
-            data    : data,
-            beforeSend: function ($xhr) {
-                $xhr.setRequestHeader("X-CSRFToken", csrftoken);
-                if (password != '')
-                    $xhr.setRequestHeader("KFetPassword", password);
+        api_with_auth({
+            url: Urls['kfet.kpsul.cancel_operations'](),
+            data: data,
+            on_success: function(data) {
+                khistory.$container.find('.ui-selected').removeClass('ui-selected');
+            },
+            on_400: function(data) {
+                displayErrors(getErrorsHtml(data));
             },
-
-        })
-        .done(function(data) {
-            khistory.$container.find('.ui-selected').removeClass('ui-selected');
-        })
-        .fail(function($xhr) {
-            var data = $xhr.responseJSON;
-            switch ($xhr.status) {
-                case 403:
-                    requestAuth(data, function(password) {
-                        cancelOperations(opes_array, password);
-                    });
-                    break;
-                case 400:
-                    displayErrors(getErrorsHtml(data));
-                    break;
-            }
-
         });
     }
 
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 369aba56..c55bbfd7 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -270,7 +270,7 @@ $(document).ready(function() {
                 coolReset();
             },
             on_400: function(data) {
-                displayErrors(data);
+                displayErrors(getErrorsHtml(data));
             },
             next_focus: kpsul.account_manager,
         });

From c1f70d9d0af05b67896caaaf6494c890af5eb806 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 17:51:55 -0300
Subject: [PATCH 06/13] Add capslock support for inputs

---
 kfet/static/kfet/css/jconfirm-kfet.css |  7 +++-
 kfet/static/kfet/js/kfet.js            | 52 +++++++++++++-------------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/kfet/static/kfet/css/jconfirm-kfet.css b/kfet/static/kfet/css/jconfirm-kfet.css
index 0bd53ab7..6c27f77c 100644
--- a/kfet/static/kfet/css/jconfirm-kfet.css
+++ b/kfet/static/kfet/css/jconfirm-kfet.css
@@ -71,14 +71,19 @@
 
 .jconfirm .capslock .glyphicon {
     position: absolute;
+    display:none;
     padding: 10px;
     right: 0px;
     top: 15px;
     font-size: 30px;
-    display: none ;
     margin-left: 60px !important;
 }
 
+.capslock_on .capslock .glyphicon{
+    display: inline-block !important;
+}
+
+
 .jconfirm .capslock input {
     padding-right: 50px;
     padding-left: 50px;
diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index c80e760a..ab3855a7 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -124,8 +124,33 @@ $(document).ready(function() {
             }
         });
     }
+
 });
 
+/*
+ * Capslock management
+ */
+
+window.capslock = -1; 
+$(document).on('keypress', function(e) {
+    var s = String.fromCharCode(e.which);
+    if ((s.toUpperCase() === s && s.toLowerCase() !== s && !e.shiftKey)|| //caps on, shift off
+        (s.toUpperCase() !== s && s.toLowerCase() === s && e.shiftKey)) { //caps on, shift on
+            $('body').addClass('capslock_on')
+    } else if ((s.toLowerCase() === s && s.toUpperCase() !== s && !e.shiftKey)|| //caps off, shift off
+               (s.toLowerCase() !== s && s.toUpperCase() === s && e.shiftKey)) { //caps off, shift on
+            $('body').removeClass('capslock_on')
+    }
+});
+
+$(document).on('keydown', function(e) {
+    if (e.which == 20) {
+        $('body').toggleClass('capslock_on')
+    }
+});
+
+
+
 function dateUTCToParis(date) {
     return moment.tz(date, 'UTC').tz('Europe/Paris');
 }
@@ -287,30 +312,3 @@ function api_with_auth(settings, password) {
         window.lock = 0 ;
     });
 }
-
-/* TODO: add capslock to all needed password inputs
- *
-                var s = String.fromCharCode(e.which);
-                if ((s.toUpperCase() === s && s.toLowerCase() !== s && !e.shiftKey)|| //caps on, shift off
-                    (s.toUpperCase() !== s && s.toLowerCase() === s && e.shiftKey)) { //caps on, shift on
-                        capslock = 1 ;
-                } else if ((s.toLowerCase() === s && s.toUpperCase() !== s && !e.shiftKey)|| //caps off, shift off
-                           (s.toLowerCase() !== s && s.toUpperCase() === s && e.shiftKey)) { //caps off, shift on
-                        capslock = 0 ;
-                }
-                if (capslock == 1)
-                    $('.capslock .glyphicon').show() ;
-                else if (capslock == 0)
-                    $('.capslock .glyphicon').hide() ;
-            });
-            // Capslock key is not detected by keypress
-            this.$content.find('input').on('keydown', function(e) {
-                if (e.which == 20) {
-                    capslock = 1-capslock ;
-                }
-                if (capslock == 1)
-                    $('.capslock .glyphicon').show() ;
-                else if (capslock == 0)
-                    $('.capslock .glyphicon').hide() ;
-            });
-*/

From 5101400f64f606daf1837630206fbc4bae120f4d Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 17:57:51 -0300
Subject: [PATCH 07/13] Use callback_as_dict for addcost

---
 kfet/templates/kfet/kpsul.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index c55bbfd7..75665f95 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -798,6 +798,7 @@ $(document).ready(function() {
     var addcostDialog = new UserDialog({
         'title': 'Majoration',
         'content': '<input type="text" placeholder="Trigramme" autocomplete="off" name="trigramme" spellcheck="false" style="text-transform:uppercase" autofocus><input type="number" lang="en" step="0.01" min="0.01" placeholder="€" name="amount">',
+        'callback_as_dict': true,
     });
 
     function askAddcost(errors = '') {

From 08c752f1b399930144e97ce2fcce92c8294b7706 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 26 Mar 2017 18:10:26 -0300
Subject: [PATCH 08/13] Simplify addcost management

---
 kfet/templates/kfet/kpsul.html | 37 +++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 75665f95..3a33bb42 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -795,27 +795,26 @@ $(document).ready(function() {
         }
     }
 
-    var addcostDialog = new UserDialog({
-        'title': 'Majoration',
-        'content': '<input type="text" placeholder="Trigramme" autocomplete="off" name="trigramme" spellcheck="false" style="text-transform:uppercase" autofocus><input type="number" lang="en" step="0.01" min="0.01" placeholder="€" name="amount">',
-        'callback_as_dict': true,
-    });
 
     function askAddcost(errors = '') {
-        addcostDialog.open(
-            function(data) {
-                api_with_auth({
-                    url: Urls['kfet.kpsul.update_addcost'](),
-                    data: data,
-                    on_400: function(data) {
-                        askAddcost(getErrorsHtml(data));
-                    },
-                    next_focus: kpsul.account_manager,
-                });
-            },
-            errors,
-            kpsul.account_manager
-       );
+        var addcostDialog = new UserDialog({
+            'title': 'Majoration',
+            'content': '<input type="text" placeholder="Trigramme" autocomplete="off" name="trigramme" spellcheck="false" style="text-transform:uppercase" autofocus><input type="number" lang="en" step="0.01" min="0.01" placeholder="€" name="amount">',
+            'callback_as_dict': true,
+        });
+
+        function callback(data) {
+            api_with_auth({
+                url: Urls['kfet.kpsul.update_addcost'](),
+                data: data,
+                on_400: function(data) {
+                    askAddcost(getErrorsHtml(data));
+                },
+                next_focus: kpsul.account_manager,
+            });
+        }
+
+        addcostDialog.open(callback, errors, kpsul.account_manager);
     }
 
 

From 582cdebaa1b8556db874486e8febf6c77c4df4a5 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Fri, 31 Mar 2017 17:49:22 -0300
Subject: [PATCH 09/13] Better callback management

---
 kfet/static/kfet/js/kfet.js    | 24 ++++++++++--------------
 kfet/templates/kfet/kpsul.html |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index ab3855a7..5e49065d 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -177,12 +177,12 @@ function isValidTrigramme(trigramme) {
 
 class UserDialog {
 
-    static get default_data() {
-        return {'title': '', 'content': '', 'callback_as_dict': false};
+    static get defaults() {
+        return {'title': '', 'content': ''};
     }
     
     constructor(data) {
-        $.extend(this, this.constructor.default_data, data);
+        $.extend(this, this.constructor.defaults, data);
     }
 
     open(callback, errors, next_focus) {
@@ -195,18 +195,14 @@ class UserDialog {
             closeAnimation:'bottom',
             keyboardEnabled: true,
             confirm: function() {
-                if (that.callback_as_dict) {
-                    var inputs = {};
-                    this.$content.find('input').each(function () {
-                        inputs[$(this).attr('name')] = $(this).val();
-                    });
+                var inputs = {};
+                this.$content.find('input').each(function () {
+                    inputs[$(this).attr('name')] = $(this).val();
+                });
+                if (Object.keys(inputs).length > 1)
                     return callback(inputs);
-                } else {
-                    var input_values = this.$content.find('input').map(function () { 
-                        return $(this).val();
-                    }).get();
-                    return callback.apply(null, input_values);
-                }
+                else
+                    return callback(inputs[Object.keys(inputs)[0]]);
             },
             onOpen: function() {
                 var that = this
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 3a33bb42..61a17ecd 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -243,7 +243,7 @@ $(document).ready(function() {
                 if ('need_comment' in data['errors'])
                     askComment(performOperations);
                 else
-                    displayErrors(data);
+                    displayErrors(getErrorsHtml(data));
             },
             next_focus: articleSelect,
         });

From 236dcb4644ac1b619f85f9b21c73889e88cc456b Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Fri, 31 Mar 2017 18:10:06 -0300
Subject: [PATCH 10/13] Tweaks to UserDialog

---
 kfet/static/kfet/js/kfet.js    | 26 ++++++++++++++++----------
 kfet/templates/kfet/kpsul.html | 23 ++++++++++++++++++-----
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index 5e49065d..0fa6e06a 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -185,11 +185,16 @@ class UserDialog {
         $.extend(this, this.constructor.defaults, data);
     }
 
-    open(callback, errors, next_focus) {
+    open(settings) {
+        // Arg management
+        var pre_content = settings.pre_content || '';
+        var post_content = settings.post_content || '';
+        var callback = settings.callback || $.noop;
+
         var that = this;
         $.confirm({
             title: this.title,
-            content: errors + this.content,
+            content: pre_content + this.content + post_content,
             backgroundDismiss: true,
             animation:'top',
             closeAnimation:'bottom',
@@ -213,7 +218,7 @@ class UserDialog {
                     }
                 });
             },
-            onClose: function() { if (next_focus) { this._lastFocused = next_focus; } }
+            onClose: function() { if (settings.next_focus) { this._lastFocused = settings.next_focus; } }
         });
     }
 }
@@ -287,24 +292,25 @@ function api_with_auth(settings, password) {
     })
     .done(function(data) {
         on_success(data);
-        window.lock = 0 ;
     })
     .fail(function($xhr) {
         var response = $xhr.responseJSON;
         switch ($xhr.status) {
             case 403:
-                authDialog.open(
-                    function(password) {
+                authDialog.open({
+                    callback: function(password) {
                         api_with_auth(settings, password)
                     },
-                    getErrorsHtml(response),
-                    settings.next_focus
-                );
+                    pre_content: getErrorsHtml(response),
+                    next_focus: settings.next_focus,
+                });
                 break;
             case 400:
                 on_400(response);
                 break;
         }
-        window.lock = 0 ;
+    })
+    .always(function() {
+        window.lock = 0;
     });
 }
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 61a17ecd..6eeb9e39 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -200,7 +200,10 @@ $(document).ready(function() {
             callback();
         }
 
-        commentDialog.open(confirm_callback, '', articleSelect);
+        commentDialog.open({
+            callback: confirm_callback,
+            next_focus: articleSelect
+        });
     }
 
     function resetComment() {
@@ -655,7 +658,10 @@ $(document).ready(function() {
         }
         var next_focus = articleSelect.val() ? articleNb : articleSelect ;
 
-        depositDialog.open(callback, '', next_focus);
+        depositDialog.open({
+            callback: callback,
+            next_focus: next_focus,
+        });
     }
 
     function askWithdraw() {
@@ -667,11 +673,14 @@ $(document).ready(function() {
         function callback(amount) {
             if (!$.isNumeric(amount) || amount <= 0)
                 return false;
-            addWithdraw(amount, is_checkout);
+            addWithdraw(amount);
 
         }
 
-        withdrawDialog.open(callback, '', articleSelect);
+        withdrawDialog.open({
+            callback: callback,
+            next_focus: articleSelect
+        });
     }
 
     // Event
@@ -814,7 +823,11 @@ $(document).ready(function() {
             });
         }
 
-        addcostDialog.open(callback, errors, kpsul.account_manager);
+        addcostDialog.open({
+            callback: callback, 
+            pre_content: errors, 
+            next_focus: kpsul.account_manager,
+        });
     }
 
 

From 29836fd15c9af51176b2d64fea79fe96fe0907d1 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sat, 1 Apr 2017 09:24:18 -0300
Subject: [PATCH 11/13] Remove deprecated option

---
 kfet/templates/kfet/kpsul.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 6eeb9e39..c0761fa4 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -809,7 +809,6 @@ $(document).ready(function() {
         var addcostDialog = new UserDialog({
             'title': 'Majoration',
             'content': '<input type="text" placeholder="Trigramme" autocomplete="off" name="trigramme" spellcheck="false" style="text-transform:uppercase" autofocus><input type="number" lang="en" step="0.01" min="0.01" placeholder="€" name="amount">',
-            'callback_as_dict': true,
         });
 
         function callback(data) {

From 4af2562121c9e032804518ec51237dcc26cbd88b Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sat, 1 Apr 2017 09:34:02 -0300
Subject: [PATCH 12/13] More clarity in argument names

---
 kfet/templates/kfet/kpsul.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index c0761fa4..d07565fb 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -238,15 +238,15 @@ $(document).ready(function() {
         api_with_auth({
             url: Urls['kfet.kpsul.perform_operations'](),
             data: data,
-            on_success: function(data) {
+            on_success: function() {
                 updatePreviousOp();
                 coolReset();
             },
-            on_400: function(data) {
-                if ('need_comment' in data['errors'])
+            on_400: function(response) {
+                if ('need_comment' in response['errors'])
                     askComment(performOperations);
                 else
-                    displayErrors(getErrorsHtml(data));
+                    displayErrors(getErrorsHtml(response));
             },
             next_focus: articleSelect,
         });
@@ -269,11 +269,11 @@ $(document).ready(function() {
         api_with_auth({
             url: Urls['kfet.kpsul.cancel_operations'](),
             data: data,
-            on_success: function(data) {
+            on_success: function() {
                 coolReset();
             },
-            on_400: function(data) {
-                displayErrors(getErrorsHtml(data));
+            on_400: function(response) {
+                displayErrors(getErrorsHtml(response));
             },
             next_focus: kpsul.account_manager,
         });
@@ -815,8 +815,8 @@ $(document).ready(function() {
             api_with_auth({
                 url: Urls['kfet.kpsul.update_addcost'](),
                 data: data,
-                on_400: function(data) {
-                    askAddcost(getErrorsHtml(data));
+                on_400: function(response) {
+                    askAddcost(getErrorsHtml(response));
                 },
                 next_focus: kpsul.account_manager,
             });

From 50200371037d68deac89d71e172ee17f402e1212 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Mon, 3 Apr 2017 16:08:40 -0300
Subject: [PATCH 13/13] api_lock inside kfet.js

---
 kfet/static/kfet/js/kfet.js    | 6 +++---
 kfet/templates/kfet/kpsul.html | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js
index 0fa6e06a..b30772a9 100644
--- a/kfet/static/kfet/js/kfet.js
+++ b/kfet/static/kfet/js/kfet.js
@@ -268,9 +268,9 @@ var authDialog = new UserDialog({
 });
 
 function api_with_auth(settings, password) {
-    if (window.lock == 1)
+    if (window.api_lock == 1)
         return false;
-    window.lock = 1;
+    window.api_lock = 1;
 
     var url = settings.url;
     if (!url)
@@ -311,6 +311,6 @@ function api_with_auth(settings, password) {
         }
     })
     .always(function() {
-        window.lock = 0;
+        window.api_lock = 0;
     });
 }
diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index d07565fb..2112c2ec 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -176,12 +176,6 @@
 
 $(document).ready(function() {
     'use strict';
-    // -----
-    // General
-    // -----
-
-    // Lock to avoid multiple requests
-    window.lock = 0;
 
     // -----
     // Auth