From d6e03b84fbf83ed8855997dbe71b8c58cd8a2eac Mon Sep 17 00:00:00 2001
From: Dalahro <Dalahro@arachne>
Date: Sun, 3 Jul 2016 01:37:58 +0200
Subject: [PATCH] Barre de recherche fonctionnelle

---
 search/templates/search/index.html     |  10 ++++++++++
 search/templates/search/search.html    |   2 +-
 templates/base.html                    |   7 ++++---
 users/__pycache__/views.cpython-34.pyc | Bin 4798 -> 5081 bytes
 users/views.py                         |   5 +++++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/search/templates/search/index.html b/search/templates/search/index.html
index bf02d7c8..13b6afc6 100644
--- a/search/templates/search/index.html
+++ b/search/templates/search/index.html
@@ -51,6 +51,7 @@
                 <th>Prix unitaire</th>
                 <th>Moyen de paiement</th>
                 <th>Date</th>
+                <th></th>
             </tr>
         </thead>
         {% for facture in facture_list %}
@@ -61,6 +62,7 @@
             <td>{{ facture.prix }}</td>
             <td>{{ facture.paiement }}</td>
             <td>{{ facture.date }}</td>
+            <td><a href="{% url 'cotisations:edit-facture' facture.id %}">Editer</a></td>
         </tr>
         {% endfor %}
     </table>
@@ -74,6 +76,7 @@
                 <th>Raison</th>
                 <th>Date de début</th>
                 <th>Date de fin</th>
+                <th></th>
             </tr>
         </thead>
         {% for ban in ban_list %}
@@ -82,9 +85,16 @@
             <td>{{ ban.raison }}</td>
             <td>{{ ban.date_start }}</td>
             <td>{{ ban.date_end }}</td>
+            <td><a href="{% url 'users:edit-ban' ban.id %}">Editer</a></td>
         </tr>
         {% endfor %}
     </table>
     {% endif %}
+    {% if not ban_list and not machine_list and not users_list and not facture_list%}
+        <h3>Aucun résultat</h3>
+    {% endif %}
+    <br />
+    <br />
+    <br />
 {% endblock %}
 
diff --git a/search/templates/search/search.html b/search/templates/search/search.html
index 063ee55d..511f8eba 100644
--- a/search/templates/search/search.html
+++ b/search/templates/search/search.html
@@ -1,4 +1,4 @@
-{% extends "search/sidebar.html" %}
+{% extends "users/sidebar.html" %}
 {% load bootstrap3 %}
 
 {% block title %}Création et modification d'utilisateur{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index a746be2c..8142bc93 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -34,14 +34,15 @@
                         <li><a href="#">Statistiques</a></li>
                     </ul>
                     <div class="col-sm-3 col-md-3 navbar-right">
-                        <form class="navbar-form" role="search">
+                      <form action="{% url "search:search"%}"  method="POST" class="navbar-form" role="search">
+                            {% csrf_token %}
                             <div class="input-group">
-                                <input type="text" class="form-control" placeholder="Search" name="srch-term" id="srch-term">
+                                <input type="text" class="form-control" placeholder="Search" name="search_field" id="search-term">
                                 <div class="input-group-btn">
                                     <button class="btn btn-default" type="submit"><i class="glyphicon glyphicon-search"></i></button>
                                 </div>
                             </div>
-                        </form>
+                       </form>
                     </div>
                     <ul class="nav navbar-nav navbar-right">
                         <li><a href="#"><span class="glyphicon glyphicon-log-in"></span> Login</a></li>
