From 95c0324098eebf31cfe4ca34c4e33442834b5077 Mon Sep 17 00:00:00 2001
From: Max Hohlfeld
Date: Wed, 3 Jul 2024 00:10:58 +0200
Subject: [PATCH] feat(wip): modern approach for planning
---
src/endpoints/assignment/get_new.rs | 6 +-
templates/assignment/new.html | 99 ++++++++++++++++++++---------
2 files changed, 74 insertions(+), 31 deletions(-)
diff --git a/src/endpoints/assignment/get_new.rs b/src/endpoints/assignment/get_new.rs
index 7ae579e6..90d784ce 100644
--- a/src/endpoints/assignment/get_new.rs
+++ b/src/endpoints/assignment/get_new.rs
@@ -18,7 +18,8 @@ pub struct NewAssignmentTemplate {
user: User,
event: Event,
available_wachhabende: Vec,
- available_posten: Vec
+ available_posten: Vec,
+ all: Vec
}
#[actix_web::get("/assignments/new")]
@@ -29,10 +30,11 @@ pub async fn get(user: Identity, pool: web::Data, query: web::QueryKleidungsordnung: {{ event.clothing }}
+
+
+
+
+ Name
+ Funktion
+ Zeit
+ Kommentar
+
+
+
+
+ {% for a in all %}
+ {% let u = a.user.as_ref().unwrap() %}
+
+ {{ u.name }}
+
+ {% match user.function %}
+ {% when Function::Posten %}
+ Posten
+ {% when Function::Wachhabender %}
+ Wachhabender
+ {% else %}
+ {% endmatch %}
+
+
+ {% if a.start_time.is_some() && a.end_time.is_some() %}
+ {{ a.start_time.as_ref().unwrap() }} - {{ a.end_time.as_ref().unwrap() }}
+ {% else %}
+ ganztägig
+ {% endif %}
+
+
+ {{ a.comment.as_deref().unwrap_or("") }}
+
+
+ {% endfor %}
+
+
+
+
{% if event.voluntary_wachhabender %}
Wachhabender
@@ -24,20 +65,20 @@
{% for a in available_wachhabende %}
{% let user = a.user.as_ref().unwrap() %}
- {{ user.name }} -
- {% match user.function %}
+ {{ user.name }} -
+ {% match user.function %}
{% when Function::Posten %}
Posten
{% when Function::Wachhabender %}
Wachhabender
{% else %}
- {% endmatch %}
- -
- {% if a.start_time.is_some() && a.end_time.is_some() %}
- {{ a.start_time.as_ref().unwrap() }} - {{ a.end_time.as_ref().unwrap() }}
- {% else %}
- ganztägig
- {% endif %}
+ {% endmatch %}
+ -
+ {% if a.start_time.is_some() && a.end_time.is_some() %}
+ {{ a.start_time.as_ref().unwrap() }} - {{ a.end_time.as_ref().unwrap() }}
+ {% else %}
+ ganztägig
+ {% endif %}
{% endfor %}
@@ -53,20 +94,20 @@
{% for a in available_posten %}
{% let user = a.user.as_ref().unwrap() %}
- {{ user.name }} -
- {% match user.function %}
+ {{ user.name }} -
+ {% match user.function %}
{% when Function::Posten %}
Posten
{% when Function::Wachhabender %}
Wachhabender
{% else %}
- {% endmatch %}
- -
- {% if a.start_time.is_some() && a.end_time.is_some() %}
- {{ a.start_time.as_ref().unwrap() }} - {{ a.end_time.as_ref().unwrap() }}
- {% else %}
- ganztägig
- {% endif %}
+ {% endmatch %}
+ -
+ {% if a.start_time.is_some() && a.end_time.is_some() %}
+ {{ a.start_time.as_ref().unwrap() }} - {{ a.end_time.as_ref().unwrap() }}
+ {% else %}
+ ganztägig
+ {% endif %}
{% endfor %}
@@ -83,17 +124,17 @@