Update person detail data, update index link

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index 9304850249f7032dc8e186636985472ee9e117b7..6b4803599f5e4ef4c1785e0f72c01b3949db3c70 100644 (file)
--- 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 b2cc68901e955a9297c40c327178f7f35594544d..f8198fc801c6821ee66886d3ec3478cbf57e29a4 100644 (file)
--- 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 97e47c73d40c41070d6330fbb373649c6f9e7fb6..7c27d30ccbbcdeeac537733770b5f270a8d0d621 100644 (file)
--- 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 e78c20878c541cb20c80e600f43aa13c96e59fbd..206e0ca1ba82ad1736e1c9c4aac6bf8a9cff4852 100644 (file)
--- 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 d5158f252cf8b3284573450876928c5bef2720b4..898cc5abc050feab94e8665b0cc5a3e5e46efbd9 100644 (file)
--- 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>