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

Compare commits

base: Ruderverein-Donau-Linz:7ab6d95e2364952919345b0864bfbbd436e90549
Branches Tags
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:test
..
compare: Ruderverein-Donau-Linz:3b3374b0cc5272f47ff68abb2529e84ea40c96a7
Branches Tags
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:test

3 Commits
7ab6d95e23 ... 3b3374b0cc

Author SHA1 Message Date
philipp
3b3374b0cc Merge pull request 'format' (#724) from format into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m55s
Details
CI/CD Pipeline / deploy-staging (push) Successful in 8m40s
Details
CI/CD Pipeline / deploy-main (push) Has been skipped
Details 
Reviewed-on: #724
 2024-09-03 21:11:18 +02:00
philipp
242f4ee266 format frontend code
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
Details
CI/CD Pipeline / deploy-main (push) Has been cancelled
Details
CI/CD Pipeline / test (push) Has been cancelled
Details
2024-09-03 22:09:42 +03:00
philipp
0689e75626 Merge pull request 'many updates :-(' (#722) from upd into main
Some checks failed
CI/CD Pipeline / test (push) Successful in 11m8s
Details
CI/CD Pipeline / deploy-staging (push) Has been skipped
Details
CI/CD Pipeline / deploy-main (push) Has been cancelled
Details 
Reviewed-on: #722
 2024-09-03 20:44:20 +02:00
2 changed files with 26 additions and 22 deletions
Show Stats Expand all files Collapse all files

4
templates/includes/macros.html.tera
View File

@ -27,8 +27,8 @@ function setChoiceByLabel(choicesInstance, label) {
{% set amount_members = planned_trip.rower | length + 1 %} {% set amount_members = planned_trip.rower | length + 1 %}
{{ planned_trip.cox_name }} ({{ amount_members }} Person{{ amount_members | pluralize(singular="", plural="en") }}) {{ planned_trip.cox_name }} ({{ amount_members }} Person{{ amount_members | pluralize(singular="", plural="en") }})
<small class="block">{{ planned_trip.planned_starting_time }}</small> <small class="block">{{ planned_trip.planned_starting_time }}</small>
</strong>
</strong><button class="btn btn-primary ml-3" <button class="btn btn-primary ml-3"
onclick="choiceObjects['newrower'].removeActiveItems(-2);choiceObjects['newrower'].setChoiceByValue('{{ planned_trip.cox_id }}'); {% for rower in planned_trip.rower %}setChoiceByLabel(choiceObjects['newrower'], '{{ rower.name }}');{% endfor %}window.scrollTo(0,0); "> onclick="choiceObjects['newrower'].removeActiveItems(-2);choiceObjects['newrower'].setChoiceByValue('{{ planned_trip.cox_id }}'); {% for rower in planned_trip.rower %}setChoiceByLabel(choiceObjects['newrower'], '{{ rower.name }}');{% endfor %}window.scrollTo(0,0); ">
👥 👥
</button> </button>

8
templates/planned.html.tera
View File

@ -100,7 +100,9 @@
style="order: {{ event.planned_starting_time | replace(from=":", to="") }}"> style="order: {{ event.planned_starting_time | replace(from=":", to="") }}">
<div class="flex justify-between items-center"> <div class="flex justify-between items-center">
<div class="mr-1"> <div class="mr-1">
{% if event.always_show and not day.regular_sees_this_day %}<span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>{% endif -%} {% if event.always_show and not day.regular_sees_this_day %}
<span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>
{% endif -%}
{%- if event.max_people == 0 %} {%- if event.max_people == 0 %}
<strong class="text-[#f43f5e]">&#9888; Absage <strong class="text-[#f43f5e]">&#9888; Absage
{{ event.planned_starting_time }} {{ event.planned_starting_time }}
@ -275,7 +277,9 @@
data-coxneeded="false"> data-coxneeded="false">
<div class="flex justify-between items-center"> <div class="flex justify-between items-center">
<div class="mr-1"> <div class="mr-1">
{% if trip.always_show and not day.regular_sees_this_day %}<span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>{% endif -%} {% if trip.always_show and not day.regular_sees_this_day %}
<span title="Du siehst diese Ausfahrt schon, obwohl sie mehr als {{ amount_days_to_show_trips_ahead }} Tage in der Zukunft liegt. Du Magier!">🔮</span>
{% endif -%}
{% if trip.max_people == 0 %} {% if trip.max_people == 0 %}
<strong class="text-[#f43f5e]">&#9888; <strong class="text-[#f43f5e]">&#9888;
{{ trip.planned_starting_time }} {{ trip.planned_starting_time }}