From be8eb4ac28902430e7786ee0ba8f2370287051a6 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 12 Feb 2017 00:01:22 -0200
Subject: [PATCH 1/6] add (temporary) better presentation

---
 kfet/templates/kfet/order_create.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index efd316a6..511e2177 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -7,7 +7,7 @@
 
 <form action="" method="post">
   {% csrf_token %}
-  <table>
+  <table class="table table-hover table text-center">
     <thead>
       <tr>
         <td rowspan="2">Article</td>
@@ -31,7 +31,7 @@
       {% for form in formset %}
         {% ifchanged form.category %}
           <tr>
-            <td colspan="11">{{ form.category_name }}</td>
+              <td> {{ form.category_name }}</td>
           </tr>
         {% endifchanged %}
         <tr>

From 15d79aff2d50d304ca711d0dcdf1e47f5b9d29f0 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 12 Feb 2017 00:48:24 -0200
Subject: [PATCH 2/6] add help tooltips

---
 kfet/static/kfet/css/index.css        |  5 +++++
 kfet/templates/kfet/order_create.html | 32 ++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index f3e9bf8c..37e04bf6 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -341,3 +341,8 @@ textarea {
 .help h4 {
     margin:15px 0;
 }
+
+/* Tooltips */
+thead .tooltip {
+    font-size:13px;
+}
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index 511e2177..fdab4282 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -7,17 +7,27 @@
 
 <form action="" method="post">
   {% csrf_token %}
-  <table class="table table-hover table text-center">
+  <table class="table table-hover table-condensed text-center">
     <thead>
       <tr>
         <td rowspan="2">Article</td>
-        <td colspan="5">Ventes</td>
-        <td rowspan="2">V. moy.</td>
-        <td rowspan="2">E.T.</td>
-        <td rowspan="2">Prév.</td>
+        <td colspan="5">Ventes
+            <span class='glyphicon glyphicon-question-sign' title="Ventes des 5 dernières semaines" data-placement="bottom"></span>
+            </td>
+        <td rowspan="2">V. moy.
+            <span class='glyphicon glyphicon-question-sign' title="Moyenne des ventes" data-placement="bottom"></span>
+            </td>
+        <td rowspan="2">E.T.
+            <span class='glyphicon glyphicon-question-sign' title="Écart-type des ventes" data-placement="bottom"></span>
+            </td>
+        <td rowspan="2">Prév.
+            <span class='glyphicon glyphicon-question-sign' title="Prévision de ventes" data-placement="bottom"></span>
+            </td>
         <td rowspan="2">Stock</td>
-        <td rowspan="2">Rec.</td>
-        <td rowspan="2">Com.</td>
+        <td rowspan="2">Rec.
+            <span class='glyphicon glyphicon-question-sign' title="Commande conseillée" data-placement="bottom"></span>
+            </td>
+        <td rowspan="2">Commande</td>
       </tr>
       <tr>
         <td>S1</td>
@@ -36,7 +46,7 @@
         {% endifchanged %}
         <tr>
           {{ form.article }}
-          <td>{{ form.name }}</td>
+          <td class='text-left'>{{ form.name }}</td>
           <td>{{ form.v_s1 }}</td>
           <td>{{ form.v_s2 }}</td>
           <td>{{ form.v_s3 }}</td>
@@ -59,4 +69,10 @@
   <input type="submit" class="btn btn-primary btn-lg" value="Envoyer">
 </form>
 
+<script type='text/javascript'>
+$(document).ready(function () {
+    $('.glyphicon-question-sign').tooltip({'html': true}) ;
+});
+</script>
+
 {% endblock %}

From db899a891b41232428a46208d5e6bbe32c852bbd Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 12 Feb 2017 02:03:41 -0200
Subject: [PATCH 3/6] css tweaks

---
 kfet/forms.py                         |  9 ++++++---
 kfet/templates/kfet/order_create.html | 13 +++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/kfet/forms.py b/kfet/forms.py
index fe2e4a9c..a9cb0950 100644
--- a/kfet/forms.py
+++ b/kfet/forms.py
@@ -471,12 +471,15 @@ class InventoryArticleForm(forms.Form):
 # Order forms
 # -----
 
+
 class OrderArticleForm(forms.Form):
     article = forms.ModelChoiceField(
-            queryset = Article.objects.all(),
-            widget = forms.HiddenInput(),
+            queryset=Article.objects.all(),
+            widget=forms.HiddenInput(),
         )
-    quantity_ordered = forms.IntegerField(required = False)
+    quantity_ordered = forms.IntegerField(
+        required=False,
+        widget=forms.NumberInput(attrs={'class': 'form-control'}))
 
     def __init__(self, *args, **kwargs):
         super(OrderArticleForm, self).__init__(*args, **kwargs)
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index fdab4282..4ea76466 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -5,9 +5,11 @@
 
 {% block content %}
 
+<div class="content-right-block">
+    <div>
 <form action="" method="post">
   {% csrf_token %}
-  <table class="table table-hover table-condensed text-center">
+  <table class="table table-condensed text-center">
     <thead>
       <tr>
         <td rowspan="2">Article</td>
@@ -40,13 +42,14 @@
     <tbody>
       {% for form in formset %}
         {% ifchanged form.category %}
-          <tr>
+          <tr class='section'>
               <td> {{ form.category_name }}</td>
+              <td colspan="11"></td>
           </tr>
         {% endifchanged %}
         <tr>
           {{ form.article }}
-          <td class='text-left'>{{ form.name }}</td>
+          <td>{{ form.name }}</td>
           <td>{{ form.v_s1 }}</td>
           <td>{{ form.v_s2 }}</td>
           <td>{{ form.v_s3 }}</td>
@@ -66,8 +69,10 @@
     <input type="password" name="KFETPASSWORD">
   {% endif %}
   {{ formset.management_form }}
-  <input type="submit" class="btn btn-primary btn-lg" value="Envoyer">
+  <input type="submit" class="btn btn-primary btn-lg btn-block" value="Envoyer">
 </form>
+    </div>
+</div>
 
 <script type='text/javascript'>
 $(document).ready(function () {

From 3dfd8bf616a78490a3f69c926321c471f27cd3a1 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 12 Feb 2017 18:04:50 -0200
Subject: [PATCH 4/6] interface for order_to_inventory

---
 kfet/forms.py                               | 13 +++++++++----
 kfet/templates/kfet/order_to_inventory.html | 19 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/kfet/forms.py b/kfet/forms.py
index a9cb0950..3691e370 100644
--- a/kfet/forms.py
+++ b/kfet/forms.py
@@ -472,6 +472,7 @@ class InventoryArticleForm(forms.Form):
 # -----
 
 
+
 class OrderArticleForm(forms.Form):
     article = forms.ModelChoiceField(
             queryset=Article.objects.all(),
@@ -506,14 +507,18 @@ class OrderArticleToInventoryForm(forms.Form):
         )
     price_HT = forms.DecimalField(
             max_digits = 7, decimal_places = 4,
-            required = False)
+            required = False,
+            widget=forms.NumberInput(attrs={'class': 'form-control'}))
     TVA = forms.DecimalField(
             max_digits = 7, decimal_places = 2,
-            required = False)
+            required = False,
+            widget=forms.NumberInput(attrs={'class': 'form-control'}))
     rights = forms.DecimalField(
             max_digits = 7, decimal_places = 4,
-            required = False)
-    quantity_received = forms.IntegerField()
+            required = False,
+            widget=forms.NumberInput(attrs={'class': 'form-control'}))
+    quantity_received = forms.IntegerField(
+        widget=forms.NumberInput(attrs={'class': 'form-control'}))
 
     def __init__(self, *args, **kwargs):
         super(OrderArticleToInventoryForm, self).__init__(*args, **kwargs)
