From 085557bd50969b97808e5f73a16abc31d6854ae4 Mon Sep 17 00:00:00 2001
From: Kasper Brandt <kasperbrandt87@gmail.com>
Date: Thu, 9 Jun 2016 09:02:04 +0200
Subject: [PATCH] [#2189] Change project listing filters and hide status when
 not present

---
 akvo/rsr/filters.py                           |  6 +-
 akvo/templates/project_directory.html         |  8 ++-
 akvo/templates/project_main_tabs/summary.html | 68 ++++++++++---------
 akvo/utils.py                                 |  5 +-
 4 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/akvo/rsr/filters.py b/akvo/rsr/filters.py
index 38a70e3f9d..9694df02ce 100644
--- a/akvo/rsr/filters.py
+++ b/akvo/rsr/filters.py
@@ -152,8 +152,8 @@ class ProjectFilter(django_filters.FilterSet):
 
     iati_status = django_filters.ChoiceFilter(
         initial=_('All'),
-        label=_(u'iati status'),
-        choices=([('', _('All'))] + codelist_choices(ACTIVITY_STATUS)))
+        label=_(u'status'),
+        choices=([('', _('All'))] + codelist_choices(ACTIVITY_STATUS, False)))
 
     title = django_filters.CharFilter(
         lookup_type='icontains',
@@ -167,7 +167,7 @@ class ProjectFilter(django_filters.FilterSet):
 
     class Meta:
         model = Project
-        fields = ['status', 'location', 'organisation', 'category',
+        fields = ['status', 'iati_status', 'location', 'organisation', 'category',
                   'sector', 'title', ]
 
 
diff --git a/akvo/templates/project_directory.html b/akvo/templates/project_directory.html
index 4a7a1c7050..683e7bd06b 100644
--- a/akvo/templates/project_directory.html
+++ b/akvo/templates/project_directory.html
@@ -40,7 +40,7 @@
             </div>
             <div>
                   <div class="btn-group">
-                    {% bootstrap_field filter.form.status %}
+                    {% bootstrap_field filter.form.iati_status %}
                   </div>
                 </div>
             <div>
@@ -109,7 +109,9 @@ <h1><a href="{% url 'project-main' project.id %}"><i class="fa fa-folder-o"></i>
             {% endif %}
             <div class="visible-xs-block hidden-sm">
               <p>
+              {% if project.iati_status %}
               <span class="detailedInfo">{% trans "Status" %}</span> {{project.show_plain_status}}<br>
+              {% endif %}
               {% if project.last_update %}
               <span class="detailedInfo">{% trans "Latest update" %}</span> <a href="{% url 'update-main' project.pk project.last_update.pk %}"><i class="fa fa-calendar-o"></i> {{project.last_update.created_at|date:"d-M-Y"}}</a><br>
               {% endif %}
@@ -140,7 +142,9 @@ <h1><a href="{% url 'project-main' project.id %}"><i class="fa fa-folder-o"></i>
                 {% endfor %}
                 <br/>
               {% endif %}
+              {% if project.iati_status %}
               <span class="detailedInfo">{% trans "Status" %}</span> {{project.show_plain_status}}<br>
+              {% endif %}
               {% if project.last_update %}
               <span class="detailedInfo">{% trans "Latest update" %}</span> <a href="{% url 'update-main' project.pk project.last_update.pk %}"><i class="fa fa-calendar-o"></i> {{project.last_update.created_at|date:"d-M-Y"}}</a><br>
               {% endif %}
@@ -178,7 +182,9 @@ <h4 class="detailedInfo">{% trans "Sectors" %}</h4>
                   {% endfor %}
                 {% endif %}
               </p>
+            {% if project.iati_status %}
             <h4 class="detailedInfo">{% trans "Status" %}</h4>
+            {% endif %}
             <p class="complete">{{project.show_plain_status}}</p>
             <h4 class="detailedInfo">{% trans "Latest update" %}</h4>
             {% if project.last_update %}
diff --git a/akvo/templates/project_main_tabs/summary.html b/akvo/templates/project_main_tabs/summary.html
index 191e115c92..b3f4c553fe 100644
--- a/akvo/templates/project_main_tabs/summary.html
+++ b/akvo/templates/project_main_tabs/summary.html
@@ -40,38 +40,42 @@
                                         {{ project.iati_activity_id }}
                                     </li>
                                 {% endif %}
-                                <li>
-                                    <span class="detailedInfo">{% trans 'Status' %}</span>
-                                    <span class="detailedPoint">{{ project.show_plain_status }}</span>
-                                    {% if project.date_start_planned %}
-                                        <br/>
-                                        <span class="detailedInfo">{% trans 'Start date (planned)' %}</span>
-                                        <span class="detailedPoint">
-                                            <i class="fa fa-calendar-o"></i> {{ project.date_start_planned|date:"d-M-Y" }}
-                                        </span>
-                                    {% endif %}
-                                    {% if project.date_start_actual %}
-                                        <br/>
-                                        <span class="detailedInfo">{% trans 'Start date' %}</span>
-                                        <span class="detailedPoint">
-                                            <i class="fa fa-calendar-o"></i> {{ project.date_start_actual|date:"d-M-Y" }}
-                                        </span>
-                                    {% endif %}
-                                    {% if project.date_end_planned %}
-                                        <br/>
-                                        <span class="detailedInfo">{% trans 'End date (planned)' %}</span>
-                                        <span class="detailedPoint">
-                                            <i class="fa fa-calendar-o"></i> {{project.date_end_planned|date:"d-M-Y"}}
-                                        </span>
-                                    {% endif %}
-                                    {% if project.date_end_actual %}
-                                        <br/>
-                                        <span class="detailedInfo">{% trans 'End date' %}</span>
-                                        <span class="detailedPoint">
-                                            <i class="fa fa-calendar-o"></i> {{project.date_end_actual|date:"d-M-Y"}}
-                                        </span>
-                                    {% endif %}
-                                </li>
+                                {% if project.iati_status or project.date_start_planned or project.date_start_actual or project.date_end_planned or project.date_end_actual %}
+                                    <li>
+                                        {% if project.iati_status %}
+                                            <span class="detailedInfo">{% trans 'Status' %}</span>
+                                            <span class="detailedPoint">{{ project.show_plain_status }}</span>
+                                        {% endif %}
+                                        {% if project.date_start_planned %}
+                                            <br/>
+                                            <span class="detailedInfo">{% trans 'Start date (planned)' %}</span>
+                                            <span class="detailedPoint">
+                                                <i class="fa fa-calendar-o"></i> {{ project.date_start_planned|date:"d-M-Y" }}
+                                            </span>
+                                        {% endif %}
+                                        {% if project.date_start_actual %}
+                                            <br/>
+                                            <span class="detailedInfo">{% trans 'Start date' %}</span>
+                                            <span class="detailedPoint">
+                                                <i class="fa fa-calendar-o"></i> {{ project.date_start_actual|date:"d-M-Y" }}
+                                            </span>
+                                        {% endif %}
+                                        {% if project.date_end_planned %}
+                                            <br/>
+                                            <span class="detailedInfo">{% trans 'End date (planned)' %}</span>
+                                            <span class="detailedPoint">
+                                                <i class="fa fa-calendar-o"></i> {{project.date_end_planned|date:"d-M-Y"}}
+                                            </span>
+                                        {% endif %}
+                                        {% if project.date_end_actual %}
+                                            <br/>
+                                            <span class="detailedInfo">{% trans 'End date' %}</span>
+                                            <span class="detailedPoint">
+                                                <i class="fa fa-calendar-o"></i> {{project.date_end_actual|date:"d-M-Y"}}
+                                            </span>
+                                        {% endif %}
+                                    </li>
+                                {% endif %}
                                 {% if project.has_relations %}
                                     <li>
                                         <span class="detailedInfo">{% trans 'Hierarchy' %}</span>
diff --git a/akvo/utils.py b/akvo/utils.py
index 41d835fd01..de1b891c6b 100644
--- a/akvo/utils.py
+++ b/akvo/utils.py
@@ -487,11 +487,12 @@ def filter_query_string(qs):
         u'&'.join([u'{}={}'.format(k, u''.join(v)) for (k, v) in q.items()])).encode('utf-8')
 
 
-def codelist_choices(codelist):
+def codelist_choices(codelist, show_code=True):
     """
     Based on a model from the codelists app, returns a list of tuples with the available choices.
 
     :param codelist: Codelist from codelists store
+    :param show_code: Show the code (e.g. '1 - ..') in front of the name, True by default
     :return: List of tuples with available choices, tuples in the form of (code, name)
     """
     name_index = 0
@@ -500,7 +501,7 @@ def codelist_choices(codelist):
             name_index = index
             break
 
-    if name_index > 0:
+    if name_index > 0 and show_code:
         return [(cl[0], '%s - %s' % (cl[0], cl[name_index])) for cl in codelist[1:]]
     else:
         return [(cl[0], cl[name_index]) for cl in codelist[1:]]