Commit Graph

504 Commits (9ba4bf46141cd232550bc9bccafaca8a2b5325b1)

Author SHA1 Message Date
mariusrklein 9ba4bf4614 added boolean rendering 11 months ago
marius.klein 1579b63e5c Merge branch 'main' into MK/iban_checks 11 months ago
mariusrklein c3ffedf5c2 changed calculation of cativity total costs, addresses #105 11 months ago
mariusrklein 4c6e271639 included IBAN check in allowance and subsidies 11 months ago
mariusrklein ce1a36a389 cleaned up translations 11 months ago
Christian Merten 7d74e5d908
members/tests: add tests for views 11 months ago
Christian Merten d4a8c4a515
members/models: factor out upload_registration_form_link 11 months ago
mariusrklein a281f6cf70 Merge branch 'main' into MK/iban_checks 11 months ago
mariusrklein 0c9579c606 added translations 11 months ago
mariusrklein b665d4ed45 abstract true/false renderings 11 months ago
Christian Merten 05cb501942
ludwigsburgalpin/tests: add tests for views and admin 11 months ago
Christian Merten 593cef520d
members/tests: only test age for passed dates 11 months ago
Christian Merten 39f1700131
members/tests: skip sjr application generation 11 months ago
Christian Merten 0960646d1f
finance/tests: adapt to new logic with allowance_to and subsidy_to 11 months ago
marius.klein 91ceaaf9f9 members/excursion: select invoice for sjr application form (#103)
Closes #61

Adds to the generate sjr application process a form in order to select one invoice.

Reviewed-on: #103
Co-authored-by: marius.klein <marius.klein@alpenverein-heidelberg.de>
Co-committed-by: marius.klein <marius.klein@alpenverein-heidelberg.de>
11 months ago
Christian Merten 98a03e4abd
members/ljp: fix calculation of participants
Implements the correct formula for computing the participant count according to the LJP
regulations. Also adds extensive unit tests for the formula.
11 months ago
Christian Merten afdbb56d81
finance: don't include subsidies in theoretic total
Subsidies paid for night and travel costs are expected to be listed
in the bills of the associated statement. Hence, they should not be
counted a second time in the theoretic total. This affects LJP
and SJR applications.
11 months ago
Christian Merten e2bff68471
members/admin: add check for valid allowance_to in finance overview 11 months ago
Christian Merten 2e6bfc9b75
finance/statement: make allowance_to optional
If an excursion has zero admissable youth leaders, the statement and hence the excursion
currently can't be saved, because the `allowance_to` field has to be non-empty, but
the number of entries has to be zero. This commit hence makes the field optional.
11 months ago
Christian Merten 5d0aa18dde
finance: adapt to allowance_to and subsidy_to
Use the new `allowance_to` and `subsidy_to` fields in statement validation. The
night and travel costs have to be transferred to the person listed as `subsidy_to`,
the allowance has to be paid to the persons listed in `allowance_to`.
11 months ago
Christian Merten 17bf6e8186
members/admin: fix incorrect syntax in translation string 11 months ago
Christian Merten 8b932461b7
finance/statement: add selection fields for allowance and subsidies
In the statement tab on excursions, add two new fields to select to which
youth leaders the allowance and subsidies should be paid. The fields
are checked for validity based on the number of approved youth leaders.

Also add a new field on excursions to allow for additional approved youth
leaders.

The new fields are not yet used in the statement confirmation process.
11 months ago
Christian Merten ce466671f2
members/waitinglist: fix queryset based age calculation 11 months ago
Christian Merten afb38c118a
members/admin: add age list filter for waitinglist 11 months ago
Christian Merten b0311dce80
members/admin: sort age in waiting list only by year
Previously, the age column was sorted according to the birth date. This typically
causes singleton grouping upon multi sort with age as the primary sorting key. A
typical use case is sorting by age and application date.

Now the age column is sorted only by the numerical year value, which causes
the groups to be bigger.
12 months ago
Christian Merten 1bd2895415
translations: remove line counts 12 months ago
Christian Merten f05c8b2fb6
members/admin: translate age label and add ordering field 12 months ago
mariusrklein edd21e6ac3 added iban-valid info to statement submit forms 12 months ago
mariusrklein 9394d5e6af added iban validity to member model 12 months ago
marius.klein 3b46695b49 finance/admin: validate IBAN and show EPC-QR code for transactions (#94)
1. IBAN validation in member admin.
2. In the transaction overview, for every transaction an EPC-QR code for banking apps is generated and displayed. The (necessary) BIC field is automatically derived from the IBAN. This closes #63.

Both steps use the python library schwifty.

Reviewed-on: #94
Reviewed-by: Christian Merten <christian@merten.dev>
Co-authored-by: marius.klein <marius.klein@alpenverein-heidelberg.de>
Co-committed-by: marius.klein <marius.klein@alpenverein-heidelberg.de>
12 months ago
mariusrklein 847638b2b7 changed js library to local static file 12 months ago
mariusrklein ac1705d72a added js qrcode library 12 months ago
Christian Merten 19eb0953d5
tests: fix, generate html coverage report 12 months ago
Christian Merten 0dadb3fc3b
fix members locale 12 months ago
Christian Merten 106f0b56d9
Merge branch 'main' into MK/finance_qr_codes 12 months ago
mariusrklein 6bcd068b63 improved qr code display 12 months ago
mariusrklein c510453fa9 fixed qr for members with umlaut 12 months ago
mariusrklein 77675dbeef implemented translations 12 months ago
mariusrklein 36b6797ade added validation-check for existing incorrect ibans 12 months ago
Christian Merten 7af3ec488e
members/waitinglist: remove registration form link from invite text
The link is no longer needed, since a prefilled registration form can
now be downloaded after filling out the online form.
12 months ago
Christian Merten 31b31a3eb3
members/waitinglist: allow editing of invite text 12 months ago
mariusrklein d5ba0499fe Merge branch 'main' into MK/finance_qr_codes 12 months ago
mariusrklein 100732602f added EPC qr code to transaction overview 12 months ago
mariusrklein 1c191496dd added iban validation check in members admin form 12 months ago
Christian Merten c2bfd85eb4
admin/sidebar: open external links in new tab 12 months ago
Christian Merten a749aca7a4
finance: allow pdfs in proof field 12 months ago
Christian Merten 4c7ff39432
members/registration: pre-fill registration form
Instead of directly uploading the filled-in registration form, a pre-filled
registration form is provided and the signed agreement can be uploaded
in a separate step.

Co-authored by: Marius Klein <marius.klein@alpenverein-heidelberg.de>
1 year ago
Christian Merten 58da7fae23
settings/texts: add space to prevent outlook glitch 1 year ago
Christian Merten f87837218e
members/waitinglist: preserve waitinglist application date 1 year ago
Christian Merten e055554125
members/admin: remove redundant sentence 1 year ago