Merge pull request 'enable self-enrollment to ergo challenge' (#1148) from allow-ergo-entry into main

Reviewed-on: #1148

.gitea/workflows/action.yml

@@ -17,6 +17,9 @@ jobs:
     - name: Run Test DB Script
       run: ./test_db.sh
 
+    - name: Test
+      run: npm --version
+
     - name: Cache Cargo dependencies
       uses: Swatinem/rust-cache@v2
 
@@ -25,15 +28,15 @@ jobs:
         cargo build 
         cd frontend && npm install && npm run build
     - name: Frontend tests
-      run: cd frontend  && npx playwright install && npx playwright test --workers 1 --reporter line
+      run: cd frontend  && npx playwright install && npx playwright test --workers 1 --reporter html,line
+    - uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: playwright-report
+        path: frontend/playwright-report/
+        retention-days: 30
     - name: Backend tests
       run: cargo test --verbose
-    #- uses: actions/upload-artifact@v3
-    #  if: always()
-    #  with:
-    #    name: playwright-report
-    #    path: frontend/playwright-report/
-    #    retention-days: 30
 
   deploy-staging:
     runs-on: ubuntu-latest

frontend/main.ts

@@ -413,6 +413,7 @@ function initNewChoice(select: HTMLInputElement) {
     steering_person.setAttribute("required", "required");
   }
   const choice = new Choices(select, {
+    searchResultLimit: 100,
     searchFields: ["label", "value", "customProperties.searchableText"],
     removeItemButton: true,
     loadingText: "Wird geladen...",

frontend/package.json

@@ -16,7 +16,7 @@
     "postcss": "^8.4.21",
     "sass": "^1.60.0",
     "tailwindcss": "^3.3.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.9.3",
     "vite": "^4.2.0",
     "vite-plugin-static-copy": "^0.13.1"
   },

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "rowt",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

src/model/user/basic.rs

@@ -8,7 +8,7 @@ use crate::model::{
     notification::Notification,
     role::Role,
 };
-use chrono::NaiveDate;
+use chrono::{Datelike, Local, NaiveDate};
 use rocket::{fs::TempFile, tokio::io::AsyncReadExt};
 use sqlx::SqlitePool;
 
@@ -578,4 +578,32 @@ impl User {
 
         Ok(())
     }
+
+    pub(crate) async fn has_to_pay_einschreibgebuehr_this_year(&self, db: &SqlitePool) -> bool {
+        if !self.has_role(db, "schnupperant").await {
+            if let Some(member_since_date) = &self.member_since_date {
+                if let Ok(member_since_date) =
+                    NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
+                {
+                    if member_since_date.year() == Local::now().year()
+                        && !self.has_role(db, "no-einschreibgebuehr").await
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        false
+    }
+    pub(crate) fn has_to_pay_only_half(&self) -> bool {
+        if let Some(member_since_date) = &self.member_since_date {
+            if let Ok(member_since_date) = NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
+            {
+                let halfprice_startdate =
+                    NaiveDate::from_ymd_opt(Local::now().year(), 7, 1).unwrap();
+                return member_since_date >= halfprice_startdate;
+            }
+        }
+        false
+    }
 }

src/model/user/fee.rs

@@ -1,10 +1,9 @@
 use super::User;
 use crate::{
-    BOAT_STORAGE, DUAL_MEMBERSHIP, EINSCHREIBGEBUEHR, FAMILY_THREE_OR_MORE, FAMILY_TWO, FOERDERND,
-    REGULAR, RENNRUDERBEITRAG, SCHECKBUCH, STUDENT_OR_PUPIL, TRIAL_ROWING, TRIAL_ROWING_REDUCED,
-    UNTERSTUETZEND, model::family::Family,
+    model::family::Family, BOAT_STORAGE, DUAL_MEMBERSHIP, EINSCHREIBGEBUEHR, FAMILY_THREE_OR_MORE,
+    FAMILY_TWO, FOERDERND, REGULAR, RENNRUDERBEITRAG, SCHECKBUCH, STUDENT_OR_PUPIL, TRIAL_ROWING,
+    TRIAL_ROWING_REDUCED, UNTERSTUETZEND,
 };
-use chrono::{Datelike, Local, NaiveDate};
 use serde::Serialize;
 use sqlx::SqlitePool;
 
@@ -81,30 +80,52 @@ impl User {
         let mut fee = Fee::new();
 
         if let Some(family) = Family::find_by_opt_id(db, self.family_id).await {
+            let mut einschreibgebuehr = false;
+            let mut half_price = true;
             for member in family.members(db).await {
                 fee.add_person(&member);
                 if member.has_role(db, "paid").await {
                     fee.paid();
                 }
-                fee.merge(member.fee_without_families(db).await);
+                fee.merge(member.fee_without_families(db, true).await);
+                if member.has_to_pay_einschreibgebuehr_this_year(db).await {
+                    einschreibgebuehr = true;
+                }
+                if !member.has_to_pay_only_half() {
+                    half_price = false;
+                }
             }
             if family.amount_family_members(db).await > 2 {
-                fee.add("Familie 3+ Personen".into(), FAMILY_THREE_OR_MORE);
+                if half_price {
+                    fee.add(
+                        "Familie 3+ Personen (Halbpreis)".into(),
+                        FAMILY_THREE_OR_MORE / 2,
+                    );
+                } else {
+                    fee.add("Familie 3+ Personen".into(), FAMILY_THREE_OR_MORE);
+                }
             } else {
-                fee.add("Familie 2 Personen".into(), FAMILY_TWO);
+                if half_price {
+                    fee.add("Familie 2 Personen (Halbpreis)".into(), FAMILY_TWO / 2);
+                } else {
+                    fee.add("Familie 2 Personen".into(), FAMILY_TWO);
+                }
+            }
+            if einschreibgebuehr {
+                fee.add("Einschreibgebühr (Familie)".into(), EINSCHREIBGEBUEHR);
             }
         } else {
             fee.add_person(self);
             if self.has_role(db, "paid").await {
                 fee.paid();
             }
-            fee.merge(self.fee_without_families(db).await);
+            fee.merge(self.fee_without_families(db, false).await);
         }
 
         Some(fee)
     }
 
-    async fn fee_without_families(&self, db: &SqlitePool) -> Fee {
+    async fn fee_without_families(&self, db: &SqlitePool, entry_fee_paid_with_family: bool) -> Fee {
         let mut fee = Fee::new();
 
         if !self.has_role(db, "Donau Linz").await
@@ -125,38 +146,24 @@ impl User {
 
         let amount_boats = self.amount_boats(db).await;
         if amount_boats > 0 {
-            fee.add(
-                format!("{}x Bootsplatz", amount_boats),
-                amount_boats * BOAT_STORAGE,
-            );
-        }
-
-        if !self.has_role(db, "schnupperant").await {
-            if let Some(member_since_date) = &self.member_since_date {
-                if let Ok(member_since_date) =
-                    NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
-                {
-                    if member_since_date.year() == Local::now().year()
-                        && !self.has_role(db, "no-einschreibgebuehr").await
-                    {
-                        fee.add("Einschreibgebühr".into(), EINSCHREIBGEBUEHR);
-                    }
-                }
+            if self.has_to_pay_only_half() {
+                fee.add(
+                    format!("{}x Bootsplatz (Halbpreis)", amount_boats),
+                    amount_boats * BOAT_STORAGE / 2,
+                );
+            } else {
+                fee.add(
+                    format!("{}x Bootsplatz", amount_boats),
+                    amount_boats * BOAT_STORAGE,
+                );
             }
         }
 
-        let halfprice = if let Some(member_since_date) = &self.member_since_date {
-            match NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d") {
-                Ok(member_since_date) => {
-                    let halfprice_startdate =
-                        NaiveDate::from_ymd_opt(Local::now().year(), 7, 1).unwrap();
-                    member_since_date >= halfprice_startdate
-                }
-                Err(_) => false,
-            }
-        } else {
-            false
-        };
+        if self.has_to_pay_einschreibgebuehr_this_year(db).await && !entry_fee_paid_with_family {
+            fee.add("Einschreibgebühr".into(), EINSCHREIBGEBUEHR);
+        }
+
+        let halfprice = self.has_to_pay_only_half();
 
         if self.has_role(db, "schnupperant").await {
             if self.has_role(db, "Student").await || self.has_role(db, "Schüler").await {

src/model/user/mod.rs

@@ -795,6 +795,7 @@ macro_rules! special_user {
         }
 
         impl $name {
+            #[allow(dead_code)]
             pub fn into_inner(self) -> User {
                 self.user
             }
@@ -859,6 +860,7 @@ special_user!(AllowedForPlannedTripsUser, +"Donau Linz", +"scheckbuch", +"Förde
 special_user!(DonauLinzUser, +"Donau Linz", +"Förderndes Mitglied", -"Unterstützend"); // TODO:
                                                                                        // remove ->
                                                                                        // RegularUser
+special_user!(ErgoAdminUser, +"ergo-admin", +"admin");
 special_user!(SchnupperBetreuerUser, +"schnupper-betreuer");
 special_user!(VorstandUser, +"admin", +"Vorstand");
 special_user!(EventUser, +"manage_events");

src/tera/ergo.rs

@@ -1,8 +1,7 @@
 use std::env;
 
-use chrono::Utc;
+use chrono::{Datelike, Utc};
 use rocket::{
-    FromForm, Route, State,
     form::Form,
     fs::TempFile,
     get,
@@ -10,18 +9,19 @@ use rocket::{
     post,
     request::FlashMessage,
     response::{Flash, Redirect},
-    routes,
+    routes, FromForm, Route, State,
 };
-use rocket_dyn_templates::{Template, context};
+use rocket_dyn_templates::{context, Template};
 use serde::Serialize;
 use sqlx::SqlitePool;
 use tera::Context;
 
 use crate::model::{
+    activity::ActivityBuilder,
     log::Log,
     notification::Notification,
     role::Role,
-    user::{AdminUser, User, UserWithDetails},
+    user::{AdminUser, ErgoAdminUser, User, UserWithDetails},
 };
 
 #[derive(Serialize)]
@@ -59,7 +59,7 @@ async fn send(db: &State<SqlitePool>, _user: AdminUser) -> Template {
 }
 
 #[get("/reset")]
-async fn reset(db: &State<SqlitePool>, _user: AdminUser) -> Flash<Redirect> {
+async fn reset(db: &State<SqlitePool>, _user: ErgoAdminUser) -> Flash<Redirect> {
     sqlx::query!("UPDATE user SET dirty_thirty = NULL, dirty_dozen = NULL;")
         .execute(db.inner())
         .await
@@ -74,7 +74,7 @@ async fn reset(db: &State<SqlitePool>, _user: AdminUser) -> Flash<Redirect> {
 #[get("/<challenge>/user/<user_id>/new?<new>")]
 async fn update(
     db: &State<SqlitePool>,
-    _admin: AdminUser,
+    _admin: ErgoAdminUser,
     challenge: &str,
     user_id: i64,
     new: &str,
@@ -146,47 +146,61 @@ pub struct UserAdd {
     sex: String,
 }
 
-//#[post("/set-data", data = "<data>")]
-//async fn new_user(db: &State<SqlitePool>, data: Form<UserAdd>, user: User) -> Flash<Redirect> {
-//    if user.has_role(db, "ergo").await {
-//        return Flash::error(Redirect::to("/ergo"), "Du hast deine Daten schon eingegeben. Wenn du sie updaten willst, melde dich bitte bei it@rudernlinz.at");
-//    }
-//
-//    // check data
-//    if data.birthyear < 1900 || data.birthyear > chrono::Utc::now().year() - 5 {
-//        return Flash::error(Redirect::to("/ergo"), "Bitte überprüfe dein Geburtsjahr...");
-//    }
-//    if data.weight < 20 || data.weight > 200 {
-//        return Flash::error(Redirect::to("/ergo"), "Bitte überprüfe dein Gewicht...");
-//    }
-//    if &data.sex != "f" && &data.sex != "m" {
-//        return Flash::error(Redirect::to("/ergo"), "Bitte überprüfe dein Geschlecht...");
-//    }
-//
-//    // set data
-//    user.update_ergo(db, data.birthyear, data.weight, &data.sex)
-//        .await;
-//
-//    // inform all other `ergo` users
-//    let ergo = Role::find_by_name(db, "ergo").await.unwrap();
-//    Notification::create_for_role(
-//        db,
-//        &ergo,
-//        &format!("{} nimmt heuer an der Ergochallenge teil 💪", user.name),
-//        "Ergo Challenge",
-//        None,
-//        None,
-//    )
-//    .await;
-//
-//    // add to `ergo`  group
-//    user.add_role(db, &ergo).await.unwrap();
-//
-//    Flash::success(
-//        Redirect::to("/ergo"),
-//        "Du hast deine Daten erfolgreich eingegeben. Viel Spaß beim Schwitzen :-)",
-//    )
-//}
+#[post("/set-data", data = "<data>")]
+async fn new_user(db: &State<SqlitePool>, data: Form<UserAdd>, user: User) -> Flash<Redirect> {
+    if user.has_role(db, "ergo").await {
+        return Flash::error(Redirect::to("/ergo"), "Du hast deine Daten schon eingegeben. Wenn du sie updaten willst, melde dich bitte bei info@rudernlinz.at");
+    }
+
+    // check data
+    if data.birthyear < 1900 || data.birthyear > chrono::Utc::now().year() - 5 {
+        return Flash::error(Redirect::to("/ergo"), "Bitte überprüfe dein Geburtsjahr...");
+    }
+    if data.weight < 20 || data.weight > 200 {
+        return Flash::error(Redirect::to("/ergo"), "Bitte überprüfe dein Gewicht...");
+    }
+    if &data.sex != "f" && &data.sex != "m" {
+        return Flash::error(Redirect::to("/ergo"), "Bitte überprüfe dein Geschlecht...");
+    }
+
+    // set data
+    user.update_ergo(db, data.birthyear, data.weight, &data.sex)
+        .await;
+
+    // inform all other `ergo` users
+    let ergo = Role::find_by_name(db, "ergo").await.unwrap();
+    Notification::create_for_role(
+        db,
+        &ergo,
+        &format!("{} nimmt heuer an der Ergochallenge teil 💪", user.name),
+        "Ergo Challenge",
+        None,
+        None,
+    )
+    .await;
+
+    // add to `ergo`  group
+    sqlx::query!(
+        "INSERT INTO user_role(user_id, role_id) VALUES (?, ?)",
+        user.id,
+        ergo.id
+    )
+    .execute(db.inner())
+    .await
+    .unwrap();
+
+    ActivityBuilder::new(&format!(
+        "{user} nimmt an der Ergo-Challenge teil und hat gerade die Daten eingegeben."
+    ))
+    .user(&user)
+    .save(db)
+    .await;
+
+    Flash::success(
+        Redirect::to("/ergo"),
+        "Du hast deine Daten erfolgreich eingegeben. Viel Spaß beim Schwitzen :-)",
+    )
+}
 
 #[derive(FromForm, Debug)]
 pub struct ErgoToAdd<'a> {
@@ -359,10 +373,7 @@ async fn new_dozen(
 }
 
 pub fn routes() -> Vec<Route> {
-    routes![
-        index, new_thirty, new_dozen, send, reset, update,
-        // new_user
-    ]
+    routes![index, new_thirty, new_dozen, send, reset, update, new_user]
 }
 
 #[cfg(test)]

src/tera/mod.rs

@@ -2,7 +2,7 @@ use std::{fs::OpenOptions, io::Write};
 
 use chrono::{Datelike, Local};
 use rocket::{
-    Build, Data, FromForm, Request, Rocket, State, catch, catchers,
+    catch, catchers,
     fairing::{AdHoc, Fairing, Info, Kind},
     form::Form,
     fs::FileServer,
@@ -13,6 +13,7 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
+    Build, Data, FromForm, Request, Rocket, State,
 };
 use rocket_dyn_templates::Template;
 use serde::Deserialize;
@@ -20,7 +21,6 @@ use sqlx::SqlitePool;
 use tera::Context;
 
 use crate::{
-    SCHECKBUCH,
     model::{
         logbook::Logbook,
         notification::Notification,
@@ -28,6 +28,7 @@ use crate::{
         role::Role,
         user::{User, UserWithDetails},
     },
+    SCHECKBUCH,
 };
 
 pub(crate) mod admin;
@@ -330,13 +331,11 @@ mod test {
 
         assert_eq!(response.status(), Status::Ok);
 
-        assert!(
-            response
-                .into_string()
-                .await
-                .unwrap()
-                .contains("Ruderassistent")
-        );
+        assert!(response
+            .into_string()
+            .await
+            .unwrap()
+            .contains("Ruderassistent"));
     }
 
     #[sqlx::test]

templates/ergo/index.html.tera

@@ -15,10 +15,7 @@
                                class="link-primary">Überblick der Challenges</a>
                         </li>
                         <li class="py-1">
-                            Eintragung ist jederzeit möglich, alle Daten die bis Sonntag 23:59 hier hochgeladen wurden, werden gesammelt an die Ister Ergo Challenge geschickt
-                            <li class="py-1">
-                                Montag &rarr; gemeinsames Training; bitte um <a href="/planned" class="link-primary">Anmeldung</a>, damit jeder einen Ergo hat
-                            </li>
+                            Eintragung ist jederzeit möglich, wenn du sie auch an die offizielle Liste schicken willst, kannst du das <a href="https://data.ergochallenge.at/" target="_blank" style="text-decoration: underline">hier</a> machen
                             <li class="py-1">
                                 <a href="https://data.ergochallenge.at"
                                    target="_blank"
@@ -194,7 +191,7 @@
                             </div>
                         </details>
                     </div>
-                    {% if "admin" in loggedin_user.roles %}
+                    {% if "admin" in loggedin_user.roles or "ergo-admin" in loggedin_user.roles %}
                         <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3">
                             <h2 class="h2">Update</h2>
                             <details class="p-2">
@@ -233,6 +230,14 @@
                                     </ol>
                                 </div>
                             </details>
+                              <div class="mt-3 text-right">
+                                <a href="/ergo/reset"
+                                   class="w-28 btn btn-alert"
+                                   onclick="return confirm('Willst du wirklich alle Ergo-Eingaben löschen?');">
+                                    {% include "includes/delete-icon" %}
+                                    Einträge löschen
+                                </a>
+                            </div>
                         </div>
                     </div>
                 {% endif %}