From b7dab4d01aeb31f5a42bd693f838be09ca5cec8f Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 9 Nov 2016 16:18:04 +0100
Subject: [PATCH] Fix person detail data (fix #383)

---
 .../core/templatetags/organization_tags.py    |   4 +
 app/templates/network/person_detail.html      |  56 +++------
 .../person_detail_multiple_activities.html    | 109 ++++++++++++++++++
 3 files changed, 128 insertions(+), 41 deletions(-)
 create mode 100644 app/templates/network/person_detail_multiple_activities.html

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 0653b547..e232532e 100644
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -166,3 +166,7 @@ def date_year_higher_than(date, years):
 @register.simple_tag
 def current_year():
     return datetime.datetime.now().strftime("%Y")
+
+@register.filter
+def is_not_host(organizations):
+    return organizations.exclude(is_host=True)
diff --git a/app/templates/network/person_detail.html b/app/templates/network/person_detail.html
index 0562294b..1cb88b2a 100644
--- a/app/templates/network/person_detail.html
+++ b/app/templates/network/person_detail.html
@@ -33,58 +33,32 @@
 
     <p><strong>{% trans 'Email' %} :</strong> {{ person_email }}</p>
 
-    {% if person.activities.all|length > 0 %}
-        <h2 class="dotted">{% trans 'Activities' %}</h2>
+    {% with person.activities.all as activities %}
+      {% if activities %}
+        {# <h2 class="dotted">{% trans 'Activities' %}</h2>#}
         <ul class="unstyled-list">
-            {% for activity in person.activities.all %}
+          {% with activities.0 as activity %}
             <li class="mb1">
-                {% comment %}
-                {% if activity.function %}
-                    <strong>{% trans 'Function'%} : </strong>{{ activity.function }}<br>
-                {% endif %}
-                {% if activity.status %}
-                    <strong>{% trans 'Status'%} : </strong>{{ activity.status }}<br>
-                {% endif %}
-                {% endcomment %}
                 {% with activity.teams.all as teams %}
+                 {% with activity.organizations.all|is_not_host as organizations %}
+                  {% with activity.employers.all|is_not_host as employers %}
                     {% if teams %}
                         <strong>{% trans 'Team' %} : </strong>
                         {% for team in teams %}
-                            <a href="{% url "page" team.pages.all.0 %}">{{ team.name }}</a>{% if not forloop.last %}, {% endif %}
+                            <a href="{% url "page" team.pages.all.0 %}">{{ team.name }}</a>
+                            {% if organizations %}({% for organization in organizations %}{{ organization.name }}{% if not forloop.last %}, {% endif %}{% endfor %})
+                            {% elif employers %}({% for employer in employers %}{{ employer.name }}{% if not forloop.last %}, {% endif %}{% endfor %}){% endif %}
+                            <br />
                         {% endfor %}
-                        <br />
-                    {% endif %}
-                {% endwith %}
-                {% with activity.organizations.all as organizations %}
-                  {% with activity.employers.all as employers %}
-                    {% if organizations %}
-                        <strong>{% trans 'Organization' %} : </strong>
-                        {% for organization in organizations %}
-                            {{ organization.name }}{% if not forloop.last %}, {% endif %}
-                        {% endfor %}
-                        <br />
-                    {% elif employers %}
-                        <strong>{% trans 'Organization' %} : </strong>
-                        {% for employer in employers %}
-                            {{ employer.name }}{% if not forloop.last %}, {% endif %}
-                        {% endfor %}
-                    <br />
                     {% endif %}
+                   {% endwith %}
                   {% endwith %}
                 {% endwith %}
-                {% if activity.date_from or activity.date_to %}
-                  {% if not activity.date_from and not activity.date_to|date_year_higher_than:10 %}
-                    <strong>{% trans 'Period' %}</strong> : {% trans 'to' %} {{ activity.date_to }}<br>
-                  {% elif not activity.date_to %}
-                    <strong>{% trans 'Period'%}</strong> : {% trans 'from' %} {{ activity.date_from }}<br>
-                  {% else %}
-                    <strong>{% trans 'Period'%}</strong> : {% trans 'from' %} {{ activity.date_from }} {% if not activity.date_to|date_year_higher_than:10 %}{% trans 'to' %} {{ activity.date_to }}{% endif %}<br>
-                  {% endif %}
-                {% endif %}
             </li>
-            {% endfor %}
+          {% endwith %}
         </ul>
-    {% endif %}
+      {% endif %}
+    {% endwith %}
 {% endblock %}
 
 {% block page_sidebar %}
@@ -101,7 +75,7 @@
 
 {% block page_link %}
     {% with person.links.all as links %}
-        {% if links or person_email %}
+        {% if links %}
             <h2 class="dotted">{% trans 'Links' %}</h2>
             {% include 'core/inc/link.html' %}
         {% endif %}
diff --git a/app/templates/network/person_detail_multiple_activities.html b/app/templates/network/person_detail_multiple_activities.html
new file mode 100644
index 00000000..0562294b
--- /dev/null
+++ b/app/templates/network/person_detail_multiple_activities.html
@@ -0,0 +1,109 @@
+{% extends "pages/page.html" %}
+{% load mezzanine_tags keyword_tags i18n organization_tags pages_tags %}
+
+{% block meta_title %}{{ person.meta_title }}{% endblock %}
+
+{% block meta_keywords %}{% metablock %}
+{% keywords_for person as keywords %}
+{% for keyword in keywords %}
+    {% if not forloop.first %}, {% endif %}
+    {{ keyword }}
+{% endfor %}
+{% endmetablock %}{% endblock %}
+
+{% block page_class %}
+    person
+{% endblock %}
+
+{% block breadcrumb_menu %}
+    {{ block.super }}
+    <li class="breadcrumb__item active">{{ person }}</li>
+{% endblock %}
+
+{% block page_title %}
+    {% editable person.title %}
+        <h1 class="dotted">{{ person.title }}</h1>
+    {% endeditable %}
+{% endblock %}
+
+{% block page_content %}
+    {% editable person.bio %}
+        {{ person.bio|richtext_filters|safe }}
+    {% endeditable %}
+
+    <p><strong>{% trans 'Email' %} :</strong> {{ person_email }}</p>
+
+    {% if person.activities.all|length > 0 %}
+        <h2 class="dotted">{% trans 'Activities' %}</h2>
+        <ul class="unstyled-list">
+            {% for activity in person.activities.all %}
+            <li class="mb1">
+                {% comment %}
+                {% if activity.function %}
+                    <strong>{% trans 'Function'%} : </strong>{{ activity.function }}<br>
+                {% endif %}
+                {% if activity.status %}
+                    <strong>{% trans 'Status'%} : </strong>{{ activity.status }}<br>
+                {% endif %}
+                {% endcomment %}
+                {% with activity.teams.all as teams %}
+                    {% if teams %}
+                        <strong>{% trans 'Team' %} : </strong>
+                        {% for team in teams %}
+                            <a href="{% url "page" team.pages.all.0 %}">{{ team.name }}</a>{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                        <br />
+                    {% endif %}
+                {% endwith %}
+                {% with activity.organizations.all as organizations %}
+                  {% with activity.employers.all as employers %}
+                    {% if organizations %}
+                        <strong>{% trans 'Organization' %} : </strong>
+                        {% for organization in organizations %}
+                            {{ organization.name }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                        <br />
+                    {% elif employers %}
+                        <strong>{% trans 'Organization' %} : </strong>
+                        {% for employer in employers %}
+                            {{ employer.name }}{% if not forloop.last %}, {% endif %}
+                        {% endfor %}
+                    <br />
+                    {% endif %}
+                  {% endwith %}
+                {% endwith %}
+                {% if activity.date_from or activity.date_to %}
+                  {% if not activity.date_from and not activity.date_to|date_year_higher_than:10 %}
+                    <strong>{% trans 'Period' %}</strong> : {% trans 'to' %} {{ activity.date_to }}<br>
+                  {% elif not activity.date_to %}
+                    <strong>{% trans 'Period'%}</strong> : {% trans 'from' %} {{ activity.date_from }}<br>
+                  {% else %}
+                    <strong>{% trans 'Period'%}</strong> : {% trans 'from' %} {{ activity.date_from }} {% if not activity.date_to|date_year_higher_than:10 %}{% trans 'to' %} {{ activity.date_to }}{% endif %}<br>
+                  {% endif %}
+                {% endif %}
+            </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+{% endblock %}
+
+{% block page_sidebar %}
+    {% if person.images.all %}
+        {% with person.images.all|get_type:'page_featured' as images %}
+            {% if images.first %}
+                <figure class="person-list-box__image">
+                    <img src="{{ MEDIA_URL }}{% thumbnail images.first 135 135 top=0.5 %}" alt="person"/>
+                </figure>
+            {% endif %}
+        {% endwith %}
+    {% endif%}
+{% endblock %}
+
+{% block page_link %}
+    {% with person.links.all as links %}
+        {% if links or person_email %}
+            <h2 class="dotted">{% trans 'Links' %}</h2>
+            {% include 'core/inc/link.html' %}
+        {% endif %}
+    {% endwith %}
+{% endblock %}
-- 
2.39.5