From 04c07fddc2b606e408ea10b6c8e56ae0f58a2780 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 8 Nov 2016 15:38:23 +0100
Subject: [PATCH] Update person detail data, update index link

---
 .../core/templatetags/organization_tags.py    |  6 +++++
 app/organization/network/admin.py             |  4 +++
 app/scripts/app.sh                            |  2 +-
 app/templates/home/inc/services.html          |  4 +--
 app/templates/network/person_detail.html      | 25 ++++++++++++++-----
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 93048502..6b480359 100644
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -156,3 +156,9 @@ def slice_ng(qs, indexes):
         return list[index_1:index_2]
     else:
         return [list[index_1]]
+
+@register.filter
+def date_year_higher_than(date, years):
+    diff = date - datetime.date.today()
+    print(diff.days)
+    return diff.days > years*365
diff --git a/app/organization/network/admin.py b/app/organization/network/admin.py
index b2cc6890..f8198fc8 100644
--- a/app/organization/network/admin.py
+++ b/app/organization/network/admin.py
@@ -134,6 +134,10 @@ class PersonActivityAdmin(BaseTranslationModelAdmin):
     list_display = ['person', 'get_teams', 'status', 'date_from', 'date_to']
     filter_horizontal = ['organizations', 'employers', 'teams', 'projects',
                          'supervisors', 'phd_directors', ]
+    search_fields = ['person__title',]
+    list_filter = [ 'date_from', 'date_to',
+                    'is_permanent', 'framework', 'grade',
+                    'status', 'teams', 'projects',]
 
     def get_teams(self, instance):
         values = []
diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 97e47c73..7c27d30c 100644
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -34,7 +34,7 @@ sh $app/scripts/wait.sh
 
 # django setup
 python $manage wait-for-db
-python $manage migrate --noinput
+# python $manage migrate --noinput
 # python $manage bower_install -- --allow-root
 python $manage create-admin-user
 # @todo searching every fixtures file in each folder
diff --git a/app/templates/home/inc/services.html b/app/templates/home/inc/services.html
index e78c2087..206e0ca1 100644
--- a/app/templates/home/inc/services.html
+++ b/app/templates/home/inc/services.html
@@ -48,12 +48,12 @@
 
         <div class="col-sm-6 col-xs-12">
 
-            <a class="banner banner--colored banner--orange banner--dark" href="http://medias.ircam.fr/" target="_blank" style="background-image:url({% static 'img/services/resources.jpg' %});">
+            <a class="banner banner--colored banner--orange banner--light" href="http://ressources.ircam.fr/" target="_blank" style="background-image:url({% static 'img/services/resources.jpg' %});">
 
                 <div class="banner__content">
 
                     <div class="banner__title fsxxxl">
-                        {% trans 'IRCAM Archives' %}
+                        {% trans 'IRCAM multimedia library' %}
                     </div>
                     <div class="banner__desc fss">
                         {% blocktrans %}Audiovisual and sound archives, a database on contemporary music (BRAHMS), a catalogue of works…{% endblocktrans %}
diff --git a/app/templates/network/person_detail.html b/app/templates/network/person_detail.html
index d5158f25..898cc5ab 100644
--- a/app/templates/network/person_detail.html
+++ b/app/templates/network/person_detail.html
@@ -39,24 +39,37 @@
             {% for activity in person.activities.all %}
             <li>
                 {% if activity.function %}
-                    {% trans 'Functions'%} : {{ activity.function }}<br>
+                    {% trans 'Function'%} : {{ activity.function }}<br>
                 {% endif %}
-                {% with activity.teams.all as actvities %}
-                    {% if actvities %}
-                        {% trans 'Teams' %} :<br>
-                        {% for team in actvities %}
+                {% if activity.status %}
+                    {% trans 'Status'%} : {{ activity.status }}<br>
+                {% endif %}
+                {% with activity.teams.all as teams %}
+                    {% if teams %}
+                        {% trans 'Team' %} :
+                        {% for team in teams %}
                             {{ team.name }}<br>
                         {% endfor %}
                     {% endif %}
                 {% endwith %}
                 {% with activity.organizations.all as organizations %}
                     {% if organizations %}
-                        {% trans 'Organization' %} :<br>
+                        {% trans 'Organization' %} :
                         {% for organization in organizations %}
                         {{ organization.name }}<br>
                         {% endfor %}
                     {% endif %}
                 {% endwith %}
+                {% if activity.date_from or activity.date_to %}
+                  {% if not activity.date_from and not activity.date_to|date_year_higher_than:10 %}
+                    {% trans 'Period' %} : {% trans 'to' %} {{ activity.date_to }}<br>
+                  {% elif not activity.date_to %}
+                    {% trans 'Period'%} : {% trans 'from' %} {{ activity.date_from }}<br>
+                  {% else %}
+                    {% trans 'Period'%} : {% 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>
-- 
2.39.5