Commit Graph

430 Commits

Author SHA1 Message Date
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
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
90155dbc0f fix ci 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
709411ce5c remove deprecated function 2023-09-05 16:13:36 +02: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
64aefde8bc fix stat query 2023-08-05 15:58:17 +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
47b534f8c3 create tests for model/logbook
Closes #31
2023-07-31 19:10:34 +02:00
adb26f6b91 create tests for model/rower.rs, Closes #32 2023-07-31 16:59:15 +02:00
32e6148844 use query_as instead of manual mapping 2023-07-31 16:33:44 +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
b2e84d727c use local timestamp for log 2023-07-31 09:10:26 +02:00
332b505955 Merge branch 'verify-rower-on-water' into 'staging'
push

See merge request PhilippHofer/rot!21
2023-07-30 21:11:51 +00:00
1bff814811 push 2023-07-30 22:59:47 +02:00
7e09c81d5e fix error on diff sqlite version 2023-07-30 22:17:47 +02:00
f3590c1437 fix parsing of sqlite timestamp (arrival) 2023-07-30 20:50:28 +02:00
dee228dce8 send departure as timestamp 2023-07-30 20:40:15 +02:00
e2b5495da6 lowercase baotdamage 2023-07-30 20:25:59 +02:00
aba8bc7749 add light damage 2023-07-30 20:21:59 +02:00
d5033ccf44 fix ci 2023-07-30 20:19:25 +02:00
aeefd9e43f add details to boat 2023-07-30 20:13:00 +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
e30dae68ad remove not unseful logging 2023-07-28 11:50:11 +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
2e9ad2215f remove unused import 2023-07-27 22:18:00 +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
3765541674 even show who's logging in 2023-07-25 11:36:36 +02:00
1436feaffd create logs for login 2023-07-25 11:31:51 +02:00
290e05dc4c add todo 2023-07-24 21:17:51 +02:00
Philipp
2dc70fa629 use function (instead of macro) to work with older sqlite 2023-07-24 21:16:43 +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
968c68e12b clean code w/ clippy 2023-07-18 17:32:34 +02:00
054efc99e3 add example code; updated deploy script 2023-07-16 20:54:11 +02:00
e6d7f15cd8 add rest login 2023-07-16 20:44:27 +02:00
eb4c4bb558 be able to use both tera and svelte 2023-07-16 20:07:38 +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
2375dd91de rename folder 2023-07-16 18:42:59 +02:00
bc63f9cc41 enable svelte build 2023-07-16 18:34:30 +02:00
cf6db88b25 segrete rest from tera 2023-07-16 18:33:17 +02:00
4ad6caa26c trim string 2023-07-11 14:37:48 +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
52f1c3c026 push 2023-06-08 17:23:23 +02:00
47920305c4 allow updating pinning an planned_trip 2023-06-08 11:28:25 +02:00
87ed710f66 add is_pinned functionality 2023-06-08 10:57:42 +02:00
d7417804a0 renew cookies on every action; increase cookie timeout to 3 months 2023-06-07 00:07:11 +02:00
2420b69d43 fix tests 2023-06-06 12:26:48 +02:00
2159802cca remove unused import 2023-06-06 10:09:48 +02:00
eccf224a40 order names by last access 2023-06-06 10:08:54 +02:00
ca93bc93c2 push 2023-06-05 14:56:15 +02:00
030fcd1c6f push 2023-06-05 14:50:01 +02:00
e8e84e8d37 push 2023-06-05 14:43:31 +02:00
5230762190 push 2023-06-05 14:25:23 +02:00
7614cab806 set content type 2023-06-05 14:15:17 +02:00
b6057f066d push 2023-06-05 14:07:46 +02:00
a72e19d8e1 push 2023-06-05 14:01:55 +02:00
51b0ba8cf4 fix ics 2023-06-05 13:29:55 +02:00
f64128e0b1 Use crlf 2023-06-05 13:27:08 +02:00
2530d6343d add dtstamp 2023-06-05 13:21:41 +02:00
b237ff3850 add timezone information in ics feed 2023-06-05 13:18:40 +02:00
bae288cb43 clean code with clippy 2023-05-30 14:47:44 +02:00
9c30cda326 clean code with clippy 2023-05-30 14:36:23 +02:00
14fd04a467 move rss key to config file 2023-05-30 14:12:08 +02:00
273239ef34 add nice name of calendar 2023-05-28 20:05:51 +02:00
d688faf579 name calendar 2023-05-24 15:44:43 +02:00
05b65b2f67 restructre 2023-05-24 15:36:38 +02:00
9dc43d2d32 fix typo 2023-05-24 15:23:19 +02:00
17599ee296 use correct time zone 2023-05-24 15:20:04 +02:00
3d801121e7 push 2023-05-24 15:16:53 +02:00
91512ecdfc use proper date format 2023-05-24 15:14:26 +02:00
aa2d5bc7dd add first draft of cal 2023-05-24 15:09:38 +02:00
478ce329e3 Push 2023-05-24 13:11:47 +02:00
c91db80ce5 no more clones! 2023-05-24 12:18:14 +02:00
1c74d11e96 fix clones() 2023-05-24 12:16:13 +02:00
99296d4060 fix many clones() 2023-05-24 12:11:55 +02:00
cf45036642 clean rss string 2023-05-24 09:39:49 +02:00
abf720ed36 push 2023-05-24 09:36:48 +02:00
e9d0ffd189 try sth 2023-05-24 09:31:18 +02:00
26f1ad785e fix feed 2023-05-24 09:21:22 +02:00
33aeb28140 properly close rss feed 2023-05-24 09:11:34 +02:00
1ff5fb9a43 fix 2023-05-24 09:07:20 +02:00
bfdc815a36 remove rss dep 2023-05-24 09:05:07 +02:00
968ab00cc0 show last access time 2023-05-10 09:04:09 +02:00
8c38a2faf6 add last_access column for user table 2023-05-10 08:57:20 +02:00
3ae07b3815 Merge branch 'main' of gitlab.com:PhilippHofer/rot 2023-05-03 23:01:28 +02:00
db674573ea fix unused import 2023-05-03 23:01:19 +02:00
8effe700d0 Merge branch 'faq' into 'main'
Faq

See merge request PhilippHofer/rot!9
2023-05-03 20:59:24 +00:00
c89a199a33 use proper field 2023-05-03 22:54:10 +02:00
9f7fa6b8c4 add edit option of planned_events 2023-05-03 22:40:22 +02:00
2fd5b65994 fix tests and add new one 2023-05-03 16:53:36 +02:00
787b28cc23 allow trip_type edit of trip 2023-05-03 16:51:37 +02:00
c9932b550b add faq route 2023-05-03 16:31:27 +02:00
3f01bf39b3 deduplicate code 2023-05-03 16:06:27 +02:00
0b34b776ac remove unwrap :-) 2023-05-03 15:59:28 +02:00
e5088bddb0 Push 2023-05-03 14:39:53 +02:00
913d0ac78e push 2023-05-03 13:32:23 +02:00