diff --git a/users/__pycache__/views.cpython-34.pyc b/users/__pycache__/views.cpython-34.pyc
index a7e395d9753a21ecfe200873535d6174e05e3caa..4bef23230c97a724b63d92dbae4d2fc485921808 100644
GIT binary patch
delta 1593
zcmah}&u<$=6rQoY>mOM=Y1#zRM)4+1leo0$FA}6SA|WX$tyHQORY-2tWs{k>Yi-tO
zcHO3kl0*9+%z+bsKtTc_PH^ajGl(mTI8<EVQo)fEd~e()#!ZFS^Ud4YH}k%E@0)pi
z<mc(bPn~k<&nsK+zdgv<Z>;N=fxUzl-~9UUHQq1A*h9wZ(@a#^do@>Y@qf1YGk0>$
zqOFkoX+XkQle1=qJ%EvAg0qhqY~IYV#9{*Doc<!qM(*Pq$BMa+=G|*Dy3-1z8~U#B
z6X^=+ZUhl^Yd*T^cI38WsgAj;ei%!)5eHE#a?>0QrUjbf$w<`8&n?f}^tWoZDuYs*
zZ>=@udJ?BuKMYfQBM1}BD*BCvk_}8vvzOtVQLn<e-dPN@A2C(c`?3=U^H|vfjego=
z4!|<AT#cjGcQT(&sVb}vxUkaPMoVoTfEC*S#%;czs~LSU``6M8-VtXCoe9=EwGhd>
z9&Kp^9<c*pe26=|#0SvStiEFZpx?2s@|r%?H>AI^Y)c)4lYVR+y>JwUdX3;1!Epi;
zFlz#)HZ2^8Jp&h|2of)dHd^EQgk9xxi1Z^rp~vz^_(^>}Kd~E8n272WEl&kkC4w^q
zBm@O9G4(%O)a&F#>F&*d6(=ajtRXS4f2oXoQ!R{g!(>u_P@FeB4(Kn6Qwy~5m(v*f
z4~^7W52YVT;Xxois!=XYEbgSKmg|&chgH2ux$>xxy#xy%`f+@>rNlWMm1_Jf>Uv)f
z^&K+AM)iaI*h*KGQ%ePn+ez;tMPCTde7OvoFBW=1f7$olvy^}0<Zte#^9}f?wveHO
zgiYp6olWMuimlGUuU<4EJb1rA0An2j*Yy+U6~3tdc7E;Dd(xEUB<8nC#LIpZ1#v7l
zWt6ynv(-+%f2553Mk}fh4tvW%U#;xFzDs*2)g47zJ^4-@952WZ#gEo;9P!r6I8Q0V
z_$~cyWt=ZV8l=z9`$?Za^^bLuwOug>zKfD!xR*?6Z!ec=M-X)j0dZoM$oDORo}*qc
z#|BOzKE}gL&)Fk<MSnJM3EX}ks9hqBrUj@4YFfLe=(c=*{?G5Ro)ttwZr!8B%ss;g
zxmv~ByR{j8W8WX!bmy21s#&t;2<8dS5-bob5-bzYm275ru{Qi&d`Jrmn=R1}<(m{J
go&*f@VO%q#d?2%mHk@%RJO!tWXAphSsbrk;zhEUoZU6uP

delta 1341
zcmah}&rcIU6y9lf%eLLNv_Qq!l>PwgqEd`VA_AhuAK_q#9@HkLS-Jx(X?M-+HXw$O
z82<q?iScCO#f0dEaOdJ#58kW?51ven{sSiZ-mC}|&~4`1>6@4NzIpGP{aD%>D1O&s
zk#EK2JF7`a`XcRm0x+L~;m&LnZ;{|_J<FevU;I_@nY=EsEVqJ%v^?jqMgo&U01^q2
zF2ZvBO>~uimc2_ki0J{Afmcgzx|FdjOnvCXplZ{lDlT-xKUV{gNDt9Sgml7SrA@A6
z3CZ(E>alRE!<k*AHP7WALW9=}kjjb({RjgHIRHKA(}i$X%VfuKp^Y_6P0OoV_MDU9
zPm_J5%xfL*$q7Ca=?^fS-&G5OGQ$lmdo_g{{D+MVVbVcVit8C3)dkHk|B*Plc{ZFO
zf~x`~uOnkflI__;($Z>mYS`4QnucdUJ@e7R#lOeYWpTnC&Po{1TE$khpHzKdxbBj}
z%u)V0s*@4u%yT&pWIU;KuXXKV^$Qunn5bqDXE}iF4l2x=U+~%~!iH&9#mWuH-QUAe
zh}H-IKDeh0;|dIyf6`t;4OU~BwVnE&ft6Osq;=|1c90mqzw8|3Rl<U|3fcQqLCjY*
zgH&+<-&wJ3Z=HuoEr4;TMsNIs-~S1}i#i0G=*i25ZCkEO8`So4#-h{o-mWt&;7S6E
z?v@dU7Q9AXkFzMhuN8)4uqym~xNDT%9po<(M|#^F+JQx#HSBx*T_R7$!8qv8t<Hfp
zp$zS^M_I!$tvTx-(uAl%RCW>}if{@+l=w8xM8EOOhwGME8SipM0cmiz#xVH;LYsV5
zTrfzQ7sj998_8+V|1+siqlT6Wjs(ZfK4jQ{KmKBq2kfL+wn>*gSaH!e5=jv@1@D`B
zi94yUD><065<(ea7-0kfZO5?3Y#d<%VG3bKs+jqop>Zf+vrZ?G!$mWuNg6&u8PXZJ
U1|uEN6iwA)@Jqovti`q1Z|MsLivR!s

diff --git a/users/views.py b/users/views.py
index db53acda..5fb9c650 100644
--- a/users/views.py
+++ b/users/views.py
@@ -12,6 +12,11 @@ from users.forms  import PassForm
 
 from re2o.login import makeSecret, hashNT
 
+def end_ban(user):
+    """ Renvoie la date de fin de ban d'un user, False sinon """
+    date_max = Ban.objects.all().filter(user=user).aggregate(Max('date_end'))['date_end__max']
+    return date_max
+
 def form(ctx, template, request):
     c = ctx
     c.update(csrf(request))