From c486cc03f237f2067b8736f198a7e5efb1b451f9 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 3 Jul 2016 01:29:26 +0200
Subject: [PATCH] =?UTF-8?q?Le=20ban=20a=20comme=20date=20de=20d=C3=A9but?=
 =?UTF-8?q?=20sa=20cr=C3=A9ation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cotisations/templates/cotisations/index.html  |   2 ++
 users/__pycache__/models.cpython-34.pyc       | Bin 6709 -> 6724 bytes
 users/migrations/0007_auto_20160702_2322.py   |  19 +++++++++++++++
 users/migrations/0008_user_registered.py      |  22 ++++++++++++++++++
 .../0007_auto_20160702_2322.cpython-34.pyc    | Bin 0 -> 642 bytes
 .../0008_user_registered.cpython-34.pyc       | Bin 0 -> 878 bytes
 users/models.py                               |   4 ++--
 users/templates/users/index.html              |   2 ++
 8 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 users/migrations/0007_auto_20160702_2322.py
 create mode 100644 users/migrations/0008_user_registered.py
 create mode 100644 users/migrations/__pycache__/0007_auto_20160702_2322.cpython-34.pyc
 create mode 100644 users/migrations/__pycache__/0008_user_registered.cpython-34.pyc

diff --git a/cotisations/templates/cotisations/index.html b/cotisations/templates/cotisations/index.html
index ce326948..0248920c 100644
--- a/cotisations/templates/cotisations/index.html
+++ b/cotisations/templates/cotisations/index.html
@@ -13,6 +13,7 @@
                 <th>Prix unitaire</th>
                 <th>Moyen de paiement</th>
                 <th>Date</th>
+  		<th></th>
             </tr>
         </thead>
         {% for facture in facture_list %}
