add default model sections to document types

dms/admin.py

@@ -3,14 +3,20 @@ from django.contrib import admin
 from reversion.admin import VersionAdmin
 
 from .models import Audience, Document, DocumentType, Version, Site, Node, Keyword
+from writer.models import ModelSection
 
 
 class DocumentAdmin(VersionAdmin):
     list_filter = ('type', 'title')
 
 
+class InlinesModelSection(admin.TabularInline):
+    model = ModelSection
+
+
 class DocumentTypeAdmin(admin.ModelAdmin):
     list_display = ('__str__', 'level')
+    inlines = [InlinesModelSection]
 
 
 admin.site.register(Audience)

process/migrations/0002_auto_20180314_1117.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-03-14 10:17
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('process', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='task',
+            name='assigned_to',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tasks', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

process/urls.py

@@ -1,8 +1,9 @@
 from django.conf.urls import url
 
-from .views import process_details
+from .views import process_details, user_tasks
 
 
 urlpatterns = [
     url(r'process/(?P<pk>\d+)', process_details, name='process_details'),
+    url(r'process/$', user_tasks, name='user_tasks'),
 ]

process/views.py

@@ -11,5 +11,5 @@ def process_details(request, pk):
 
 def user_tasks(request):
     admin = User.objects.first()
-    tasks = Task.objects.filter(user=admin)
+    tasks = Task.objects.filter(assigned_to=admin)
     return render(request, 'process/user_tasks.html', {'tasks': tasks})

templates/base.html

@@ -49,7 +49,7 @@
     </a>
     <a class="item" href="/jci">Dashboard</a>
       <a class="item" href="/docs">Documents</a>
-      <a class="item" href="/docs">Tâches</a>
+      <a class="item" href="{% url 'user_tasks' %}">Tâches</a>
     {% block "navigation" %} {% endblock %}
 
     <div class="ui right search item">

templates/process/user_tasks.html

@@ -2,10 +2,21 @@
 
 {% block "content" %}
 
-    <h2>Tasks</h2>
-    <ul>
-    {% for task in tasks %}
-        <li>{{ task }}</li>
-    {% endfor %}
-    </ul>
+    <h2>Tâches utilisateur</h2>
+
+    {% regroup tasks by get_status_display as tasks_status %}
+    {% if tasks_status %}
+        <ul>
+            {% for status in tasks_status %}
+                <li><b>{{ status.grouper }}</b>
+                    <ul>
+                        {% for task in status.list %}
+                            <li>{{ task }}</li>
+                        {% endfor %}
+                    </ul>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
 {% endblock "content" %}

writer/migrations/0004_auto_20180314_1117.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-03-14 10:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('writer', '0003_auto_20180223_2103'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ModelSection',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='section',
+            name='document',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sections', to='dms.Document'),
+        ),
+    ]

writer/migrations/0005_modelsection_document_type.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-03-14 10:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dms', '0005_auto_20180308_1623'),
+        ('writer', '0004_auto_20180314_1117'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='modelsection',
+            name='document_type',
+            field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='model_sections', to='dms.DocumentType'),
+            preserve_default=False,
+        ),
+    ]

writer/models.py

@@ -1,10 +1,14 @@
 from django.db import models
 
 from django.utils.html import mark_safe
-from markdown import Markdown, markdown
-import pdfkit
+from markdown import markdown
 
-from dms.models import Document
+from dms.models import Document, DocumentType
+
+
+class ModelSection(models.Model):
+    title = models.CharField(max_length=255)
+    document_type = models.ForeignKey(DocumentType, related_name='model_sections')
 
 
 class Section(models.Model):