Merge pull request ofri#42 from itayperl/master

Feature #3624
salty-horse · Dec 29, 2012 · 8b4c29d · 8b4c29d
2 parents f0dfc5e + 304b45a
commit 8b4c29d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/mks/views.py b/mks/views.py
@@ -312,6 +312,7 @@ def get_context_data (self, **kwargs):
                 'bills_tags':bills_tags,
                 'agendas':agendas,
                 'presence':presence,
+                'current_knesset_start_date': date(2009, 2, 24),
                 'factional_discipline':factional_discipline,
                 'votes_against_own_bills':votes_against_own_bills,
                 'general_discipline':general_discipline,

diff --git a/templates/mks/member_detail.html b/templates/mks/member_detail.html
@@ -122,6 +122,24 @@ <h3> {% trans "Personal Information" %}</h3>
                                                 <td>{{ object.residence_economy }}</td>
                                             </tr>
                                             {% endif %}
+                                            {% if object.start_date != current_knesset_start_date %}
+                                            <tr>
+                                                <td>{% trans "entrance to knesset" %}</td>
+                                                <td>{{ object.start_date }}</td>
+                                            </tr>
+                                            {% endif %}
+                                            {% if object.end_date != None %}
+                                            <tr>
+                                                <td>{% trans "retirement from knesset" %}</td>
+                                                <td>{{ object.end_date }}</td>
+                                            </tr>
+                                            {% endif %}
+                                            {% if object.start_date != current_knesset_start_date or object.end_date != None %}
+                                            <tr>
+                                                <td>{% trans "time in knesset" %}</td>
+                                                <td>{{ object.start_date|timesince:object.end_date }}</td>
+                                            </tr>
+                                            {% endif %}
                                         </table>
                                     </td>
                                 </tr>