@@ -23,6 +24,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>
diff --git a/users/__pycache__/models.cpython-34.pyc b/users/__pycache__/models.cpython-34.pyc
index 4d9f3b10b7c155696bc19173f9e2bb89f094f3a6..d62f0a8983eb44b668e68f32a0080328bb9e1498 100644
GIT binary patch
delta 2297
zcmbtVO>9#~5Z?8_<7daQ<DX~9k3#|&5<(Kw3N<ZILP$Yzss;oyL{Emd3NDG=tX~?6
zgxsoBaGyi3y;NK{&{mwPiVJY-sfS8Wz4XQbDpl>NJ;2Nw67Ziaa@bG1o}HO*X1_PS
zpM9A1|D^@H=I5`SbNt}{ne%_)5g+1lc*1`i7GCygoSEIs>|$Rto=-3{%*-Bkld*h~
znGv>_Nx)slHz8XqtXpNHRNgQOrU?_y!#oC8o%?wTzI9#-CmCZ>CrBY=bnv?_@F)n^
z<s)`*reKLP#Z@s|6f0)FON!-U#S&7OGC>}(Hz7_(Hv+B75Il7aId}v@?*C_ZkZC7D
zAA;SzUMjAw3&Sce3+sxI%_7;Zd0`dO6v~01aXA4Cp3@@-D9SiOhRa^sZ?RAWh}kea
z@boRcnN(5~xr<<!U^9-KpkvE|M$t;7D?S8`CwbBlb;?nA9@b&WcL;8I4-F2WsSTZd
z@Q1g5x*45*bd==XI)4bQd*B`4MLq_%y;Jbm7t&kReGs1c(x+M`nrfS946U>(E(DE7
z9C8eL+&ZlJ7yG=-^eLGInCU0Uk<2t^22f@i{OQ*{GJ;-b;6J}noy47LukDeAVx?Sa
z)0)GSkY0xI>wymor2~dhv7}+-GC|p_j=J|#{d<@4?MKLWnJCzCj8Kr4?W2PsN^QiN
zMW-p~2}F4o77}OSdf<x?y@u`iSc+14RSp8zqI?8m+9dCVIc=a@sZ9y(2wr?2KG!y?
zbwo-2wtKZ~iWPYj_pd2*%bP@Z9M{Wkdr;nZ%DC&RrYtpuZt5J{IYYlH7T7=sn}$;G
z_n6Yrdt@0Tm?jv3d?=077m~3$>T~d2=tfofsOwR>KBRmIb|d66o_ab|o17&$O0dbP
zwo{C#jvTH|DoeL3?E?&Q5`O8vSKULo_EOxpX0+JAD3@{7SEnXHV@+NrPon!L@K5;r
z>b`B!IKK@VOwQ3`p94K|M?GAVZqT&o;C+_1MdKr)aS@J1e+$wS&AVr0xoF98NcT3^
z+9g=-U8~YvHMyJcrYYM2@8t&GoqsVw%%B8%3WF4WGGm-y>4=i;71u7Wtec{x+)E9#
za+$#E;(}k}yZ9*l9iQxPp)n>;W00$GEb$c%`lrD$55w8&%t3$hVD0-&Z4D0^3YAwm
z8Q0;<<dSM{lg`qNt93R<yGC`_#>>X5a2kKRS%m*dl0GuI6)56@&-4>v^|m20(cg>A
T!Xte&T+ah|s*fjOAQgWBM{!<Z

delta 2267
zcmbtVO=uHA6rM@5+a%qzF+WYVHno3NHf^mIMaB9{ZMCJrT2ZM=o4PAR(pG1;_yZD(
zdQ$N4t_pe(@#0?*4}ur<;7w2vbM)lNqZd8+-b5PBPYD(>A2T~MZ@%~5_g>y^d9lU&
zUGw|0&6kb`o_Sw!{uSQwb{>Im{CUu9U}k__XKb>OnQPdD(Fm_yH(<PG2M@!|nr^Pc
z%bJ-$lrbh^1UiBd1;c%k2jPbMOs8n1&*6U|LQ4gKhTRGqly(?Ze%3Y7_q7DgFs??r
z%3RC2$1Eq+if3#Wg2qK3+)_u^_uxYGA{bnRXkNH0Un3eF@Jo%K{_7DsM^;2TK?lLI
z9nnY2itH1(+l<5ZAZR?sW3Et*NWh{e32$q+wzlBs6{r}Xds+s{QHkS4LANWvU5~q6
zV0%vSZusEYr&sc~4-($Ck&2IOUh$D`+@)aHZUl`7U7{P3iVlyx6LE!^D!az`WF0eW
zndy-V(U|E)h4`Swr^7DaRPQFTPbPAzNTu!hxfSBE9p3xaX3J46N{tN9Rx;`zOgYxk
z^sF_MwlZeUXX0|oc2dI0dF0%hGb_iiA5GA(eF&7lAP*|!Wk04c40odYV5#nMJ0&8g
z9v0Tz{H$0<3;zKpHIqr(wl!<bIieGiT0alLqPDI<N=~Y651t%=C)&k-B)!=mNfl&S
zI8931kK<3MRn#=D3`G>hgRJIdxoibPI!IsTt2=PE6CV0MN2Gps(gtxB0|cD_^=-&>
zIu<EnIt*XxuV&>Pc|1tR+vFXB^$1BrEoMWtD~1U65-d~7&m<voV+=<%j<v1i*={s4
z1V0*{X1nOE4G90w=tv2pq~R|1PF8=ZPqj=8<MnaqS@R%ktcu3*RnTDKAY=9H7@433
zhHda5>Q;w%AOZJ-CuB0qM2I>^6*)V#Dr$!qbFq_fCG^ox)jz2Wiutr7dSNnLUVkaL
z7ru~P?!0AqQ@5>x_t_HO)fbT;Uy!05K_k;kcO#rvM=4ipT{@FlFs+IuFk3<^Y19=9
zj@oQ4Ha2fsnX!e8lRlrZARg6t0us^wmI`uYVid2PgDcTR_!%0EEl`4~FSeTad-G^!
z!4cc=6ZFM4<x9W0&~{`y!A)C5U|i<`xE(t!oi39CYL@vFBxzP!8u`|A5jU$T_lnhy
phQ$OLxlk|^R3NJ#2uKk~1=D{MHtJ7$PoS6w1e)SJ3LBdme*-IPRR#b6

diff --git a/users/migrations/0007_auto_20160702_2322.py b/users/migrations/0007_auto_20160702_2322.py
new file mode 100644
index 00000000..ad1b0d8a
--- /dev/null
+++ b/users/migrations/0007_auto_20160702_2322.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_ban'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ban',
+            name='date_start',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+    ]
diff --git a/users/migrations/0008_user_registered.py b/users/migrations/0008_user_registered.py
new file mode 100644
index 00000000..430f0061
--- /dev/null
+++ b/users/migrations/0008_user_registered.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.utils.timezone import utc
+import datetime
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0007_auto_20160702_2322'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='registered',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2016, 7, 2, 23, 25, 21, 698883, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]
diff --git a/users/migrations/__pycache__/0007_auto_20160702_2322.cpython-34.pyc b/users/migrations/__pycache__/0007_auto_20160702_2322.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ec7a409b047b8bb6f28a3772af489485c5f8156b
GIT binary patch
literal 642
zcmYk2&2H2%5P&DKlih?=>H&C%T$&K1R!9gHfy#yULM5bJEO*CUW#uG`ov^@lIq?=8
zc_m*tap?naV(e8_oOm>Up800(ilhAJ`!64VL;%0xzr#sCr)%GkK>8!l0DS~)1d+F6
z&@uE3S_VCbmP7Oo86b!66y%^7Y!cX0JONDLLz(`eLQqETcpkddh)U>gQbuZ9#xC!>
zwUJXd4%VeT1+`uI^!t;Ma!%J?kWk<uh@p)EAHkZK7%1-h9SEo&rhp4jDQp&iOTY~F
z5bc5aWHNICDqMDX-_<3vRmQqyUDv1LMh-;eDa0Uq)iUqkUUfOjNeMeiGr8opQyN_%
z=V=tfxDyib`l^h-9g3L+v6h)zicm!emkU8vXRSytg!nW|?TdN~)m9CthE=DmVf4`D
zuQjdb!nZKoJC5E`>+7yp!RPXEOWO-8`vvAPWd!l}MfF*lYPZ`}Mm1v<=BggnThWAP
zA|N;Qv(x&lZbb9EX->9ZO+rOHw9QErEaO>}(ii+!W$O8F=V>-XY+_1r8E)jT9#8Nl
cFbB?%{lIh3p7`wL%fs}q{9Eg1I*y;Rf5+yZ<^TWy

literal 0
HcmV?d00001

diff --git a/users/migrations/__pycache__/0008_user_registered.cpython-34.pyc b/users/migrations/__pycache__/0008_user_registered.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d92dba68decc869680ab31636a648881eb00a7c1
GIT binary patch
literal 878
zcmZ{iOK;Oa5Xb+1#IL##pbv3CaLuJjgVa(9p(3GjYA;km%4KCTo5+zLVQn{%Yxpwo
zk@kedDHlEfCuZ$d<-*!Cnwj;?{$|#{<J~B^{POY427ck6<+6RwQVCYXuZ0ZAEley}
z#<!8#$Q?`^<Sr&|7j=;Jkb9VTo$n&^G4b)9dLR$qIMIW2un4f>+yLa_!@%G2AsAS?
z-xTSzBq_4AmMY1rfvuxFovWly%c9a=&YK*ywA0kntEox5TYGGrvs4u;2?NTU6B~4Z
zIdeOZE*6a8m_s`r@*zDed=Qg_pa?QBY_tQ4LA#&_pogG7=n?2KWQdJ#ZD7+A&>l8$
zP2~u*&s`kq@bV5-_nJzoN*|6!qf?PIbt%T9<CD?pXe`Dr$7AlwbRvo*m)bSoYPYo`
zCFg0y%}dg~St>KqahqP0E0GXgYoFvSX|g)~=>uC9Z29uAJv8d6QTwb?=SKwX)$6pF
zmAb!FlFzu2;x_r>YGAKB#`XUg2Rk|tEuj!P5`u}FOtKvd@wrJd!)rW}OIeUCrm3uy
z!)NQ@EzyNxSFUk)-zBxYPIKADbU^IZ?5dvGjmjlob$h?xp`LT7Rew%~H;EdqR;!_s
z<8s)}b9nzR40*Dzgo%p#ksU3+Dvv9KELF@Zc0xC_Jbuosc4rWpR%T7zD27*Nayq0%
zQq0RE`qbig(EGQ+rcSf!$l$KaqC-~CIIFF8kK0)<Ou687H>o$Kconef+Xq(Pik-ic
Cs@@#{

literal 0
HcmV?d00001

diff --git a/users/models.py b/users/models.py
index 86b3b7dd..aeea40c3 100644
--- a/users/models.py
+++ b/users/models.py
@@ -21,6 +21,7 @@ class User(models.Model):
     pwd_ssha = models.CharField(max_length=255)
     pwd_ntlm = models.CharField(max_length=255)
     state = models.IntegerField(choices=STATES, default=STATE_ACTIVE)
+    registered = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.pseudo
@@ -50,7 +51,7 @@ class ListRight(models.Model):
 class Ban(models.Model):
     user = models.ForeignKey('User', on_delete=models.PROTECT)
     raison = models.CharField(max_length=255)
-    date_start = models.DateTimeField(help_text='%m/%d/%y %H:%M:%S')
+    date_start = models.DateTimeField(auto_now_add=True)
     date_end = models.DateTimeField(help_text='%m/%d/%y %H:%M:%S')    
 
     def __str__(self):
@@ -113,7 +114,6 @@ class DelRightForm(ModelForm):
 class BanForm(ModelForm):
     def __init__(self, *args, **kwargs):
         super(BanForm, self).__init__(*args, **kwargs)
-        self.fields['date_start'].label = 'Date de début'
         self.fields['date_end'].label = 'Date de fin'
 
     class Meta:
diff --git a/users/templates/users/index.html b/users/templates/users/index.html
index a2f9ce5d..651ca085 100644
--- a/users/templates/users/index.html
+++ b/users/templates/users/index.html
@@ -10,6 +10,7 @@
                 <th>Prénom</th>
                 <th>Nom</th>
                 <th>Pseudo</th>
+                <th>Inscrit le</th>
                 <th>Modifier</th>
             </tr>
         </thead>
@@ -18,6 +19,7 @@
             <td>{{ user.name }}</td>
             <td>{{ user.surname }}</td>
             <td>{{ user.pseudo }}</td>
+            <td>{{ user.registered }}</td>
             <td><a href="{% url 'users:edit-info' user.id %}">Editer</a></td>
         </tr>
         {% endfor %}