|
|
3a8650028d
|
add qr code for payment
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 |
|
|
|
e498b4be3b
|
group families in fee calc
CI/CD Pipeline / test (push) Successful in 9m35s
CI/CD Pipeline / deploy-staging (push) Successful in 4m11s
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2024-01-19 08:02:09 +01:00 |
|
|
|
267becfbce
|
progress @fees, next step, deply+enter families/student/pupil/...
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 |
|
|
|
ff795ce66c
|
start with fee calc
CI/CD Pipeline / test (push) Successful in 8m40s
CI/CD Pipeline / deploy-staging (push) Successful in 4m24s
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2024-01-18 22:02:44 +01:00 |
|
|
|
474db1232d
|
start working on calculating member fees
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
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 |
|
|
|
5788d3d9f4
|
fix ci
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-10 15:49:57 +01:00 |
|
|
|
a95ff3657f
|
fix ci
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-10 15:11:35 +01:00 |
|
|
|
87e4b8fbb4
|
fix redirect
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 |
|
|
|
a4b8bf1e3f
|
improve code w/ clippy
CI/CD Pipeline / test (push) Successful in 15m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2024-01-10 14:24:58 +01:00 |
|
|
|
3e2e058bcc
|
limit users to proper role, Fixes #135
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 |
|
|
|
1cfbb97034
|
fix tests, as we now show all boats in kiosk mode
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-04 20:46:49 +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
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 |
|
|
|
29e7142883
|
Merge pull request 'main' (#111) from main into staging
CI/CD Pipeline / deploy-staging (push) Waiting to run
CI/CD Pipeline / deploy-main (push) Waiting to run
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #111
|
2024-01-01 16:30:52 +01:00 |
|
|
|
6bbe1302d9
|
Merge pull request 'nxdata' (#109) from nxdata into main
CI/CD Pipeline / test (push) Successful in 11m22s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 15m1s
Reviewed-on: #109
|
2024-01-01 15:51:16 +01:00 |
|
|
|
0ad342b147
|
add mail
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 |
|
|
|
5800f137f3
|
add data from nx
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 |
|
|
|
c9c7ad967d
|
push
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
|
2023-12-30 17:13:21 +01:00 |
|
|
|
9fb4167b50
|
in preparation to moving userdata into app, we switched to arbitrary groups
|
2023-12-30 17:11:46 +01:00 |
|
|
|
a9fbb05944
|
fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids
CI/CD Pipeline / test (push) Successful in 10m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2023-12-28 18:14:11 +01:00 |
|
|
|
c7d7d0ca83
|
in preparation to moving userdata into app, we switched to arbitrary groups
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
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 |
|
|
|
861262b62b
|
cleaner code thanks to clippy
CI/CD Pipeline / test (push) Successful in 10m54s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
|
2023-11-27 12:49:36 +01:00 |
|
|
|
53ed032c25
|
Merge branch 'staging' into 'log-2022'
# Conflicts:
# src/model/logbook.rs
|
2023-11-18 11:22:50 +00:00 |
|
|
|
f001aaf90f
|
add routes for different years
|
2023-11-18 12:21:37 +01:00 |
|
|
|
a87832e4f4
|
update tests to use current date
|
2023-11-16 15:36:38 +01:00 |
|
|
|
5b4238da92
|
update tests to use current date
|
2023-11-16 15:35:52 +01:00 |
|
|
|
a3c7461c2b
|
don't allow to add entry which is not completed today
|
2023-11-14 23:09:33 +01:00 |
|
|
|
844e2c1f8c
|
add timestamp to save imgs
|
2023-11-12 21:28:06 +01:00 |
|
|
|
144bcefcab
|
update deps, switch to newest rocket version
|
2023-11-08 17:39:39 +01:00 |
|
|
|
4f4c053d0e
|
ergo-admin-edit
|
2023-11-07 21:27:40 +01:00 |
|
|
|
95e1ea3028
|
allow guests to see + upload ergo entries; show ergo menu item for guests
|
2023-11-03 14:20:58 +01:00 |
|
|
|
9331b2001d
|
improve code with clippy
|
2023-11-02 22:19:13 +01:00 |
|
|
|
71da6546b0
|
image required; cleaner log
|
2023-11-02 19:02:17 +01:00 |
|
|
|
1ff050a247
|
add ergo tool
|
2023-11-02 12:15:10 +01:00 |
|
|
|
2eba6a0f66
|
more rights to the kiosk!
|
2023-10-31 22:41:12 +01:00 |
|
|
|
56ae0ae429
|
fix 1x no cox stuff
|
2023-10-31 22:16:14 +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 |
|
|
|
1d7f95e522
|
finish backend tests of new db layout
|
2023-10-30 15:32:17 +01:00 |
|
|
|
09075989e3
|
first draft
|
2023-10-30 15:32:17 +01:00 |
|
|
|
dcb7bc4c24
|
clean
|
2023-10-28 14:48:51 +02:00 |
|
|
|
08a1d16f88
|
add functionality to show log
|
2023-10-28 14:48:08 +02:00 |
|
|
|
cfd0ccc8c2
|
add logs
|
2023-10-28 14:33:22 +02:00 |
|
|
|
31b2ed3b37
|
deploy :O
|
2023-10-26 18:50:43 +02:00 |
|
|
|
6d7ef2e836
|
fix ci..
|
2023-10-24 14:58:32 +02:00 |
|
|
|
cb109e7005
|
fix ci
|
2023-10-24 14:33:22 +02:00 |
|
|
|
e9641e6a33
|
move faq to wiki
|
2023-10-24 14:24:33 +02:00 |
|
|
|
afa5597f49
|
remove debug thingy
|
2023-10-24 13:36:14 +02:00 |
|
|
|
4321986204
|
debug
|
2023-10-24 13:14:26 +02:00 |
|
|
|
b1a66d71b9
|
test wiki auth
|
2023-10-24 12:36:14 +02:00 |
|
|
|
8f28553608
|
fix js errors
|
2023-10-24 11:01:35 +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 |
|
|
|
c27b83e9fd
|
allow adding boatdamage from everyone
|
2023-10-24 09:40:48 +02:00 |
|
|
|
e4e6bf7f15
|
disable functionality until introduced
|
2023-10-24 09:14:11 +02:00 |
|
|
|
6d4ebda4bc
|
fix ci
|
2023-10-24 08:16:17 +02:00 |
|
Marie Birner
|
8ebc06e445
|
[TASK] translate alerts
|
2023-10-23 22:52:11 +02:00 |
|
|
|
88af24db7b
|
allow all users to report boat damage
|
2023-10-23 21:38:08 +02:00 |
|
|
|
51860ded27
|
allow deletion of trip in kiosk mode
|
2023-10-23 21:32:44 +02:00 |
|
|
|
6f9edfa23f
|
show header in kiosk mode
|
2023-10-23 21:05:59 +02:00 |
|
|
|
fa3ab3ec8a
|
fix proper loggedin_user cookie after setting pw
|
2023-10-13 09:43:59 +02:00 |
|
|
|
c323b209d0
|
fix ci
|
2023-10-05 09:01:55 +02:00 |
|
|
|
c47b3bb447
|
log if new kiosk cookie is set
|
2023-10-05 08:46:34 +02:00 |
|
|
|
8852e1cdd6
|
allow boatdamage add in kiosk mode
|
2023-10-04 13:56:58 +02:00 |
|
|
|
bb142a0969
|
clean code with clippy
|
2023-10-02 12:39:05 +02:00 |
|
|
|
e67b345789
|
allow showing stat in kiosk mode
|
2023-10-01 20:52:42 +02:00 |
|
|
|
826402cd41
|
give proper results for stats
|
2023-10-01 20:52:42 +02:00 |
|
|
|
af81920a47
|
fake personal history
|
2023-10-01 20:52:42 +02:00 |
|
|
|
02e1546f0e
|
complete tests for logbook
|
2023-10-01 20:52:41 +02:00 |
|
|
|
6d0501d3b0
|
add tests
|
2023-10-01 20:52:41 +02:00 |
|
|
|
e41aa9b4e7
|
fun with timezones
|
2023-10-01 20:52:41 +02:00 |
|
|
|
33810d69da
|
push
|
2023-10-01 20:52:41 +02:00 |
|
|
|
09af9981df
|
fix multi-select; only show private boats owner + kiosk
|
2023-10-01 20:52:41 +02:00 |
|
|
|
514561321e
|
change select properly if boat is selected on the left
|
2023-10-01 20:52:41 +02:00 |
|
|
|
57e540f450
|
allow users to delete trips
|
2023-10-01 20:52:41 +02:00 |
|
|
|
fd4d097d72
|
verify that arrivaldate > departuredate
|
2023-10-01 20:52:41 +02:00 |
|
|
|
e849b6f5f9
|
error if same person selected as cox + rower
|
2023-10-01 20:52:41 +02:00 |
|
|
|
d102e57b09
|
disable rowers in logbook if they are on water
|
2023-10-01 20:52:41 +02:00 |
|
|
|
1f801b0436
|
add debug trait; switch to proper name of form field (rowerS)
|
2023-10-01 20:52:41 +02:00 |
|
|
|
8b0264d181
|
clean code with clippy
|
2023-10-01 20:52:41 +02:00 |
|
|
|
fe4c0bebfc
|
Staging
|
2023-09-05 21:03:18 +00:00 |
|
|
|
590b41aa33
|
Allow to add real guests
|
2023-08-09 20:30:37 +00:00 |
|
|
|
bd4ee5954c
|
implement is_locked for trip_details
|
2023-08-09 11:54:18 +02:00 |
|
|
|
f0c6bdac14
|
fix ci; clean code
|
2023-08-05 16:29:58 +02:00 |
|
|
|
94a9d285be
|
clean db
|
2023-08-05 16:27:51 +02:00 |
|
|
|
7309b1f2b2
|
update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects)
|
2023-08-05 13:21:35 +02:00 |
|
|
|
e459a4e2d9
|
store loation in kiosk cookie, to avoid having to handle each location separately
|
2023-08-05 13:09:58 +02:00 |
|
|
|
351ba1ba4e
|
fix tests, default redirect to linz kiosk
|
2023-08-05 13:01:01 +02:00 |
|
|
|
8a40dfe017
|
allow filter for kiosk, to only show boats at specific location
|
2023-08-05 12:59:02 +02:00 |
|
|
|
f3c18c6949
|
update mail address
|
2023-08-02 18:36:38 +02:00 |
|
|
|
ff31ad83fe
|
add boatdamages functionality
|
2023-08-02 14:29:19 +02:00 |
|
|
|
f2baca668c
|
add tests for tera/admin/planned_event
Closes #19
|
2023-07-31 21:33:49 +02:00 |
|
|
|
da6a16cd66
|
add tests for tera/admin/planned_event
Closes #20
|
2023-07-31 21:29:03 +02:00 |
|
|
|
8fa8e17c5a
|
add tests for tera/admin/planned_event
Closes #24
|
2023-07-31 21:15:28 +02:00 |
|
|
|
96af3c3b17
|
create tests for /public
Closes #25
|
2023-07-31 21:07:01 +02:00 |
|
|
|
3730940aed
|
add tests for tera/log.rs
Closes #34
|
2023-07-31 20:09:03 +02:00 |
|
|
|
8b5be3fb41
|
add test for tera/admin/boat.rs
Fixes #33
|
2023-07-31 19:38:53 +02:00 |
|
|
|
adb26f6b91
|
create tests for model/rower.rs, Closes #32
|
2023-07-31 16:59:15 +02:00 |
|
|
|
dc4b4b3499
|
add tests; Closes #30
|
2023-07-31 16:25:07 +02:00 |
|
|
|
bbb78cbc44
|
move todos to gitlab; write tests for /cox/remove/<id>; Closes #9
|
2023-07-31 13:34:02 +02:00 |
|
|
|
2e80f7bc38
|
add logbook history
|
2023-07-30 14:13:49 +02:00 |
|
|
|
e49279afef
|
remove log from page
|
2023-07-30 13:02:29 +02:00 |
|
|
|
efbe589c83
|
remove unnecessary autotrait
|
2023-07-27 22:42:00 +02:00 |
|
|
|
56e1deccc0
|
fix error w/ clippy
|
2023-07-27 22:20:40 +02:00 |
|
|
|
16a0654e1f
|
only save (encrypted) user_id in cookie
|
2023-07-27 22:16:12 +02:00 |
|
|
|
b5fd4018ff
|
extract common functionality to functoin
|
2023-07-27 15:24:29 +02:00 |
|
|
|
0c906f2bda
|
check if shipmaster is already on the water
|
2023-07-27 15:00:52 +02:00 |
|
|
|
621058356d
|
proper redirects
|
2023-07-27 14:50:44 +02:00 |
|
|
|
1733fc7fe7
|
clippy clean
|
2023-07-27 14:40:05 +02:00 |
|
|
|
38300d826a
|
add kiosk mode
|
2023-07-27 14:38:46 +02:00 |
|
|
|
48eb1b7dc2
|
clean ui for logbook
|
2023-07-26 12:56:19 +02:00 |
|
|
|
8c6fcd7fb0
|
only log useragent on succ login
|
2023-07-26 08:29:22 +02:00 |
|
|
|
156122eba4
|
log useragent on login
|
2023-07-25 13:55:16 +02:00 |
|
|
|
9a3636f05f
|
fix testsg
|
2023-07-25 13:33:12 +02:00 |
|
|
|
e5f22ae070
|
more clippy :-)
|
2023-07-25 13:32:20 +02:00 |
|
|
|
a7789af713
|
clean code with clippy
|
2023-07-25 13:22:11 +02:00 |
|
|
|
082fac9789
|
add stats
|
2023-07-24 20:56:46 +02:00 |
|
|
|
c42cd2cd9c
|
allow adding rowers to logbook
|
2023-07-24 13:01:39 +02:00 |
|
|
|
c43feb1834
|
add test
|
2023-07-24 09:40:28 +02:00 |
|
|
|
c32c8bb643
|
move always_show to tripdetails
|
2023-07-23 19:45:48 +02:00 |
|
|
|
9fa70b1411
|
add functionality to finish logbook trips
|
2023-07-23 16:49:14 +02:00 |
|
|
|
3259582aab
|
create new tests for /cox/trip/<id>
|
2023-07-23 14:21:27 +02:00 |
|
|
|
1d4c5f356d
|
add first draft of logbook
|
2023-07-23 12:17:57 +02:00 |
|
|
|
b2f626f906
|
allow creating all fields for new boats
|
2023-07-22 16:36:02 +02:00 |
|
|
|
0381465272
|
add db constraints; add optional name for login (to be sent to members)
|
2023-07-22 15:51:20 +02:00 |
|
|
|
524d1acee2
|
add full CRUD for boats
|
2023-07-22 15:34:42 +02:00 |
|
|
|
c0bb6d51de
|
create create/delete/view function for boats
|
2023-07-22 13:57:17 +02:00 |
|
|
|
d712859566
|
add tests
|
2023-07-22 12:24:29 +02:00 |
|
|
|
5a27c5a225
|
add first tera test
|
2023-07-21 10:26:50 +02:00 |
|
|
|
2f6464ff84
|
separate rest from tera
|
2023-07-16 19:16:42 +02:00 |
|
|
|
a3b3b03c8b
|
push
|
2023-07-16 19:10:22 +02:00 |
|
|
|
cf6db88b25
|
segrete rest from tera
|
2023-07-16 18:33:17 +02:00 |
|
|
|
a0afce344f
|
add debug log for auth
|
2023-07-11 09:16:13 +02:00 |
|
|
|
59ab01d36b
|
add contact options on failed login
|
2023-07-10 17:17:17 +02:00 |
|
|
|
0fbdcc084e
|
rename subfolder
|
2023-06-28 14:06:28 +02:00 |
|
