diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 336f47c..dde7de5 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 9a91689..267980a 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-11 22:23+0300\n" +"POT-Creation-Date: 2017-05-13 10:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,7 +50,7 @@ msgid "External image" msgstr "External image" #: infoscreen/templates/infoscreen_admin.html:23 -#: members/templates/members_base.html:51 +#: members/templates/members_base.html:67 msgid "Log out" msgstr "Log out" @@ -88,7 +88,6 @@ msgstr "Add to rotation" #: infoscreen/templates/infoscreen_admin.html:84 #: infoscreen/templates/infoscreen_admin.html:101 #: infoscreen/templates/infoscreen_admin.html:105 -#: members/templates/member_list.html:84 msgid "Delete" msgstr "Delete" @@ -151,15 +150,15 @@ msgstr "Instance" msgid "Duration" msgstr "Duration" -#: members/models.py:11 members/templates/member_list.html.py:57 +#: members/models.py:11 msgid "First name" msgstr "First name" -#: members/models.py:12 members/templates/member_list.html.py:56 +#: members/models.py:12 msgid "Last name" msgstr "Last name" -#: members/models.py:13 members/templates/member_list.html.py:58 +#: members/models.py:13 msgid "Email" msgstr "Email" @@ -167,7 +166,7 @@ msgstr "Email" msgid "Place of residence" msgstr "Place of residence" -#: members/models.py:15 +#: members/models.py:15 members/models.py:35 msgid "AYY" msgstr "AYY" @@ -175,122 +174,149 @@ msgstr "AYY" msgid "JAS" msgstr "JAS" -#: members/templates/add_member.html:8 members/templates/edit_member.html:8 -#: members/templates/members_base.html:42 +#: members/models.py:36 +msgid "Cash" +msgstr "Cash" + +#: members/models.py:37 +msgid "Bank transfer" +msgstr "Bank transfer" + +#: members/templates/application_list.html:8 +msgid "Member applications" +msgstr "Member applications" + +#: members/templates/error.html:8 +msgid "Error" +msgstr "Error" + +#: members/templates/error.html:15 +msgid "Back" +msgstr "Back" + +#: members/templates/member_add.html:8 members/templates/member_edit.html:8 +#: members/templates/members_base.html:43 msgid "Add member" msgstr "Add member" -#: members/templates/add_member.html:15 members/templates/edit_member.html:16 +#: members/templates/member_add.html:15 members/templates/member_edit.html:16 +#: members/templates/payment_add.html:15 msgid "Save" -msgstr "" +msgstr "Save" -#: members/templates/delete_member_confirm.html:8 +#: members/templates/member_delete_confirm.html:8 msgid "Are you sure you want to delete this member?" msgstr "Are you sure you want to delete this member?" -#: members/templates/delete_member_confirm.html:17 +#: members/templates/member_delete_confirm.html:17 msgid "Yes, I'm sure" msgstr "Yes, I'm sure" -#: members/templates/member_list.html:9 -msgid "Show filters" -msgstr "Show filters" - -#: members/templates/member_list.html:15 -msgid "Search" -msgstr "Search" - -#: members/templates/member_list.html:20 -msgid "Added after" -msgstr "Added after" - -#: members/templates/member_list.html:24 -msgid "Added before" -msgstr "Added before" - -#: members/templates/member_list.html:30 -msgid "Paid after" -msgstr "Paid after" - -#: members/templates/member_list.html:34 -msgid "Paid before" -msgstr "Paid before" - -#: members/templates/member_list.html:40 -msgid "Filter" -msgstr "Filter" - -#: members/templates/member_list.html:41 -msgid "Reset" -msgstr "Reset" - -#: members/templates/member_list.html:49 members/templates/members_base.html:15 +#: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Member register" -#: members/templates/member_list.html:50 +#: members/templates/member_list.html:17 members/templates/payment_list.html:14 msgid "Download CSV" msgstr "Download CSV" -#: members/templates/member_list.html:59 -msgid "AYY member" -msgstr "AYY member" +#: members/templates/member_list.html:24 members/templates/payment_list.html:21 +msgid "Search" +msgstr "Search" -#: members/templates/member_list.html:60 -msgid "JAS recipient" -msgstr "JAS recipient" +#: members/templates/member_list.html:29 members/templates/payment_list.html:26 +msgid "Added after" +msgstr "Added after" -#: members/templates/member_list.html:61 -msgid "Residence" -msgstr "Residence" +#: members/templates/member_list.html:33 members/templates/payment_list.html:30 +msgid "Added before" +msgstr "Added before" -#: members/templates/member_list.html:62 -msgid "Added" -msgstr "Added" +#: members/templates/member_list.html:39 members/templates/payment_list.html:36 +msgid "Paid after" +msgstr "Paid after" -#: members/templates/member_list.html:63 -msgid "Paid" -msgstr "Paid" +#: members/templates/member_list.html:43 members/templates/payment_list.html:40 +msgid "Paid before" +msgstr "Paid before" -#: members/templates/member_list.html:64 -msgid "Member count" -msgstr "Member count" +#: members/templates/member_list.html:49 members/templates/payment_list.html:46 +msgid "Filter" +msgstr "Filter" -#: members/templates/member_list.html:79 -msgid "Update payment" -msgstr "Update payment" +#: members/templates/member_list.html:50 members/templates/payment_list.html:47 +msgid "Reset" +msgstr "Reset" -#: members/templates/member_list.html:81 -msgid "Edit" -msgstr "Edit" +#: members/templates/member_list.html:58 members/templates/payment_list.html:55 +msgid "Show filters" +msgstr "Show filters" -#: members/templates/members_base.html:41 -msgid "Member list" -msgstr "Member list" +#: members/templates/members_base.html:40 webapp/templates/main_index.html:7 +msgid "Members" +msgstr "Members" -#: members/templates/members_base.html:43 +#: members/templates/members_base.html:42 +#, fuzzy +#| msgid "Add member" +msgid "List members" +msgstr "Add member" + +#: members/templates/members_base.html:44 msgid "Add multiple" msgstr "Add multiple" -#: members/templates/members_base.html:44 -msgid "Member application" -msgstr "Member application" +#: members/templates/members_base.html:48 +msgid "Payments" +msgstr "Payments" -#: members/templates/members_base.html:60 +#: members/templates/members_base.html:50 +msgid "List payments" +msgstr "List payments" + +#: members/templates/members_base.html:51 members/templates/payment_add.html:8 +msgid "Add payment" +msgstr "Add payment" + +#: members/templates/members_base.html:55 +msgid "Applications" +msgstr "Applications" + +#: members/templates/members_base.html:57 +msgid "List applications" +msgstr "List applications" + +#: members/templates/members_base.html:58 +msgid "Application form" +msgstr "Application form" + +#: members/templates/members_base.html:63 members/templates/settings.html:11 +msgid "Settings" +msgstr "Settings" + +#: members/templates/members_base.html:80 msgid "Member register of SIK ry" msgstr "Member register of SIK ry" -#: sikweb/settings-docker-sample.py:171 sikweb/settings-sample.py:171 -#: sikweb/settings.py:171 -msgid "English" -msgstr "English" +#: members/templates/payment_list.html:8 +msgid "Payment events" +msgstr "Payment events" -#: sikweb/settings-docker-sample.py:172 sikweb/settings-sample.py:172 -#: sikweb/settings.py:172 +#: members/templates/settings.html:17 +msgid "Language" +msgstr "Language" + +#: members/templates/settings.html:20 sikweb/settings-docker-sample.py:174 +#: sikweb/settings-sample.py:173 sikweb/settings.py:173 msgid "Finnish" msgstr "Finnish" -#: templates/footer.html:11 +#: members/templates/settings.html:21 sikweb/settings-docker-sample.py:173 +#: sikweb/settings-sample.py:172 sikweb/settings.py:172 +msgid "English" +msgstr "English" + +#: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" @@ -298,10 +324,6 @@ msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgid "SIK Admin" msgstr "SIK Admin" -#: webapp/templates/main_index.html:7 -msgid "Members" -msgstr "Members" - #: webapp/templates/main_index.html:8 msgid "Infoscreen" msgstr "Infoscreen" @@ -324,7 +346,4 @@ msgstr "Sössö" #: webapp/templates/navigation.html:32 msgid "Contact" -msgstr "Contact" - -#~ msgid "Are you sure?" -#~ msgstr "Are you sure?" +msgstr "Contact" \ No newline at end of file diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 6e3eef0..2733527 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 59d6bc2..9ba0b3b 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-11 22:23+0300\n" +"POT-Creation-Date: 2017-05-13 10:29+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,7 @@ msgid "External image" msgstr "Ulkoinen kuva" #: infoscreen/templates/infoscreen_admin.html:23 -#: members/templates/members_base.html:51 +#: members/templates/members_base.html:67 msgid "Log out" msgstr "Kirjaudu ulos" @@ -89,7 +89,6 @@ msgstr "Lisää rotaatioon" #: infoscreen/templates/infoscreen_admin.html:84 #: infoscreen/templates/infoscreen_admin.html:101 #: infoscreen/templates/infoscreen_admin.html:105 -#: members/templates/member_list.html:84 msgid "Delete" msgstr "Poista" @@ -152,15 +151,15 @@ msgstr "Dia" msgid "Duration" msgstr "Kesto" -#: members/models.py:11 members/templates/member_list.html.py:57 +#: members/models.py:11 msgid "First name" msgstr "Etunimi" -#: members/models.py:12 members/templates/member_list.html.py:56 +#: members/models.py:12 msgid "Last name" msgstr "Sukunimi" -#: members/models.py:13 members/templates/member_list.html.py:58 +#: members/models.py:13 msgid "Email" msgstr "Sähköposti" @@ -168,7 +167,7 @@ msgstr "Sähköposti" msgid "Place of residence" msgstr "Asuinpaikka" -#: members/models.py:15 +#: members/models.py:15 members/models.py:35 msgid "AYY" msgstr "AYY" @@ -176,122 +175,147 @@ msgstr "AYY" msgid "JAS" msgstr "JAS" -#: members/templates/add_member.html:8 members/templates/edit_member.html:8 -#: members/templates/members_base.html:42 +#: members/models.py:36 +msgid "Cash" +msgstr "Käteinen" + +#: members/models.py:37 +msgid "Bank transfer" +msgstr "Tilisiirto" + +#: members/templates/application_list.html:8 +msgid "Member applications" +msgstr "Jäsenhakemukset" + +#: members/templates/error.html:8 +msgid "Error" +msgstr "Virhe" + +#: members/templates/error.html:15 +msgid "Back" +msgstr "Takaisin" + +#: members/templates/member_add.html:8 members/templates/member_edit.html:8 +#: members/templates/members_base.html:43 msgid "Add member" msgstr "Lisää jäsen" -#: members/templates/add_member.html:15 members/templates/edit_member.html:16 +#: members/templates/member_add.html:15 members/templates/member_edit.html:16 +#: members/templates/payment_add.html:15 msgid "Save" msgstr "Tallenna" -#: members/templates/delete_member_confirm.html:8 +#: members/templates/member_delete_confirm.html:8 msgid "Are you sure you want to delete this member?" msgstr "Oletko varma, että haluat poistaa tämän jäsenen?" -#: members/templates/delete_member_confirm.html:17 +#: members/templates/member_delete_confirm.html:17 msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" -#: members/templates/member_list.html:9 -msgid "Show filters" -msgstr "Näytä suodattimet" - -#: members/templates/member_list.html:15 -msgid "Search" -msgstr "Haku" - -#: members/templates/member_list.html:20 -msgid "Added after" -msgstr "Lisätty jälkeen" - -#: members/templates/member_list.html:24 -msgid "Added before" -msgstr "Lisätty ennen" - -#: members/templates/member_list.html:30 -msgid "Paid after" -msgstr "Maksettu jälkeen" - -#: members/templates/member_list.html:34 -msgid "Paid before" -msgstr "Maksettu ennen" - -#: members/templates/member_list.html:40 -msgid "Filter" -msgstr "Suodata" - -#: members/templates/member_list.html:41 -msgid "Reset" -msgstr "Nollaa" - -#: members/templates/member_list.html:49 members/templates/members_base.html:15 +#: members/templates/member_list.html:11 members/templates/members_base.html:15 msgid "Member register" msgstr "Jäsenrekisteri" -#: members/templates/member_list.html:50 +#: members/templates/member_list.html:17 members/templates/payment_list.html:14 msgid "Download CSV" msgstr "Lataa CSV" -#: members/templates/member_list.html:59 -msgid "AYY member" -msgstr "AYY:n jäsen" +#: members/templates/member_list.html:24 members/templates/payment_list.html:21 +msgid "Search" +msgstr "Haku" -#: members/templates/member_list.html:60 -msgid "JAS recipient" -msgstr "JAS-vastaanottaja" +#: members/templates/member_list.html:29 members/templates/payment_list.html:26 +msgid "Added after" +msgstr "Lisätty jälkeen" -#: members/templates/member_list.html:61 -msgid "Residence" -msgstr "Asuinpaikka" +#: members/templates/member_list.html:33 members/templates/payment_list.html:30 +msgid "Added before" +msgstr "Lisätty ennen" -#: members/templates/member_list.html:62 -msgid "Added" -msgstr "Lisätty" +#: members/templates/member_list.html:39 members/templates/payment_list.html:36 +msgid "Paid after" +msgstr "Maksettu jälkeen" -#: members/templates/member_list.html:63 -msgid "Paid" -msgstr "Maksettu" +#: members/templates/member_list.html:43 members/templates/payment_list.html:40 +msgid "Paid before" +msgstr "Maksettu ennen" -#: members/templates/member_list.html:64 -msgid "Member count" -msgstr "Lukumäärä" +#: members/templates/member_list.html:49 members/templates/payment_list.html:46 +msgid "Filter" +msgstr "Suodata" -#: members/templates/member_list.html:79 -msgid "Update payment" -msgstr "Päivitä maksu" +#: members/templates/member_list.html:50 members/templates/payment_list.html:47 +msgid "Reset" +msgstr "Nollaa" -#: members/templates/member_list.html:81 -msgid "Edit" -msgstr "Muokkaa" +#: members/templates/member_list.html:58 members/templates/payment_list.html:55 +msgid "Show filters" +msgstr "Näytä suodattimet" -#: members/templates/members_base.html:41 -msgid "Member list" +#: members/templates/members_base.html:40 webapp/templates/main_index.html:7 +msgid "Members" +msgstr "Jäsenet" + +#: members/templates/members_base.html:42 +msgid "List members" msgstr "Jäsenlistaus" -#: members/templates/members_base.html:43 +#: members/templates/members_base.html:44 msgid "Add multiple" msgstr "Lisää useita" -#: members/templates/members_base.html:44 -msgid "Member application" -msgstr "Jäsenhakemus" +#: members/templates/members_base.html:48 +msgid "Payments" +msgstr "Maksutapahtumat" -#: members/templates/members_base.html:60 +#: members/templates/members_base.html:50 +msgid "List payments" +msgstr "Maksulistaus" + +#: members/templates/members_base.html:51 members/templates/payment_add.html:8 +msgid "Add payment" +msgstr "Lisää maksu" + +#: members/templates/members_base.html:55 +msgid "Applications" +msgstr "Jäsenhakemukset" + +#: members/templates/members_base.html:57 +msgid "List applications" +msgstr "Hakemuslistaus" + +#: members/templates/members_base.html:58 +msgid "Application form" +msgstr "Jäsenhakemuslomake" + +#: members/templates/members_base.html:63 members/templates/settings.html:11 +msgid "Settings" +msgstr "Asetukset" + +#: members/templates/members_base.html:80 msgid "Member register of SIK ry" msgstr "Aalto-yliopiston Sähköinsinöörikilta ry:n jäsenrekisteri" -#: sikweb/settings-docker-sample.py:171 sikweb/settings-sample.py:171 -#: sikweb/settings.py:171 -msgid "English" -msgstr "englanti" +#: members/templates/payment_list.html:8 +msgid "Payment events" +msgstr "Maksutapahtumat" -#: sikweb/settings-docker-sample.py:172 sikweb/settings-sample.py:172 -#: sikweb/settings.py:172 +#: members/templates/settings.html:17 +msgid "Language" +msgstr "Kieli" + +#: members/templates/settings.html:20 sikweb/settings-docker-sample.py:174 +#: sikweb/settings-sample.py:173 sikweb/settings.py:173 msgid "Finnish" msgstr "suomi" -#: templates/footer.html:11 +#: members/templates/settings.html:21 sikweb/settings-docker-sample.py:173 +#: sikweb/settings-sample.py:172 sikweb/settings.py:172 +msgid "English" +msgstr "englanti" + +#: templates/footer.html:7 msgid "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" @@ -299,10 +323,6 @@ msgstr "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" msgid "SIK Admin" msgstr "SIK Hallintapaneeli" -#: webapp/templates/main_index.html:7 -msgid "Members" -msgstr "Jäsenlistaus" - #: webapp/templates/main_index.html:8 msgid "Infoscreen" msgstr "Infonäyttö" @@ -326,6 +346,3 @@ msgstr "Sössö" #: webapp/templates/navigation.html:32 msgid "Contact" msgstr "Yhteystiedot" - -#~ msgid "Are you sure?" -#~ msgstr "Oletko varma?" diff --git a/members/migrations/0005_auto_20170513_1029.py b/members/migrations/0005_auto_20170513_1029.py new file mode 100644 index 0000000..32c81e4 --- /dev/null +++ b/members/migrations/0005_auto_20170513_1029.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-05-13 07:29 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0004_auto_20170512_1454'), + ] + + operations = [ + migrations.RemoveField( + model_name='member', + name='paid', + ), + migrations.AlterField( + model_name='payment', + name='date', + field=models.DateTimeField(default=datetime.datetime(2017, 5, 13, 10, 29, 50, 116064)), + ), + migrations.AlterField( + model_name='payment', + name='source', + field=models.CharField(choices=[('AYY', 'AYY'), ('cash', 'Cash'), ('bank_transfer', 'Bank transfer')], max_length=255), + ), + ] diff --git a/members/templates/application_list.html b/members/templates/application_list.html index 4bad49d..b9a4bfc 100644 --- a/members/templates/application_list.html +++ b/members/templates/application_list.html @@ -4,10 +4,11 @@ {% block content %}
-

