diff --git a/account/templates/memberstatus.html b/account/templates/memberstatus.html index f5dd84b..c68a968 100644 --- a/account/templates/memberstatus.html +++ b/account/templates/memberstatus.html @@ -4,30 +4,41 @@ {% block container %}
-

{% trans "Basic information about your account" %}

- - {{ contributions }} - - - - - - - - - - - - - - - - - - - - -
{% trans "Crewname:" %}{{ cteward.Crewname }}
{% trans "Membership Number:" %}{{ cteward.Mitgliedsnummer }}
{% trans "Status:" %}{{ cteward.Status }}
{% trans "Firstname:" %}{{ cteward.Vorname }}
{% trans "Lastname:" %}{{ cteward.Nachname }}
{% trans "Street:" %}{{ cteward.Strasse }}
{% trans "Postcode:" %}{{ cteward.PLZ }}
{% trans "City:" %}{{ cteward.Ort }}
{% trans "Gender:" %}{{ cteward.Geschlecht }}
{% trans "Birth Date:" %}{{ cteward.Geburtsdatum }}
{% trans "Entry Date:" %}{{ cteward.Eintritt }}
{% trans "Godfather:" %}{{ cteward.Paten }}
{% trans "Payment Method:" %}{{ cteward.Zahlungsart }}
{% trans "Payment Frequency:" %}{{ cteward.Zahlungsweise }}
{% trans "Debit Authorization:" %}{{ cteward.Lastschriftmandat }}
{% trans "Bank:" %}{{ cteward.Bank }}
{% trans "IBAN:" %}{{ cteward.IBAN }}
{% trans "BIC:" %}{{ cteward.BIC }}
+
+
+ {% trans "Basic information about your account" %} +
+
+ + + + + + + + + + + + + + + + + + + +
{% trans "Crewname:" %}{{ cteward.Crewname }}
{% trans "Membership Number:" %}{{ cteward.Mitgliedsnummer }}
{% trans "Status:" %}{{ cteward.Status }}
{% trans "Firstname:" %}{{ cteward.Vorname }}
{% trans "Lastname:" %}{{ cteward.Nachname }}
{% trans "Street:" %}{{ cteward.Strasse }}
{% trans "Postcode:" %}{{ cteward.PLZ }}
{% trans "City:" %}{{ cteward.Ort }}
{% trans "Gender:" %}{{ cteward.Geschlecht }}
{% trans "Birth Date:" %}{{ cteward.Geburtsdatum }}
{% trans "Entry Date:" %}{{ cteward.Eintritt }}
{% trans "Godfather:" %}{{ cteward.Paten|join:", " }}
{% trans "Payment Method:" %}{{ cteward.Zahlungsart }}
{% trans "Payment Frequency:" %}{{ cteward.Zahlungsweise }}
{% trans "Debit Authorization:" %}{{ cteward.Lastschriftmandat }}
{% trans "Bank:" %}{{ cteward.Bank }}
{% trans "IBAN:" %}{{ cteward.IBAN }}
{% trans "BIC:" %}{{ cteward.BIC }}
+
+
+
+
+
+
+
+
+
+ {% trans "DISCLAIMER: due to crappy association management software, the data below is only a rough estimate. c-base cannot take responsibility for the correctness of this information." %}
diff --git a/account/views.py b/account/views.py index cc6ee12..7eebb8d 100644 --- a/account/views.py +++ b/account/views.py @@ -303,8 +303,10 @@ def memberstatus(request): url = "https://vorstand.c-base.org/cteward-api/legacy/member/%s/contributions" % username r = requests.get(url, verify=False, auth=(username, password)) contributions = r.json() - years = collections.OrderedDict(sorted(contributions['years'].items(), reverse=True)) - contributions['years'] = years.items() + try: + years = collections.OrderedDict(sorted(contributions['years'].items(), reverse=True)) + contributions['years'] = years.items() + except: pass url = "https://vorstand.c-base.org/cteward-api/legacy/member/%s" % username r = requests.get(url, verify=False, auth=(username, password)) diff --git a/guni.sh b/guni.sh new file mode 100755 index 0000000..d617f72 --- /dev/null +++ b/guni.sh @@ -0,0 +1,19 @@ +#!/bin/bash +set -e +LOGFILE=/home/cbmi/cbmi/cbmi.log +LOGDIR=$(dirname $LOGFILE) +NUM_WORKERS=3 +# user/group to run as +USER=cbmi +GROUP=cbmi +ADDRESS=127.0.0.1:8000 +DJANGO_SETTINGS=cbmi.settings +DJANGO_SETTINGS_MODULE=cbmi.settings +source /home/cbmi/cbmi/bin/activate +cd /home/cbmi/cbmi +test -d $LOGDIR || mkdir -p $LOGDIR +echo "foo" +exec gunicorn -w $NUM_WORKERS --bind=$ADDRESS \ + --user=$USER --group=$GROUP --log-level=debug \ + cbmi.wsgi:application \ + --log-file=$LOGFILE 2>>$LOGFILE