Permalink
Browse files

List views for requested dissociation and dissociated

  • Loading branch information...
1 parent 055e067 commit ef90882e59c0fd55144040366a58660fd88e55d7 @guaq guaq committed Sep 29, 2013
Showing with 47 additions and 14 deletions.
  1. +12 −0 membership/urls.py
  2. +22 −14 sikteeri/locale/fi/LC_MESSAGES/django.po
  3. +13 −0 sikteeri/templates/menu.html
View
12 membership/urls.py
@@ -84,6 +84,18 @@
'template_name': 'membership/membership_list.html',
'template_object_name': 'member',
'paginate_by': ENTRIES_PER_PAGE}, name='approved_memberships'),
+ url(r'memberships/dissociation_requested/$', 'membership.views.member_object_list',
+ {'queryset': Membership.objects.filter(status__exact='S').
+ order_by('person__last_name', 'person__first_name', 'id'),
+ 'template_name': 'membership/membership_list.html',
+ 'template_object_name': 'member',
+ 'paginate_by': ENTRIES_PER_PAGE}, name='dissociation_requested_memberships'),
+ url(r'memberships/dissociated/$', 'membership.views.member_object_list',
+ {'queryset': Membership.objects.filter(status__exact='I').
+ order_by('person__last_name', 'person__first_name', 'id'),
+ 'template_name': 'membership/membership_list.html',
+ 'template_object_name': 'member',
+ 'paginate_by': ENTRIES_PER_PAGE}, name='dissociated_memberships'),
url(r'memberships/approved-emails/$', 'membership.views.member_object_list',
{'queryset': Membership.objects.filter(status__exact='A').
order_by('id').values('person__email', 'organization__email'),
View
36 sikteeri/locale/fi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 19:29+0300\n"
+"POT-Creation-Date: 2013-09-29 14:29+0300\n"
"PO-Revision-Date: 2013-02-18 22:58+0300\n"
"Last-Translator: Atte Hinkka <gua@kapsi.fi>\n"
"MIME-Version: 1.0\n"
@@ -92,55 +92,63 @@ msgstr "Jäsenet"
msgid "emails"
msgstr "emailit"
-#: templates/menu.html:27
+#: templates/menu.html:30
+msgid "Members that have requested dissociation"
+msgstr "Jäsenet, jotka ovat hakeneet eroa"
+
+#: templates/menu.html:36
+msgid "Dissociated members"
+msgstr "Eronneet jäsenet"
+
+#: templates/menu.html:40
msgid "Deleted members"
msgstr "Poistetut jäsenet"
-#: templates/menu.html:28
+#: templates/menu.html:41
msgid "All membership entities"
msgstr "Kaikki jäsentietueet"
-#: templates/menu.html:32
+#: templates/menu.html:45
msgid "Search memberships"
msgstr "Hae jäsentietoja"
-#: templates/menu.html:39
+#: templates/menu.html:52
msgid "List of unpaid bills"
msgstr "Lista avoimista laskuista"
-#: templates/menu.html:40
+#: templates/menu.html:53
msgid "Unpaid paper reminders"
msgstr "Maksamattomat paperimuistutukset"
-#: templates/menu.html:42
+#: templates/menu.html:55
msgid "All bills"
msgstr "Kaikki laskut"
-#: templates/menu.html:43
+#: templates/menu.html:56
msgid "Unknown payments"
msgstr "Tunnistamattomat maksut"
-#: templates/menu.html:44
+#: templates/menu.html:57
msgid "Ignored payments"
msgstr "Huomiotta jätetyt maksut"
-#: templates/menu.html:45
+#: templates/menu.html:58
msgid "All payments"
msgstr "Kaikki maksut"
-#: templates/menu.html:46
+#: templates/menu.html:59
msgid "Print reminders"
msgstr "Tulosta muistutukset"
-#: templates/menu.html:48
+#: templates/menu.html:61
msgid "Import payments"
msgstr "Tuo maksut"
-#: templates/menu.html:53
+#: templates/menu.html:66
msgid "Send test e-mail"
msgstr "Lähetä testisähköposti"
-#: templates/menu.html:58
+#: templates/menu.html:71
msgid "Admin"
msgstr "Ylläpito"
View
13 sikteeri/templates/menu.html
@@ -24,6 +24,19 @@
<li><a href="{% url approved_memberships %}">{% trans "Members" %}</a>
<small><a href="{% url approved_memberships_emails %}">{% trans "emails" %}</a></small>
</li>
+
+ <li>
+ <a href="{% url dissociation_requested_memberships %}">
+ {% trans "Members that have requested dissociation" %}
+ </a>
+ </li>
+
+ <li>
+ <a href="{% url dissociated_memberships %}">
+ {% trans "Dissociated members" %}
+ </a>
+ </li>
+
<li><a href="{% url deleted_memberships %}">{% trans "Deleted members" %}</a></li>
<li><small><a href="{% url all_memberships %}">{% trans "All membership entities" %}</a></small></li>
<li>

0 comments on commit ef90882

Please sign in to comment.