{% trans "Member applications" %}

-
+
+

{% trans "Member applications" %}

+
-
{{ table|safe }}
+ {% endblock content %} diff --git a/members/templates/error.html b/members/templates/error.html new file mode 100644 index 0000000..b8c30ae --- /dev/null +++ b/members/templates/error.html @@ -0,0 +1,18 @@ +{% extends "members_base.html" %} + +{% load static %} +{% load i18n %} +{% block content %} +
+
+

{% trans "Error" %}

+
+ +
+ {{ error }} +
+
+ +
+
+{% endblock content %} diff --git a/members/templates/member_list.html b/members/templates/member_list.html index f44f88e..dff458d 100644 --- a/members/templates/member_list.html +++ b/members/templates/member_list.html @@ -8,12 +8,14 @@
-

{% trans "Member register" %}

- {% trans "Download CSV" %} +

{% trans "Member register" %}

{{ table|safe }} +
diff --git a/members/templates/payment_list.html b/members/templates/payment_list.html index 53af160..74fc26a 100644 --- a/members/templates/payment_list.html +++ b/members/templates/payment_list.html @@ -5,12 +5,15 @@ {% block content %}
-

{% trans "Payment events" %}

- {% trans "Download CSV" %} +

{% trans "Payment events" %}

{{ table|safe }} + +
diff --git a/members/views.py b/members/views.py index 859cf6f..fcadb51 100644 --- a/members/views.py +++ b/members/views.py @@ -53,6 +53,19 @@ def send_mail_wrapper(subject, message): def convert_table_to_html(table, request): + ''' + This is a horrible hack for converting a table object to raw html. + Even with extensive research I wasn't able to find a way to add a path + prefix "e.g. /members/list" to the query strings "e.g. ?sort=foo", so I + did it manually with string.replace. + + Note: When adding the html to a page, you need to run it through + the "safe" filter. E.g. "{{ table|safe }}" + + :param table: Table object from members.tables + :param request: HttpRequest + :return: Raw html string + ''' table_as_html = table.as_html(request) path = request.path @@ -118,8 +131,7 @@ def member_submit(request, *args, **kwargs): memberlogger.info("Saved new member to member register with the following info: {}".format(form)) return HttpResponseRedirect('/members') else: - print(form.errors) - return HttpResponse('oh shit') + return render(request, 'error.html', {'error': form.errors}) @ensure_csrf_cookie @@ -254,8 +266,7 @@ def payment_submit(request, *args, **kwargs): memberlogger.info("Saved new payment to member register with the following info: {}".format(form)) return HttpResponseRedirect('/members/payments') else: - print(form.errors) - return HttpResponse('oh shit') + return render(request, 'error.html', {'error': form.errors}) @ensure_csrf_cookie @require_http_methods(["GET"])