diff --git a/kfet/templates/kfet/order_to_inventory.html b/kfet/templates/kfet/order_to_inventory.html
index 4345cf2b..3aabea5e 100644
--- a/kfet/templates/kfet/order_to_inventory.html
+++ b/kfet/templates/kfet/order_to_inventory.html
@@ -7,24 +7,27 @@
 
 {% include 'kfet/base_messages.html' %}
 
+<div class="content-right-block">
+    <div>
 <form action="" method="post">
   {% csrf_token %}
-  <table>
+  <table class='table table-condensed text-center'>
     <thead>
       <tr>
-        <td>Article</td>
-        <td>HT</td>
+        <td style="width:25%">Article</td>
+        <td>Prix HT</td>
         <td>TVA</td>
         <td>Droits</td>
-        <td>Com.</td>
+        <td>Commandé</td>
         <td>Reçu</td>
       </tr>
     </thead>
     <tbody>
       {% for form in formset %}
         {% ifchanged form.category %}
-          <tr>
-            <td colspan="6">{{ form.category_name }}</td>
+          <tr class='section'>
+            <td>{{ form.category_name }}</td>
+            <td colspan="5"></td>
           </tr>
         {% endifchanged %}
         <tr>
@@ -42,7 +45,9 @@
     <input type="password" name="KFETPASSWORD">
   {% endif %}
   {{ formset.management_form }}
