From bf19300d4014fe1e83b20421814362171961c8d6 Mon Sep 17 00:00:00 2001
From: Fred Pauchet <frederick.pauchet@erasme.ulb.ac.be>
Date: Mon, 18 Sep 2017 15:49:32 +0200
Subject: [PATCH] add document types

---
 db.sqlite3                                   | Bin 323584 -> 331776 bytes
 evolus/admin.py                              |  11 +++++--
 evolus/migrations/0009_auto_20170918_1514.py |  29 +++++++++++++++++++
 evolus/migrations/0010_documenttype_level.py |  21 ++++++++++++++
 evolus/migrations/0011_auto_20170918_1544.py |  24 +++++++++++++++
 evolus/models.py                             |  16 +++++++++-
 6 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 evolus/migrations/0009_auto_20170918_1514.py
 create mode 100644 evolus/migrations/0010_documenttype_level.py
 create mode 100644 evolus/migrations/0011_auto_20170918_1544.py

diff --git a/db.sqlite3 b/db.sqlite3
index c9c273cfcbdf7da14f9050f3e87901a9beff53a9..827cbf9dac24f941baa87da6348199f36cb61faf 100644
GIT binary patch
delta 4485
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

delta 1807
zcmZuxeNa?Y6u;-5yZd$*-a8LLHkOYTFrz?NQ!^`trVni#QU7q7DVb$sH`)>w*rl{g
zU9+jiY1G;BHq#$sUsg^jZuly3pi#=K)N%Tl91{n1bT9*yvW&931lAwDH}}5#&OP^h
z{eI`JY0Fx3GIL{YMuai8P>nm)05y(oDw_t8_S#oyf~J12yI)P&`MR3(on}Ha??~R|
zJ>*E5IT!8a)htu*AtPqoM*ECow942|kCKDRi~%}syko341nn}4N$O|x9=#_y)%S{S
zD=5LcK(_ya9=piD5i3Cs{)Raq5*g(MQ!(=fEQQb$k!7t>e=t(l+7N1tVHU?J5PU4q
zSRe5Rf(_wD|FTHEhpuOnM-Amn5^7zbj!gut7*}iv*S7>>;YedNKeqty068@VZaaGN
zaTdsoC}fvmX8OO*0<FPtsIe}Dlxb7aKx^z#e^aQXAsme=8@|Lq`I6gjbdE(94aY+N
z?<+6MP_d4y#adeHVy!J9OsuNNcKpOd&Sabk(l>$=OHC@q;%l19pxrHS+IaMJk;a%x
z-5*=g6fzUXD@w9VV=tqh=}S6Bd#R0{q@^@3>G7>M61Ao$xp&T7K-1_<XjO&DjM|rt
zWM}m}KwsL~gtjQ4AX}Z5Jo`|741LDwgmxs5oUn1Fkr><|lIKq3Y$}B<EQ9S~G~Ed6
z{`42q`dl+z!g0z$T7&(7?N#2x_K1(TTPQ}zvL<*~Y8SCgu8P7L7hYk@-IbN_>=N1a
zCuYm?VRXn_zTy*P#V~3xU2cuRL|Jo5NxOeR7ZrI+io(GnZ&)Q*A8L_9&G3O$7lRp)
z;+XE9JsX}~7z;cstD0e#Y-@pD>(y3Rc5|MGLQJLKLtV6uw$f|VOpjBDKBgqSFH71W
zPvw0RrE-$t9q<}@XtmUK!VD$8o8;;)cn*CIx74~JkX&r;&@A@>xS*j&^GNN8Qd?}E
zuv?z*p?|pxsh`mmx=8)%@Nts;e(vcI`~u0L2+!Oms<^3ix*46N!_=*Gc9HDf!0)ky
zj}MYHyoH;lB}_g-<vRY(GTA!j9MV5QuX8EC+p$l39p<ui_FmgjTUA<}Sm}CK%+ZU|
zJ+v~h*qoCaFR9ktHPaxzAlw)XEx*<c@v5L)b{X?z_ZQqHyT0V<a^N6$SX&SBwcv_B
zxKwjbnF4F;<tKx91I$eozCgAOp(Y&{alWL(yi}gMin?6X3PLs?;>R@C8|+^9<CXH{
zFc#+fqvL$_hlBn{0=N2Zoe>O;xtHxdyi&gR8Q*W=0UqF1@mIVMFrHl_AG?a1<&R(U
z&2mE%wA<5uV|I6q9O&VDWaH=jWnn~Ek!-k(xu_gi8T)w~$oYqP2dN83cl&2SeDP?a
zsje)PP0bKjJM5(U=~=Kg^V-f#d8P%j<xBhcy0-_xG;|tfNF9ti=pgkf47QQ%7~r=R
zdt;$!%sW+?NY|MF!F2U9Ca7-=Q|eRNN6G5D%8SNe+C2!ubO}1m=nopEpOWUrZ;0E4
zJY9)ig*-Pq?EDJtu0^3v`1r{6o7bS-ah}l#U8W(+Y~$aNrU?K*l;^i#jwPCSKNX>{
zVM>;oIY)FlRVd@neQI%^W$wfkq?$OOsB2Te3@+qZ+e9~-XwvhFnpmjX_am2e@)))W
zxu$|^*7Lpilv$eYWfRy6mbTgTqU!<Y31_uqwpL?**ABJ?qJ;m&0cNum#)vUp4=Y|R
z5b>(GCq<yi)}dc<yKwsA6E$~fDXf*nmv9nPT<g?`_2eH|jn;*3?gY90YkrIM>!)0*
zQZl&T+O&_~3zj~Nl7A@vTMo-!g?%K?Rf@cSvIn#VR^wIjj#Yt=RsmC0NFjpM$!LIj
zsZ-(c0a=|9F|SG`{eo&+k-EidNxsk}Rw~h3s%=L_&yZ~If-L#*VKLuj(wiv&exTi!
yc|>fWO^dYA_J5~WEKL`5DuwqYI!~vpj9UIJ<qDR9!j7pgM;jN+2|UFRr}J-scq$VB

diff --git a/evolus/admin.py b/evolus/admin.py
index 718b9bc..4fb37a5 100644
--- a/evolus/admin.py
+++ b/evolus/admin.py
@@ -1,13 +1,18 @@
 from django.contrib import admin
 
-from .models import Audience, Document, Site, Structure
+from .models import Audience, Document, DocumentType, Site, Structure
 
 
 class DocumentAdmin(admin.ModelAdmin):
-    list_filter = ('audiences', 'sites', 'structures')
+    list_filter = ('type', 'audiences', 'sites', 'structures')
+
+
+class DocumentTypeAdmin(admin.ModelAdmin):
+    list_display = ('__str__', 'level')
 
 
 admin.site.register(Audience)
 admin.site.register(Site)
 admin.site.register(Structure)
-admin.site.register(Document, DocumentAdmin)
\ No newline at end of file
+admin.site.register(Document, DocumentAdmin)
+admin.site.register(DocumentType, DocumentTypeAdmin)
diff --git a/evolus/migrations/0009_auto_20170918_1514.py b/evolus/migrations/0009_auto_20170918_1514.py
new file mode 100644
index 0000000..726f2eb
--- /dev/null
+++ b/evolus/migrations/0009_auto_20170918_1514.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-18 13:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evolus', '0008_auto_20170918_1305'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DocumentType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=50)),
+                ('template', models.FileField(blank=True, null=True, upload_to='documents_templates/')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='type',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='evolus.DocumentType'),
+        ),
+    ]
diff --git a/evolus/migrations/0010_documenttype_level.py b/evolus/migrations/0010_documenttype_level.py
new file mode 100644
index 0000000..0c994d8
--- /dev/null
+++ b/evolus/migrations/0010_documenttype_level.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-18 13:18
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evolus', '0009_auto_20170918_1514'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='documenttype',
+            name='level',
+            field=models.IntegerField(default=1),
+            preserve_default=False,
+        ),
+    ]
diff --git a/evolus/migrations/0011_auto_20170918_1544.py b/evolus/migrations/0011_auto_20170918_1544.py
new file mode 100644
index 0000000..e062ddb
--- /dev/null
+++ b/evolus/migrations/0011_auto_20170918_1544.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-18 13:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('evolus', '0010_documenttype_level'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='documenttype',
+            options={'ordering': ['level']},
+        ),
+        migrations.AddField(
+            model_name='structure',
+            name='acronym',
+            field=models.CharField(blank=True, max_length=20, null=True),
+        ),
+    ]
diff --git a/evolus/models.py b/evolus/models.py
index aa9d639..6fc7f7e 100644
--- a/evolus/models.py
+++ b/evolus/models.py
@@ -28,12 +28,25 @@ class Site(models.Model):
 
 class Structure(ClosureModel):
     name = models.CharField(max_length=50)
+    acronym = models.CharField(max_length=20, null=True, blank=True)
     parent = models.ForeignKey('self', related_name='children', null=True, blank=True)
 
     def __str__(self):
         return self.name
 
 
+class DocumentType(models.Model):
+    name = models.CharField(max_length=50)
+    level = models.IntegerField()
+    template = models.FileField(upload_to='documents_templates/', null=True, blank=True)
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        ordering = ['level']
+
+
 class Document(models.Model):
     audiences = models.ManyToManyField(Audience)
     sites = models.ManyToManyField(Site)
@@ -41,6 +54,7 @@ class Document(models.Model):
     structures = models.ManyToManyField(Structure)
     title = models.CharField(max_length=255)
     overview = models.TextField(blank=True, null=True)
+    type = models.ForeignKey(DocumentType, null=True)
 
     def __str__(self):
-        return self.title
\ No newline at end of file
+        return self.title