indoor pin and cteward integration
This commit is contained in:
parent
0c7b3b9d62
commit
ac372412fd
13 changed files with 224 additions and 32 deletions
0
account/templates/500.html
Normal file
0
account/templates/500.html
Normal file
|
|
@ -2,10 +2,10 @@
|
|||
{% load i18n %}
|
||||
{% load crispy_forms_tags %}
|
||||
|
||||
{% block form_title %}{% trans "c-lab PIN"%}{% endblock %}
|
||||
{% block form_title %}{% trans "Indoor PIN"%}{% endblock %}
|
||||
|
||||
{% block form_description %}
|
||||
<p>{% blocktrans %}Change your c-lab PIN to access the c-lab in the basement.{% endblocktrans %}</p>
|
||||
<p>{% blocktrans %}Change your PIN to access rooms secured with PIN-pad.{% endblocktrans %}</p>
|
||||
{% endblock %}
|
||||
|
||||
{% block form_fields %}
|
||||
|
|
@ -19,4 +19,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock form_fields %}
|
||||
{% endblock form_fields %}
|
||||
|
|
|
|||
|
|
@ -37,21 +37,36 @@
|
|||
|
||||
<h3>{% trans "Management information" %}</h3>
|
||||
|
||||
<ul>
|
||||
<li>{% trans "Name:" %}
|
||||
{{ member.displayName }}
|
||||
</li>
|
||||
<li>
|
||||
{% trans "External e-mail address:" %}
|
||||
{{ member.externalEmail }}<br>
|
||||
<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>
|
||||
<tr><td>{% trans "Status:" %}</td><td>{{ cteward.Status }}</td></tr>
|
||||
<tr>
|
||||
<td>{% trans "External e-mail address:" %}</td><td>{{ member.externalEmail }}</td>
|
||||
<!--<td>
|
||||
<span class="muted">{% blocktrans %}The external e-mail address is used by the
|
||||
board of c-base to reach you in cases where your c-base
|
||||
address (see above) is not working. To change your
|
||||
external e-mail address please contact the c-base board via {% endblocktrans %}
|
||||
(<a href="mailto:cash@c-base.org">cash@c-base.org</a>).</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</td>-->
|
||||
</tr>
|
||||
<tr><td>{% trans "Firstname:" %}</td><td>{{ cteward.Vorname }}</td></tr>
|
||||
<tr><td>{% trans "Lastname:" %}</td><td>{{ cteward.Nachname }}</td></tr>
|
||||
<tr><td>{% trans "Street:" %}</td><td>{{ cteward.Strasse }}</td></tr>
|
||||
<tr><td>{% trans "Postcode:" %}</td><td>{{ cteward.PLZ }}</td></tr>
|
||||
<tr><td>{% trans "City:" %}</td><td>{{ cteward.Ort }}</td></tr>
|
||||
<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 "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>
|
||||
<tr><td>{% trans "Bank:" %}</td><td>{{ cteward.Bank }}</td></tr>
|
||||
<tr><td>{% trans "IBAN:" %}</td><td>{{ cteward.IBAN }}</td></tr>
|
||||
<tr><td>{% trans "BIC:" %}</td><td>{{ cteward.BIC }}</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock container %}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
</li>
|
||||
{% url account.views.clabpin as clab_url %}
|
||||
<li class="{% if request.path == clab_url %}active{% endif %}">
|
||||
<a href="{{ clab_url }}">{% trans "c-lab-PIN" %}</a>
|
||||
<a href="{{ clab_url }}">{% trans "Indoor-PIN" %}</a>
|
||||
</li>
|
||||
{% url account.views.nrf24 as nrf24_url %}
|
||||
<li class="{% if request.path == nrf24_url %}active{% endif %}">
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
|
||||
<hr />
|
||||
<div class="row pull-right">
|
||||
<small class="muted">Copyright © 2013 by c-base e.V.</small>
|
||||
<small class="muted">Copyright © 2015 by c-base e.V.</small>
|
||||
</div>
|
||||
</div><!-- /.container -->
|
||||
{% endblock body %}
|
||||
|
|
|
|||
114
account/templates/memberstatus.html
Normal file
114
account/templates/memberstatus.html
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
{% extends "member_base.html" %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block container %}
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h3>{% trans "Basic information about your account" %}</h3>
|
||||
|
||||
{{ contributions }}
|
||||
|
||||
<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>
|
||||
<tr><td>{% trans "Status:" %}</td><td>{{ cteward.Status }}</td></tr>
|
||||
<tr><td>{% trans "Firstname:" %}</td><td>{{ cteward.Vorname }}</td></tr>
|
||||
<tr><td>{% trans "Lastname:" %}</td><td>{{ cteward.Nachname }}</td></tr>
|
||||
<tr><td>{% trans "Street:" %}</td><td>{{ cteward.Strasse }}</td></tr>
|
||||
<tr><td>{% trans "Postcode:" %}</td><td>{{ cteward.PLZ }}</td></tr>
|
||||
<tr><td>{% trans "City:" %}</td><td>{{ cteward.Ort }}</td></tr>
|
||||
<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 "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>
|
||||
<tr><td>{% trans "Bank:" %}</td><td>{{ cteward.Bank }}</td></tr>
|
||||
<tr><td>{% trans "IBAN:" %}</td><td>{{ cteward.IBAN }}</td></tr>
|
||||
<tr><td>{% trans "BIC:" %}</td><td>{{ cteward.BIC }}</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div>
|
||||
<h3>{% trans "Contributions:" %}</h3>
|
||||
</div>
|
||||
<div class="panel-group" id="accordion">
|
||||
<div class="panel panel-default">
|
||||
<a class="btn btn-lg btn-default btn-block" data-toggle="collapse" data-parent="#accordion" href="#total">{% trans "Total" %}</a>
|
||||
<div id="total" class="panel-collapse">
|
||||
<div class="terminal">
|
||||
<table class="table table-condensed table-bordered table-hover">
|
||||
<tr><td>{% trans "Billed:" %}</td><td>{{ contributions.total.billed }}</td></tr>
|
||||
<tr><td>{% trans "Paid:" %}</td><td>{{ contributions.total.paid }}</td></tr>
|
||||
<tr><td>{% trans "Unpaid:" %}</td><td>{{ contributions.total.unpaid }}</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% for year,values in contributions.years %}
|
||||
<div class="panel panel-default">
|
||||
<a class="btn btn-lg btn-default btn-block" data-toggle="collapse" data-parent="#accordion" href="#{{ year }}">{{ year }}</a>
|
||||
<div id="{{ year }}" class="panel-collapse collapse">
|
||||
<div class="terminal">
|
||||
<table class="table table-condensed table-bordered table-hover">
|
||||
<tr><td>{% trans "Billed:" %}</td><td>{{ values.billed }}</td></tr>
|
||||
<tr><td>{% trans "Paid:" %}</td><td>{{ values.paid }}</td></tr>
|
||||
<tr><td>{% trans "Unpaid:" %}</td><td>{{ values.unpaid }}</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% empty %}
|
||||
<a class="btn btn-block btn-lg btn-default btn-block"><b>{% trans "no data available" %}</b></a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div>
|
||||
<h3>{% trans "Contracts:" %}</h3>
|
||||
</div>
|
||||
<div class="panel-group" id="contract-accordion">
|
||||
{% for contract in contributions.contracts %}
|
||||
<div class="panel panel-default">
|
||||
<a class="btn btn-lg btn-default btn-block" data-toggle="collapse" data-parent="#contract-accordion" href="#{{ contract.Vertragsnummer }}">Contract #{{ contract.Vertragsnummer }}</a>
|
||||
<div id="{{ contract.Vertragsnummer }}" class="panel-collapse collapse">
|
||||
<div class="terminal">
|
||||
<table class="table table-condensed table-bordered table-hover">
|
||||
<tr><td>{% trans "Type:" %}</td><td>{{ contract.Art }}</td></tr>
|
||||
<tr><td>{% trans "Total:" %}</td><td>
|
||||
<table>
|
||||
<tr>
|
||||
<td>{% trans "Billed:" %}</td><td>{{ contract.total.billed }}</td>
|
||||
<td>{% trans "Paid:" %}</td><td>{{ contract.total.paid }}</td>
|
||||
<td>{% trans "Unpaid:" %}</td><td>{{ contract.total.unpaid }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td></tr>
|
||||
<tr><td>{% trans "Sums:" %}</td><td>
|
||||
<table>
|
||||
{% for detail, values in contract.Summen.items %}
|
||||
<tr>
|
||||
<td>{{ detail }}:</td>
|
||||
<td>{% trans "Billed:" %}</td><td>{{ values.billed }}</td>
|
||||
<td>{% trans "Paid:" %}</td><td>{{ values.paid }}</td>
|
||||
<td>{% trans "Unpaid:" %}</td><td>{{ values.unpaid }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</td></tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% empty %}
|
||||
<a class="btn btn-block btn-lg btn-default btn-block"><b>{% trans "no data available" %}</b></a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock container %}
|
||||
Loading…
Add table
Add a link
Reference in a new issue