From 780e2d6acbe7a0f1f944dcf2df5af5f8b86867a3 Mon Sep 17 00:00:00 2001
From: Elias <hirvone5@aalto.fi>
Date: Thu, 1 Mar 2018 19:28:27 +0200
Subject: [PATCH] Committee model

---
 webapp/models.py              |  7 ++++++-
 webapp/templates/contact.html | 31 +++++++++++++++++++++++++++----
 webapp/views.py               |  6 ++++--
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/webapp/models.py b/webapp/models.py
index c6cea6b..c2bf792 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -236,6 +236,11 @@ class KaehmyForm(MessageParent):
         return self.preset_roles.filter(is_board=True).exists() or self.custom_roles.filter(is_board=True)
 
 
+class Committee(models.Model):
+    """ Committee model, has many Roles found under variable roles """
+    name = models.CharField(max_length=255)
+
+
 class Role(PresetRole):
     """
     Model for Role.
@@ -253,7 +258,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)
 
 class Official(User):
     """Model representing a guild official."""
diff --git a/webapp/templates/contact.html b/webapp/templates/contact.html
index a7643c3..320ce45 100644
--- a/webapp/templates/contact.html
+++ b/webapp/templates/contact.html
@@ -5,10 +5,33 @@
 
 <div class="contact_div">
     <div class="container">
-        <div class="row">
-            <div class="col">
+        <!--<div class="row">
+            <div class="col">-->
                 <h2>{% trans "Contact" %}</h2>
                 <div>
+                    {% if roolit %}
+                    {% load static %}
+                        <h3>Kaikki toimihenkilöt</h3>
+                        <table>
+                        {% for rooli in roolit %}
+                            <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>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </table>
+                    {% else%}
+                        <p>Ei rooleja</p>
+                    {% endif %}
                     {% if kaikki %}
                         <table>
                         {% for teekkari in kaikki %}
@@ -29,8 +52,8 @@
                         <p>Ei henkilöitä</p>
                     {% endif %}
                 </div>
-            </div>
-        </div>
+            <!--</div>
+        </div>-->
     </div>
 </div>
 
diff --git a/webapp/views.py b/webapp/views.py
index 64915ad..f21c057 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
+from webapp.models import PresetKaehmyRole, CustomKaehmyRole, Official, Role
 from webapp.models import OhlhafvChallenge, KaehmyForm, TelegramChannel
 from webapp.forms import OhlhafvForm, KaehmyForm_Form, KaehmyCommentForm
 from webapp.tables import OhlhafvTable, KaehmyExportTable
@@ -146,7 +146,9 @@ def contact_view(request, *args, **kwargs):
     """Render "Contact" page."""
 
     kaikki = Official.objects.all()
-    context = {"kaikki": kaikki}
+    roolit = Role.objects.all()
+
+    context = {"roolit": roolit, "kaikki": kaikki}
 
     return render(request, "contact.html", context)