-  <input type="submit" value="Enregistrer">
+  <input type="submit" class="btn btn-primary btn-lg btn-block" value="Enregistrer">
 </form>
+    </div>
+</div>
 
 {% endblock %}

From 83e41c292e5e0dc43e250b30b2d749e4498e4aa3 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Mon, 13 Feb 2017 11:34:47 -0200
Subject: [PATCH 5/6] css tweaks

---
 kfet/static/kfet/css/index.css        | 18 ++++++++++++++++++
 kfet/templates/kfet/order_create.html |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index 37e04bf6..3d553ad9 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -190,6 +190,24 @@ textarea {
     font-size:25px;
 }
 
+/*
+ * Pages tableaux seuls
+ */
+
+.content-center > div {
+    background:#fff;
+}
+
+.content-center tbody tr:not(.section) td {
+    padding:0 !important;
+}
+
+.content-center .table .form-control {
+    padding: 1px 12px ;
+    height:28px;
+    margin:3px 0px;
+}
+
 /*
  * Pages formulaires seuls
  */
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index 4ea76466..676cc69a 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -5,11 +5,11 @@
 
 {% block content %}
 
-<div class="content-right-block">
+<div class="content-center">
     <div>
 <form action="" method="post">
   {% csrf_token %}
-  <table class="table table-condensed text-center">
+  <table class="table text-center">
     <thead>
       <tr>
         <td rowspan="2">Article</td>

From 8e31fae3409568e807b74bef4154a7d08484c581 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Sun, 5 Mar 2017 21:29:20 -0300
Subject: [PATCH 6/6] last tweaks

---
 kfet/static/kfet/css/index.css              | 2 +-
 kfet/templates/kfet/order_create.html       | 2 +-
 kfet/templates/kfet/order_to_inventory.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index 9fc46e58..e5ffacb6 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -222,7 +222,7 @@ textarea {
 }
 
 .content-center tbody tr:not(.section) td {
-    padding:0 !important;
+    padding:0px 5px !important;
 }
 
 .content-center .table .form-control {
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index 676cc69a..cbd84ba8 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -27,7 +27,7 @@
             </td>
         <td rowspan="2">Stock</td>
         <td rowspan="2">Rec.
-            <span class='glyphicon glyphicon-question-sign' title="Commande conseillée" data-placement="bottom"></span>
+            <span class='glyphicon glyphicon-question-sign' title="Quantité conseillée" data-placement="bottom"></span>
             </td>
         <td rowspan="2">Commande</td>
       </tr>
diff --git a/kfet/templates/kfet/order_to_inventory.html b/kfet/templates/kfet/order_to_inventory.html
index 3aabea5e..ab107065 100644
--- a/kfet/templates/kfet/order_to_inventory.html
+++ b/kfet/templates/kfet/order_to_inventory.html
@@ -7,11 +7,11 @@
 
 {% include 'kfet/base_messages.html' %}
 
-<div class="content-right-block">
+<div class="content-center">
     <div>
 <form action="" method="post">
   {% csrf_token %}
-  <table class='table table-condensed text-center'>
+  <table class='table text-center'>
     <thead>
       <tr>
         <td style="width:25%">Article</td>