Commit Graph

193 Commits

Author SHA1 Message Date
c372051561 try
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-frontend (push) Failing after 13m30s
CI/CD Pipeline / test-backend (push) Has been cancelled
2024-01-16 22:29:57 +01:00
3e2e058bcc limit users to proper role, Fixes #135
Some checks are pending
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
2726db433e Merge pull request 'allow to add logbook entries up to a week late; show all boats in boatshouse; don't show guests for external boats' (#141) from fixes into main
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
Reviewed-on: #141
2024-01-04 20:44:26 +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
f5bfb9fbdf fix weird iphone issue
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
2024-01-03 09:59:09 +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
e5f6a543e1 improve text 2023-11-10 09:03:04 +01:00
9b86d93979 try to get new people 2023-11-09 22:02:31 +01:00
Marie Birner
3467e02748 [BUGFIX] color label dark-mode 2023-11-09 19:37:46 +01:00
715fae59fc implement default destination for boats 2023-11-09 08:56:08 +01:00
04958d80a4 Merge branch 'staging' into 'input-val'
# Conflicts:
#   templates/ergo.html.tera
#   templates/includes/macros.html.tera
2023-11-08 17:02:32 +00:00
e7a6d57bf0 simple (client only) val 2023-11-08 18:00:27 +01:00
Marie Birner
895492946c [TASK] add color switch option btn 2023-11-04 20:16:20 +01:00
Marie Birner
b465923fa9 [TASK] support dark mode second draft 2023-11-04 19:45:57 +01:00
Marie Birner
97897437a9 [TASK] support dark mode second draft 2023-11-04 19:33:36 +01:00
Marie Birner
2fd053efed Merge commit 'bc9c5198d1a1df7526ee95de9411f8e7d0a60894' into dark-mode 2023-11-04 17:25:14 +01:00
0f8c7a365e push 2023-11-04 16:27:17 +01:00
c2034ed690 show proper amount of guests (changed bc cox is now included in rowers) 2023-11-04 15:07:16 +01:00
Marie Birner
5f494dc9e9 [TASK] support dark mode first draft 2023-11-04 00:19:46 +01:00
Marie Birner
c4e3c836e2 [TASK] guest user menu ergo 2023-11-03 14:35:15 +01:00
Marie Birner
150a86c2f1 Merge commit '95e1ea302884fa1214950b6c4005525f7469ac58' into ergo-styling 2023-11-03 14:31:14 +01:00
Marie Birner
8014dba27e [TASK] guest user menu ergo 2023-11-03 14:30:43 +01:00
95e1ea3028 allow guests to see + upload ergo entries; show ergo menu item for guests 2023-11-03 14:20:58 +01:00
f5ad37a0bb auto select owner as rower of private boat, Fixes #46 2023-11-02 19:50:19 +01:00
eb0f3ba9d8 clearer label 2023-11-02 19:32:16 +01:00
1ff050a247 add ergo tool 2023-11-02 12:15:10 +01:00
Marie Birner
d805f6c1cd [BUGFIX] stat wording and search string 2023-10-31 21:57:31 +01:00
Marie Birner
4179b7bd6b [TASK] declutter end trip view 2023-10-31 21:43:25 +01:00
Marie Birner
8a3cd8d688 [BUGFIX] relationship destination and distance 2023-10-31 21:04:38 +01:00
Marie Birner
dc4eddc044 Merge commit 'ef0965fad12c402e14fad64f3ece50fca3cb9638' into staging 2023-10-31 20:58:38 +01:00
Marie Birner
3c7f56e94f [TASK] beautify Steuerperson/Schiffsführer tag in list view 2023-10-31 20:57:28 +01:00
ef0965fad1 Merge branch 'boat-stats' into 'staging'
Boat stats

