Add status.display_text, comment person status and functions (for the moment)

diff --git a/app/organization/network/migrations/0055_activitystatus_display_text.py b/app/organization/network/migrations/0055_activitystatus_display_text.py
new file mode 100644 (file)
index 0000000..995bc35
--- /dev/null
+++ b/app/organization/network/migrations/0055_activitystatus_display_text.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-11-08 15:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0054_auto_20161107_1543'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='activitystatus',
+            name='display_text',
+            field=models.CharField(blank=True, default=True, max_length=128, verbose_name='display text'),
+        ),
+    ]

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index 689248f90374c389b810a02992f411ee46717771..34a5283f21560e7dc991d5f80d4af9c75ed25785 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -315,6 +315,7 @@ class ActivityStatus(Named):
 
     order = models.IntegerField(_('order number'), default=100)
     display = models.BooleanField(_('display on team page'), blank=True, default=True)
+    display_text = models.CharField(_('display text'), max_length=128, blank=True, default=True)
 
     class Meta:
         verbose_name = _('activity status')

diff --git a/app/templates/network/person_detail.html b/app/templates/network/person_detail.html
index fd6971056f9aa30566130e462dd9d2be6160180b..0562294bf59964898d592339fdae6a197d3994f5 100644 (file)
--- a/app/templates/network/person_detail.html
+++ b/app/templates/network/person_detail.html
@@ -38,12 +38,14 @@
         <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>
@@ -54,13 +56,21 @@
                     {% 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 %}