Commit Graph

627 Commits (acb838b49662af5ba91cf1226e80c8a6aa295683)
 

Author SHA1 Message Date
leonard.koenig acb838b496 Merge pull request 'docu-new-group' (#124) from docu-new-group into testing
Reviewed-on: #124
1 year ago
leonard.koenig 54dbeaf77c „docs/source/user_manual/index.rst“ ändern 1 year ago
leonard.koenig 0007b679de „docs/source/user_manual/group.rst“ hinzufügen 1 year ago
Christian Merten a9bd5d59d6
remove old migrations 1 year ago
Christian Merten 7f3fa1c1bb
squash migrations 1 year ago
Christian Merten 0daafdd5d7
fix 1 year ago
Christian Merten 582dd81465
add postcode and not bw reason 1 year ago
Christian Merten 4f0e9435e9
fixes 1 year ago
Christian Merten 91b5fea8b6
Merge branch 'main' into cm-ljp-new 1 year ago
Christian Merten e8f4448d62
members/admin: remove trailing whitespace 1 year ago
Christian Merten 0edd7df843
update dockerfiles 1 year ago
Christian Merten 6b187812bb
more cleanup 1 year ago
Christian Merten f5ffee2f79
cleanup 1 year ago
Christian Merten bdf7e76f22
progress 1 year ago
Christian Merten f59a97578c
ljp vbk generation 1 year ago
Christian Merten 5227efe17b
members/excursion: add LJP category field to activity category 1 year ago
Christian Merten 79c20087e3
mailer: use internal mail domains variable in error messages 1 year ago
Christian Merten 06db761021
locale: fix translations 1 year ago
Christian Merten 79b48c9079
members/admin: add action to only request mail confirmation of not yet confirmed email addresses 1 year ago
marius.klein 678559fb4d members/pdf: add numbering to participant listings (#119)
Also add a total participants and youth leaders count on the members on list inline tab.

Reviewed-on: #119
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>
1 year ago
marius.klein d1a8e7f159 members/admin: group overview excel (#118)
closes #110

Reviewed-on: #118
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>
1 year ago
Christian Merten 530aea3244
contrib: factor common media path manipulations out 1 year ago
Christian Merten 49c4e4c548
settings: remove MEDIA_MEMBERLISTS and use MEDIA_ROOT everywhere 1 year ago
marius.klein cfcde2da3a finance/statement: make `subsidy_to` and `allowance_to` optional (#112)
closes #108

- fields for receivers of allowance `a` and subsidies `s` are not compulsory anymore. If receivers are given, `a` and `s` are payed out for them. `s` can only be payed out in total, disregarding the number of receivers given for `a`.
- In the overview pages (activity and statement), we are now distinguishing between theoretical `a` + `s` and what has been payed out practically. If no receiver was given for either things, it is made clear that nothing is payed out. All combinations of `0`, ..., `n` payed allowances (`n` being number of approved participating YLs) and `0, `1` payed subsidies are possible.
- transaction generation logic adapted accordingly

Reviewed-on: #112
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>
1 year ago
Christian Merten 7b2a47536e
templates: replace local specific templates by placeholders 1 year ago
Christian Merten 6ffa2376b8
settings: use toml configuration files
We replace the current environment variable based configuration approach by
reading all local configuration from a `settings.toml` configuration file.
The docker test, development and production setups have been updated to use
the new setup.

The configuration folder also allows overriding every template in a
`config/templates` directory. We use this in a follow-up to move
all local specific templates, e.g. the registration form, into this
config directory.
1 year ago
Christian Merten 8a9cdc22d1
startpage/templates: use section variable 1 year ago
Christian Merten 9a07ef74a6
templates/admin: use section variable 1 year ago
Christian Merten aefef315bc
members/models: use section name in signature on SJR application 1 year ago
Christian Merten aaa43b9ae1
locale: fix various grammar mistakes 1 year ago
Christian Merten 56d8adb510
members/admin: add place column and group filter to excursion list display 1 year ago
Christian Merten 3e1a5c3fbb
tests: add coveragerc to exclude jet files from coverage report 1 year ago
Christian Merten d1075f43e7
members/tests: add more admin tests 1 year ago
Christian Merten 9610503caa
finance/tests: add tests for models 1 year ago
Christian Merten 034478ba44
members/admin: show and filter by echo status 1 year ago
Christian Merten a0da26476c
members/tests: add tests for admin pages 1 year ago
Christian Merten 3622743d2c
members/pdf: normalize filenames in merge_pdf 1 year ago
Christian Merten 3e0d55c0ed
members/registration: escape special characters in user input 1 year ago
marius.klein e7dcbb47ab finance/statement: show IBAN validity in submit views (#104)
* Add new attribute `iban_valid` to `Member`.
* Submit pages of regular expenses and activity expenses now include an overview which people with expenses have a valid IBAN.
* Add a note that IBAN validity should be checked manually before submitting.

Right now, no technical barriers are in place that prevent missing/wrong IBANs when a statement is submitted. This is intentional to preserve maximal flexibility.

In a follow-up PR, one could add custom warning messages on top of page when some IBANs are invalid.

Reviewed-on: #104
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>
1 year ago
Christian Merten a2cbae2c8e
media: require staff login for media access 1 year ago
Christian Merten 7d74e5d908
members/tests: add tests for views 1 year ago
Christian Merten d4a8c4a515
members/models: factor out upload_registration_form_link 1 year ago
Christian Merten 05cb501942
ludwigsburgalpin/tests: add tests for views and admin 1 year ago
Christian Merten 593cef520d
members/tests: only test age for passed dates 1 year ago
Christian Merten 39f1700131
members/tests: skip sjr application generation 1 year ago
Christian Merten 0960646d1f
finance/tests: adapt to new logic with allowance_to and subsidy_to 1 year ago
Christian Merten e02b0acefe
docker/test: improve setup
`make test` now automatically forces a rebuild. Also passing `keepdb=true` runs
the test suite with `--keepdb` which is useful when repeatedly running tests.
1 year 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>
1 year 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.
1 year 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.
1 year ago