Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 54 Pull Requests Actions Packages Projects Wiki Activity

show steering person in logs if not cox #375

Merged
philipp merged 3 commits from show-steering-person-in-logs into staging 2024-04-15 22:03:41 +02:00
Conversation 0 Commits 3 Files Changed 6 +5 -5
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8315a27ea8 - Show all commits

4
frontend/tests/log.spec.ts
View File

@@ -81,7 +81,7 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
const currentValue = await page.$eval(datetimeSelector, el => el.value); const currentValue = await page.$eval(datetimeSelector, el => el.value);
const currentDate = new Date(currentValue); const currentDate = new Date(currentValue);
currentDate.setMinutes(currentDate.getMinutes() + 1); currentDate.setMinutes(currentDate.getMinutes() + 1);
currentDate.setHours(currentDate.getHours() + 1); currentDate.setHours(currentDate.getHours() - new Date().getTimezoneOffset()/60);
const newDatetime = currentDate.toISOString().slice(0, 16); const newDatetime = currentDate.toISOString().slice(0, 16);
await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime); await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime);
@@ -165,7 +165,7 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
const currentValue = await page.$eval(datetimeSelector, el => el.value); const currentValue = await page.$eval(datetimeSelector, el => el.value);
const currentDate = new Date(currentValue); const currentDate = new Date(currentValue);
currentDate.setMinutes(currentDate.getMinutes() + 1); currentDate.setMinutes(currentDate.getMinutes() + 1);
currentDate.setHours(currentDate.getHours() + 1); currentDate.setHours(currentDate.getHours() - new Date().getTimezoneOffset()/60);
const newDatetime = currentDate.toISOString().slice(0, 16); const newDatetime = currentDate.toISOString().slice(0, 16);
await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime); await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime);

2
src/model/logbook.rs
View File

@@ -505,7 +505,7 @@ ORDER BY departure DESC
let dep = NaiveDateTime::parse_from_str(&log.departure, "%Y-%m-%dT%H:%M").unwrap(); let dep = NaiveDateTime::parse_from_str(&log.departure, "%Y-%m-%dT%H:%M").unwrap();
let arr = NaiveDateTime::parse_from_str(&log.arrival, "%Y-%m-%dT%H:%M").unwrap(); let arr = NaiveDateTime::parse_from_str(&log.arrival, "%Y-%m-%dT%H:%M").unwrap();
if arr.timestamp() <= dep.timestamp() { if arr.timestamp() < dep.timestamp() {
return Err(LogbookUpdateError::ArrivalNotAfterDeparture); return Err(LogbookUpdateError::ArrivalNotAfterDeparture);
} }
let today = Local::now().date_naive(); let today = Local::now().date_naive();

4
templates/includes/forms/log.html.tera
View File

@@ -223,10 +223,10 @@
Ruderer: Ruderer:
{% for rower in log.rowers -%} {% for rower in log.rowers -%}
{{ rower.name }} {{ rower.name }}
{% if rower.id == log.steering_user.id and rower.id != log.shipmaster_user.id %} {%- if rower.id == log.steering_user.id and rower.id != log.shipmaster_user.id %}
(Steuerperson){%- endif -%} (Steuerperson){%- endif -%}
{%- if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %} {%- if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %}
{% endfor %} {% endfor -%}
{% if amount_guests > 0 and log.boat.name != 'Externes Boot' %} {% if amount_guests > 0 and log.boat.name != 'Externes Boot' %}
Gäste Gäste
<small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>: <small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>: