From 6b7415f0dd42cfe10a6f4044484b0a746fc40575 Mon Sep 17 00:00:00 2001
From: Franz Dietrich <dietrich@teilgedanken.de>
Date: Tue, 21 Feb 2023 09:05:29 +0100
Subject: [PATCH] =?UTF-8?q?Anzeigen=20der=20Sch=C3=BClernamen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 terminwahl_back/src/db/read.rs                    | 2 +-
 terminwahl_back/src/db/write.rs                   | 2 +-
 terminwahl_back/src/views.rs                      | 2 ++
 terminwahl_back/templates/lehrer_einzeln.html.hbs | 2 +-
 terminwahl_front/src/main.rs                      | 6 +++---
 terminwahl_typen/src/lib.rs                       | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/terminwahl_back/src/db/read.rs b/terminwahl_back/src/db/read.rs
index 70319c7..d2afe69 100644
--- a/terminwahl_back/src/db/read.rs
+++ b/terminwahl_back/src/db/read.rs
@@ -139,7 +139,7 @@ pub async fn get_all_teachers(db: &Pool) -> Result<Vec<TeacherWithAppointments>,
             let nutzer = query_as!(
                 Nutzer,
                 r#"
-            SELECT name, schueler as schüler,email
+            SELECT name, schueler as schueler,email
             FROM `nutzer` WHERE id = ? "#,
                 appointment.nutzer_id
             )
diff --git a/terminwahl_back/src/db/write.rs b/terminwahl_back/src/db/write.rs
index 89c7235..c5ce823 100644
--- a/terminwahl_back/src/db/write.rs
+++ b/terminwahl_back/src/db/write.rs
@@ -37,7 +37,7 @@ pub async fn save_nutzer(pool: &Pool, nutzer: &Nutzer) -> Result<IdType, sqlx::E
     query!(
         "INSERT INTO nutzer (name, schueler, email) VALUES ($1, $2, $3)",
         nutzer.name,
-        nutzer.schüler,
+        nutzer.schueler,
         nutzer.email
     )
     .execute(pool)
diff --git a/terminwahl_back/src/views.rs b/terminwahl_back/src/views.rs
index 945467e..79c4dc9 100644
--- a/terminwahl_back/src/views.rs
+++ b/terminwahl_back/src/views.rs
@@ -1,6 +1,7 @@
 use actix_web::{error, web, HttpResponse};
 use handlebars::Handlebars;
 use lettre::{AsyncSmtpTransport, Tokio1Executor};
+use log::info;
 use serde_json::json;
 use terminwahl_typen::IdType;
 
@@ -71,6 +72,7 @@ pub async fn export_appointments(
                     "css_file" :  css.path,
                     "teachers": teachers,
                 });
+                info!("{:?}", data);
                 Ok(HttpResponse::Ok()
                     .body(handlebars.render("lehrer_einzeln.html", &data).unwrap()))
             }
diff --git a/terminwahl_back/templates/lehrer_einzeln.html.hbs b/terminwahl_back/templates/lehrer_einzeln.html.hbs
index 15bd004..5b59a63 100644
--- a/terminwahl_back/templates/lehrer_einzeln.html.hbs
+++ b/terminwahl_back/templates/lehrer_einzeln.html.hbs
@@ -58,7 +58,7 @@
                           {{time_of appointment.slot.end_time}}
                         </th>
                         <td>
-                          {{appointment.nutzer.name}}
+                          {{appointment.nutzer.name}} <br /><small>⇨ {{appointment.nutzer.schueler}}</small>
                         </td>
                       </tr>
                     {{/each}}
diff --git a/terminwahl_front/src/main.rs b/terminwahl_front/src/main.rs
index ab7fa30..09d4842 100644
--- a/terminwahl_front/src/main.rs
+++ b/terminwahl_front/src/main.rs
@@ -59,7 +59,7 @@ impl Component for App {
             nutzer: None,
             tmp_nutzer: Nutzer {
                 name: "".into(),
-                schüler: "".into(),
+                schueler: "".into(),
                 email: "".into(),
             },
             successfully_saved: None,
@@ -112,7 +112,7 @@ impl Component for App {
                 true
             }
             Msg::UpdateSchüler(s) => {
-                self.tmp_nutzer.schüler = s;
+                self.tmp_nutzer.schueler = s;
                 true
             }
             Msg::UpdateEmail(s) => {
@@ -204,7 +204,7 @@ impl App {
               <div class="field">
                 <label class="label">{"Alle betreffenden SchülerInnen"}</label>
                 <p class="control has-icons-left has-icons-right">
-                  <input class="input" type="email" placeholder="SchülerInnen" value={self.tmp_nutzer.schüler.to_string()}
+                  <input class="input" type="email" placeholder="SchülerInnen" value={self.tmp_nutzer.schueler.to_string()}
                     oninput={ctx.link().batch_callback(|event:InputEvent| {
                         event.target_dyn_into::<HtmlInputElement>().map(|input|Msg::UpdateSchüler(input.value()))
                         })}/>
diff --git a/terminwahl_typen/src/lib.rs b/terminwahl_typen/src/lib.rs
index 06c5e43..ca4def6 100644
--- a/terminwahl_typen/src/lib.rs
+++ b/terminwahl_typen/src/lib.rs
@@ -75,12 +75,12 @@ pub enum RequestState {
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct Nutzer {
     pub name: String,
-    pub schüler: String,
+    pub schueler: String,
     pub email: String,
 }
 
 impl Nutzer {
     pub fn validate(&self) -> bool {
-        !self.name.is_empty() && !self.email.is_empty() && !self.schüler.is_empty()
+        !self.name.is_empty() && !self.email.is_empty() && !self.schueler.is_empty()
     }
 }