From 78d8e163896667358ae820ebf906ca18d7c83543 Mon Sep 17 00:00:00 2001
From: okhin <okhin@okhin.fr>
Date: Thu, 2 Feb 2017 19:14:33 +0100
Subject: [PATCH] Updating the feedback form

---
 app/Controller.php          |  3 +++
 app/Main.php                |  3 ---
 templates/feedbackform.html | 42 ++++++++++++++++---------------------
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/app/Controller.php b/app/Controller.php
index 5d8d8aa..91c43a1 100644
--- a/app/Controller.php
+++ b/app/Controller.php
@@ -28,6 +28,9 @@ class Controller {
         }
         // Workaround for caching variables
         $f3->set('contacts', $f3->get('contacts'));
+
+        $group_types = Api::get_group_types();
+        $f3->set('group_types', $group_types);
     }
 
     // Function called after routing
diff --git a/app/Main.php b/app/Main.php
index 2aa7bfa..19f2ac3 100644
--- a/app/Main.php
+++ b/app/Main.php
@@ -19,9 +19,6 @@ class Main extends Controller {
         $groups = Api::get_groups();
         $f3->set('groups', $groups);
 
-        $group_types = Api::get_group_types();
-        $f3->set('group_types', $group_types);
-
         $f3->set('block_content', 'home.html');
     }
 
diff --git a/templates/feedbackform.html b/templates/feedbackform.html
index 4077bcb..209ae50 100644
--- a/templates/feedbackform.html
+++ b/templates/feedbackform.html
@@ -1,14 +1,4 @@
 <!-- Let's split this page in two -->
-<main>
-<div class="container">
-    <div class="row">
-        <div class="section indigo">
-            <div class="container">
-                <h1 class="header white-text center-on-small-only">{{ @campaign.title }}</h1>
-                <h4 class="light indigo-text text-accent-1 center-on-small-only">{{ @campaign.description }}</h4>
-            </div>
-        </div>
-    </div>
     <div class="row">
         <div class="col s6">
             <include href="argumentation.html">
@@ -16,24 +6,29 @@
         <div class="col s6">
             <div class="card">
                 <div class="card-image">
-                    <img src="/static/img/124786.jpg">
+                    <img src="<check if="{{ @contact.photo == '' }}">/static/img/placeholder.jpg<false>{{ @contact.photo }}</false></check>">
                     <span class="card-title">{{ @contact.first_name }} {{ @contact.last_name }}</span>
                 </div>
                 <div class="card-content">
-                    <p>{{ _("Phone number") }}:</abbr> <a href="tel: {{ @contact.phone }}">{{ @contact.phone }}</a></p>
-                    <repeat group="{{ @contact.groups }}" value="{{ @group }}">
-                    <div class="chip">
-                        <check if="{{ @group.media }}">
-                        <img src="{{ @group.media }}" alt="{{ @group.type }}">
-                        </check>
-                        {{ @group.name }}
-                    </div>
+                    <p>{{ _("Phone number") }}: <a href="tel:{{ @contact.phone }}">{{ @contact.phone }}</a></p>
+                    <repeat group="{{ @group_types }}" value="{{ @group_type }}">
+                    <ul class="groups">{{ @group_type.name }}
+                        <repeat group="{{ @contact.groups }}" value="{{ @group }}">
+                        <check if="{{ @group.type == @group_type }}">
+                        <li class="chip">
+                            <check if="{{ @group.media }} != ''">
+                            <img src="{{ @group.media }}" alt="{{ @group.type }}">
+                            </check>
+                            {{ @group.name }}
+                        </li>
+                        </repeat>
+                    </ul>
                     </repeat>
-                    <h5 id="step_init" class="light text-lighten-2">{{ _("0. Initialising the call") }}</h3>
-                    <h5 id="step_caller" class="light text-lighten-2">{{ _("1. Calling you") }}</h3>
+                    <h5 id="step_init" class="light text-lighten-2">{{ _("0. Initialising the call") }}</h5>
+                    <h5 id="step_caller" class="light text-lighten-2">{{ _("1. Calling you") }}</h5>
                     <h5 id="step_wait" class="light text-lighten-2">{{ _("2. When ready, please dial 1 on your phone") }}</h3>
-                    <h5 id="step_callee" class="light text-lighten-2">{{ _("3. Calling ")}}{{ @contact.full_name }}</h3>
-                    <h5 id="step_connected" class="light text-lighten-2">{{ _("4. Connected to ") }}{{ @contact.full_name }}</h3>
+                    <h5 id="step_callee" class="light text-lighten-2">{{ _("3. Calling ")}}{{ @contact.full_name }}</h5>
+                    <h5 id="step_connected" class="light text-lighten-2">{{ _("4. Connected to ") }}{{ @contact.full_name }}</h5>
                 </div>
                 <div class="card-action">
                     <h4>{{ _("Feedback Form") }}</h4>
@@ -143,4 +138,3 @@
         interval = window.setInterval(fetch, 3000);
     });
 </script>
-</main>
-- 
GitLab