See merge request PhilippHofer/rot!61
2023-10-31 19:42:42 +00:00
aed8e7d5c3 use names that also m enjoys seeing 2023-10-31 20:29:33 +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
388ed175bd finish frontend(?) 2023-10-30 15:32:17 +01:00
7788be5a17 use proper names for new form fields 2023-10-30 15:32:17 +01:00
2d520298e7 frontend for new db 2023-10-30 15:32:17 +01:00
e256d7274d use proper names for new form fields 2023-10-30 15:32:17 +01:00
ccc9f76691 do proper things in ui @ new log 2023-10-30 15:32:17 +01:00
Marie Birner
a8c43cbf40 [BUGFIX] add cursor-pointer boats 2023-10-30 09:43:20 +01:00
Marie Birner
f7e499d135 [BUGFIX] truncate username 2023-10-24 15:28:06 +02:00
e9641e6a33 move faq to wiki 2023-10-24 14:24:33 +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
1c75b478e3 show logbuch to everyone 2023-10-24 09:22:07 +02:00
f4d0a88575 merge 2023-10-23 22:00:04 +02:00
Marie Birner
da29d5dcdc [TASK] style delete button in logbook 2023-10-23 21:53:43 +02:00
fc42559f1b show amount of guests 2023-10-23 21:44:39 +02:00
d838a1ca68 allow deletion of logs 2023-10-01 20:52:42 +02:00
e41aa9b4e7 fun with timezones 2023-10-01 20:52:41 +02:00
Marie Birner
d65ce90fce [TASK] styling boat form 2023-10-01 20:52:41 +02:00
Marie Birner
9fbd3d970b [TASK] style boat damage screen 2023-10-01 20:52:41 +02:00
Marie Birner
a544d5d060 [TASK] style boat screen 2023-10-01 20:52:41 +02:00
Marie Birner
8cec4e4c11 [TASK] refactor steering checkbox 2023-10-01 20:52:41 +02:00
Marie Birner
2ae01c0c65 [TASK] refactor select 2023-10-01 20:52:41 +02:00
Marie Birner
fedbc00dc5 [TASK] add label for logtype 2023-10-01 20:52:41 +02:00
Marie Birner
1d9d7bbbb8 [TASK] change style of boats on water 2023-10-01 20:52:41 +02:00
Marie Birner
2616c19bd4 [TASK] improve white space entries logbook 2023-10-01 20:52:41 +02:00
Marie Birner
ed4bf67982 [BUGFIX] km issue relation destination 2023-10-01 20:52:41 +02:00
Marie Birner
3cb14835cc [TASK] improve log and stats look & feel 2023-10-01 20:52:41 +02:00
Marie Birner
90713b4e3d [BUGFIX] wordings 2023-10-01 20:52:41 +02:00
Marie Birner
c69289504b [TASK] basic styling logbook and stats 2023-10-01 20:52:41 +02:00
Marie Birner
46d50668ee [TASK] streamline form 2023-10-01 20:52:41 +02:00
Marie Birner
c2e0c874ad [BUGFIX] header menu logbook styling 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
Marie Birner
2e5b913c8c [TASK] select boat on click 2023-10-01 20:52:41 +02:00
Marie Birner
97ef19513e [TASK] change styling choice.js 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
Marie Birner
cbe77ebf0e [TASK] fix issues with destination 2023-10-01 20:52:41 +02:00
Marie Birner
17422a78a0 [TASK] improve rower select 2023-10-01 20:52:41 +02:00
Marie Birner
e3012be264 [TASK] add working choices.js 2023-10-01 20:52:41 +02:00
Marie Birner
5e097a95da [TASK] [NPM] install choices.js (styling copy & paste) 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
ff31ad83fe add boatdamages functionality 2023-08-02 14:29:19 +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
c414164b82 push 2023-07-30 14:00:15 +02:00
039df224a6 first draft layout logbook 2023-07-30 13:42:33 +02:00
861df59ebc set some fields to required 2023-07-28 10:25:57 +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