|
|
0afd523e05
|
update faq
|
2023-08-09 12:01:49 +02:00 |
|
|
|
bd4ee5954c
|
implement is_locked for trip_details
|
2023-08-09 11:54:18 +02:00 |
|
|
|
2192bb73ed
|
Merge branch 'fix-order-trips' into 'staging'
fix order of displayed trips + events
See merge request PhilippHofer/rot!23
|
2023-08-05 10:38:58 +00:00 |
|
|
|
6809a85749
|
add option to lock boat on damage
|
2023-08-05 12:05:54 +02:00 |
|
|
|
ff31ad83fe
|
add boatdamages functionality
|
2023-08-02 14:29:19 +02:00 |
|
|
|
5b8dfb8284
|
fix order of displayed trips + events
|
2023-07-31 20:12:50 +02:00 |
|
|
|
dc4b4b3499
|
add tests; Closes #30
|
2023-07-31 16:25:07 +02:00 |
|
Marie Birner
|
9b270fbbf9
|
[TASK] show pretty timestamp
|
2023-07-30 20:53:27 +02:00 |
|
Marie Birner
|
041733a3ba
|
[TASK] set boat status
|
2023-07-30 20:45:16 +02:00 |
|
Marie Birner
|
fafe82b15a
|
[TASK] add status to boat
|
2023-07-30 20:02:46 +02:00 |
|
Marie Birner
|
80e57dfe12
|
[TASK] add multiselct js
|
2023-07-30 18:07:44 +02:00 |
|
Marie Birner
|
354e267a3a
|
[WIP] styling logbook page
|
2023-07-30 17:20:03 +02:00 |
|
Marie Birner
|
8de9568684
|
[WIP] styling logbook page
|
2023-07-30 16:59:20 +02:00 |
|
Marie Birner
|
e4376c29b4
|
Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64'
# Conflicts:
# templates/includes/forms/log.html.tera
# templates/kiosk.html.tera
|
2023-07-30 15:10:48 +02:00 |
|
Marie Birner
|
4d80421b9b
|
[WIP] styling kiosk page
|
2023-07-30 15:10:09 +02:00 |
|
|
|
db3cf59d21
|
format tera files
|
2023-07-30 14:33:50 +02:00 |
|
Marie Birner
|
2ff7e24cbd
|
[WIP] styling kiosk page
|
2023-07-30 14:31:15 +02:00 |
|
|
|
bf2135b1b3
|
fix typo
|
2023-07-30 14:16:58 +02:00 |
|
|
|
2e80f7bc38
|
add logbook history
|
2023-07-30 14:13:49 +02:00 |
|
|
|
c6d19d276c
|
show boats on water
|
2023-07-30 14:02:53 +02:00 |
|
|
|
c414164b82
|
push
|
2023-07-30 14:00:15 +02:00 |
|
|
|
039df224a6
|
first draft layout logbook
|
2023-07-30 13:42:33 +02:00 |
|
|
|
e49279afef
|
remove log from page
|
2023-07-30 13:02:29 +02:00 |
|
|
|
861df59ebc
|
set some fields to required
|
2023-07-28 10:25:57 +02:00 |
|
|
|
301d3527c1
|
fix planned_event creation
|
2023-07-27 22:41:01 +02:00 |
|
|
|
b5fd4018ff
|
extract common functionality to functoin
|
2023-07-27 15:24:29 +02:00 |
|
|
|
7093e29c9b
|
fix
|
2023-07-27 14:44:47 +02:00 |
|
|
|
38300d826a
|
add kiosk mode
|
2023-07-27 14:38:46 +02:00 |
|
|
|
b3349c87ff
|
don't show cox twice
|
2023-07-27 13:15:40 +02:00 |
|
|
|
d5c16ad7a0
|
allow non-cox to (only) use 1x
|
2023-07-27 13:07:00 +02:00 |
|
|
|
fad7d747d7
|
fixes
|
2023-07-27 12:31:53 +02:00 |
|
|
|
c37d9fa393
|
beautify frontend code
|
2023-07-27 12:24:38 +02:00 |
|
|
|
d2b162b397
|
push
|
2023-07-27 11:53:28 +02:00 |
|
|
|
a633239c84
|
push
|
2023-07-27 11:50:52 +02:00 |
|
|
|
6f8e977ecc
|
push
|
2023-07-27 11:47:34 +02:00 |
|
|
|
2707a8b17f
|
push
|
2023-07-27 11:45:57 +02:00 |
|
|
|
553bbf24cd
|
push
|
2023-07-27 11:43:10 +02:00 |
|
|
|
79679414d3
|
mobile fix
|
2023-07-27 11:35:20 +02:00 |
|
|
|
70930321ee
|
fun with js :-)
|
2023-07-27 11:25:11 +02:00 |
|
|
|
00aaa2dd86
|
remove debug
|
2023-07-26 13:11:17 +02:00 |
|
|
|
48eb1b7dc2
|
clean ui for logbook
|
2023-07-26 12:56:19 +02:00 |
|
|
|
97703403a8
|
clean code for boats ui
|
2023-07-26 12:24:22 +02:00 |
|
|
|
082fac9789
|
add stats
|
2023-07-24 20:56:46 +02:00 |
|
|
|
e90e27fc3d
|
improve faq
|
2023-07-24 14:00:34 +02:00 |
|
|
|
0e567ed02d
|
improve faq
|
2023-07-24 13:46:53 +02:00 |
|
|
|
346ca4d2c8
|
add faq
|
2023-07-24 13:43:13 +02:00 |
|
|
|
c42cd2cd9c
|
allow adding rowers to logbook
|
2023-07-24 13:01:39 +02:00 |
|
|
|
7c439b5b0a
|
fix typo
|
2023-07-23 20:09:47 +02:00 |
|
|
|
7ce3caece3
|
add faq
|
2023-07-23 20:00:47 +02:00 |
|
|
|
c32c8bb643
|
move always_show to tripdetails
|
2023-07-23 19:45:48 +02:00 |
|
|
|
61961b24e2
|
use autofocus
|
2023-07-23 18:16:26 +02:00 |
|
|
|
9fa70b1411
|
add functionality to finish logbook trips
|
2023-07-23 16:49:14 +02:00 |
|
|
|
1d4c5f356d
|
add first draft of logbook
|
2023-07-23 12:17:57 +02:00 |
|
|
|
f09454fb38
|
fix bug, forgot to use new data field
|
2023-07-22 18:24:48 +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 |
|
|
|
115533e484
|
add faq
|
2023-07-18 09:32:32 +02:00 |
|
|
|
92a33ec731
|
friendlier faq
|
2023-07-11 15:11:01 +02:00 |
|
|
|
6d97c37fb0
|
be more verbose @ faq
|
2023-07-11 15:08:58 +02:00 |
|
|
|
c3870764dd
|
correct faq
|
2023-07-11 15:01:32 +02:00 |
|
|
|
49f254a9d5
|
fix ci
|
2023-06-28 14:32:35 +02:00 |
|
|
|
a17726e714
|
lower bound = 0 for unused seats
|
2023-06-28 14:15:03 +02:00 |
|
|
|
509412599f
|
change text
|
2023-06-26 09:34:52 +02:00 |
|
|
|
f05af311f2
|
add faq
|
2023-06-08 17:43:16 +02:00 |
|
Marie Birner
|
0e9d7857f8
|
[BUGFIX] styling special events list view
|
2023-06-08 15:42:00 +02:00 |
|
Marie Birner
|
16d00f2e11
|
[BUGFIX] styling special events list view
|
2023-06-08 15:38:49 +02:00 |
|
Marie Birner
|
46faccf959
|
[BUGFIX] styling special events list view
|
2023-06-08 15:37:05 +02:00 |
|
Marie Birner
|
6f2071df37
|
[BUGFIX] duplicate ids checkboxes in sidebar form
|
2023-06-08 15:28:08 +02:00 |
|
|
|
91fff843cb
|
Merge branch 'main' of gitlab.com:PhilippHofer/rot
|
2023-06-08 15:00:22 +02:00 |
|
|
|
d45c73cac9
|
show proper state of checkbox
|
2023-06-08 15:00:15 +02:00 |
|
Marie Birner
|
efb47ae52f
|
[TASK] change color header pinned event
|
2023-06-08 14:46:57 +02:00 |
|
Marie Birner
|
c17c86f7b7
|
[BUGFX] styling header date
|
2023-06-08 14:28:55 +02:00 |
|
|
|
47920305c4
|
allow updating pinning an planned_trip
|
2023-06-08 11:28:25 +02:00 |
|
Marie Birner
|
5d0bfddadf
|
[BUGFIX] sorting trips & events
|
2023-06-08 11:25:08 +02:00 |
|
|
|
87ed710f66
|
add is_pinned functionality
|
2023-06-08 10:57:42 +02:00 |
|
|
|
70e3d7524d
|
update deps; switch to hü :-)
|
2023-05-30 09:04:13 +02:00 |
|
|
|
d00aa35429
|
rephrase faq!
|
2023-05-14 09:33:15 +02:00 |
|
|
|
6a4ad409d7
|
order planned_events by time
|
2023-05-12 15:00:45 +02:00 |
|
|
|
968ab00cc0
|
show last access time
|
2023-05-10 09:04:09 +02:00 |
|
|
|
dab396640b
|
formulate more positively
|
2023-05-10 08:37:25 +02:00 |
|
|
|
b7aaea5fe8
|
allow trip_type specification for creating a trip
|
2023-05-05 09:28:29 +02:00 |
|
|
|
f9f9f49197
|
fix typo
|
2023-05-04 10:25:13 +02:00 |
|
|
|
9b4433ab09
|
fix typos
|
2023-05-03 23:17:05 +02:00 |
|
|
|
8effe700d0
|
Merge branch 'faq' into 'main'
Faq
See merge request PhilippHofer/rot!9
|
2023-05-03 20:59:24 +00:00 |
|
|
|
69ea13a365
|
show different faq depending on user type
|
2023-05-03 22:50:05 +02:00 |
|
Marie Birner
|
8d951b9a1b
|
[TASK] add macro for faq
|
2023-05-03 22:41:37 +02:00 |
|
|
|
9f7fa6b8c4
|
add edit option of planned_events
|
2023-05-03 22:40:22 +02:00 |
|
Marie Birner
|
db5f151b96
|
[TASK] add faqs for cox
|
2023-05-03 17:11:01 +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 |
|
Marie Birner
|
1f29779ede
|
[TASK] layout trip_types and add onclick join msg javascript
|
2023-05-03 16:14:18 +02:00 |
|
Marie Birner
|
15644e8a0b
|
Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype
# Conflicts:
# templates/index.html.tera
|
2023-05-03 15:26:41 +02:00 |
|
|
|
bb4dba7bc9
|
only allow guests to register for specific events; don't even show them the other trips
|
2023-04-29 18:57:01 +02:00 |
|
Philipp
|
a2a124d8c0
|
if clause forms add trip and add event
|
2023-04-28 22:12:13 +02:00 |
|
|
|
5421a3658d
|
Merge branch 'feature/cancelation' into 'main'
Feature/cancelation
See merge request PhilippHofer/rot!6
|
2023-04-28 19:50:48 +00:00 |
|
|
|
2730687d97
|
Merge branch 'feature/input-labels' into 'main'
show input labels in default case
See merge request PhilippHofer/rot!8
|
2023-04-28 19:47:00 +00:00 |
|
|
|
29234e08af
|
Update index.html.tera
|
2023-04-28 19:42:12 +00:00 |
|
Philipp
|
cb4d53c7f7
|
style delete button in admin view
|
2023-04-28 21:22:41 +02:00 |
|
|
|
0861d8b8d6
|
first draft of using trip types
|
2023-04-28 21:21:21 +02:00 |
|
Philipp
|
e51bd5882f
|
show input labels in default case
|
2023-04-28 21:06:14 +02:00 |
|
Philipp
|
d6b0ce1603
|
show cancelation in sidebar
|
2023-04-28 20:46:46 +02:00 |
|
Philipp
|
cecf15320d
|
show status of trip by adding icon and text
|
2023-04-28 20:22:46 +02:00 |
|
Philipp
|
cdebcefae8
|
show alert messages in admin view
|
2023-04-28 19:47:33 +02:00 |
|
Philipp
|
9baae98ecb
|
show alert messages in admin view
|
2023-04-28 19:44:32 +02:00 |
|
|
|
ce8ea22190
|
Merge branch 'delete-user' into 'main'
allow 'deletion' of user
See merge request PhilippHofer/rot!2
|
2023-04-28 17:39:09 +00:00 |
|
Philipp
|
071f88c9a7
|
change header message box sidebar
|
2023-04-28 19:35:21 +02:00 |
|
Philipp
|
9384c78f42
|
change header message box sidebar
|
2023-04-28 19:33:56 +02:00 |
|
|
|
055c330a3e
|
allow 'deletion' of user
|
2023-04-28 19:29:20 +02:00 |
|
Philipp
|
1e29fab4d1
|
fix divider visual bug between events and trips
|
2023-04-28 19:27:36 +02:00 |
|
Philipp
|
62617b4b42
|
show if_guest next to name change color
|
2023-04-28 19:16:15 +02:00 |
|
Philipp
|
ed684a0ff5
|
show if_guest next to name
|
2023-04-28 19:04:35 +02:00 |
|
Philipp
|
a8dbf6b025
|
add missing sidebar
|
2023-04-28 18:55:51 +02:00 |
|
Philipp
|
7950b23c49
|
TASK improve structure index file
|
2023-04-28 18:35:42 +02:00 |
|
|
|
d535d241e4
|
more clear about how many rowers should be added
|
2023-04-21 21:12:27 +02:00 |
|
|
|
55ca9a5c15
|
add optional min=0 field; add time for starting time
|
2023-04-18 21:41:16 +02:00 |
|
|
|
b50d546a5c
|
show how many people can join trip, even if no one is registered yet
|
2023-04-18 11:09:14 +02:00 |
|
|
|
57750620b0
|
add example of time format
|
2023-04-18 11:06:29 +02:00 |
|
|
|
30c7637693
|
make 'Steuern' gray if already enough cox enrolled
|
2023-04-17 19:37:21 +02:00 |
|
|
|
ac534cf690
|
make 'Steuern' gray if already enough cox enrolled
|
2023-04-17 19:34:22 +02:00 |
|
|
|
d9bb190301
|
be more precise with cox_needed
|
2023-04-17 19:21:19 +02:00 |
|
Marie Birner
|
1e9f3a74fb
|
[BUGFIX] favicon & title tag head
|
2023-04-13 21:27:05 +02:00 |
|
Marie Birner
|
5a40f8ebd6
|
[BUGFIX] layout shift after filterung
|
2023-04-10 23:10:24 +02:00 |
|
Marie Birner
|
25a27b492c
|
[WIP] filter btns session storage
|
2023-04-10 22:42:00 +02:00 |
|
Marie Birner
|
504192e5f2
|
[TASK] improve functionality cox_needed filter
|
2023-04-10 15:00:25 +02:00 |
|
Marie Birner
|
2112d2bdae
|
[BUGFIX] refactor buttons
|
2023-04-09 19:03:04 +02:00 |
|
Marie Birner
|
e7a4b2e8b9
|
[TASK] refactor sidebar close btn
|
2023-04-08 09:24:36 +02:00 |
|
Marie Birner
|
d8049dd1e6
|
[TASK] refactor sidebar
|
2023-04-08 09:17:46 +02:00 |
|
Marie Birner
|
f1c812b436
|
[TASK] refactor sidebar
|
2023-04-08 09:14:48 +02:00 |
|
Marie Birner
|
276e2fae88
|
[BUGIFX] edit trip styling
|
2023-04-08 07:44:31 +02:00 |
|
Marie Birner
|
8f5c0f1b05
|
[BUGFIX] rounded is_cox add trip
|
2023-04-08 07:33:32 +02:00 |
|
Marie Birner
|
41ee9f05d6
|
[TASK] change card layout
|
2023-04-08 07:29:39 +02:00 |
|
Marie Birner
|
f2df222f89
|
[TASK] add filter and change aria-pressed style button
|
2023-04-07 21:59:25 +02:00 |
|
Marie Birner
|
e8799e5766
|
[TASK] style edit form trip
|
2023-04-07 21:30:55 +02:00 |
|
|
|
712f47c7ff
|
enable date-locale feature; update dependencies
|
2023-04-07 20:51:10 +02:00 |
|
Marie Birner
|
fb6dee0fcc
|
[TASK] add day of week
|
2023-04-07 12:46:21 +02:00 |
|
Marie Birner
|
bca65e15c6
|
Merge commit '769bc7f1770230a51896073ee440f7f68b8e51be'
|
2023-04-07 12:37:58 +02:00 |
|
Marie Birner
|
69c7eebd54
|
[WIP] filter btn cox list view
|
2023-04-07 12:37:33 +02:00 |
|
|
|
0b961ca1b8
|
merge
|
2023-04-07 11:58:00 +02:00 |
|
|
|
1d03dd59b2
|
allow cox to edit own trips
|
2023-04-07 11:54:56 +02:00 |
|
Marie Birner
|
3b04cdc5ca
|
[BUGFIX] hide forms if not used
|
2023-04-07 11:39:23 +02:00 |
|
Marie Birner
|
9303d5ce3d
|
Merge commit 'eeb7af4fc10b76f6d606c6290f86c6971a189ae6'
# Conflicts:
# templates/index.html.tera
|
2023-04-07 11:37:48 +02:00 |
|
Marie Birner
|
2d75e7696d
|
[TASK] refactor sidebar forms (reduced size dramatically)
|
2023-04-07 11:35:39 +02:00 |
|
|
|
eeb7af4fc1
|
only show delete_trip button when no one is registered
|
2023-04-07 11:17:25 +02:00 |
|
|
|
3f9d5bb4c7
|
allow trip to be deleted if noone has registered yet
|
2023-04-07 11:16:39 +02:00 |
|
Marie Birner
|
5e4df13289
|
[TASK] refactor list in sidebar (cox, rower)
|
2023-04-07 10:39:15 +02:00 |
|
Marie Birner
|
7190e14c2f
|
[TASK] refactor alert messages
|
2023-04-07 09:57:38 +02:00 |
|
Marie Birner
|
1490b191af
|
[TASK] refactor code and add base css components
|
2023-04-07 09:44:08 +02:00 |
|
Marie Birner
|
0ee9967d3a
|
[TASK] improve styling list view
|
2023-04-07 08:57:18 +02:00 |
|
