added mote details from cteward

This commit is contained in:
smile 2015-09-26 17:24:52 +02:00
parent ac372412fd
commit cd6f655deb
3 changed files with 58 additions and 26 deletions

View file

@ -4,10 +4,11 @@
{% block container %}
<div class="row">
<div class="col-md-12">
<h3>{% trans "Basic information about your account" %}</h3>
{{ contributions }}
<div class="panel-group" id="basic-accordion">
<div class="panel panel-default">
<a class="btn btn-lg btn-default btn-block" data-toggle="collapse" data-parent="#basic-accordion" href="#basic">{% trans "Basic information about your account" %}</a>
<div id="basic" class="panel-collapse">
<div class="terminal">
<table class="table table-condensed table-bordered table-hover">
<tr><td>{% trans "Crewname:" %}</td><td>{{ cteward.Crewname }}</td></tr>
<tr><td>{% trans "Membership Number:" %}</td><td>{{ cteward.Mitgliedsnummer }}</td></tr>
@ -20,7 +21,7 @@
<tr><td>{% trans "Gender:" %}</td><td>{{ cteward.Geschlecht }}</td></tr>
<tr><td>{% trans "Birth Date:" %}</td><td>{{ cteward.Geburtsdatum }}</td></tr>
<tr><td>{% trans "Entry Date:" %}</td><td>{{ cteward.Eintritt }}</td></tr>
<tr><td>{% trans "Godfather:" %}</td><td>{{ cteward.Paten }}</td></tr>
<tr><td>{% trans "Godfather:" %}</td><td>{{ cteward.Paten|join:", " }}</td></tr>
<tr><td>{% trans "Payment Method:" %}</td><td>{{ cteward.Zahlungsart }}</td></tr>
<tr><td>{% trans "Payment Frequency:" %}</td><td>{{ cteward.Zahlungsweise }}</td></tr>
<tr><td>{% trans "Debit Authorization:" %}</td><td>{{ cteward.Lastschriftmandat }}</td></tr>
@ -30,6 +31,16 @@
</table>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<br>
<a class="btn btn-lg btn-danger btn-block" data-toggle="collapse" data-parent="#accordion" href="#total">{% 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." %}</a>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div>

View file

@ -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()
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))

19
guni.sh Executable file
View file

@ -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