From 5267a8a3683165dd88502be3d088fa4891d70a9b Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Thu, 22 Dec 2016 01:13:14 -0200 Subject: [PATCH 1/4] add previous op recap --- kfet/static/kfet/css/kpsul.css | 11 ++++++++--- kfet/templates/kfet/kpsul.html | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css index 9fd53604..8149613c 100644 --- a/kfet/static/kfet/css/kpsul.css +++ b/kfet/static/kfet/css/kpsul.css @@ -8,7 +8,7 @@ input[type=number]::-webkit-outer-spin-button { margin: 0; } -#account, #checkout, input, #history, #basket, #basket_rel, #articles_data { +#account, #checkout, input, #history, #basket, #basket_rel, #previous_op, #articles_data { background:#fff; } @@ -335,11 +335,11 @@ input[type=number]::-webkit-outer-spin-button { padding:0; } -#basket, #basket_rel { +#basket, #basket_rel, #previous_op { height:100%; } -#basket_rel { +#basket_rel, #previous_op { border-top:1px solid #C8102E; } @@ -354,6 +354,11 @@ input[type=number]::-webkit-outer-spin-button { #basket_rel { border-top:0; margin-left:7px; + margin-right:7px; + } + #previous_op { + border-top:0; + margin-left:7px; } } diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 88f8f2f9..f5e80b03 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -138,10 +138,14 @@ -
+
+
+
+
+
@@ -473,6 +477,7 @@ $(document).ready(function() { }, }) .done(function(data) { + updatePreviousOp(); coolReset(); lock = 0; }) @@ -1045,6 +1050,16 @@ $(document).ready(function() { }); } + var previousop_container = $('#previous_op'); + + function updatePreviousOp() { + var previousop_html = ''; + var trigramme = triInput.val().toUpperCase(); + previousop_html += '
Trigramme : '+trigramme+'
'; + previousop_html += basketrel_container.html(); + previousop_container.html(previousop_html); + } + // ----- // Addcost // ----- From b27a2d072069c4f4d305fab91391e3ac1cd9be6d Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Thu, 22 Dec 2016 01:29:40 -0200 Subject: [PATCH 2/4] mise en valeur du trigramme --- kfet/static/kfet/css/kpsul.css | 11 +++++++++++ kfet/templates/kfet/kpsul.html | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css index 8149613c..f9c6a596 100644 --- a/kfet/static/kfet/css/kpsul.css +++ b/kfet/static/kfet/css/kpsul.css @@ -341,6 +341,7 @@ input[type=number]::-webkit-outer-spin-button { #basket_rel, #previous_op { border-top:1px solid #C8102E; + padding-left: 3px; } #basket { @@ -390,6 +391,16 @@ input[type=number]::-webkit-outer-spin-button { /* History */ +#previous_op .trigramme { + width:100%; + background-color:rgba(200,16,46,0.85); + color:#FFF; + font-weight:bold; + padding:3px; + margin-left: -3px; + margin-bottom: 3px; +} + .kpsul_middle_right_col { overflow:auto; } diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index f5e80b03..5965f950 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -1055,7 +1055,7 @@ $(document).ready(function() { function updatePreviousOp() { var previousop_html = ''; var trigramme = triInput.val().toUpperCase(); - previousop_html += '
Trigramme : '+trigramme+'
'; + previousop_html += '
Trigramme : '+trigramme+'
'; previousop_html += basketrel_container.html(); previousop_container.html(previousop_html); } From 7ed9c907265151628bc680fb424deaae062a2813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Sat, 7 Jan 2017 01:56:33 +0100 Subject: [PATCH 3/4] fix whitespaces --- kfet/static/kfet/css/kpsul.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css index f9c6a596..e7950914 100644 --- a/kfet/static/kfet/css/kpsul.css +++ b/kfet/static/kfet/css/kpsul.css @@ -392,13 +392,13 @@ input[type=number]::-webkit-outer-spin-button { /* History */ #previous_op .trigramme { - width:100%; + width:100%; background-color:rgba(200,16,46,0.85); color:#FFF; font-weight:bold; padding:3px; - margin-left: -3px; - margin-bottom: 3px; + margin-left: -3px; + margin-bottom: 3px; } .kpsul_middle_right_col { From a34732cc9df109fc399a1dbef41041ce89de2c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Sat, 7 Jan 2017 02:28:19 +0100 Subject: [PATCH 4/4] ajouts supp. previous_op MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Le trigramme est obtenu à partir de ``account_data`` qui contient les données traitées et validées relatives au compte en train de commander. - L'opération précédente disparaît en cas de ``hard reset`` --- kfet/templates/kfet/kpsul.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 5965f950..ae1b320b 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -1054,12 +1054,16 @@ $(document).ready(function() { function updatePreviousOp() { var previousop_html = ''; - var trigramme = triInput.val().toUpperCase(); + var trigramme = account_data['trigramme']; previousop_html += '
Trigramme : '+trigramme+'
'; previousop_html += basketrel_container.html(); previousop_container.html(previousop_html); } + function resetPreviousOp() { + previousop_container.html(''); + } + // ----- // Addcost // ----- @@ -1228,6 +1232,7 @@ $(document).ready(function() { coolReset(give_tri_focus); checkoutInput.trigger('change'); resetArticles(); + resetPreviousOp(); khistory.reset(); resetSettings(); getArticles();