From efe8808e79c176410df1b13a455a148223240dd5 Mon Sep 17 00:00:00 2001
From: Elias <hirvone5@aalto.fi>
Date: Wed, 24 Jan 2018 17:48:14 +0200
Subject: [PATCH] Yhteystiedot alustava

---
 webapp/static/img/missing.png | Bin 0 -> 1988 bytes
 webapp/templates/contact.html |  21 +++++++++++++++++++++
 webapp/views.py               |   8 ++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 webapp/static/img/missing.png

diff --git a/webapp/static/img/missing.png b/webapp/static/img/missing.png
new file mode 100644
index 0000000000000000000000000000000000000000..85d21d227cd731ae1bdc7b0b53a962d5dc21ebac
GIT binary patch
literal 1988
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
NfbckC0N<Zl@Gt&MfY$&3

literal 0
HcmV?d00001

diff --git a/webapp/templates/contact.html b/webapp/templates/contact.html
index 1be617e..a7643c3 100644
--- a/webapp/templates/contact.html
+++ b/webapp/templates/contact.html
@@ -8,6 +8,27 @@
         <div class="row">
             <div class="col">
                 <h2>{% trans "Contact" %}</h2>
+                <div>
+                    {% 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>
+                        {% endfor %}
+                        </table>
+                    {% else %}
+                        <p>Ei henkilöitä</p>
+                    {% endif %}
+                </div>
             </div>
         </div>
     </div>
diff --git a/webapp/views.py b/webapp/views.py
index 63e9090..64915ad 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
+from webapp.models import PresetKaehmyRole, CustomKaehmyRole, Official
 from webapp.models import OhlhafvChallenge, KaehmyForm, TelegramChannel
 from webapp.forms import OhlhafvForm, KaehmyForm_Form, KaehmyCommentForm
 from webapp.tables import OhlhafvTable, KaehmyExportTable
@@ -144,7 +144,11 @@ def sosso_view(request, *args, **kwargs):
 @require_http_methods(["GET"])
 def contact_view(request, *args, **kwargs):
     """Render "Contact" page."""
-    return render(request, "contact.html", {})
+
+    kaikki = Official.objects.all()
+    context = {"kaikki": kaikki}
+
+    return render(request, "contact.html", context)
 
 
 @require_http_methods(["GET"])