Commit Graph

476 Commits

Author SHA1 Message Date
05b7b7fbbf Create admin function to use copy-pasted users from ekey, return the ones which don't match to "Donau Linz" rowt user, Fixes #204 (#230)
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Reviewed-on: #230
2024-03-04 16:59:44 +01:00
8edbf15235 show user icon in all vorstand users
Some checks are pending
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 15m40s
2024-03-04 16:37:53 +01:00
b6a318df85 fix link
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m26s
CI/CD Pipeline / deploy-staging (push) Successful in 4m1s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-04 15:57:06 +01:00
62ff5f0c2e fix spacing issues 2024-03-04 14:25:14 +01:00
c98170636b show proper amount of guests
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-03-04 13:35:13 +01:00
442257df01 reformat files
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-03-04 13:28:42 +01:00
9c3ae7434e allow vorstand to see member details, Fixes #199
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-03-04 09:19:04 +01:00
5781937bee show ottensheim boats to rennjugend
Some checks failed
CI/CD Pipeline / test (push) Failing after 3m20s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-03-03 20:03:20 +01:00
043d042dcc remove useless button
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m15s
CI/CD Pipeline / deploy-staging (push) Successful in 3m40s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-02-16 08:05:07 +01:00
5b5eb2e831 add remark about bank synchornistaion
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m12s
CI/CD Pipeline / deploy-staging (push) Successful in 3m45s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-02-12 19:07:45 +01:00
8c43ab3331 better wording
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m24s
CI/CD Pipeline / deploy-staging (push) Successful in 3m48s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-02-11 16:04:47 +01:00
3462ac5963 allow changing title of planned-event; fixes #52
Some checks failed
CI/CD Pipeline / test (push) Failing after 10m50s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-24 22:47:53 +01:00
99c615c400 fix edit/delete trip
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-01-24 18:12:22 +01:00
6ad3b8f741 add has-paid filter
All checks were successful
CI/CD Pipeline / test (push) Successful in 26m35s
CI/CD Pipeline / deploy-staging (push) Successful in 19m55s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-22 22:57:42 +01:00
a1a5e2ad89 move managing events to own role
Some checks failed
CI/CD Pipeline / test (push) Failing after 38m58s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-22 19:27:22 +01:00
eda072c713 enable changing paid state
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m15s
CI/CD Pipeline / deploy-staging (push) Successful in 4m40s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-22 19:05:18 +01:00
7f7259a3e1 improve texts
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-01-19 11:56:49 +01:00
578e3df9e9 use text instead of creditor id in qr code, more clear that fee is for full family
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m9s
CI/CD Pipeline / deploy-staging (push) Successful in 4m5s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-19 10:22:13 +01:00
3a8650028d add qr code for payment
Some checks failed
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 9m11s
CI/CD Pipeline / deploy-staging (push) Has been cancelled
2024-01-19 10:10:23 +01:00
f1ba331fdf remove wrong header
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m2s
CI/CD Pipeline / deploy-staging (push) Successful in 4m3s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-19 08:47:49 +01:00
267becfbce progress @fees, next step, deply+enter families/student/pupil/...
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-01-19 00:39:15 +01:00
474db1232d start working on calculating member fees
All checks were successful
CI/CD Pipeline / test (push) Successful in 8m54s
CI/CD Pipeline / deploy-staging (push) Successful in 4m20s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-18 21:36:38 +01:00
07c76f4e64 add family
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-18 16:37:54 +01:00
66365c4a68 fix typo
All checks were successful
CI/CD Pipeline / test (push) Successful in 7m47s
CI/CD Pipeline / deploy-staging (push) Successful in 4m22s
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-18 09:32:25 +01:00
c372051561 try
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test-frontend (push) Failing after 13m30s
CI/CD Pipeline / test-backend (push) Has been cancelled
2024-01-16 22:29:57 +01:00
bbfc94d54b add mail
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-10 15:52:27 +01:00
87e4b8fbb4 fix redirect
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-10 15:10:05 +01:00
3e2e058bcc limit users to proper role, Fixes #135
Some checks are pending
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 15m47s
2024-01-10 14:08:15 +01:00
2726db433e Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#141) from fixes into main
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
Reviewed-on: #141
2024-01-04 20:44:26 +01:00
bada4deedd allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-01-04 20:43:38 +01:00
f5bfb9fbdf fix weird iphone issue
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-03 09:59:09 +01:00
e925fadbb8 fix boat damage show
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m6s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-01 18:54:44 +01:00
0ad342b147 add mail
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
2024-01-01 15:50:06 +01:00
cf5b2751dd better filter:
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-30 21:30:27 +01:00
5800f137f3 add data from nx
Some checks failed
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2023-12-30 21:21:30 +01:00
c7d7d0ca83 in preparation to moving userdata into app, we switched to arbitrary groups
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m4s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 21:27:52 +01:00
aca5340370 show guest km, Fixes #41
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m56s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-23 15:26:49 +01:00
4297c8e971 Merge pull request 'add css magic from marie' (#73) from years-changeable into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m58s
CI/CD Pipeline / deploy-staging (push) Successful in 15m6s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #73
2023-11-20 18:43:04 +01:00
72aeeb5eab add css magic from marie
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m52s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 18:42:32 +01:00
2b427438b8 Merge pull request 'fix-typo' (#70) from fix-typo into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m50s
CI/CD Pipeline / deploy-staging (push) Successful in 14m46s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #70
2023-11-20 17:55:11 +01:00
c2f3c541fd fix typo
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m41s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:54:41 +01:00
9ef1cd3459 make years in stat changeable
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m51s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 17:52:10 +01:00
08202691f6 push 2023-11-19 22:02:25 +01:00
fea5b6f3d8 push
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m1s
CI/CD Pipeline / deploy-staging (push) Successful in 15m4s
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-19 21:41:46 +01:00
5c7cd58edc Merge branch 'ergo-again' into 'staging'
Ergo again

See merge request PhilippHofer/rot!120
2023-11-16 14:00:41 +00:00
b361fbbe50 link new urls + fix typo 2023-11-16 14:46:40 +01:00
Marie Birner
e1b9cdcd3b Merge branch 'ergo-style' into staging 2023-11-14 11:49:08 +01:00
Marie Birner
19fc50d711 [TASK] ergo styling 2023-11-14 11:48:33 +01:00
9749d0a6df Merge branch 'ergo-desc' into 'main'
add notes about ergo challenge

See merge request PhilippHofer/rot!97
2023-11-12 18:25:55 +00:00
56163a4732 Merge branch 'finalize-ergo' into 'staging'
push

See merge request PhilippHofer/rot!111
2023-11-12 14:35:57 +00:00
55fc8b6db1 push 2023-11-12 15:22:30 +01:00
65edd4caa8 Merge branch 'ergo-desc' into 'staging'
Ergo desc

See merge request PhilippHofer/rot!106
2023-11-10 12:24:55 +00:00
8dc38a4fc0 improve text 2023-11-10 13:11:46 +01:00
fee89b0f19 fix link 2023-11-10 13:10:46 +01:00
23a21b55c7 Merge branch 'new-people' into 'staging'
improve text

See merge request PhilippHofer/rot!101
2023-11-10 09:30:56 +00:00
5c3be25285 Merge branch 'ergo-desc' into 'staging'
more concise

See merge request PhilippHofer/rot!100
2023-11-10 09:30:52 +00:00
e5f6a543e1 improve text 2023-11-10 09:03:04 +01:00
b929c757ce more concise 2023-11-10 08:56:36 +01:00
87b5cff190 Merge branch 'new-people' into 'staging'
New people

See merge request PhilippHofer/rot!98
2023-11-09 21:29:59 +00:00
9b86d93979 try to get new people 2023-11-09 22:02:31 +01:00
9bfa89a841 Merge branch 'ergo-desc' into 'staging'
add notes about ergo challenge

See merge request PhilippHofer/rot!96
2023-11-09 21:02:28 +00:00
8926d82bd6 add notes about ergo challenge 2023-11-09 21:48:21 +01:00
Marie Birner
8c5fbfec63 [BUGFIX] filter issues 2023-11-09 21:02:21 +01:00
Marie Birner
609483f1df [BUGFIX] color text and btn dark-mode 2023-11-09 19:40:41 +01:00
Marie Birner
3467e02748 [BUGFIX] color label dark-mode 2023-11-09 19:37:46 +01:00
715fae59fc implement default destination for boats 2023-11-09 08:56:08 +01:00
04958d80a4 Merge branch 'staging' into 'input-val'
# Conflicts:
#   templates/ergo.html.tera
#   templates/includes/macros.html.tera
2023-11-08 17:02:32 +00:00
e7a6d57bf0 simple (client only) val 2023-11-08 18:00:27 +01:00
61cc470e0f also allow dozen updates 2023-11-07 22:01:34 +01:00
4f4c053d0e ergo-admin-edit 2023-11-07 21:27:40 +01:00
c0cefd82b6 slightly change labels 2023-11-07 20:53:45 +01:00
7c684a30f7 update deps; allow gallery image select 2023-11-07 20:49:22 +01:00
Marie Birner
8123299861 [BUGFIX] login screen dark mode 2023-11-04 20:51:03 +01:00
Marie Birner
895492946c [TASK] add color switch option btn 2023-11-04 20:16:20 +01:00
Marie Birner
b465923fa9 [TASK] support dark mode second draft 2023-11-04 19:45:57 +01:00
Marie Birner
97897437a9 [TASK] support dark mode second draft 2023-11-04 19:33:36 +01:00
Marie Birner
2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode 2023-11-04 17:25:14 +01:00
0f8c7a365e push 2023-11-04 16:27:17 +01:00
c2034ed690 show proper amount of guests (changed bc cox is now included in rowers) 2023-11-04 15:07:16 +01:00
Marie Birner
5f494dc9e9 [TASK] support dark mode first draft 2023-11-04 00:19:46 +01:00
Marie Birner
c4e3c836e2 [TASK] guest user menu ergo 2023-11-03 14:35:15 +01:00
Marie Birner
150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling 2023-11-03 14:31:14 +01:00
Marie Birner
8014dba27e [TASK] guest user menu ergo 2023-11-03 14:30:43 +01:00
95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests 2023-11-03 14:20:58 +01:00
Marie Birner
1522531baa [TASK] styling ergo challenge screen 2023-11-03 10:52:30 +01:00
f5ad37a0bb auto select owner as rower of private boat, Fixes #46 2023-11-02 19:50:19 +01:00
eb0f3ba9d8 clearer label 2023-11-02 19:32:16 +01:00
2767e2fe25 better label 2023-11-02 15:34:21 +01:00
50de29284f disable reload on ergo page; allow camera capture 2023-11-02 13:50:34 +01:00
2bff02f43a ergo: default own person 2023-11-02 13:19:21 +01:00
728d87ab05 show own data + add gitignore folder 2023-11-02 13:17:33 +01:00
1ff050a247 add ergo tool 2023-11-02 12:15:10 +01:00
Marie Birner
d805f6c1cd [BUGFIX] stat wording and search string 2023-10-31 21:57:31 +01:00
Marie Birner
4179b7bd6b [TASK] declutter end trip view 2023-10-31 21:43:25 +01:00
Marie Birner
8a3cd8d688 [BUGFIX] relationship destination and distance 2023-10-31 21:04:38 +01:00
Marie Birner
dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging 2023-10-31 20:58:38 +01:00
Marie Birner
3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view 2023-10-31 20:57:28 +01:00
ef0965fad1 Merge branch 'boat-stats' into 'staging'
Boat stats

See merge request PhilippHofer/rot!61
2023-10-31 19:42:42 +00:00
aed8e7d5c3 use names that also m enjoys seeing 2023-10-31 20:29:33 +01:00
8479d0c70b fix link 2023-10-31 20:25:12 +01:00
abe4a68c23 Merge branch 'boat-stats' into 'staging'
also show in kiosk mode

See merge request PhilippHofer/rot!60
2023-10-31 17:35:54 +00:00
fe5ba9020d also show in kiosk mode 2023-10-31 18:22:34 +01:00
a6519d7b7b Merge branch 'boat-stats' into 'staging'
add boat stats Fixes #50

Closes #50

See merge request PhilippHofer/rot!58
2023-10-31 15:20:36 +00:00
730f9e5dff add boat stats Fixes #50 2023-10-31 16:07:15 +01:00
388ed175bd finish frontend(?) 2023-10-30 15:32:17 +01:00
7788be5a17 use proper names for new form fields 2023-10-30 15:32:17 +01:00
2d520298e7 frontend for new db 2023-10-30 15:32:17 +01:00
e256d7274d use proper names for new form fields 2023-10-30 15:32:17 +01:00
ccc9f76691 do proper things in ui @ new log 2023-10-30 15:32:17 +01:00
Marie Birner
a8c43cbf40 [BUGFIX] add cursor-pointer boats 2023-10-30 09:43:20 +01:00
bc4512acc1 fix invalid link in kiosk mode 2023-10-26 22:11:17 +02:00
Marie Birner
f7e499d135 [BUGFIX] truncate username 2023-10-24 15:28:06 +02:00
ff6184e343 fix boat update error 2023-10-24 14:44:31 +02:00
e9641e6a33 move faq to wiki 2023-10-24 14:24:33 +02:00
beb5f3a217 hide logbook for guests 2023-10-24 10:57:51 +02:00
1f35be88ad scheckbuch can't see logbuch 2023-10-24 10:16:26 +02:00
1c75b478e3 show logbuch to everyone 2023-10-24 09:22:07 +02:00
Marie Birner
52b245b14e [TASK] correct sorting verified and style input / btn combi 2023-10-23 22:36:57 +02:00
f4d0a88575 merge 2023-10-23 22:00:04 +02:00
Marie Birner
da29d5dcdc [TASK] style delete button in logbook 2023-10-23 21:53:43 +02:00
fc42559f1b show amount of guests 2023-10-23 21:44:39 +02:00
Marie Birner
547cab368c [TASK] style header kiosk mode 2023-10-23 21:43:01 +02:00
88af24db7b allow all users to report boat damage 2023-10-23 21:38:08 +02:00
6f9edfa23f show header in kiosk mode 2023-10-23 21:05:59 +02:00
3e327e98f1 allow editing of boat damages 2023-10-12 12:05:12 +02:00
8852e1cdd6 allow boatdamage add in kiosk mode 2023-10-04 13:56:58 +02:00
e67b345789 allow showing stat in kiosk mode 2023-10-01 20:52:42 +02:00
Marie Birner
79c378a887 [WIP] typescript 2023-10-01 20:52:42 +02:00
d838a1ca68 allow deletion of logs 2023-10-01 20:52:42 +02:00
Marie Birner
c8a06f55aa [TASK] move code to js / css 2023-10-01 20:52:42 +02:00
af81920a47 fake personal history 2023-10-01 20:52:42 +02:00
8a75ba4335 wurking 2023-10-01 20:52:42 +02:00
877df86f0d maybe a bit better? 2023-10-01 20:52:42 +02:00
Marie Birner
f176c9e43e [TASK] not working chart 2023-10-01 20:52:42 +02:00
e41aa9b4e7 fun with timezones 2023-10-01 20:52:41 +02:00
Marie Birner
c4028d5f25 [TASK] streamline width of boatdamage container 2023-10-01 20:52:41 +02:00
Marie Birner
d65ce90fce [TASK] styling boat form 2023-10-01 20:52:41 +02:00
Marie Birner
9fbd3d970b [TASK] style boat damage screen 2023-10-01 20:52:41 +02:00
Marie Birner
a544d5d060 [TASK] style boat screen 2023-10-01 20:52:41 +02:00
Marie Birner
8cec4e4c11 [TASK] refactor steering checkbox 2023-10-01 20:52:41 +02:00
Marie Birner
2ae01c0c65 [TASK] refactor select 2023-10-01 20:52:41 +02:00
Marie Birner
f46e6b47c7 [TASK] text no boats on water 2023-10-01 20:52:41 +02:00
Marie Birner
fedbc00dc5 [TASK] add label for logtype 2023-10-01 20:52:41 +02:00
Marie Birner
1d9d7bbbb8 [TASK] change style of boats on water 2023-10-01 20:52:41 +02:00
Marie Birner
2616c19bd4 [TASK] improve white space entries logbook 2023-10-01 20:52:41 +02:00
Marie Birner
ed4bf67982 [BUGFIX] km issue relation destination 2023-10-01 20:52:41 +02:00
Marie Birner
3cb14835cc [TASK] improve log and stats look & feel 2023-10-01 20:52:41 +02:00
Marie Birner
97df1f16a4 [TASK] add current place to stats 2023-10-01 20:52:41 +02:00
Marie Birner
90713b4e3d [BUGFIX] wordings 2023-10-01 20:52:41 +02:00
Marie Birner
c69289504b [TASK] basic styling logbook and stats 2023-10-01 20:52:41 +02:00