Merge pull request 'formating-ergo' (#790) from formating-ergo into main

Reviewed-on: #790

src/model/event.rs

@@ -9,8 +9,12 @@ use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
 use super::{
-    notification::Notification, role::Role, tripdetails::TripDetails, triptype::TripType,
+    log::Log,
-    user::User,
+    notification::Notification,
+    role::Role,
+    tripdetails::TripDetails,
+    triptype::TripType,
+    user::{EventUser, User},
 };
 
 #[derive(Serialize, Clone, FromRow, Debug, PartialEq)]
@@ -242,6 +246,7 @@ WHERE trip_details.id=?
 
     pub async fn create(
         db: &SqlitePool,
+        user: &EventUser,
         name: &str,
         planned_amount_cox: i32,
         always_show: bool,
@@ -270,6 +275,15 @@ WHERE trip_details.id=?
         .execute(db)
         .await
         .unwrap(); //Okay, as TripDetails can only be created with proper DB backing
+
+        Log::create(
+            db,
+            format!(
+                "{} created event {} on {} at {}.",
+                user.user.name, name, trip_details.day, trip_details.planned_starting_time
+            ),
+        )
+        .await;
     }
 
     //TODO: create unit test

src/tera/admin/event.rs

@@ -26,7 +26,7 @@ struct AddEventForm<'r> {
 async fn create(
     db: &State<SqlitePool>,
     data: Form<AddEventForm<'_>>,
-    _admin: EventUser,
+    user: EventUser,
 ) -> Flash<Redirect> {
     let data = data.into_inner();
 
@@ -37,6 +37,7 @@ async fn create(
 
     Event::create(
         db,
+        &user,
         data.name,
         data.planned_amount_cox,
         data.always_show,

templates/ergo/final.html.tera

@@ -7,13 +7,15 @@
             <summary>Dirty Thirty</summary>
             <p>
                 <div class="border-r border-l">
-                    {% for stat in thirty %}
+		<textarea style="width: 100%; height: 300px;">
-                        {% set names = stat.name | split(pat=" ") %}{% set lastname_index = names | length - 1 %}{% set lastname = names[lastname_index] %}{{ lastname }}&#9;
+                    {%- for stat in thirty %}
-                        {% for name in names %}
+                        {%- set names = stat.name | split(pat=" ") %}{% set lastname_index = names | length - 1 %}{% set lastname = names[lastname_index] %}{{ lastname }}&#9;
+                        {%- for name in names -%}
                             {% if loop.index != lastname_index +1 %}{{ name }}{% endif %}
-                        {% endfor %}
+                        {%- endfor -%}
-                        &#9;{{ stat.dob }}&#9;{{ stat.weight }}&#9;{{ stat.sex }}&#9;&#9;DLI&#9;{{ stat.result }}
+                        &#9;{{ stat.dob }}&#9;{{ stat.weight }}&#9;{{ stat.sex }}&#9;&#9;DLI&#9;{{ stat.result }}&#13;&#10;
-                    {% endfor %}
+                    {%- endfor -%}
+		    </textarea>
                 </div>
             </p>
         </details>
@@ -21,17 +23,15 @@
             <summary>Dirty Dozen</summary>
             <p>
                 <div class="border-r border-l">
-                    {% for stat in dozen %}
+		<textarea style="width: 100%; height: 300px;">
-                        {% set names = stat.name | split(pat=" ") %}
+                    {%- for stat in dozen -%}
-                        {% set lastname_index = names | length - 1 %}
+                        {%- set names = stat.name | split(pat=" ") %}{% set lastname_index = names | length - 1 %}{% set lastname = names[lastname_index] %}{{ lastname }}&#9;
-                        {% set lastname = names[lastname_index] %}
+                        {%- for name in names -%}
-                        {{ lastname }};
-                        {% for name in names %}
                             {% if loop.index != lastname_index +1 %}{{ name }}{% endif %}
-                        {% endfor %}
+                        {%- endfor -%}
-                        ;{{ stat.dob }};{{ stat.weight }};{{ stat.sex }};DLI;{{ stat.result }}
+                        &#9;{{ stat.dob }}&#9;{{ stat.weight }}&#9;{{ stat.sex }}&#9;&#9;DLI&#9;{{ stat.result }}&#13;&#10;
-                        <br />
+                    {%- endfor -%}
-                    {% endfor %}
+		    </textarea>
                 </div>
             </p>
         </details>