Commit Graph

373 Commits

Author SHA1 Message Date
b50471d339 hide external boat in stats
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-05 20:42:20 +01:00
1c020da84f fix stat
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-05 20:37:40 +01:00
323f6da201 Merge pull request 'show guests km' (#146) from show-guests-km into staging
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
Reviewed-on: #146
2024-01-05 20:08:47 +01:00
0aeec175ac show guests km
All checks were successful
CI/CD Pipeline / test (push) Successful in 15m30s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-01-05 20:08:13 +01:00
1cfbb97034 fix tests, as we now show all boats in kiosk mode
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-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
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
29e7142883 Merge pull request 'main' (#111) from main into staging
Some checks failed
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
All checks were successful
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
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
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
c9c7ad967d push
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
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
34280dbbea 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
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m1s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-28 18:19:43 +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
All checks were successful
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
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
e081c7a31f cleaner code
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m28s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-12-01 10:10:18 +01:00
861262b62b cleaner code thanks to clippy
All checks were successful
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
a2ca26fef3 fix ci
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m8s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-27 11:58:02 +01:00
7569798b00 upgrade sqlx to 0.7 Fixes #76 restructure registrations
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m57s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-22 13:19:31 +01:00
2dd3885ba0 fix query
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m53s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-20 23:44:13 +01:00
4199fadc0a use current year in test_db
All checks were successful
CI/CD Pipeline / test (push) Successful in 11m10s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-19 22:19:28 +01:00
7bc8293c65 add routes for different years
Some checks failed
CI/CD Pipeline / test (push) Failing after 11m0s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2023-11-19 22:02:43 +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
bcd275fc3e Merge branch 'save-ergo-imgs' into 'main'
add timestamp to save imgs

See merge request PhilippHofer/rot!114
2023-11-12 20:41:31 +00:00
844e2c1f8c add timestamp to save imgs 2023-11-12 21:28:06 +01:00
f4a278030f fix 2023-11-10 16:55:57 +01:00
8f3774dfc1 fix tests 2023-11-09 09:13:32 +01:00
715fae59fc implement default destination for boats 2023-11-09 08:56:08 +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
039f9fbddf switch order 2023-11-02 16:00:41 +01:00
4726c25d20 migration + better ordering 2023-11-02 15:04:08 +01:00
e1a7bdae65 fix ci 2023-11-02 12:25:13 +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
2d7c86f323 aaaaah 2023-10-31 21:02:56 +01:00
d9c7c218bc allow no cox in 1x; require them in >2x 2023-10-31 20:57:05 +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
6e6b6eafa3 fix stat query 2023-10-30 15:32:17 +01:00
2d520298e7 frontend for new db 2023-10-30 15:32:17 +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
9497116265 add first draft of notifications 2023-10-29 17:31:07 +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
3f5fc85a8b fix 2023-10-26 20:37:48 +02:00
31b2ed3b37 deploy :O 2023-10-26 18:50:43 +02:00
6d7ef2e836 fix ci.. 2023-10-24 14:58:32 +02:00
816425c158 fix ci 2023-10-24 14:56:59 +02:00
ff6184e343 fix boat update error 2023-10-24 14:44:31 +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
c015a672ea don't show scheckbuch-people in stat 2023-10-24 09:07:20 +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
76a05b6107 add verified for boats 2023-10-23 22:26:33 +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
4cb374e246 remove debug statements 2023-10-23 09:36:38 +02:00
fa3ab3ec8a fix proper loggedin_user cookie after setting pw 2023-10-13 09:43:59 +02:00
1581570d97 fix off-by-one error of not showing 'always show' trips 7 days before the event 2023-10-09 20:42:01 +02:00
c323b209d0 fix ci 2023-10-05 09:01:55 +02:00
1386ba05c2 log important events 2023-10-05 08:59:13 +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
88833b9f4b fix ci 2023-10-02 12:40:20 +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
7500b90b22 fix ci 2023-10-01 20:52:41 +02:00
22db993767 remove unused variable 2023-10-01 20:52:41 +02:00
e41aa9b4e7 fun with timezones 2023-10-01 20:52:41 +02:00
665cbe7aae remove debugging statement 2023-10-01 20:52:41 +02:00
bf63313515 debug none 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