From 7bc277a97883a514ac1fa0eb62f7f54dab216255 Mon Sep 17 00:00:00 2001
From: Elias <hirvone5@aalto.fi>
Date: Thu, 1 Mar 2018 20:53:31 +0200
Subject: [PATCH] korjauksia

---
 webapp/admin.py                              |  3 +-
 webapp/migrations/0036_auto_20180301_2011.py | 28 ++++++++++++
 webapp/models.py                             |  9 +++-
 webapp/templates/contact.html                | 46 ++++++++++----------
 webapp/views.py                              | 30 +++++++++++--
 5 files changed, 85 insertions(+), 31 deletions(-)
 create mode 100644 webapp/migrations/0036_auto_20180301_2011.py

diff --git a/webapp/admin.py b/webapp/admin.py
index 0cfeb8c..3297a3c 100644
--- a/webapp/admin.py
+++ b/webapp/admin.py
@@ -1,7 +1,7 @@
 """File containing webapp app admin registers."""
 
 from django.contrib import admin
-from webapp.models import Official, Role
+from webapp.models import Official, Role, Committee
 from webapp.models import Feed, Tag, BaseFeed, Event, Registration
 from webapp.models import KaehmyForm, KaehmyMessage
 from webapp.models import CustomKaehmyRole, PresetKaehmyRole
@@ -19,6 +19,7 @@ admin.site.register(Event, TranslationAdmin)
 admin.site.register(Registration, TranslationAdmin)
 admin.site.register(Official)
 admin.site.register(Role)
+admin.site.register(Committee)
 admin.site.register(KaehmyForm)
 admin.site.register(KaehmyMessage)
 admin.site.register(CustomKaehmyRole)
diff --git a/webapp/migrations/0036_auto_20180301_2011.py b/webapp/migrations/0036_auto_20180301_2011.py
new file mode 100644
index 0000000..073a964
--- /dev/null
+++ b/webapp/migrations/0036_auto_20180301_2011.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-03-01 18:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0035_auto_20171019_1413'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Committee',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='role',
+            name='committee',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index c2bf792..3010192 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -237,7 +237,12 @@ class KaehmyForm(MessageParent):
 
 
 class Committee(models.Model):
-    """ Committee model, has many Roles found under variable roles """
+    """ 
+    Committee model
+    
+    Has many Roles found under variable roles 
+    """
+
     name = models.CharField(max_length=255)
 
 
@@ -258,7 +263,7 @@ class Role(PresetRole):
     start_date = models.DateField(_('Start date'))
     end_date = models.DateField(_('End date'))
     official = models.ForeignKey('Official', related_name='roles')
-    committee = models.ForeignKey('Committee', related_name='roles', on_delete=models.SET_NULL, blank=True)
+    committee = models.ForeignKey('Committee', related_name='roles', on_delete=models.SET_NULL, null=True)
 
 class Official(User):
     """Model representing a guild official."""
diff --git a/webapp/templates/contact.html b/webapp/templates/contact.html
index 320ce45..c400a99 100644
--- a/webapp/templates/contact.html
+++ b/webapp/templates/contact.html
@@ -9,21 +9,21 @@
             <div class="col">-->
                 <h2>{% trans "Contact" %}</h2>
                 <div>
-                    {% if roolit %}
+                    {% if all_roles %}
                     {% load static %}
-                        <h3>Kaikki toimihenkilöt</h3>
+                        <h3>Kaikki Roolit</h3>
                         <table>
-                        {% for rooli in roolit %}
+                        {% for role in all_roles %}
                             <tr>
                                 <td>
                                     <!--Haetaan kuva-->
                                     <img src="static/img/missing.png">
                                 </td>
                                 <td>
-                                    <p class="rooli-otsikko">{{rooli}}</h3>
-                                    <p class="rooli-toimari">{{ rooli.official.first_name }} {{ rooli.official.last_name }}</p>
-                                    {{ rooli.official.email }}
-                                    {{ rooli.official.phone_number }}
+                                    <p class="rooli-otsikko">{{role}}</h3>
+                                    <p class="rooli-toimari">{{ role.official.first_name }} {{ rooli.official.last_name }}</p>
+                                    {{ role.official.email }}
+                                    {{ role.official.phone_number }}
                                     </p>
                                 </td>
                             </tr>
@@ -32,24 +32,22 @@
                     {% else%}
                         <p>Ei rooleja</p>
                     {% endif %}
-                    {% if kaikki %}
-                        <table>
-                        {% for teekkari in kaikki %}
-                            {% load static %}
-                            <tr>
-                                <td>
-                                    <img src="static/img/missing.png">
-                                </td>
-                                <td>
-                                    <p class="name">{{ teekkari.first_name }} {{ teekkari.last_name }}</p>
-                                    <p class="email">{{ teekkari.email }}</p>
-                                    <p class="puh">{{ teekkari.phone_number }}</p>
-                                </td>
-                            </tr>
+                    
+                    {% if all_committees %}
+                    {% load static %}
+                        <h3>Kaikki Toimikunnat</h3>
+                        {% for com in all_committees %}
+                            <p>{{committee.name}}</p>
+                            {% if roles_list %}
+                                {% for role in roles_list %}
+                                <p>{{role.name}}</p>
+                                {% endfor %}
+                            {% else %}
+                                <p>Ei ole rooleja tällä toimikunnalla</p>
+                            {% endif %}
                         {% endfor %}
-                        </table>
-                    {% else %}
-                        <p>Ei henkilöitä</p>
+                    {% else%}
+                        <p>Ei Toimikuntia</p>
                     {% endif %}
                 </div>
             <!--</div>
diff --git a/webapp/views.py b/webapp/views.py
index f21c057..9107645 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -13,7 +13,7 @@ import logging
 import requests
 from dealer.git import git
 
-from webapp.models import PresetKaehmyRole, CustomKaehmyRole, Official, Role
+from webapp.models import PresetKaehmyRole, CustomKaehmyRole, Official, Role, Committee
 from webapp.models import OhlhafvChallenge, KaehmyForm, TelegramChannel
 from webapp.forms import OhlhafvForm, KaehmyForm_Form, KaehmyCommentForm
 from webapp.tables import OhlhafvTable, KaehmyExportTable
@@ -145,10 +145,32 @@ def sosso_view(request, *args, **kwargs):
 def contact_view(request, *args, **kwargs):
     """Render "Contact" page."""
 
-    kaikki = Official.objects.all()
-    roolit = Role.objects.all()
+    # TODO
+    #
+    # Lajitellaan roolit toimikunnittain
+    #   in format: context = {
+    #   committee_list: [
+    #       {"committee": 'toimikunta_object',
+    #       "roles_list": [ {role:'Taittaja', officer:'Pekka'},
+    #           {role:'PJ', officer:'Pentti'},
+    #           {role:'X-Vastaava', officer:'Petra'}
+    #       ]},
+    #       {roles_list: [ {role:'Taittaja', officer:'Pekka'},
+    #           {role:'PJ', officer:'Pentti'},
+    #           {role:'X-Vastaava', officer:'Petra'}
+    #       ]}
+    #   ]}        
+    # 
 
-    context = {"roolit": roolit, "kaikki": kaikki}
+    #all_officials = Official.objects.all()
+    all_roles = Role.objects.all()
+    all_committees = Committee.objects.all()
+
+    committee_list = []
+    for committee in all_committees:
+        committee_list.append({"committee":committee, "roles_list":committee.roles})
+
+    context = {"all_roles": all_roles, "all_committees": committee_list}
 
     return render(request, "contact.html", context)