philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Issues Pull Requests Actions Activity

switch from cox to steeringuser, which contains both cox + bootsfuehrer

Browse Source
This commit is contained in:
philipp
2024-10-25 18:29:50 +02:00
parent 4d4c680e59
commit de567eedec
11 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/boatdamages.html.tera
View File

@ -56,7 +56,7 @@
{% if boatdamage.fixed_at %}
<small class="block text-gray-600 dark:text-gray-100">Repariert von {{ boatdamage.user_fixed.name }} am/um {{ boatdamage.fixed_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
{% else %}
{% if loggedin_user and "cox" in loggedin_user.roles %}
{% if loggedin_user and loggedin_user.allowed_to_steer %}
<form action="/boatdamage/{{ boatdamage.id }}/fixed"
method="post"
class="flex justify-between mt-3">

2
templates/includes/buttons.html.tera
View File

@ -1,4 +1,4 @@
{% if "cox" in loggedin_user.roles %}
{% if loggedin_user.allowed_to_steer %}
<div class="sm:col-span-2 lg:col-span-3 grid md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-3">
<button type="button"
title="Toggle View"

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

@ -93,7 +93,7 @@
<option value="{{ user.id }}"
{% if sel %}selected{% endif %}
{% if user.on_water %}disabled="disabled"{% endif %}
data-custom-properties='{"is_cox": {{ "cox" in user.roles }}, "is_racing": {{ "Rennrudern" in user.roles }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat }}, "searchableText": "{{ user.nickname }}"}'>
data-custom-properties='{"is_cox": {{ user.allowed_to_steer }}, "is_racing": {{ "Rennrudern" in user.roles }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat }}, "searchableText": "{{ user.nickname }}"}'>
{{ user.name }}
{% if user.on_water %}(am Wasser){% endif %}
</option>

4
templates/log.html.tera
View File

@ -23,9 +23,9 @@
{% if on_water | length > 0 %}
{% for log in on_water %}
{% if log.shipmaster == loggedin_user.id %}
{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=not loggedin_user.allowed_to_steer) }}
{% elif "Vorstand" in loggedin_user.roles %}
{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
{{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=not loggedin_user.allowed_to_steer) }}
{% else %}
{{ log::show(log=log, state="on_water", only_ones=true) }}
{% endif %}

12
templates/planned.html.tera
View File

@ -151,7 +151,7 @@
{% endif %}
{# --- END Row Buttons --- #}
{# --- START Cox Buttons --- #}
{% if "cox" in loggedin_user.roles %}
{% if loggedin_user.allowed_to_steer %}
{% set_global cur_user_participates = false %}
{% for cox in event.cox %}
{% if cox.name == loggedin_user.name %}
@ -421,11 +421,11 @@
{% endif %}
</div>
{# --- START Add Buttons --- #}
{% if "manage_events" in loggedin_user.roles or "cox" in loggedin_user.roles %}
<div class="grid {% if "manage_events" in loggedin_user.roles and "cox" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
{% if "manage_events" in loggedin_user.roles or loggedin_user.allowed_to_steer %}
<div class="grid {% if "manage_events" in loggedin_user.roles and loggedin_user.allowed_to_steer %}grid-cols-2{% endif %} text-center">
{% if "manage_events" in loggedin_user.roles %}
<a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Event</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#addEventForm" class="relative inline-block w-full bg-primary-900 hover:bg-primary-950 focus:bg-primary-950 dark:bg-primary-950 text-white py-2 text-sm font-semibold
{% if "cox" in loggedin_user.roles %}
{% if loggedin_user.allowed_to_steer %}
rounded-bl-md
{% else %}
rounded-b-md
@ -435,7 +435,7 @@
Event
</a>
{% endif %}
{% if "cox" in loggedin_user.roles %}
{% if loggedin_user.allowed_to_steer %}
<a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Ausfahrt</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#sidebarForm" class="relative inline-block w-full py-2 text-primary-900 hover:text-primary-950 dark:bg-primary-600 dark:text-white dark:hover:bg-primary-500 dark:hover:text-white focus:text-primary-950 text-sm font-semibold bg-gray-100 hover:bg-gray-200 focus:bg-gray-200
{% if "manage_events" in loggedin_user.roles %}
rounded-br-md
@ -454,7 +454,7 @@
{% endfor %}
</div>
</div>
{% if "cox" in loggedin_user.roles %}
{% if loggedin_user.allowed_to_steer %}
{% include "forms/trip" %}
{% endif %}
{% if "manage_events" in loggedin_user.roles %}