430 Commits

Author	SHA1	Message	Date
philipp	7e1a0a2159	try	2024-01-16 20:24:02 +01:00
philipp	5788d3d9f4	fix ci	2024-01-10 15:49:57 +01:00
philipp	a95ff3657f	fix ci	2024-01-10 15:11:35 +01:00
philipp	87e4b8fbb4	fix redirect	2024-01-10 15:10:05 +01:00
philipp	a4b8bf1e3f	improve code w/ clippy	2024-01-10 14:24:58 +01:00
philipp	3e2e058bcc	limit users to proper role, Fixes #135	2024-01-10 14:08:15 +01:00
philipp	9cbbdb38c2	remove external cox from stat	2024-01-05 22:23:36 +01:00
philipp	b50471d339	hide external boat in stats	2024-01-05 20:42:20 +01:00
philipp	1c020da84f	fix stat	2024-01-05 20:37:40 +01:00
philipp	323f6da201	Merge pull request 'show guests km' (#146) from show-guests-km into staging ... Reviewed-on: #146	2024-01-05 20:08:47 +01:00
philipp	0aeec175ac	show guests km	2024-01-05 20:08:13 +01:00
philipp	1cfbb97034	fix tests, as we now show all boats in kiosk mode	2024-01-04 20:46:49 +01:00
philipp	bada4deedd	allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats	2024-01-04 20:43:38 +01:00
philipp	29e7142883	Merge pull request 'main' (#111) from main into staging ... Reviewed-on: #111	2024-01-01 16:30:52 +01:00
philipp	6bbe1302d9	Merge pull request 'nxdata' (#109) from nxdata into main ... Reviewed-on: #109	2024-01-01 15:51:16 +01:00
philipp	0ad342b147	add mail	2024-01-01 15:50:06 +01:00
philipp	5800f137f3	add data from nx	2023-12-30 21:21:30 +01:00
philipp	c9c7ad967d	push	2023-12-30 17:13:21 +01:00
philipp	9fb4167b50	in preparation to moving userdata into app, we switched to arbitrary groups	2023-12-30 17:11:46 +01:00
philipp	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	2023-12-28 18:19:43 +01:00
philipp	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	2023-12-28 18:14:11 +01:00
philipp	c7d7d0ca83	in preparation to moving userdata into app, we switched to arbitrary groups	2023-12-23 21:27:52 +01:00
philipp	aca5340370	show guest km, Fixes #41	2023-12-23 15:26:49 +01:00
philipp	e081c7a31f	cleaner code	2023-12-01 10:10:18 +01:00
philipp	861262b62b	cleaner code thanks to clippy	2023-11-27 12:49:36 +01:00
philipp	a2ca26fef3	fix ci	2023-11-27 11:58:02 +01:00
philipp	7569798b00	upgrade sqlx to 0.7 Fixes #76 restructure registrations	2023-11-22 13:19:31 +01:00
philipp	2dd3885ba0	fix query	2023-11-20 23:44:13 +01:00
philipp	4199fadc0a	use current year in test_db	2023-11-19 22:19:28 +01:00
philipp	7bc8293c65	add routes for different years	2023-11-19 22:02:43 +01:00
PhilippHofer	53ed032c25	Merge branch 'staging' into 'log-2022' ... # Conflicts: # src/model/logbook.rs	2023-11-18 11:22:50 +00:00
philipp	f001aaf90f	add routes for different years	2023-11-18 12:21:37 +01:00
philipp	a87832e4f4	update tests to use current date	2023-11-16 15:36:38 +01:00
philipp	5b4238da92	update tests to use current date	2023-11-16 15:35:52 +01:00
philipp	a3c7461c2b	don't allow to add entry which is not completed today	2023-11-14 23:09:33 +01:00
PhilippHofer	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
philipp	844e2c1f8c	add timestamp to save imgs	2023-11-12 21:28:06 +01:00
philipp	f4a278030f	fix	2023-11-10 16:55:57 +01:00
philipp	8f3774dfc1	fix tests	2023-11-09 09:13:32 +01:00
philipp	715fae59fc	implement default destination for boats	2023-11-09 08:56:08 +01:00
philipp	144bcefcab	update deps, switch to newest rocket version	2023-11-08 17:39:39 +01:00
philipp	4f4c053d0e	ergo-admin-edit	2023-11-07 21:27:40 +01:00
philipp	95e1ea3028	allow guests to see + upload ergo entries; show ergo menu item for guests	2023-11-03 14:20:58 +01:00
philipp	9331b2001d	improve code with clippy	2023-11-02 22:19:13 +01:00
philipp	71da6546b0	image required; cleaner log	2023-11-02 19:02:17 +01:00
philipp	039f9fbddf	switch order	2023-11-02 16:00:41 +01:00
philipp	4726c25d20	migration + better ordering	2023-11-02 15:04:08 +01:00
philipp	e1a7bdae65	fix ci	2023-11-02 12:25:13 +01:00
philipp	1ff050a247	add ergo tool	2023-11-02 12:15:10 +01:00
philipp	2eba6a0f66	more rights to the kiosk!	2023-10-31 22:41:12 +01:00
philipp	56ae0ae429	fix 1x no cox stuff	2023-10-31 22:16:14 +01:00
philipp	2d7c86f323	aaaaah	2023-10-31 21:02:56 +01:00
philipp	d9c7c218bc	allow no cox in 1x; require them in >2x	2023-10-31 20:57:05 +01:00
PhilippHofer	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
philipp	730f9e5dff	add boat stats Fixes #50	2023-10-31 16:07:15 +01:00
philipp	6e6b6eafa3	fix stat query	2023-10-30 15:32:17 +01:00
philipp	2d520298e7	frontend for new db	2023-10-30 15:32:17 +01:00
philipp	1d7f95e522	finish backend tests of new db layout	2023-10-30 15:32:17 +01:00
philipp	09075989e3	first draft	2023-10-30 15:32:17 +01:00
philipp	9497116265	add first draft of notifications	2023-10-29 17:31:07 +01:00
philipp	dcb7bc4c24	clean	2023-10-28 14:48:51 +02:00
philipp	08a1d16f88	add functionality to show log	2023-10-28 14:48:08 +02:00
philipp	cfd0ccc8c2	add logs	2023-10-28 14:33:22 +02:00
philipp	3f5fc85a8b	fix	2023-10-26 20:37:48 +02:00
philipp	31b2ed3b37	deploy :O	2023-10-26 18:50:43 +02:00
philipp	6d7ef2e836	fix ci..	2023-10-24 14:58:32 +02:00
philipp	816425c158	fix ci	2023-10-24 14:56:59 +02:00
philipp	ff6184e343	fix boat update error	2023-10-24 14:44:31 +02:00
philipp	cb109e7005	fix ci	2023-10-24 14:33:22 +02:00
philipp	e9641e6a33	move faq to wiki	2023-10-24 14:24:33 +02:00
philipp	afa5597f49	remove debug thingy	2023-10-24 13:36:14 +02:00
philipp	4321986204	debug	2023-10-24 13:14:26 +02:00
philipp	b1a66d71b9	test wiki auth	2023-10-24 12:36:14 +02:00
philipp	8f28553608	fix js errors	2023-10-24 11:01:35 +02:00
philipp	beb5f3a217	hide logbook for guests	2023-10-24 10:57:51 +02:00
philipp	1f35be88ad	scheckbuch can't see logbuch	2023-10-24 10:16:26 +02:00
philipp	c27b83e9fd	allow adding boatdamage from everyone	2023-10-24 09:40:48 +02:00
philipp	e4e6bf7f15	disable functionality until introduced	2023-10-24 09:14:11 +02:00
philipp	c015a672ea	don't show scheckbuch-people in stat	2023-10-24 09:07:20 +02:00
philipp	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
philipp	76a05b6107	add verified for boats	2023-10-23 22:26:33 +02:00
philipp	88af24db7b	allow all users to report boat damage	2023-10-23 21:38:08 +02:00
philipp	51860ded27	allow deletion of trip in kiosk mode	2023-10-23 21:32:44 +02:00
philipp	6f9edfa23f	show header in kiosk mode	2023-10-23 21:05:59 +02:00
philipp	4cb374e246	remove debug statements	2023-10-23 09:36:38 +02:00
philipp	fa3ab3ec8a	fix proper loggedin_user cookie after setting pw	2023-10-13 09:43:59 +02:00
philipp	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
philipp	c323b209d0	fix ci	2023-10-05 09:01:55 +02:00
philipp	1386ba05c2	log important events	2023-10-05 08:59:13 +02:00
philipp	c47b3bb447	log if new kiosk cookie is set	2023-10-05 08:46:34 +02:00
philipp	8852e1cdd6	allow boatdamage add in kiosk mode	2023-10-04 13:56:58 +02:00
philipp	88833b9f4b	fix ci	2023-10-02 12:40:20 +02:00
philipp	bb142a0969	clean code with clippy	2023-10-02 12:39:05 +02:00
philipp	e67b345789	allow showing stat in kiosk mode	2023-10-01 20:52:42 +02:00
philipp	826402cd41	give proper results for stats	2023-10-01 20:52:42 +02:00
philipp	af81920a47	fake personal history	2023-10-01 20:52:42 +02:00
philipp	02e1546f0e	complete tests for logbook	2023-10-01 20:52:41 +02:00
philipp	6d0501d3b0	add tests	2023-10-01 20:52:41 +02:00
philipp	7500b90b22	fix ci	2023-10-01 20:52:41 +02:00
philipp	22db993767	remove unused variable	2023-10-01 20:52:41 +02:00
philipp	e41aa9b4e7	fun with timezones	2023-10-01 20:52:41 +02:00
philipp	665cbe7aae	remove debugging statement	2023-10-01 20:52:41 +02:00
philipp	bf63313515	debug none	2023-10-01 20:52:41 +02:00
philipp	33810d69da	push	2023-10-01 20:52:41 +02:00
philipp	09af9981df	fix multi-select; only show private boats owner + kiosk	2023-10-01 20:52:41 +02:00
philipp	514561321e	change select properly if boat is selected on the left	2023-10-01 20:52:41 +02:00
philipp	57e540f450	allow users to delete trips	2023-10-01 20:52:41 +02:00
philipp	fd4d097d72	verify that arrivaldate > departuredate	2023-10-01 20:52:41 +02:00
philipp	e849b6f5f9	error if same person selected as cox + rower	2023-10-01 20:52:41 +02:00
philipp	d102e57b09	disable rowers in logbook if they are on water	2023-10-01 20:52:41 +02:00
philipp	90155dbc0f	fix ci	2023-10-01 20:52:41 +02:00
philipp	1f801b0436	add debug trait; switch to proper name of form field (rowerS)	2023-10-01 20:52:41 +02:00
philipp	8b0264d181	clean code with clippy	2023-10-01 20:52:41 +02:00
PhilippHofer	fe4c0bebfc	Staging	2023-09-05 21:03:18 +00:00
philipp	709411ce5c	remove deprecated function	2023-09-05 16:13:36 +02:00
PhilippHofer	590b41aa33	Allow to add real guests	2023-08-09 20:30:37 +00:00
philipp	bd4ee5954c	implement is_locked for trip_details	2023-08-09 11:54:18 +02:00
philipp	f0c6bdac14	fix ci; clean code	2023-08-05 16:29:58 +02:00
philipp	94a9d285be	clean db	2023-08-05 16:27:51 +02:00
philipp	64aefde8bc	fix stat query	2023-08-05 15:58:17 +02:00
philipp	7309b1f2b2	update unit tests; add location name in kiosk settting to cookie (to avoid specific redirects)	2023-08-05 13:21:35 +02:00
philipp	e459a4e2d9	store loation in kiosk cookie, to avoid having to handle each location separately	2023-08-05 13:09:58 +02:00
philipp	351ba1ba4e	fix tests, default redirect to linz kiosk	2023-08-05 13:01:01 +02:00
philipp	8a40dfe017	allow filter for kiosk, to only show boats at specific location	2023-08-05 12:59:02 +02:00
philipp	f3c18c6949	update mail address	2023-08-02 18:36:38 +02:00
philipp	ff31ad83fe	add boatdamages functionality	2023-08-02 14:29:19 +02:00
philipp	f2baca668c	add tests for tera/admin/planned_event ... Closes #19	2023-07-31 21:33:49 +02:00
philipp	da6a16cd66	add tests for tera/admin/planned_event ... Closes #20	2023-07-31 21:29:03 +02:00
philipp	8fa8e17c5a	add tests for tera/admin/planned_event ... Closes #24	2023-07-31 21:15:28 +02:00
philipp	96af3c3b17	create tests for /public ... Closes #25	2023-07-31 21:07:01 +02:00
philipp	3730940aed	add tests for tera/log.rs ... Closes #34	2023-07-31 20:09:03 +02:00
philipp	8b5be3fb41	add test for tera/admin/boat.rs ... Fixes #33	2023-07-31 19:38:53 +02:00
philipp	47b534f8c3	create tests for model/logbook ... Closes #31	2023-07-31 19:10:34 +02:00
philipp	adb26f6b91	create tests for model/rower.rs, Closes #32	2023-07-31 16:59:15 +02:00
philipp	32e6148844	use query_as instead of manual mapping	2023-07-31 16:33:44 +02:00
philipp	dc4b4b3499	add tests; Closes #30	2023-07-31 16:25:07 +02:00
philipp	bbb78cbc44	move todos to gitlab; write tests for /cox/remove/<id>; Closes #9	2023-07-31 13:34:02 +02:00
philipp	b2e84d727c	use local timestamp for log	2023-07-31 09:10:26 +02:00
PhilippHofer	332b505955	Merge branch 'verify-rower-on-water' into 'staging' ... push See merge request PhilippHofer/rot!21	2023-07-30 21:11:51 +00:00
philipp	1bff814811	push	2023-07-30 22:59:47 +02:00
philipp	7e09c81d5e	fix error on diff sqlite version	2023-07-30 22:17:47 +02:00
philipp	f3590c1437	fix parsing of sqlite timestamp (arrival)	2023-07-30 20:50:28 +02:00
philipp	dee228dce8	send departure as timestamp	2023-07-30 20:40:15 +02:00
philipp	e2b5495da6	lowercase baotdamage	2023-07-30 20:25:59 +02:00
philipp	aba8bc7749	add light damage	2023-07-30 20:21:59 +02:00
philipp	d5033ccf44	fix ci	2023-07-30 20:19:25 +02:00
philipp	aeefd9e43f	add details to boat	2023-07-30 20:13:00 +02:00
philipp	2e80f7bc38	add logbook history	2023-07-30 14:13:49 +02:00
philipp	e49279afef	remove log from page	2023-07-30 13:02:29 +02:00