fix migration

Reviewed-on: #593

.gitea/workflows/action.yml

@@ -11,23 +11,14 @@ env:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240215
+    container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240419
     steps:
     - uses: actions/checkout@v3
     - name: Run Test DB Script
       run: ./test_db.sh
 
-    - name: Set up cargo cache
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo-debug-rowt-${{ hashFiles('**/Cargo.lock') }}
-        restore-keys: ${{ runner.os }}-cargo-debug-rowt-
+    - name: Cache Cargo dependencies
+      uses: Swatinem/rust-cache@v2
 
     - name: Build
       run: |
@@ -46,7 +37,7 @@ jobs:
 
   deploy-staging:
     runs-on: ubuntu-latest
-    container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240215
+    container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240419
     needs: [test]
     if: github.ref == 'refs/heads/staging'
     steps:
@@ -56,17 +47,9 @@ jobs:
       - name: Run Test DB Script
         run: ./test_db.sh
 
-      - name: Set up cargo cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-release-rowt-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-release-rowt-
+      - name: Cache Cargo dependencies
+        uses: Swatinem/rust-cache@v2
+
       - name: Build
         run: |
           cargo build --release --target $CARGO_TARGET
@@ -97,7 +80,7 @@ jobs:
 
   deploy-main:
     runs-on: ubuntu-latest
-    container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240215
+    container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240419
     needs: [test]
     if: github.ref == 'refs/heads/main'
     steps:
@@ -107,17 +90,8 @@ jobs:
       - name: Run Test DB Script
         run: ./test_db.sh
       
-      - name: Set up cargo cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-release-rowt-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-release-rowt-
+      - name: Cache Cargo dependencies
+        uses: Swatinem/rust-cache@v2
 
       - name: Build
         run: |

.gitignore

@@ -5,3 +5,4 @@ Rocket.toml
 frontend/node_modules/*
 /static/
 /data-ergo/
+usage.txt

Cargo.toml

@@ -10,7 +10,7 @@ rest = []
 
 [dependencies]
 rocket = { version = "0.5.0", features = ["secrets"]}
-rocket_dyn_templates = {version = "0.1.0", features = [ "tera" ], optional = true }
+rocket_dyn_templates = {version = "0.2", features = [ "tera" ], optional = true }
 log = "0.4"
 env_logger = "0.11"
 sqlx = { version = "0.7", features = ["sqlite", "runtime-tokio-rustls", "macros", "chrono", "time"] }
@@ -18,13 +18,16 @@ argon2 = "0.5"
 serde = { version = "1.0", features = [ "derive" ]}
 serde_json = "1.0"
 chrono =  { version = "0.4", features = ["serde"]}
-chrono-tz = "0.8"
+chrono-tz = "0.9"
 tera =  { version = "1.18", features = ["date-locale"], optional = true}
 ics = "0.5"
 futures = "0.3"
 lettre = "0.11"
 csv = "1.3"
-itertools = "0.12"
+itertools = "0.13"
+job_scheduler_ng = "2.0"
+ureq = { version = "2.9", features = ["json"] }
+regex = "1.10"
 
 [target.'cfg(not(windows))'.dependencies]
 openssl = { version = "0.10", features = [ "vendored" ] }

Dockerfile

@@ -5,7 +5,7 @@
 # 2. Tag the image: `docker tag <id> git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>`
 # 3. Push the image: `docker push git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>`
 
-FROM rust:1.76
+FROM rust:1.77.2
 
 RUN apt-get update && apt-get install -y sqlite3
 

README.md

@@ -1,3 +1,5 @@
+![latest CI run on main](https://git.hofer.link/Ruderverein-Donau-Linz/rowt/actions/workflows/action.yml/badge.svg?branch=main)
+
 # Build
 ## Frontend
 1. `cd frontend`

Rocket.toml

@@ -3,3 +3,5 @@ secret_key = "/NtVGizglEoyoxBLzsRDWTy4oAG1qDw4J4O+CWJSv+fypD7W9sam8hUY4j90EZsbZk
 rss_key = "rss-key-for-ci"
 limits = { file = "10 MiB", data-form = "10 MiB"}
 smtp_pw = "8kIjlLH79Ky6D3jQ"
+usage_log_path = "./usage.txt"
+openweathermap_key = "c8dab8f91b5b815d76e9879cbaecd8d5"

fd

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+scp read@128.140.64.118:/home/rowing/db.sqlite db.sqlite
+#sqlite3 db.sqlite < seeds.sql
+

frontend/main.ts

@@ -5,6 +5,7 @@ export interface choiceMap {
   [details: string]: Choices;
 }
 
+declare var loggedin_user_id: string;
 let choiceObjects: choiceMap = {};
 let boat_in_ottensheim = true;
 let boat_reserved_today= true;
@@ -118,6 +119,8 @@ interface ChoiceBoatEvent extends Event {
       default_destination: string;
       boat_in_ottensheim: boolean;
       boat_reserved_today: boolean;
+      default_handoperated: boolean;
+      convert_handoperated_possible: boolean;
     };
   };
 }
@@ -147,6 +150,19 @@ function selectBoatChange() {
         const amount_seats = event.detail.customProperties.amount_seats;
         setMaxAmountRowers("newrower", amount_seats);
 
+	let only_steering =  <HTMLSelectElement>document.querySelector('#shipmaster_only_steering');
+	if (event.detail.customProperties.default_handoperated) {
+		only_steering.setAttribute('checked', 'true');
+	}else {
+		only_steering.removeAttribute('checked');
+	}
+
+	if (event.detail.customProperties.convert_handoperated_possible) {
+		only_steering.removeAttribute('disabled');
+	}else {
+		only_steering.setAttribute('disabled', 'disabled');
+	}
+
         const destination = <HTMLSelectElement>(
           document.querySelector("#destination")
         );
@@ -154,8 +170,15 @@ function selectBoatChange() {
 
         if (event.detail.customProperties.owner) {
           choiceObjects["newrower"].setChoiceByValue(
-            event.detail.customProperties.owner + "",
+            event.detail.customProperties.owner.toString(),
           );
+
+          if(event.detail.value === '36') {
+              /** custom code for Etsch */
+              choiceObjects["newrower"].setChoiceByValue("81");
+          }
+        }else if (typeof loggedin_user_id !== 'undefined'){
+              choiceObjects["newrower"].setChoiceByValue(loggedin_user_id);
 	}
 
         const inputElement = document.getElementById(
@@ -166,11 +189,6 @@ function selectBoatChange() {
 
         inputElement.value = formattedDateTime;
 
-        const distinput = <HTMLInputElement>(
-          document.querySelector("#distance_in_km")
-        );
-        distinput.value = "";
-
         const destinput = <HTMLInputElement>(
           document.querySelector("#destination")
         );
@@ -243,22 +261,6 @@ function setMaxAmountRowers(name: string, rowers: number) {
       }
     }
 
-    //let only_steering =  <HTMLSelectElement>document.querySelector('#shipmaster_only_steering');
-    //if(only_steering) {
-    //  if(isShipmasterSteering == 'true') {
-    //    only_steering.removeAttribute('disabled');
-    //    only_steering.setAttribute('checked', 'true');
-    //    only_steering.parentElement?.parentElement?.parentElement?.classList.remove('hidden');
-    //    only_steering.parentElement?.parentElement?.parentElement?.classList.remove('md:block');
-    //    only_steering.parentElement?.parentElement?.parentElement?.classList.remove('opacity-50');
-    //  } else {
-    //    only_steering.setAttribute('disabled', 'disabled');
-    //    only_steering.removeAttribute('checked');
-    //    only_steering.parentElement?.parentElement?.parentElement?.classList.add('hidden');
-    //    only_steering.parentElement?.parentElement?.parentElement?.classList.add('md:block');
-    //    only_steering.parentElement?.parentElement?.parentElement?.classList.add('opacity-50');
-    //  }
-    //}
     let shipmaster = <HTMLElement>(
       document.querySelector("#shipmaster-" + name + "js")
     );
@@ -752,9 +754,11 @@ function addRelationMagic(bodyElement: HTMLElement) {
                 },
               );
 
+	      if (option && option.value !== ""){
               // Get distance
               const distance = option.getAttribute("distance");
-              if (distance) relatedField.value = distance;
+              if (distance && relatedField.value === "") relatedField.value = distance;
+	      }
             }
           });
         }

frontend/playwright.config.ts

@@ -72,5 +72,6 @@ export default defineConfig({
   webServer: {
     timeout: 15 * 60 * 1000,
     command: 'cd .. && ./test_db.sh && cargo r',
+    url: 'http://127.0.0.1:8000'
   },
 });

frontend/scss/app.scss

@@ -12,3 +12,5 @@
 @import 'components/chart';
 @import 'components/search';
 @import 'components/important';
+@import 'components/searchable-table';
+@import 'components/notification';

frontend/scss/components/_notification.scss

@@ -0,0 +1,5 @@
+.notification {
+    right: -.2rem;
+    top: -.1rem;
+    font-size: .5rem;
+}

frontend/scss/components/_searchable-table.scss

@@ -0,0 +1,178 @@
+/*!
+ * JSTable v1.6.5
+ */
+
+ .dt-container{
+  position:relative;
+  display: block;
+  width: 100%;
+  overflow-x: auto;
+  -webkit-overflow-scrolling: touch;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
+  overflow-y: hidden;
+
+  .dt-message {
+      text-align: center;
+  }
+
+  .dt-loading{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 100%;
+      margin-left: -50%;
+      margin-top: -20px;
+      height: 40px;
+      text-align: center;
+      background-color: white;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: linear-gradient(to right,rgba(255,255,255,0) 0,rgba(255,255,255,0.9) 25%,rgba(255,255,255,0.9) 75%,rgba(255,255,255,0) 100%);
+  }
+}
+
+.dt-top,
+.dt-bottom {
+  padding: 8px 10px;
+  display:flex;
+  justify-content:space-between;
+
+  .dt-info {
+      margin: 7px 0;
+  }
+
+}
+
+/* PAGER */
+.dt-pagination {
+
+  ul {
+      margin: 0;
+      padding-left: 0;
+      li {
+          list-style: none;
+          float: left;
+      }
+  }
+  a, span{
+      border: 1px solid transparent;
+      float: left;
+      margin-left: 2px;
+      padding: 6px 12px;
+      position: relative;
+      text-decoration: none;
+      color: inherit;
+  }
+
+  a:hover {
+      background-color: #d9d9d9;
+  }
+  .active a{
+      &, &:focus, &:hover{
+          background-color: #d9d9d9;
+          cursor: default;
+      }
+  }
+
+  .dt-ellipsis span{
+      cursor: not-allowed;
+  } 
+  .disabled a{
+      &, &:focus, &:hover{
+          cursor: not-allowed;
+          opacity: 0.4;
+      }
+  }
+
+  .pager a {
+      font-weight: bold;
+  }
+}
+
+
+.dt-table {
+  max-width: 100%;
+  width: 100%;
+  border-spacing: 0;
+
+  & > tbody, > tfoot, > thead{
+      & > tr{
+          & > td, & > th{
+              vertical-align: top;
+              padding: 8px 10px;
+              white-space: nowrap;
+          }
+      }
+  }
+
+  & > thead > tr{ 
+      & > th, & > td{
+          vertical-align: bottom;
+          text-align: left;
+          border-bottom: 1px solid #d9d9d9;
+      }
+  }
+
+  & > tfoot  > tr{ 
+      & > th, & > td{
+          vertical-align: bottom;
+          text-align: left;
+          border-top: 1px solid #d9d9d9;
+      }
+  }
+
+  th {
+      vertical-align: bottom;
+      text-align: left;
+
+      &.dt-sorter {
+          position: relative;
+          cursor: pointer;
+          padding-right:20px;
+
+          &::before,
+          &::after {
+              content: "";
+              height: 0;
+              width: 0;
+              position: absolute;
+              right: 7px;
+              border-left: 4px solid transparent;
+              border-right: 4px solid transparent;
+              opacity: 0.2;
+          }
+
+          &::before {
+              border-top: 4px solid #000;
+              top: 18px;
+          }
+
+          &::after {
+              border-bottom: 4px solid #000;
+              border-top: 4px solid transparent;
+              bottom: 22px;
+          }
+
+          &.asc::after,
+          &.desc::before {
+              opacity: 0.6;
+          }
+
+      }
+  }
+
+}
+
+.dt-loading.hidden{
+  display:none!important;
+  opacity:0!important;
+}
+
+.dt-input {
+  @extend .input;
+}
+
+.dt-selector {
+  @extend .input;
+}

frontend/scss/components/_sidebar.scss

@@ -10,6 +10,7 @@
 
   &.open {
       display: block;
+      height: 100dvh;
       height: 100vh;
       right: 0;
       top: 0;

frontend/static/images/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

frontend/static/images/favicon.svg

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 372 372" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(17.8229,1.77636e-15,-1.77636e-15,17.8229,-6843.65,-3821.15)">
+        <path d="M397.575,225.019C397.575,225.386 397.493,225.701 397.329,225.965C397.165,226.229 396.93,226.444 396.626,226.612C396.883,226.808 397.079,227.039 397.211,227.307C397.344,227.574 397.411,227.903 397.411,228.294C397.411,228.646 397.339,228.957 397.197,229.229C397.054,229.5 396.852,229.729 396.59,229.914C396.329,230.1 396.013,230.24 395.644,230.336C395.275,230.432 394.862,230.48 394.405,230.48C394.01,230.48 393.623,230.439 393.242,230.359C392.861,230.279 392.521,230.145 392.222,229.955C391.923,229.766 391.683,229.514 391.502,229.199C391.32,228.885 391.229,228.493 391.229,228.024L392.858,228.019C392.858,228.249 392.903,228.438 392.993,228.584C393.083,228.73 393.201,228.847 393.347,228.933C393.494,229.019 393.66,229.078 393.845,229.111C394.031,229.145 394.217,229.161 394.405,229.161C394.854,229.161 395.197,229.083 395.433,228.927C395.669,228.771 395.788,228.562 395.788,228.3C395.788,228.171 395.76,228.056 395.706,227.954C395.651,227.853 395.556,227.758 395.421,227.67C395.287,227.582 395.107,227.496 394.882,227.412C394.658,227.328 394.376,227.237 394.036,227.14C393.598,227.022 393.208,226.895 392.864,226.756C392.52,226.617 392.228,226.452 391.988,226.261C391.748,226.069 391.564,225.845 391.437,225.587C391.31,225.329 391.247,225.022 391.247,224.667C391.247,224.308 391.33,223.994 391.496,223.727C391.662,223.459 391.897,223.239 392.202,223.067C391.944,222.868 391.748,222.635 391.613,222.367C391.478,222.1 391.411,221.771 391.411,221.38C391.411,221.044 391.482,220.738 391.625,220.463C391.767,220.188 391.97,219.953 392.234,219.76C392.498,219.566 392.816,219.417 393.189,219.312C393.562,219.206 393.977,219.153 394.434,219.153C394.903,219.153 395.325,219.208 395.7,219.317C396.075,219.427 396.392,219.588 396.652,219.801C396.912,220.014 397.112,220.276 397.252,220.589C397.393,220.901 397.463,221.259 397.463,221.661L395.829,221.661C395.829,221.493 395.799,221.337 395.741,221.192C395.682,221.048 395.594,220.922 395.477,220.814C395.36,220.707 395.214,220.622 395.041,220.56C394.867,220.497 394.665,220.466 394.434,220.466C394.192,220.466 393.983,220.49 393.807,220.539C393.631,220.588 393.487,220.653 393.374,220.735C393.26,220.817 393.177,220.913 393.125,221.022C393.072,221.132 393.045,221.247 393.045,221.368C393.045,221.517 393.07,221.644 393.119,221.749C393.168,221.855 393.256,221.951 393.385,222.039C393.514,222.127 393.691,222.21 393.916,222.288C394.14,222.366 394.428,222.452 394.78,222.546C395.225,222.663 395.622,222.791 395.969,222.93C396.317,223.068 396.61,223.233 396.848,223.425C397.086,223.616 397.267,223.841 397.39,224.099C397.513,224.356 397.575,224.663 397.575,225.019ZM394.206,223.917C393.901,223.835 393.62,223.747 393.362,223.653C393.19,223.735 393.065,223.852 392.987,224.002C392.909,224.152 392.87,224.323 392.87,224.515C392.87,224.671 392.894,224.805 392.943,224.916C392.992,225.027 393.081,225.13 393.21,225.224C393.338,225.317 393.515,225.406 393.74,225.49C393.964,225.574 394.252,225.669 394.604,225.774C394.756,225.817 394.903,225.859 395.044,225.9C395.184,225.941 395.321,225.985 395.454,226.032C395.622,225.942 395.751,225.823 395.84,225.675C395.93,225.526 395.975,225.358 395.975,225.171C395.975,225.03 395.947,224.905 395.89,224.796C395.834,224.687 395.737,224.583 395.6,224.485C395.463,224.388 395.282,224.294 395.055,224.204C394.829,224.114 394.545,224.019 394.206,223.917Z" style="fill:white;fill-rule:nonzero;"/>
+    </g>
+    <g transform="matrix(-0.695637,0.718394,-0.718394,-0.695637,185.736,185.735)">
+        <circle cx="0" cy="0" r="185.772" style="fill:url(#_Linear1);"/>
+    </g>
+    <g transform="matrix(0.291595,0,0,0.291595,185.736,185.735)">
+        <g transform="matrix(1,0,0,1,-291.5,-512)">
+            <clipPath id="_clip2">
+                <rect x="0" y="0" width="583" height="1024"/>
+            </clipPath>
+            <g clip-path="url(#_clip2)">
+                <g transform="matrix(1,0,0,1,-1574,-536.199)">
+                    <g transform="matrix(1,0,0,1,0,10.8235)">
+                        <g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
+                            <rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;"/>
+                        </g>
+                        <path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;"/>
+                    </g>
+                    <g transform="matrix(-1,0,0,1,3730.88,10.8235)">
+                        <g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
+                            <rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;"/>
+                        </g>
+                        <path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;"/>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(371.543,-2.84217e-14,2.84217e-14,371.543,-185.772,1.13687e-13)"><stop offset="0" style="stop-color:rgb(131,0,0);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(255,0,0);stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>

frontend/static/images/site.webmanifest

@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}

frontend/static/jstable.min.js

@@ -2,4 +2,3 @@
  * JSTable v1.6.5
  */
 const JSTableDefaultConfig={perPage:5,perPageSelect:[5,10,15,20,25],sortable:!0,searchable:!0,nextPrev:!0,firstLast:!1,prevText:"&lsaquo;",nextText:"&rsaquo;",firstText:"&laquo;",lastText:"&raquo;",ellipsisText:"&hellip;",truncatePager:!0,pagerDelta:2,classes:{top:"dt-top",info:"dt-info",input:"dt-input",table:"dt-table",bottom:"dt-bottom",search:"dt-search",sorter:"dt-sorter",wrapper:"dt-wrapper",dropdown:"dt-dropdown",ellipsis:"dt-ellipsis",selector:"dt-selector",container:"dt-container",pagination:"dt-pagination",loading:"dt-loading",message:"dt-message"},labels:{placeholder:"Search...",perPage:"{select} entries per page",noRows:"No entries found",info:"Showing {start} to {end} of {rows} entries",loading:"Loading...",infoFiltered:"Showing {start} to {end} of {rows} entries (filtered from {rowsTotal} entries)"},layout:{top:"{select}{search}",bottom:"{info}{pager}"},serverSide:!1,deferLoading:null,ajax:null,ajaxParams:{},queryParams:{page:"page",search:"search",sortColumn:"sortColumn",sortDirection:"sortDirection",perPage:"perPage"},addQueryParams:!0,rowAttributesCreator:null,searchDelay:null,method:"GET"};class JSTable{constructor(e,t={}){let s=e;"string"==typeof e&&(s=document.querySelector(e)),null!==s&&(this.config=this._merge(JSTableDefaultConfig,t),this.table=new JSTableElement(s),this.currentPage=1,this.columnRenderers=[],this.columnsNotSearchable=[],this.searchQuery=null,this.sortColumn=null,this.sortDirection="asc",this.isSearching=!1,this.dataCount=null,this.filteredDataCount=null,this.searchTimeout=null,this.pager=new JSTablePager(this),this._build(),this._buildColumns(),this.update(null===this.config.deferLoading),this._bindEvents(),this._emit("init"),this._parseQueryParams())}_build(){let e=this.config;this.wrapper=document.createElement("div"),this.wrapper.className=e.classes.wrapper;var t=["<div class='",e.classes.top,"'>",e.layout.top,"</div>","<div class='",e.classes.container,"'>","<div class='",e.classes.loading," hidden'>",e.labels.loading,"</div>","</div>","<div class='",e.classes.bottom,"'>",e.layout.bottom,"</div>"].join("");if(t=t.replace("{info}","<div class='"+e.classes.info+"'></div>"),e.perPageSelect){var s=["<div class='",e.classes.dropdown,"'>","<label>",e.labels.perPage,"</label>","</div>"].join(""),a=document.createElement("select");a.className=e.classes.selector,e.perPageSelect.forEach((function(t){var s=t===e.perPage,r=new Option(t,t,s,s);a.add(r)})),s=s.replace("{select}",a.outerHTML),t=t.replace(/\{select\}/g,s)}else t=t.replace(/\{select\}/g,"");if(e.searchable){var r=["<div class='",e.classes.search,"'>","<input class='",e.classes.input,"' placeholder='",e.labels.placeholder,"' type='text'>","</div>"].join("");t=t.replace(/\{search\}/g,r)}else t=t.replace(/\{search\}/g,"");this.table.element.classList.add(e.classes.table),t=t.replace("{pager}","<div class='"+e.classes.pagination+"'></div>"),this.wrapper.innerHTML=t,this.table.element.parentNode.replaceChild(this.wrapper,this.table.element),this.wrapper.querySelector("."+e.classes.container).appendChild(this.table.element),this._updatePagination(),this._updateInfo()}async update(e=!0){var t=this;this.currentPage>this.pager.getPages()&&(this.currentPage=this.pager.getPages());let s=t.wrapper.querySelector(" ."+t.config.classes.loading);if(s.classList.remove("hidden"),this.table.header.getCells().forEach((function(e,s){let a=t.table.head.rows[0].cells[s];a.innerHTML=e.getInnerHTML(),e.classes.length>0&&(a.className=e.classes.join(" "));for(let t in e.attributes)a.setAttribute(t,e.attributes[t]);a.setAttribute("data-sortable",e.isSortable)})),e)return this.getPageData(this.currentPage).then((function(e){t.table.element.classList.remove("hidden"),t.table.body.innerHTML="",e.forEach((function(e){t.table.body.appendChild(e.getFormatted(t.columnRenderers,t.config.rowAttributesCreator))})),s.classList.add("hidden")})).then((function(){t.getDataCount()<=0&&(t.wrapper.classList.remove("search-results"),t.setMessage(t.config.labels.noRows)),t._emit("update")})).then((function(){t._updatePagination(),t._updateInfo()}));t.table.element.classList.remove("hidden"),t.table.body.innerHTML="",this.getDataCount()<=0&&(t.wrapper.classList.remove("search-results"),t.setMessage(t.config.labels.noRows)),this._getData().forEach((function(e){t.table.body.appendChild(e.getFormatted(t.columnRenderers,t.config.rowAttributesCreator))})),s.classList.add("hidden")}_updatePagination(){let e=this.wrapper.querySelector(" ."+this.config.classes.pagination);e.innerHTML="",e.appendChild(this.pager.render(this.currentPage))}_updateInfo(){let e=this.wrapper.querySelector(" ."+this.config.classes.info),t=this.isSearching?this.config.labels.infoFiltered:this.config.labels.info;if(e&&t.length){var s=t.replace("{start}",this.getDataCount()>0?this._getPageStartIndex()+1:0).replace("{end}",this._getPageEndIndex()+1).replace("{page}",this.currentPage).replace("{pages}",this.pager.getPages()).replace("{rows}",this.getDataCount()).replace("{rowsTotal}",this.getDataCountTotal());e.innerHTML=s}}_getPageStartIndex(){return(this.currentPage-1)*this.config.perPage}_getPageEndIndex(){let e=this.currentPage*this.config.perPage-1;return e>this.getDataCount()-1?this.getDataCount()-1:e}_getData(){return this._emit("getData",this.table.dataRows),this.table.dataRows.filter((function(e){return e.visible}))}_fetchData(){var e=this;let t={searchQuery:this.searchQuery,sortColumn:this.sortColumn,sortDirection:this.sortDirection,start:this._getPageStartIndex(),length:this.config.perPage,datatable:1};t=Object.assign({},this.config.ajaxParams,t);let s=this.config.ajax+"?"+this._queryParams(t);return fetch(s,{method:this.config.method,credentials:"same-origin",headers:{Accept:"application/json","Content-Type":"application/json"}}).then((function(e){return e.json()})).then((function(t){return e._emit("fetchData",t),e.dataCount=t.recordsTotal,e.filteredDataCount=t.recordsFiltered,t.data})).then((function(e){let t=[];return e.forEach((function(e){t.push(JSTableRow.createFromData(e))})),t})).catch((function(e){console.error(e)}))}_queryParams(e){return Object.keys(e).map((t=>encodeURIComponent(t)+"="+encodeURIComponent(e[t]))).join("&")}getDataCount(){return this.isSearching?this.getDataCountFiltered():this.getDataCountTotal()}getDataCountFiltered(){return this.config.serverSide?this.filteredDataCount:this._getData().length}getDataCountTotal(){return this.config.serverSide?null!==this.config.deferLoading?this.config.deferLoading:this.dataCount:this.table.dataRows.length}getPageData(){if(this.config.serverSide)return this._fetchData();let e=this._getPageStartIndex();var t=this._getPageEndIndex();return Promise.resolve(this._getData()).then((function(s){return s.filter((function(s,a){return a>=e&&a<=t}))}))}async search(e){var t=this;if(this.searchQuery===e.toLowerCase())return!1;if(this.searchQuery=e.toLowerCase(),this.config.searchDelay){if(this.searchTimeout)return!1;this.searchTimeout=setTimeout((function(){t.searchTimeout=null}),this.config.searchDelay)}return this.currentPage=1,this.isSearching=!0,this.searchQuery.length?(this.config.serverSide||this.table.dataRows.forEach((function(e){e.visible=!1,t.searchQuery.split(" ").reduce((function(s,a){var r;let i=e.getCells();return i=i.filter((function(e,s){if(t.columnsNotSearchable.indexOf(s)<0)return!0})),r=i.some((function(e,t){if(e.getTextContent().toLowerCase().indexOf(a)>=0)return!0})),s&&r}),!0)&&(e.visible=!0)})),this.wrapper.classList.add("search-results"),this.update().then((function(){t._emit("search",e)}))):(this.table.dataRows.forEach((function(e){e.visible=!0})),this.isSearching=!1,t.wrapper.classList.remove("search-results"),t.update(),!1)}sort(e,t,s=!1){var a=this;if(this.sortColumn=e||0,this.sortDirection=t,this.sortColumn<0||this.sortColumn>this.table.getColumnCount()-1)return!1;var r=this.table.header.getCell(this.sortColumn),i=this.table.dataRows;this.table.header.getCells().forEach((function(e){e.removeClass("asc"),e.removeClass("desc")})),r.addClass(this.sortDirection),this.config.serverSide||(i=i.sort((function(e,t){var s=e.getCellTextContent(a.sortColumn).toLowerCase(),r=t.getCellTextContent(a.sortColumn).toLowerCase();return s=s.replace(/(\$|\,|\s|%)/g,""),r=r.replace(/(\$|\,|\s|%)/g,""),s=isNaN(s)||""===s?s:parseFloat(s),r=isNaN(r)||""===r?r:parseFloat(r),""===s&&""!==r||!isNaN(s)&&isNaN(r)?"asc"===a.sortDirection?1:-1:""!==s&&""===r||isNaN(s)&&!isNaN(r)?"asc"===a.sortDirection?-1:1:"asc"===a.sortDirection?s===r?0:s>r?1:-1:s===r?0:s<r?1:-1})),this.table.dataRows=i),this.config.serverSide&&s||this.update(),this._emit("sort",this.sortColumn,this.sortDirection)}async paginate(e){var t=this;return this.currentPage=e,this.update().then((function(){t._emit("paginate",t.currentPage,e)}))}_setQueryParam(e,t){if(!this.config.addQueryParams)return;const s=new URL(window.location.href);s.searchParams.set(this.config.queryParams[e],t),window.history.replaceState(null,null,s)}_bindEvents(){var e=this;this.wrapper.addEventListener("click",(function(t){var s=t.target;if(s.hasAttribute("data-page")){t.preventDefault();let a=parseInt(s.getAttribute("data-page"),10);e.paginate(a),e._setQueryParam("page",a)}if("TH"===s.nodeName&&s.hasAttribute("data-sortable")){if("false"===s.getAttribute("data-sortable"))return!1;t.preventDefault();let a=s.classList.contains("asc")?"desc":"asc";e.sort(s.cellIndex,a),e._setQueryParam("sortColumn",s.cellIndex),e._setQueryParam("sortDirection",a)}})),this.config.perPageSelect&&this.wrapper.addEventListener("change",(function(t){var s=t.target;if("SELECT"===s.nodeName&&s.classList.contains(e.config.classes.selector)){t.preventDefault();let a=parseInt(s.value,10);e._emit("perPageChange",e.config.perPage,a),e.config.perPage=a,e.update(),e._setQueryParam("perPage",a)}})),this.config.searchable&&this.wrapper.addEventListener("keyup",(function(t){"INPUT"===t.target.nodeName&&t.target.classList.contains(e.config.classes.input)&&(t.preventDefault(),e.search(t.target.value),e._setQueryParam("search",t.target.value))}))}on(e,t){this.events=this.events||{},this.events[e]=this.events[e]||[],this.events[e].push(t)}off(e,t){this.events=this.events||{},e in this.events!=!1&&this.events[e].splice(this.events[e].indexOf(t),1)}_emit(e){if(this.events=this.events||{},e in this.events!=!1)for(var t=0;t<this.events[e].length;t++)this.events[e][t].apply(this,Array.prototype.slice.call(arguments,1))}setMessage(e){var t=this.table.getColumnCount(),s=document.createElement("tr");s.innerHTML='<td class="'+this.config.classes.message+'" colspan="'+t+'">'+e+"</td>",this.table.body.innerHTML="",this.table.body.appendChild(s)}_buildColumns(){var e=this;let t=null,s=null;this.config.columns&&this.config.columns.forEach((function(a){isNaN(a.select)||(a.select=[a.select]),a.select.forEach((function(r){var i=e.table.header.getCell(r);if(void 0!==i){if(a.hasOwnProperty("render")&&"function"==typeof a.render&&(e.columnRenderers[r]=a.render),a.hasOwnProperty("sortable")){let r=!1;i.hasSortable?r=i.isSortable:(r=a.sortable,i.setSortable(r)),r&&(i.addClass(e.config.classes.sorter),a.hasOwnProperty("sort")&&1===a.select.length&&(t=a.select[0],s=a.sort))}a.hasOwnProperty("searchable")&&(i.addAttribute("data-searchable",a.searchable),!1===a.searchable&&e.columnsNotSearchable.push(r))}}))})),this.table.header.getCells().forEach((function(a,r){null===a.isSortable&&a.setSortable(e.config.sortable),a.isSortable&&(a.addClass(e.config.classes.sorter),a.hasSort&&(t=r,s=a.sortDirection))})),null!==t&&e.sort(t,s,!0)}_merge(e,t){var s=this;return Object.keys(e).forEach((function(a){!t.hasOwnProperty(a)||"object"!=typeof t[a]||t[a]instanceof Array||null===t[a]?t.hasOwnProperty(a)||(t[a]=e[a]):s._merge(e[a],t[a])})),t}async _parseQueryParams(){const e=new URLSearchParams(window.location.search);let t=e.get(this.config.queryParams.perPage);if(t){t=parseInt(t),this.config.perPage=t,this.wrapper.querySelectorAll("."+this.config.classes.selector).forEach((function(e){e.querySelectorAll("option").forEach((e=>e.removeAttribute("selected"))),e.value=t,e.querySelector(`option[value='${t}']`).setAttribute("selected","")})),this.update()}let s=e.get(this.config.queryParams.search);if(s){this.wrapper.querySelectorAll("."+this.config.classes.input).forEach((function(e){e.value=s})),await this.search(s)}let a=e.get(this.config.queryParams.page);a&&await this.paginate(parseInt(a));let r=e.get(this.config.queryParams.sortColumn);if(r){r=parseInt(r);let t=e.get(this.config.queryParams.sortDirection);t=null==t?"asc":t,this.sort(r,t)}}}class JSTableElement{constructor(e){this.element=e,this.body=this.element.tBodies[0],this.head=this.element.tHead,this.rows=Array.from(this.element.rows).map((function(e,t){return new JSTableRow(e,e.parentNode.nodeName,t)})),this.dataRows=this._getBodyRows(),this.header=this._getHeaderRow()}_getBodyRows(){return this.rows.filter((function(e){return!e.isHeader&&!e.isFooter}))}_getHeaderRow(){return this.rows.find((function(e){return e.isHeader}))}getColumnCount(){return this.header.getColumnCount()}getFooterRow(){return this.rows.find((function(e){return e.isFooter}))}}class JSTableRow{constructor(e,t="",s=null){this.cells=Array.from(e.cells).map((function(e){return new JSTableCell(e)})),this.d=this.cells.length,this.isHeader="THEAD"===t,this.isFooter="TFOOT"===t,this.visible=!0,this.rowID=s;var a=this;this.attributes={},[...e.attributes].forEach((function(e){a.attributes[e.name]=e.value}))}getCells(){return Array.from(this.cells)}getColumnCount(){return this.cells.length}getCell(e){return this.cells[e]}getCellTextContent(e){return this.getCell(e).getTextContent()}static createFromData(e){let t=document.createElement("tr");if(e.hasOwnProperty("data")){if(e.hasOwnProperty("attributes"))for(const s in e.attributes)t.setAttribute(s,e.attributes[s]);e=e.data}return e.forEach((function(e){let s=document.createElement("td");if(s.innerHTML=e&&e.hasOwnProperty("data")?e.data:e,e&&e.hasOwnProperty("attributes"))for(const t in e.attributes)s.setAttribute(t,e.attributes[t]);t.appendChild(s)})),new JSTableRow(t)}getFormatted(e,t=null){let s=document.createElement("tr");var a=this;for(let e in this.attributes)s.setAttribute(e,this.attributes[e]);let r=t?t.call(this,this.getCells()):{};for(const e in r)s.setAttribute(e,r[e]);return this.getCells().forEach((function(t,r){var i=document.createElement("td");i.innerHTML=t.getInnerHTML(),e.hasOwnProperty(r)&&(i.innerHTML=e[r].call(a,t.getElement(),r)),t.classes.length>0&&(i.className=t.classes.join(" "));for(let e in t.attributes)i.setAttribute(e,t.attributes[e]);s.appendChild(i)})),s}setCellClass(e,t){this.cells[e].addClass(t)}}class JSTableCell{constructor(e){this.textContent=e.textContent,this.innerHTML=e.innerHTML,this.className="",this.element=e,this.hasSortable=e.hasAttribute("data-sortable"),this.isSortable=this.hasSortable?"true"===e.getAttribute("data-sortable"):null,this.hasSort=e.hasAttribute("data-sort"),this.sortDirection=e.getAttribute("data-sort"),this.classes=[];var t=this;this.attributes={},[...e.attributes].forEach((function(e){t.attributes[e.name]=e.value}))}getElement(){return this.element}getTextContent(){return this.textContent}getInnerHTML(){return this.innerHTML}setClass(e){this.className=e}setSortable(e){this.isSortable=e}addClass(e){this.classes.push(e)}removeClass(e){this.classes.indexOf(e)>=0&&this.classes.splice(this.classes.indexOf(e),1)}addAttribute(e,t){this.attributes[e]=t}}class JSTablePager{constructor(e){this.instance=e}getPages(){let e=Math.ceil(this.instance.getDataCount()/this.instance.config.perPage);return 0===e?1:e}render(){var e=this.instance.config;let t=this.getPages(),s=document.createElement("ul");if(t>1){let a=1===this.instance.currentPage?1:this.instance.currentPage-1,r=this.instance.currentPage===t?t:this.instance.currentPage+1;e.firstLast&&s.appendChild(this.createItem("pager",1,e.firstText)),e.nextPrev&&s.appendChild(this.createItem("pager",a,e.prevText)),this.truncate().forEach((function(e){s.appendChild(e)})),e.nextPrev&&s.appendChild(this.createItem("pager",r,e.nextText)),e.firstLast&&s.appendChild(this.createItem("pager",t,e.lastText))}return s}createItem(e,t,s,a){let r=document.createElement("li");return r.className=e,r.innerHTML=a?"<span>"+s+"</span>":'<a href="#" data-page="'+t+'">'+s+"</a>",r}isValidPage(e){return e>0&&e<=this.getPages()}truncate(){var e,t=this,s=t.instance.config,a=2*s.pagerDelta,r=t.instance.currentPage,i=r-s.pagerDelta,n=r+s.pagerDelta,o=this.getPages(),l=[],c=[];if(this.instance.config.truncatePager){r<4-s.pagerDelta+a?n=3+a:r>this.getPages()-(3-s.pagerDelta+a)&&(i=this.getPages()-(2+a));for(var h=1;h<=o;h++)(1===h||h===o||h>=i&&h<=n)&&l.push(h);l.forEach((function(a){e&&(a-e==2?c.push(t.createItem("",e+1,e+1)):a-e!=1&&c.push(t.createItem(s.classes.ellipsis,0,s.ellipsisText,!0))),c.push(t.createItem(a==r?"active":"",a,a)),e=a}))}else for(let e=1;e<=this.getPages();e++)c.push(this.createItem(e===r?"active":"",e,e));return c}}window.JSTable=JSTable;
-

frontend/table.ts

@@ -0,0 +1,21 @@
+// @ts-ignore  
+new JSTable('#basic', {
+  perPage: 100,
+  perPageSelect: [10,100],
+
+   // Customise the display text
+  labels: {
+      placeholder: 'Suchen (z.B. "Linz")',
+      perPage: '{select} per Seite',
+      noRows: 'Keine Einträge gefunden',
+      info: 'Zeigt {start} bis {end} von {rows} Einträgen',
+      loading: 'Laden...',
+      infoFiltered: 'Zeigt {start} bis {end} von {rows} Einträgen (gefiltert aus {rowsTotal} Einträgen)'
+  },
+
+  // Customise the layout
+  layout: {
+      top: '{search}{select}',
+      bottom: '{info}{pager}'
+  },
+});

frontend/tests/cox.spec.ts

@@ -8,7 +8,7 @@ test("cox can create and delete trip", async ({ page }) => {
   await page.getByPlaceholder("Passwort").fill("cox");
   await page.getByPlaceholder("Passwort").press("Enter");
   await page.locator('li').filter({ hasText: 'Geplante Ausfahrten' }).getByRole('link').click();
-  await page.locator(".relative").first().click();
+  await page.locator('a[href="#"]:has-text("Ausfahrt")').first().click();
   await page.locator("#sidebar #planned_starting_time").click();
   await page.locator("#sidebar #planned_starting_time").fill("18:00");
   await page.locator("#sidebar #planned_starting_time").press("Tab");
@@ -39,7 +39,7 @@ test.describe("cox can edit trips", () => {
     await page.getByPlaceholder("Passwort").fill("cox");
     await page.getByPlaceholder("Passwort").press("Enter");
     await page.locator('li').filter({ hasText: 'Geplante Ausfahrten' }).getByRole('link').click();
-    await page.locator(".relative").first().click();
+    await page.locator('a[href="#"]:has-text("Ausfahrt")').first().click();
     await page.locator("#sidebar #planned_starting_time").click();
     await page.locator("#sidebar #planned_starting_time").fill("18:00");
     await page.locator("#sidebar #planned_starting_time").press("Tab");

frontend/tests/log.spec.ts

@@ -12,11 +12,13 @@ test("Cox can start and cancel trip", async ({ page }, testInfo) => {
   await page.getByRole("link", { name: "Ausfahrt eintragen" }).click();
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x', { exact: true }).click();
     await page.getByText("Joe", { exact: true }).click();
   }
+  await page.getByLabel('Remove item: \'6\'').click(); // remove pre-filled cox2
   await page.getByPlaceholder("Ruderer auswählen").click();
   await page.getByRole("option", { name: "rower2" }).click();
   await page.getByRole("option", { name: "cox2" }).click();
@@ -52,17 +54,29 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
   await page.getByRole("link", { name: "Ausfahrt eintragen" }).click();
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x', { exact: true }).click();
     await page.getByText("Joe", { exact: true }).click();
   }
+  await page.getByLabel('Remove item: \'6\'').click(); // remove pre-filled cox2
   await page.getByPlaceholder("Ruderer auswählen").click();
   await page.getByRole("option", { name: "rower2" }).click();
   await page.getByRole("option", { name: "cox2" }).click();
   await expect(page.getByRole("listbox")).toContainText(
     "Nur 2 Ruderer können hinzugefügt werden",
   );
+
+  // Trip starts 2 hours ago
+  const datetimeSelector = '#departure';
+  const currentValue = await page.$eval(datetimeSelector, el => el.value);
+  const currentDate = new Date(currentValue);
+  currentDate.setMinutes(currentDate.getMinutes());
+  currentDate.setHours(currentDate.getHours() - new Date().getTimezoneOffset()/60 - 2);
+  const newDatetime = currentDate.toISOString().slice(0, 16);
+  await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime);
+
   await expect(page.locator("#shipmaster-newrowerjs")).toContainText("cox");
   await expect(page.locator("#steering_person-newrowerjs")).toContainText(
     "rower2 cox",
@@ -76,15 +90,6 @@ test("Cox can start and finish trip", async ({ page }, testInfo) => {
   await page.goto("/log");
   await page.locator("div:nth-child(2) > .border-0").click();
 
-  // Add a minute
-  const datetimeSelector = '#arrivaljs';
-  const currentValue = await page.$eval(datetimeSelector, el => el.value);
-  const currentDate = new Date(currentValue);
-  currentDate.setMinutes(currentDate.getMinutes() + 1);
-  currentDate.setHours(currentDate.getHours() + 1);
-  const newDatetime = currentDate.toISOString().slice(0, 16);
-  await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime);
-
   await page.getByRole("combobox", { name: "Destination" }).click();
   await page.getByRole("combobox", { name: "Destination" }).fill("Ottensheim");
   await page.getByRole("button", { name: "Ausfahrt beenden" }).click();
@@ -103,9 +108,10 @@ test("Kiosk can start and cancel trip", async ({ page }, testInfo) => {
   await page.goto("/log/kiosk/ekrv2019/Linz");
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x', { exact: true }).click();
     await page.getByText("Joe", { exact: true }).click();
   }
   await page.getByPlaceholder("Ruderer auswählen").click();
@@ -136,9 +142,10 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
 
   if (testInfo.project.name.includes("Mobile")) {
     // No left boat selector on mobile views
-    await page.getByText("Kaputtes Boot :-( (7 x)").nth(1).click();
+    await page.getByText('-- Wähle ein Boot aus ---').nth(1).click();
     await page.getByRole("option", { name: "Joe" }).click();
   } else {
+    await page.getByText('2x', { exact: true }).click();
     await page.getByText("Joe", { exact: true }).click();
   }
   await page.getByPlaceholder("Ruderer auswählen").click();
@@ -147,6 +154,16 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
   await expect(page.getByRole("listbox")).toContainText(
     "Nur 2 Ruderer können hinzugefügt werden",
   );
+
+  // Trip starts 2 hours ago
+  const datetimeSelector = '#departure';
+  const currentValue = await page.$eval(datetimeSelector, el => el.value);
+  const currentDate = new Date(currentValue);
+  currentDate.setMinutes(currentDate.getMinutes());
+  currentDate.setHours(currentDate.getHours() - new Date().getTimezoneOffset()/60 - 2);
+  const newDatetime = currentDate.toISOString().slice(0, 16);
+  await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime);
+
   await expect(page.locator("#shipmaster-newrowerjs")).toContainText("cox");
   await expect(page.locator("#steering_person-newrowerjs")).toContainText(
     "rower2 cox",
@@ -160,15 +177,6 @@ test("Kiosk can start and finish trip", async ({ page }, testInfo) => {
   await page.goto("/log");
   await page.locator('div:nth-child(2) > .pt-2 > div > div > div:nth-child(2) > .border-0').click(); // 2 trips currently running, try to close second one
   
-  // Add a minute
-  const datetimeSelector = '#arrivaljs';
-  const currentValue = await page.$eval(datetimeSelector, el => el.value);
-  const currentDate = new Date(currentValue);
-  currentDate.setMinutes(currentDate.getMinutes() + 1);
-  currentDate.setHours(currentDate.getHours() + 1);
-  const newDatetime = currentDate.toISOString().slice(0, 16);
-  await page.$eval(datetimeSelector, (el, value) => el.value = value, newDatetime);
-
   await page.getByRole("combobox", { name: "Destination" }).click();
   await page.getByRole("combobox", { name: "Destination" }).fill("Ottensheim");
   await page.getByRole("button", { name: "Ausfahrt beenden" }).click();

frontend/vite.config.js

@@ -24,6 +24,7 @@ export default defineConfig({
       input: {
         main: './main.ts',
         logbook: './logbook.ts',
+        table: './table.ts',
         // Example for more entry points
         // test: './src/test.ts',
       },

migration.sql

@@ -99,9 +99,11 @@ CREATE TABLE IF NOT EXISTS "boat" (
 	"year_built" INTEGER,
 	"boatbuilder" TEXT,
 	"default_shipmaster_only_steering" boolean default false not null,
+	"convert_handoperated_possible" boolean default false not null,
 	"default_destination" text,
 	"skull" boolean default true NOT NULL, -- false => riemen
-	"external" boolean default false NOT NULL -- false => owned by different club
+	"external" boolean default false NOT NULL, -- false => owned by different club
+	"deleted" boolean NOT NULL DEFAULT FALSE
 );
 
 CREATE TABLE IF NOT EXISTS "logbook_type" (
@@ -158,6 +160,7 @@ CREATE TABLE IF NOT EXISTS "notification" (
 	"read_at" DATETIME,
 	"created_at" DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
 	"category" TEXT NOT NULL,
+	"action_after_reading" TEXT,
 	"link" TEXT
 );
 
@@ -173,3 +176,40 @@ CREATE TABLE IF NOT EXISTS "boat_reservation" (
 	"created_at" datetime not null default CURRENT_TIMESTAMP
 );
 
+CREATE TABLE IF NOT EXISTS "waterlevel" (
+	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"day" DATE NOT NULL,
+	"time" TEXT NOT NULL,
+	"max" INTEGER NOT NULL,
+	"min" INTEGER NOT NULL,
+	"mittel" INTEGER NOT NULL,
+	"tumax" INTEGER NOT NULL,
+	"tumin" INTEGER NOT NULL,
+	"tumittel" INTEGER NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "weather" (
+	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"day" DATE NOT NULL,
+	"max_temp" FLOAT NOT NULL,
+	"wind_gust" FLOAT NOT NULL,
+	"rain_mm" FLOAT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS "trailer" (
+	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"name" text NOT NULL UNIQUE
+);
+
+CREATE TABLE IF NOT EXISTS "trailer_reservation" (
+	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
+	"trailer_id" INTEGER NOT NULL REFERENCES trailer(id), 
+	"start_date" DATE NOT NULL,
+	"end_date" DATE NOT NULL,
+	"time_desc" TEXT NOT NULL,
+	"usage" TEXT NOT NULL,
+	"user_id_applicant" INTEGER NOT NULL REFERENCES user(id), 
+	"user_id_confirmation" INTEGER REFERENCES user(id), 
+	"created_at" datetime not null default CURRENT_TIMESTAMP
+);
+

seeds.sql

@@ -3,10 +3,12 @@ INSERT INTO "role" (name) VALUES ('cox');
 INSERT INTO "role" (name) VALUES ('scheckbuch');
 INSERT INTO "role" (name) VALUES ('tech');
 INSERT INTO "role" (name) VALUES ('Donau Linz');
-INSERT INTO "role" (name) VALUES ('planned_event');
+INSERT INTO "role" (name) VALUES ('manage_events');
 INSERT INTO "role" (name) VALUES ('Rennrudern');
 INSERT INTO "role" (name) VALUES ('paid');
 INSERT INTO "role" (name) VALUES ('Vorstand');
+INSERT INTO "role" (name) VALUES ('Bootsführer');
+INSERT INTO "role" (name) VALUES ('schnupperant');
 INSERT INTO "user" (name, pw) VALUES('admin', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$4P4NCw4Ukhv80/eQYTsarHhnw61JuL1KMx/L9dm82YM');
 INSERT INTO "user_role" (user_id, role_id) VALUES(1,1);
 INSERT INTO "user_role" (user_id, role_id) VALUES(1,2);
@@ -62,3 +64,5 @@ INSERT INTO "rower" (logbook_id, rower_id) VALUES(3,3);
 INSERT INTO "boat_damage" (boat_id, desc, user_id_created, created_at) VALUES(4,'Dolle bei Position 2 fehlt', 5, '2142-12-24 15:02');
 INSERT INTO "boat_damage" (boat_id, desc, user_id_created, created_at, lock_boat) VALUES(5, 'TOHT', 5, '2142-12-24 15:02', 1);
 INSERT INTO "notification" (user_id, message, category) VALUES (1, 'This is a test notification', 'test-cat');
+INSERT INTO "trailer" (name) VALUES('Großer Hänger');
+INSERT INTO "trailer" (name) VALUES('Kleiner Hänger');

src/lib.rs

@@ -8,6 +8,8 @@ pub mod tera;
 #[cfg(feature = "rest")]
 pub mod rest;
 
+pub mod scheduled;
+
 #[cfg(test)]
 #[macro_export]
 macro_rules! testdb {

src/main.rs

@@ -6,6 +6,7 @@ use std::str::FromStr;
 use rot::rest;
 #[cfg(feature = "rowing-tera")]
 use rot::tera;
+use rot::{scheduled, tera::Config};
 
 use sqlx::{pool::PoolOptions, sqlite::SqliteConnectOptions, ConnectOptions};
 
@@ -26,7 +27,7 @@ async fn rocket() -> _ {
         .await
         .unwrap();
 
-    let rocket = rocket::build().manage(db);
+    let rocket = rocket::build().manage(db.clone());
 
     #[cfg(feature = "rowing-tera")]
     let rocket = tera::config(rocket);
@@ -34,5 +35,11 @@ async fn rocket() -> _ {
     #[cfg(feature = "rest")]
     let rocket = rest::config(rocket);
 
+    let config: Config = rocket
+        .figment()
+        .extract()
+        .expect("Config extraction failed");
+    scheduled::schedule(&db, &config);
+
     rocket
 }

src/model/boat.rs

@@ -5,6 +5,8 @@ use rocket::serde::{Deserialize, Serialize};
 use rocket::FromForm;
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
+use crate::model::boathouse::Boathouse;
+
 use super::location::Location;
 use super::user::User;
 
@@ -19,11 +21,14 @@ pub struct Boat {
     pub boatbuilder: Option<String>,
     pub default_destination: Option<String>,
     #[serde(default = "bool::default")]
-    default_shipmaster_only_steering: bool,
+    pub convert_handoperated_possible: bool,
+    #[serde(default = "bool::default")]
+    pub default_shipmaster_only_steering: bool,
     #[serde(default = "bool::default")]
     skull: bool,
     #[serde(default = "bool::default")]
-    external: bool,
+    pub external: bool,
+    pub deleted: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -41,6 +46,7 @@ pub struct BoatWithDetails {
     damage: BoatDamage,
     on_water: bool,
     reserved_today: bool,
+    cat: String,
 }
 
 #[derive(FromForm)]
@@ -50,6 +56,7 @@ pub struct BoatToAdd<'r> {
     pub year_built: Option<i64>,
     pub boatbuilder: Option<&'r str>,
     pub default_shipmaster_only_steering: bool,
+    pub convert_handoperated_possible: bool,
     pub default_destination: Option<&'r str>,
     pub skull: bool,
     pub external: bool,
@@ -66,6 +73,7 @@ pub struct BoatToUpdate<'r> {
     pub default_shipmaster_only_steering: bool,
     pub default_destination: Option<&'r str>,
     pub skull: bool,
+    pub convert_handoperated_possible: bool,
     pub external: bool,
     pub location_id: i64,
     pub owner: Option<i64>,
@@ -73,20 +81,20 @@ pub struct BoatToUpdate<'r> {
 
 impl Boat {
     pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
-        sqlx::query_as!(Self, "SELECT * FROM boat WHERE id like ?", id)
+        sqlx::query_as!(Self, "SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, convert_handoperated_possible, default_destination, skull, external, deleted FROM boat WHERE id like ?", id)
             .fetch_one(db)
             .await
             .ok()
     }
     pub async fn find_by_id_tx(db: &mut Transaction<'_, Sqlite>, id: i32) -> Option<Self> {
-        sqlx::query_as!(Self, "SELECT * FROM boat WHERE id like ?", id)
+        sqlx::query_as!(Self, "SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, convert_handoperated_possible, default_destination, skull, external, deleted FROM boat WHERE id like ?", id)
             .fetch_one(db.deref_mut())
             .await
             .ok()
     }
 
     pub async fn find_by_name(db: &SqlitePool, name: String) -> Option<Self> {
-        sqlx::query_as!(Self, "SELECT * FROM boat WHERE name like ?", name)
+        sqlx::query_as!(Self, "SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, convert_handoperated_possible, default_destination, skull, external, deleted FROM boat WHERE name like ?", name)
             .fetch_one(db)
             .await
             .ok()
@@ -172,11 +180,20 @@ AND date('now') BETWEEN start_date AND end_date;",
             if boat.is_locked(db).await {
                 damage = BoatDamage::Locked;
             }
+            let cat = if boat.external {
+                "Vereinsfremde Boote".to_string()
+            } else if boat.default_shipmaster_only_steering {
+                format!("{}+", boat.amount_seats - 1)
+            } else {
+                format!("{}x", boat.amount_seats)
+            };
+
             res.push(BoatWithDetails {
                 damage,
                 on_water: boat.on_water(db).await,
                 reserved_today: boat.reserved_today(db).await,
                 boat,
+                cat,
             });
         }
         res
@@ -186,8 +203,9 @@ AND date('now') BETWEEN start_date AND end_date;",
         let boats = sqlx::query_as!(
             Boat,
             "
-SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external 
+SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, deleted, convert_handoperated_possible 
 FROM boat 
+WHERE deleted=false
 ORDER BY amount_seats DESC
         "
         )
@@ -213,12 +231,15 @@ SELECT
     b.default_shipmaster_only_steering, 
     b.default_destination, 
     b.skull, 
-    b.external
+    b.external,
+    b.deleted,
+    b.convert_handoperated_possible
 FROM 
     boat AS b
 WHERE 
     b.external = false 
     AND b.location_id = (SELECT id FROM location WHERE name = 'Linz')
+    AND b.deleted = false
 ORDER BY 
     b.name DESC;
         "
@@ -238,9 +259,9 @@ ORDER BY
             sqlx::query_as!(
             Boat,
             "
-SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external 
+SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, deleted, convert_handoperated_possible
 FROM boat 
-WHERE owner is null or owner = ?
+WHERE (owner is null or owner = ?) AND deleted = 0
 ORDER BY amount_seats DESC
         ",
         user.id
@@ -252,9 +273,9 @@ ORDER BY amount_seats DESC
             sqlx::query_as!(
             Boat,
             "
-SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external 
+SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, deleted, convert_handoperated_possible 
 FROM boat 
-WHERE owner = ? OR (owner is null and amount_seats = 1)
+WHERE (owner = ? OR (owner is null and amount_seats = 1)) AND deleted = 0
 ORDER BY amount_seats DESC
         ",
         user.id
@@ -270,9 +291,9 @@ ORDER BY amount_seats DESC
                 .unwrap();
             let boats_in_ottensheim = sqlx::query_as!(
             Boat,
-            "SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external 
+            "SELECT id, name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, deleted, convert_handoperated_possible 
 FROM boat 
-WHERE owner is null and location_id = ? 
+WHERE (owner is null and location_id = ?) AND deleted = 0
 ORDER BY amount_seats DESC
         ",ottensheim.id)
         .fetch_all(db)
@@ -289,10 +310,10 @@ ORDER BY amount_seats DESC
         let boats = sqlx::query_as!(
             Boat,
             "
-SELECT boat.id, boat.name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external 
+SELECT boat.id, boat.name, amount_seats, location_id, owner, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, deleted, convert_handoperated_possible
 FROM boat 
 INNER JOIN location ON boat.location_id = location.id
-WHERE location.name=?
+WHERE location.name=? AND deleted = 0
 ORDER BY amount_seats DESC
         ",
         location
@@ -306,26 +327,7 @@ ORDER BY amount_seats DESC
 
     pub async fn create(db: &SqlitePool, boat: BoatToAdd<'_>) -> Result<(), String> {
         sqlx::query!(
-            "INSERT INTO boat(name, amount_seats, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, location_id, owner) VALUES (?,?,?,?,?,?,?,?,?,?)",
-            boat.name,
-            boat.amount_seats,
-            boat.year_built,
-            boat.boatbuilder,
-            boat.default_shipmaster_only_steering,
-            boat.default_destination,
-            boat.skull,
-            boat.external,
-            boat.location_id,
-            boat.owner
-        )
-        .execute(db)
-        .await.map_err(|e| e.to_string())?;
-        Ok(())
-    }
-
-    pub async fn update(&self, db: &SqlitePool, boat: BoatToUpdate<'_>) -> Result<(), String> {
-        sqlx::query!(
-            "UPDATE boat SET name=?, amount_seats=?, year_built=?, boatbuilder=?, default_shipmaster_only_steering=?, default_destination=?, skull=?, external=?, location_id=?, owner=? WHERE id=?",
+            "INSERT INTO boat(name, amount_seats, year_built, boatbuilder, default_shipmaster_only_steering, default_destination, skull, external, location_id, owner, convert_handoperated_possible) VALUES (?,?,?,?,?,?,?,?,?,?,?)",
             boat.name,
             boat.amount_seats,
             boat.year_built,
@@ -336,6 +338,27 @@ ORDER BY amount_seats DESC
             boat.external,
             boat.location_id,
             boat.owner,
+            boat.convert_handoperated_possible
+        )
+        .execute(db)
+        .await.map_err(|e| e.to_string())?;
+        Ok(())
+    }
+
+    pub async fn update(&self, db: &SqlitePool, boat: BoatToUpdate<'_>) -> Result<(), String> {
+        sqlx::query!(
+            "UPDATE boat SET name=?, amount_seats=?, year_built=?, boatbuilder=?, default_shipmaster_only_steering=?, default_destination=?, skull=?, external=?, location_id=?, owner=?, convert_handoperated_possible=? WHERE id=?",
+        boat.name,
+        boat.amount_seats,
+        boat.year_built,
+        boat.boatbuilder,
+        boat.default_shipmaster_only_steering,
+        boat.default_destination,
+        boat.skull,
+        boat.external,
+        boat.location_id,
+        boat.owner,
+        boat.convert_handoperated_possible,
             self.id
         )
         .execute(db)
@@ -352,11 +375,22 @@ ORDER BY amount_seats DESC
     }
 
     pub async fn delete(&self, db: &SqlitePool) {
-        sqlx::query!("DELETE FROM boat WHERE id=?", self.id)
+        sqlx::query!("UPDATE boat SET deleted=1 WHERE id=?", self.id)
             .execute(db)
             .await
             .unwrap(); //Okay, because we can only create a Boat of a valid id
     }
+
+    pub async fn boathouse(&self, db: &SqlitePool) -> Option<Boathouse> {
+        sqlx::query_as!(
+            Boathouse,
+            "SELECT * FROM boathouse WHERE boat_id like ?",
+            self.id
+        )
+        .fetch_one(db)
+        .await
+        .ok()
+    }
 }
 
 #[cfg(test)]
@@ -404,6 +438,7 @@ mod test {
                     year_built: None,
                     boatbuilder: "Best Boatbuilder".into(),
                     default_shipmaster_only_steering: true,
+                    convert_handoperated_possible: false,
                     skull: true,
                     external: false,
                     location_id: Some(1),
@@ -429,6 +464,7 @@ mod test {
                     year_built: None,
                     boatbuilder: "Best Boatbuilder".into(),
                     default_shipmaster_only_steering: true,
+                    convert_handoperated_possible: false,
                     skull: true,
                     external: false,
                     location_id: Some(1),
@@ -531,6 +567,7 @@ mod test {
             year_built: None,
             boatbuilder: None,
             default_shipmaster_only_steering: false,
+            convert_handoperated_possible: false,
             skull: true,
             external: false,
             location_id: 1,
@@ -554,6 +591,7 @@ mod test {
             year_built: None,
             boatbuilder: None,
             default_shipmaster_only_steering: false,
+            convert_handoperated_possible: false,
             skull: true,
             external: false,
             location_id: 999,

src/model/boatdamage.rs

@@ -73,6 +73,10 @@ impl BoatDamage {
             "
 SELECT id, boat_id, desc, user_id_created, created_at, user_id_fixed, fixed_at, user_id_verified, verified_at, lock_boat 
 FROM boat_damage
+WHERE (
+    verified_at IS NULL 
+    OR verified_at >= datetime('now', '-30 days')
+  ) 
 ORDER BY created_at DESC
         "
         )
@@ -115,6 +119,10 @@ ORDER BY created_at DESC
 
     pub async fn create(db: &SqlitePool, boatdamage: BoatDamageToAdd<'_>) -> Result<(), String> {
         Log::create(db, format!("New boat damage: {boatdamage:?}")).await;
+        let Some(boat) = Boat::find_by_id(db, boatdamage.boat_id as i32).await else {
+            return Err("Boot gibt's ned".into());
+        };
+        let was_unusable_before = boat.is_locked(db).await;
 
         sqlx::query!(
             "INSERT INTO boat_damage(boat_id, desc, user_id_created, lock_boat) VALUES (?,?,?, ?)",
@@ -127,6 +135,11 @@ ORDER BY created_at DESC
         .await
         .map_err(|e| e.to_string())?;
 
+        if !was_unusable_before && boat.is_locked(db).await {
+            let cox = Role::find_by_name(db, "cox").await.unwrap();
+            Notification::create_for_role(db, &cox, &format!("Liebe Steuerberechtigte, bitte beachten, dass {} bis auf weiteres aufgrund von Reparaturarbeiten gesperrt ist.", boat.name), "Boot gesperrt", None, None).await;
+        }
+
         let technicals =
             User::all_with_role(db, &Role::find_by_name(db, "tech").await.unwrap()).await;
         for technical in technicals {
@@ -140,14 +153,12 @@ ORDER BY created_at DESC
                             .await
                             .unwrap()
                             .name,
-                        Boat::find_by_id(db, boatdamage.boat_id as i32)
-                            .await
-                            .unwrap()
-                            .name,
+                        boat.name,
                         boatdamage.desc
                     ),
                     "Neuer Bootsschaden angelegt",
                     None,
+                    None,
                 )
                 .await;
             }
@@ -168,6 +179,7 @@ ORDER BY created_at DESC
             ),
             "Neuer Bootsschaden angelegt",
             None,
+            None,
         )
         .await;
 
@@ -225,25 +237,37 @@ ORDER BY created_at DESC
                        boat.name,
                     ),
                     "Bootsschaden repariert",
-                    None,
+                    None,None
                 )
                 .await;
             }
         }
 
+        if boat_damage.user_id_fixed != self.user_id_created as i32 {
+            let user_fixed = User::find_by_id(db, boat_damage.user_id_fixed)
+                .await
+                .unwrap();
+            let user_created = User::find_by_id(db, self.user_id_created as i32)
+                .await
+                .unwrap();
+
+            // Boatdamage is also directly verified, if a tech has repaired it. We don't want to
+            // send 2 notifications.
+            if !user_fixed.has_role(db, "tech").await {
                 Notification::create(
                 db,
-            &User::find_by_id(db, boat_damage.user_id_fixed)
-                .await
-                .unwrap(),
+                &user_created,
                 &format!(
-                "Du hat den Bootschaden '{}' beim Boot '{}' repariert. Danke für deine Hilfe!",
+                    "{} hat den von dir eingetragenen Bootschaden '{}' beim Boot '{}' repariert. Dieser muss nun noch von unseren Bootswarten bestätigt werden.",
+                    user_fixed.name,
                     boat_damage.desc, boat.name,
                 ),
                 "Bootsschaden repariert",
-            None,
+                None,None
             )
             .await;
+            }
+        }
 
         Ok(())
     }
@@ -251,28 +275,77 @@ ORDER BY created_at DESC
     pub async fn verified(
         &self,
         db: &SqlitePool,
-        boat: BoatDamageVerified<'_>,
+        boat_form: BoatDamageVerified<'_>,
     ) -> Result<(), String> {
-        if let Some(verifier) = User::find_by_id(db, boat.user_id_verified).await {
+        if let Some(verifier) = User::find_by_id(db, boat_form.user_id_verified).await {
             if !verifier.has_role(db, "tech").await {
-                Log::create(db, format!("User {verifier:?} tried to verify boat {boat:?}. The user is no tech. Manually craftted request?")).await;
+                Log::create(db, format!("User {verifier:?} tried to verify boat {boat_form:?}. The user is no tech. Manually craftted request?")).await;
                 return Err("You are not allowed to verify the boat!".into());
             }
         } else {
-            Log::create(db, format!("Someone tried to verify the boat {boat:?} with user_id={} which does not exist. Manually craftted request?", boat.user_id_verified)).await;
+            Log::create(db, format!("Someone tried to verify the boat {boat_form:?} with user_id={} which does not exist. Manually craftted request?", boat_form.user_id_verified)).await;
             return Err("Could not find user".into());
         }
 
-        Log::create(db, format!("Verified boat damage: {boat:?}")).await;
+        let Some(boat) = Boat::find_by_id(db, self.boat_id as i32).await else {
+            return Err("Boot gibt's ned".into());
+        };
+        let was_unusable_before = boat.is_locked(db).await;
+
+        Log::create(db, format!("Verified boat damage: {boat_form:?}")).await;
 
         sqlx::query!(
             "UPDATE boat_damage SET desc=?, user_id_verified=?, verified_at=CURRENT_TIMESTAMP WHERE id=?",
-            boat.desc,
-            boat.user_id_verified,
+            boat_form.desc,
+            boat_form.user_id_verified,
             self.id
         )
         .execute(db)
         .await.map_err(|e| e.to_string())?;
+
+        if boat_form.user_id_verified != self.user_id_created as i32 {
+            let user_verified = User::find_by_id(db, boat_form.user_id_verified)
+                .await
+                .unwrap();
+            let user_created = User::find_by_id(db, self.user_id_created as i32)
+                .await
+                .unwrap();
+
+            if user_verified.id == self.user_id_fixed.unwrap() {
+                Notification::create(
+                 db,
+                 &user_created,
+                 &format!(
+                     "{} hat den von dir eingetragenen Bootschaden '{}' beim Boot '{}' repariert und verifiziert.",
+                     user_verified.name,
+                     self.desc, boat.name,
+                 ),
+                 "Bootsschaden repariert & verifiziert",
+                 None,
+                 None
+             )
+             .await;
+            } else {
+                Notification::create(
+                db,
+                &user_created,
+                &format!(
+                    "{} hat verifiziert, dass der von dir eingetragenen Bootschaden '{}' beim Boot '{}' korrekt repariert wurde.",
+                    user_verified.name,
+                    self.desc, boat.name,
+                ),
+                "Bootsschaden verifiziert",
+                None,
+                None
+            ).await;
+            }
+        }
+
+        if was_unusable_before && !boat.is_locked(db).await {
+            let cox = Role::find_by_name(db, "cox").await.unwrap();
+            Notification::create_for_role(db, &cox, &format!("Liebe Steuerberechtigte, {} wurde repariert und freut sich ab sofort wieder gerudert zu werden :-)", boat.name), "Boot repariert", None, None).await;
+        }
+
         Ok(())
     }
 }

src/model/boatreservation.rs

@@ -1,4 +1,7 @@
+use std::collections::HashMap;
+
 use crate::model::{boat::Boat, user::User};
+use crate::tera::boatreservation::ReservationEditForm;
 use chrono::NaiveDate;
 use chrono::NaiveDateTime;
 use rocket::serde::{Deserialize, Serialize};
@@ -24,7 +27,7 @@ pub struct BoatReservation {
 #[derive(FromRow, Debug, Serialize, Deserialize)]
 pub struct BoatReservationWithDetails {
     #[serde(flatten)]
-    boat_reservation: BoatReservation,
+    reservation: BoatReservation,
     boat: Boat,
     user_applicant: User,
     user_confirmation: Option<User>,
@@ -84,7 +87,7 @@ WHERE end_date >= CURRENT_DATE ORDER BY end_date
                 .unwrap();
 
             res.push(BoatReservationWithDetails {
-                boat_reservation: reservation,
+                reservation,
                 boat,
                 user_applicant,
                 user_confirmation,
@@ -92,6 +95,31 @@ WHERE end_date >= CURRENT_DATE ORDER BY end_date
         }
         res
     }
+    pub async fn all_future_with_groups(
+        db: &SqlitePool,
+    ) -> HashMap<String, Vec<BoatReservationWithDetails>> {
+        let mut grouped_reservations: HashMap<String, Vec<BoatReservationWithDetails>> =
+            HashMap::new();
+
+        let reservations = Self::all_future(db).await;
+        for reservation in reservations {
+            let key = format!(
+                "{}-{}-{}-{}-{}",
+                reservation.reservation.start_date,
+                reservation.reservation.end_date,
+                reservation.reservation.time_desc,
+                reservation.reservation.usage,
+                reservation.user_applicant.name
+            );
+
+            grouped_reservations
+                .entry(key)
+                .or_default()
+                .push(reservation);
+        }
+
+        grouped_reservations
+    }
 
     pub async fn create(
         db: &SqlitePool,
@@ -147,7 +175,7 @@ WHERE end_date >= CURRENT_DATE ORDER BY end_date
                         boatreservation.usage
                     ),
                     "Neue Bootsreservierung",
-                    None,
+                    None,None
                 )
                 .await;
         }
@@ -177,6 +205,20 @@ AND start_date <= ? AND end_date >= ?;",
             > 0
     }
 
+    pub async fn update(&self, db: &SqlitePool, data: ReservationEditForm) {
+        let time_desc = data.time_desc.trim();
+        let usage = data.usage.trim();
+        sqlx::query!(
+            "UPDATE boat_reservation SET time_desc = ?, usage = ? where id = ?",
+            time_desc,
+            usage,
+            self.id
+        )
+        .execute(db)
+        .await
+        .unwrap(); //Okay, because we can only create a User of a valid id
+    }
+
     pub async fn delete(&self, db: &SqlitePool) {
         sqlx::query!("DELETE FROM boat_reservation WHERE id=?", self.id)
             .execute(db)

src/model/event.rs

@@ -3,33 +3,33 @@ use std::io::Write;
 use chrono::NaiveDate;
 use ics::{
     properties::{DtStart, Summary},
-    Event, ICalendar,
+    ICalendar,
 };
 use serde::Serialize;
 use sqlx::{FromRow, Row, SqlitePool};
 
-use super::{tripdetails::TripDetails, triptype::TripType, user::User};
+use super::{notification::Notification, tripdetails::TripDetails, triptype::TripType, user::User};
 
 #[derive(Serialize, Clone, FromRow, Debug, PartialEq)]
-pub struct PlannedEvent {
+pub struct Event {
     pub id: i64,
     pub name: String,
-    planned_amount_cox: i64,
+    pub(crate) planned_amount_cox: i64,
     trip_details_id: i64,
     pub planned_starting_time: String,
-    max_people: i64,
+    pub(crate) max_people: i64,
     pub day: String,
     pub notes: Option<String>,
     pub allow_guests: bool,
     trip_type_id: Option<i64>,
-    always_show: bool,
-    is_locked: bool,
+    pub(crate) always_show: bool,
+    pub(crate) is_locked: bool,
 }
 
 #[derive(Serialize, Debug)]
-pub struct PlannedEventWithUserAndTriptype {
+pub struct EventWithUserAndTriptype {
     #[serde(flatten)]
-    pub planned_event: PlannedEvent,
+    pub event: Event,
     trip_type: Option<TripType>,
     cox_needed: bool,
     cox: Vec<Registration>,
@@ -73,7 +73,7 @@ FROM user_trip WHERE trip_details_id = {}
         .collect()
     }
 
-    pub async fn all_cox(db: &SqlitePool, trip_details_id: i64) -> Vec<Registration> {
+    pub async fn all_cox(db: &SqlitePool, event_id: i64) -> Vec<Registration> {
         //TODO: switch to join
         sqlx::query!(
             "
@@ -82,7 +82,7 @@ SELECT
     (SELECT created_at FROM user WHERE cox_id = id) as registered_at
 FROM trip WHERE planned_event_id = ?
         ",
-            trip_details_id
+            event_id
         )
         .fetch_all(db)
         .await
@@ -94,11 +94,22 @@ FROM trip WHERE planned_event_id = ?
             is_guest: false,
             is_real_guest: false,
         })
-        .collect() //Okay, as PlannedEvent can only be created with proper DB backing
+        .collect() //Okay, as Event can only be created with proper DB backing
     }
 }
 
-impl PlannedEvent {
+#[derive(Debug)]
+pub struct EventUpdate<'a> {
+    pub name: &'a str,
+    pub planned_amount_cox: i32,
+    pub max_people: i32,
+    pub notes: Option<&'a str>,
+    pub always_show: bool,
+    pub is_locked: bool,
+    pub trip_type_id: Option<i64>,
+}
+
+impl Event {
     pub async fn find_by_id(db: &SqlitePool, id: i64) -> Option<Self> {
         sqlx::query_as!(
             Self,
@@ -119,19 +130,16 @@ WHERE planned_event.id like ?
     pub async fn get_pinned_for_day(
         db: &SqlitePool,
         day: NaiveDate,
-    ) -> Vec<PlannedEventWithUserAndTriptype> {
+    ) -> Vec<EventWithUserAndTriptype> {
         let mut events = Self::get_for_day(db, day).await;
-        events.retain(|e| e.planned_event.always_show);
+        events.retain(|e| e.event.always_show);
         events
     }
 
-    pub async fn get_for_day(
-        db: &SqlitePool,
-        day: NaiveDate,
-    ) -> Vec<PlannedEventWithUserAndTriptype> {
+    pub async fn get_for_day(db: &SqlitePool, day: NaiveDate) -> Vec<EventWithUserAndTriptype> {
         let day = format!("{day}");
         let events = sqlx::query_as!(
-            PlannedEvent,
+            Event,
             "SELECT planned_event.id, planned_event.name, planned_amount_cox, trip_details_id, planned_starting_time, always_show, max_people, day, notes, allow_guests, trip_type_id, is_locked
 FROM planned_event
 INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id
@@ -149,20 +157,20 @@ WHERE day=?",
             if let Some(trip_type_id) = event.trip_type_id {
                 trip_type = TripType::find_by_id(db, trip_type_id).await;
             }
-            ret.push(PlannedEventWithUserAndTriptype {
+            ret.push(EventWithUserAndTriptype {
                 cox_needed: event.planned_amount_cox > cox.len() as i64,
                 cox,
                 rower: Registration::all_rower(db, event.trip_details_id).await,
-                planned_event: event,
+                event,
                 trip_type,
             });
         }
         ret
     }
 
-    pub async fn all(db: &SqlitePool) -> Vec<PlannedEvent> {
+    pub async fn all(db: &SqlitePool) -> Vec<Event> {
         sqlx::query_as!(
-            PlannedEvent,
+            Event,
             "SELECT planned_event.id, planned_event.name, planned_amount_cox, trip_details_id, planned_starting_time, always_show, max_people, day, notes, allow_guests, trip_type_id, is_locked
 FROM planned_event
 INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
@@ -189,11 +197,27 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
         is_rower.amount > 0
     }
 
+    pub async fn find_by_trip_details(db: &SqlitePool, tripdetails_id: i64) -> Option<Self> {
+        sqlx::query_as!(
+            Self,
+            "
+SELECT planned_event.id, planned_event.name, planned_amount_cox, trip_details_id, planned_starting_time, always_show, max_people, day, notes, allow_guests, trip_type_id, is_locked
+FROM planned_event 
+INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id
+WHERE trip_details.id=?
+        ",
+            tripdetails_id
+        )
+        .fetch_one(db)
+        .await
+        .ok()
+    }
+
     pub async fn create(
         db: &SqlitePool,
         name: &str,
         planned_amount_cox: i32,
-        trip_details: TripDetails,
+        trip_details: &TripDetails,
     ) {
         sqlx::query!(
             "INSERT INTO planned_event(name, planned_amount_cox, trip_details_id) VALUES(?, ?, ?)",
@@ -207,58 +231,153 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
     }
 
     //TODO: create unit test
-    pub async fn update(
-        &self,
-        db: &SqlitePool,
-        name: &str,
-        planned_amount_cox: i32,
-        max_people: i32,
-        notes: Option<&str>,
-        always_show: bool,
-        is_locked: bool,
-    ) {
+    pub async fn update(&self, db: &SqlitePool, update: &EventUpdate<'_>) {
         sqlx::query!(
             "UPDATE planned_event SET name = ?, planned_amount_cox = ? WHERE id = ?",
-            name,
-            planned_amount_cox,
+            update.name,
+            update.planned_amount_cox,
             self.id
         )
         .execute(db)
         .await
         .unwrap(); //Okay, as planned_event can only be created with proper DB backing
 
+        let tripdetails = self.trip_details(db).await;
+        let was_already_cancelled = tripdetails.max_people == 0;
+
         sqlx::query!(
-            "UPDATE trip_details SET max_people = ?, notes = ?, always_show = ?, is_locked = ? WHERE id = ?",
-            max_people,
-            notes,
-            always_show,
-            is_locked,
+            "UPDATE trip_details SET max_people = ?, notes = ?, always_show = ?, is_locked = ?, trip_type_id = ? WHERE id = ?",
+            update.max_people,
+            update.notes,
+            update.always_show,
+            update.is_locked,
+            update.trip_type_id,
             self.trip_details_id
         )
         .execute(db)
         .await
         .unwrap(); //Okay, as planned_event can only be created with proper DB backing
+
+        if update.max_people == 0 && !was_already_cancelled {
+            let coxes = Registration::all_cox(db, self.id).await;
+            for user in coxes {
+                if let Some(user) = User::find_by_name(db, &user.name).await {
+                    let notes = match update.notes {
+                        Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
+                        _ => String::from(""),
+                    };
+                    Notification::create(
+                        db,
+                        &user,
+                        &format!(
+                            "Die Ausfahrt {} am {} um {} wurde abgesagt. {}",
+                            self.name, self.day, self.planned_starting_time, notes
+                        ),
+                        "Absage Ausfahrt",
+                        None,
+                        Some(&format!("remove_trip_by_event:{}", self.id)),
+                    )
+                    .await;
+                }
+            }
+
+            let rower = Registration::all_rower(db, self.trip_details_id).await;
+            for user in rower {
+                if let Some(user) = User::find_by_name(db, &user.name).await {
+                    let notes = match update.notes {
+                        Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
+                        _ => String::from(""),
+                    };
+
+                    Notification::create(
+                        db,
+                        &user,
+                        &format!(
+                            "Die Ausfahrt {} am {} um {} wurde abgesagt. {}",
+                            self.name, self.day, self.planned_starting_time, notes
+                        ),
+                        "Absage Ausfahrt",
+                        None,
+                        Some(&format!(
+                            "remove_user_trip_with_trip_details_id:{}",
+                            tripdetails.id
+                        )),
+                    )
+                    .await;
+                }
+            }
+        }
+        if update.max_people > 0 && was_already_cancelled {
+            Notification::delete_by_action(
+                db,
+                &format!("remove_user_trip_with_trip_details_id:{}", tripdetails.id),
+            )
+            .await;
+            Notification::delete_by_action(db, &format!("remove_trip_by_event:{}", self.id)).await;
+        }
+    }
+
+    pub async fn delete(&self, db: &SqlitePool) -> Result<(), String> {
+        if !Registration::all_rower(db, self.trip_details_id)
+            .await
+            .is_empty()
+        {
+            return Err(
+                "Event kann nicht gelöscht werden, weil mind. 1 Ruderer angemeldet ist.".into(),
+            );
+        }
+        if !Registration::all_cox(db, self.trip_details_id)
+            .await
+            .is_empty()
+        {
+            return Err(
+                "Event kann nicht gelöscht werden, weil mind. 1 Steuerperson angemeldet ist."
+                    .into(),
+            );
         }
 
-    pub async fn delete(&self, db: &SqlitePool) {
         sqlx::query!("DELETE FROM planned_event WHERE id = ?", self.id)
             .execute(db)
             .await
-            .unwrap(); //Okay, as PlannedEvent can only be created with proper DB backing
+            .unwrap(); //Okay, as Event can only be created with proper DB backing
+
+        Ok(())
+    }
+
+    pub fn is_cancelled(&self) -> bool {
+        self.max_people == 0
     }
 
     pub async fn get_ics_feed(db: &SqlitePool) -> String {
         let mut calendar = ICalendar::new("2.0", "ics-rs");
 
-        let events = PlannedEvent::all(db).await;
+        let events = Event::all(db).await;
         for event in events {
-            let mut vevent = Event::new(format!("{}@rudernlinz.at", event.id), "19900101T180000");
+            let mut vevent =
+                ics::Event::new(format!("{}@rudernlinz.at", event.id), "19900101T180000");
             vevent.push(DtStart::new(format!(
                 "{}T{}00",
                 event.day.replace('-', ""),
                 event.planned_starting_time.replace(':', "")
             )));
-            vevent.push(Summary::new(event.name));
+            let tripdetails = event.trip_details(db).await;
+            let mut name = String::new();
+            if event.is_cancelled() {
+                name.push_str("ABGESAGT");
+                if let Some(notes) = &tripdetails.notes {
+                    if !notes.is_empty() {
+                        name.push_str(&format!(" (Grund: {notes})"))
+                    }
+                }
+
+                name.push_str("! :-( ");
+            }
+            name.push_str(&format!("{} ", event.name));
+
+            if let Some(triptype) = tripdetails.triptype(db).await {
+                name.push_str(&format!("• {} ", triptype.name))
+            }
+            vevent.push(Summary::new(name));
             calendar.add_event(vevent);
         }
         let mut buf = Vec::new();
@@ -277,7 +396,7 @@ INNER JOIN trip_details ON planned_event.trip_details_id = trip_details.id",
 mod test {
     use crate::{model::tripdetails::TripDetails, testdb};
 
-    use super::PlannedEvent;
+    use super::Event;
     use chrono::NaiveDate;
     use sqlx::SqlitePool;
 
@@ -285,8 +404,7 @@ mod test {
     fn test_get_day() {
         let pool = testdb!();
 
-        let res =
-            PlannedEvent::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
+        let res = Event::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
         assert_eq!(res.len(), 1);
     }
 
@@ -296,22 +414,20 @@ mod test {
 
         let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap();
 
-        PlannedEvent::create(&pool, "new-event".into(), 2, trip_details).await;
+        Event::create(&pool, "new-event".into(), 2, &trip_details).await;
 
-        let res =
-            PlannedEvent::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
+        let res = Event::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
         assert_eq!(res.len(), 2);
     }
 
     #[sqlx::test]
     fn test_delete() {
         let pool = testdb!();
-        let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
+        let planned_event = Event::find_by_id(&pool, 1).await.unwrap();
 
-        planned_event.delete(&pool).await;
+        planned_event.delete(&pool).await.unwrap();
 
-        let res =
-            PlannedEvent::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
+        let res = Event::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
         assert_eq!(res.len(), 0);
     }
 
@@ -319,7 +435,7 @@ mod test {
     fn test_ics() {
         let pool = testdb!();
 
-        let actual = PlannedEvent::get_ics_feed(&pool).await;
-        assert_eq!("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:ics-rs\r\nBEGIN:VEVENT\r\nUID:1@rudernlinz.at\r\nDTSTAMP:19900101T180000\r\nDTSTART:19700101T100000\r\nSUMMARY:test-planned-event\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", actual);
+        let actual = Event::get_ics_feed(&pool).await;
+        assert_eq!("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:ics-rs\r\nBEGIN:VEVENT\r\nUID:1@rudernlinz.at\r\nDTSTAMP:19900101T180000\r\nDTSTART:19700101T100000\r\nSUMMARY:test-planned-event \r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", actual);
     }
 }

src/model/logbook.rs

@@ -5,7 +5,9 @@ use rocket::FromForm;
 use serde::Serialize;
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
-use super::{boat::Boat, log::Log, notification::Notification, rower::Rower, user::User};
+use super::{
+    boat::Boat, log::Log, notification::Notification, role::Role, rower::Rower, user::User,
+};
 
 #[derive(FromRow, Serialize, Clone, Debug)]
 pub struct Logbook {
@@ -102,6 +104,7 @@ pub enum LogbookUpdateError {
     SteeringPersonNotInRowers,
     UserNotAllowedToUseBoat,
     OnlyAllowedToEndTripsEndingToday,
+    TooFast(i64, i64),
 }
 
 #[derive(Debug, PartialEq)]
@@ -116,7 +119,7 @@ pub enum LogbookCreateError {
     BoatLocked,
     BoatNotFound,
     TooManyRowers(usize, usize),
-    RowerAlreadyOnWater(User),
+    RowerAlreadyOnWater(Box<User>),
     RowerCreateError(i64, String),
     ArrivalNotAfterDeparture,
     SteeringPersonNotInRowers,
@@ -124,6 +127,8 @@ pub enum LogbookCreateError {
     NotYourEntry,
     ArrivalSetButNotRemainingTwo,
     OnlyAllowedToEndTripsEndingToday,
+    CantChangeHandoperatableStatusForThisBoat,
+    TooFast(i64, i64),
 }
 
 impl From<LogbookUpdateError> for LogbookCreateError {
@@ -147,6 +152,7 @@ impl From<LogbookUpdateError> for LogbookCreateError {
             LogbookUpdateError::OnlyAllowedToEndTripsEndingToday => {
                 LogbookCreateError::OnlyAllowedToEndTripsEndingToday
             }
+            LogbookUpdateError::TooFast(km, min) => LogbookCreateError::TooFast(km, min),
         }
     }
 }
@@ -295,11 +301,17 @@ ORDER BY departure DESC
         db: &SqlitePool,
         mut log: LogToAdd,
         created_by_user: &User,
-    ) -> Result<(), LogbookCreateError> {
+    ) -> Result<String, LogbookCreateError> {
         let Some(boat) = Boat::find_by_id(db, log.boat_id).await else {
             return Err(LogbookCreateError::BoatNotFound);
         };
 
+        if log.shipmaster_only_steering != boat.default_shipmaster_only_steering
+            && !boat.convert_handoperated_possible
+        {
+            return Err(LogbookCreateError::CantChangeHandoperatableStatusForThisBoat);
+        }
+
         if boat.amount_seats == 1 && log.rowers.is_empty() {
             log.rowers = vec![created_by_user.id];
         }
@@ -342,7 +354,7 @@ ORDER BY departure DESC
             {
                 Ok(_) => {
                     tx.commit().await.unwrap();
-                    Ok(())
+                    Ok(String::new())
                 }
                 Err(a) => Err(a.into()),
             };
@@ -377,7 +389,7 @@ ORDER BY departure DESC
             let user = User::find_by_id(db, *rower as i32).await.unwrap();
 
             if user.on_water(db).await {
-                return Err(LogbookCreateError::RowerAlreadyOnWater(user));
+                return Err(LogbookCreateError::RowerAlreadyOnWater(Box::new(user)));
             }
         }
 
@@ -414,7 +426,15 @@ ORDER BY departure DESC
 
         tx.commit().await.unwrap();
 
-        Ok(())
+        let mut ret = String::new();
+        for rower in &log.rowers {
+            let user = User::find_by_id(db, *rower as i32).await.unwrap();
+            if let Some(msg) = user.close_thousands_trip(db).await {
+                ret.push_str(&format!(" • {msg}"));
+            }
+        }
+
+        Ok(ret)
     }
 
     pub async fn distances(db: &SqlitePool) -> Vec<(String, i64)> {
@@ -505,9 +525,20 @@ ORDER BY departure DESC
 
         let dep = NaiveDateTime::parse_from_str(&log.departure, "%Y-%m-%dT%H:%M").unwrap();
         let arr = NaiveDateTime::parse_from_str(&log.arrival, "%Y-%m-%dT%H:%M").unwrap();
-        if arr.timestamp() <= dep.timestamp() {
+        if arr.and_utc().timestamp() < dep.and_utc().timestamp() {
             return Err(LogbookUpdateError::ArrivalNotAfterDeparture);
         }
+
+        let duration_in_mins = (arr.and_utc().timestamp() - dep.and_utc().timestamp()) / 60;
+        // Not possible to row < 1 min / 500 m = < 2 min / km
+        let possible_distance_km = duration_in_mins / 2;
+        if log.distance_in_km > possible_distance_km {
+            return Err(LogbookUpdateError::TooFast(
+                log.distance_in_km,
+                duration_in_mins,
+            ));
+        }
+
         let today = Local::now().date_naive();
         let day_diff = today - arr.date();
         let day_diff = day_diff.num_days();
@@ -540,6 +571,7 @@ ORDER BY departure DESC
                 ),
                 "Neuer Logbucheintrag",
                 None,
+                None,
             )
             .await;
         }
@@ -560,11 +592,36 @@ ORDER BY departure DESC
         .execute(db.deref_mut())
         .await.unwrap(); //TODO: fixme
 
+        let duration = arr - dep;
+        if duration.num_days() > 0 {
+            let vorstand = Role::find_by_name_tx(db, "Vorstand").await.unwrap();
+
+            Notification::create_for_role_tx(
+                db,
+                &vorstand,
+                &format!("'{}' hat eine mehrtägige Ausfahrt vom {} bis {} eingetragen ({} km; Ziel: {}; Anmerkungen: {}). Falls das nicht stimmen sollte, bitte nachhaken.",user.name,log.departure, log.arrival, log.distance_in_km, log.destination, log.comments.clone().unwrap_or("".into())),
+                "Mehrtägige Ausfahrt eingetragen",
+                None,None
+            ).await;
+        }
+
+        if boat.external {
+            let vorstand = Role::find_by_name_tx(db, "Vorstand").await.unwrap();
+
+            Notification::create_for_role_tx(
+                db,
+                &vorstand,
+                &format!("'{}' hat eine Ausfahrt mit externem Boot '{}' am {} eingetragen ({} km; Ziel: {}; Anmerkungen: {}). Falls das nicht stimmen sollte, bitte nachhaken.",user.name,boat.name,log.departure,log.distance_in_km, log.destination, log.comments.unwrap_or("".into())),
+                "Ausfahrt mit externem Boot eingetragen",
+                None,None,
+            ).await;
+        }
+
         Ok(())
     }
 
     pub async fn delete(&self, db: &SqlitePool, user: &User) -> Result<(), LogbookDeleteError> {
-        Log::create(db, format!("{user:?} deleted trip: {self:?}")).await;
+        Log::create(db, format!("{} deleted trip: {self:?}", user.name)).await;
 
         if user.has_role(db, "admin").await
             || user.has_role(db, "Vorstand").await
@@ -586,6 +643,7 @@ mod test {
     use crate::model::user::User;
     use crate::testdb;
 
+    use chrono::Duration;
     use sqlx::SqlitePool;
 
     #[sqlx::test]
@@ -637,7 +695,7 @@ mod test {
     fn test_succ_create() {
         let pool = testdb!();
 
-        Logbook::create(
+        let msg = Logbook::create(
             &pool,
             LogToAdd {
                 boat_id: 3,
@@ -655,7 +713,62 @@ mod test {
             &User::find_by_id(&pool, 4).await.unwrap(),
         )
         .await
-        .unwrap()
+        .unwrap();
+        assert_eq!(msg, String::from(""));
+    }
+
+    #[sqlx::test]
+    fn test_succ_create_with_thousands_msg() {
+        let pool = testdb!();
+
+        let logbook = Logbook::find_by_id(&pool, 1).await.unwrap();
+        let user = User::find_by_id(&pool, 2).await.unwrap();
+        let current_date = chrono::Local::now().format("%Y-%m-%d").to_string();
+        let start_date = chrono::Local::now() - Duration::days(3);
+        let start_date = start_date.format("%Y-%m-%d").to_string();
+        logbook
+            .home(
+                &pool,
+                &user,
+                super::LogToFinalize {
+                    destination: "new-destination".into(),
+                    distance_in_km: 995,
+                    comments: Some("Perfect water".into()),
+                    logtype: None,
+                    rowers: vec![2],
+                    shipmaster: Some(2),
+                    steering_person: Some(2),
+                    shipmaster_only_steering: false,
+                    departure: format!("{}T10:00", start_date),
+                    arrival: format!("{}T12:00", current_date),
+                },
+            )
+            .await
+            .unwrap();
+
+        let msg = Logbook::create(
+            &pool,
+            LogToAdd {
+                boat_id: 3,
+                shipmaster: Some(2),
+                steering_person: Some(2),
+                shipmaster_only_steering: false,
+                departure: "2128-05-20T12:00".into(),
+                arrival: None,
+                destination: None,
+                distance_in_km: None,
+                comments: None,
+                logtype: None,
+                rowers: vec![2],
+            },
+            &User::find_by_id(&pool, 1).await.unwrap(),
+        )
+        .await
+        .unwrap();
+        assert_eq!(
+            msg,
+            String::from(" • rower braucht nur mehr 5 km bis die 1000 km voll sind 🤑")
+        );
     }
 
     #[sqlx::test]

src/model/mail.rs

@@ -14,6 +14,63 @@ use super::{family::Family, log::Log, role::Role, user::User};
 pub struct Mail {}
 
 impl Mail {
+    pub async fn send_single(
+        db: &SqlitePool,
+        to: &str,
+        subject: &str,
+        body: String,
+        smtp_pw: &str,
+    ) -> Result<(), String> {
+        let mut email = Message::builder()
+            .from(
+                "ASKÖ Ruderverein Donau Linz <no-reply@rudernlinz.at>"
+                    .parse()
+                    .unwrap(),
+            )
+            .reply_to(
+                "ASKÖ Ruderverein Donau Linz <info@rudernlinz.at>"
+                    .parse()
+                    .unwrap(),
+            )
+            .to("ASKÖ Ruderverein Donau Linz <no-reply@rudernlinz.at>"
+                .parse()
+                .unwrap());
+        let splitted = to.split(',');
+        for single_rec in splitted {
+            match single_rec.parse() {
+                Ok(new_bcc_mail) => email = email.bcc(new_bcc_mail),
+                Err(_) => {
+                    Log::create(
+                        db,
+                        format!("Mail not sent to {single_rec}, because it could not be parsed"),
+                    )
+                    .await;
+                    return Err(format!(
+                        "Mail nicht versandt, da '{single_rec}' keine gültige Mailadresse ist."
+                    ));
+                }
+            }
+        }
+
+        let email = email
+            .subject(subject)
+            .header(ContentType::TEXT_PLAIN)
+            .body(body)
+            .unwrap();
+
+        let creds = Credentials::new("no-reply@rudernlinz.at".to_owned(), smtp_pw.into());
+
+        let mailer = SmtpTransport::relay("mail.your-server.de")
+            .unwrap()
+            .credentials(creds)
+            .build();
+
+        // Send the email
+        mailer.send(&email).unwrap();
+
+        Ok(())
+    }
+
     pub async fn send(db: &SqlitePool, data: MailToSend<'_>, smtp_pw: String) -> bool {
         let mut email = Message::builder()
             .from(

src/model/mod.rs

@@ -1,16 +1,20 @@
 use chrono::NaiveDate;
 use serde::Serialize;
 use sqlx::SqlitePool;
+use waterlevel::WaterlevelDay;
 
 use self::{
-    planned_event::{PlannedEvent, PlannedEventWithUserAndTriptype},
+    event::{Event, EventWithUserAndTriptype},
     trip::{Trip, TripWithUserAndType},
+    waterlevel::Waterlevel,
+    weather::Weather,
 };
 
 pub mod boat;
 pub mod boatdamage;
 pub mod boathouse;
 pub mod boatreservation;
+pub mod event;
 pub mod family;
 pub mod location;
 pub mod log;
@@ -18,22 +22,27 @@ pub mod logbook;
 pub mod logtype;
 pub mod mail;
 pub mod notification;
-pub mod planned_event;
 pub mod role;
 pub mod rower;
 pub mod stat;
+pub mod trailer;
+pub mod trailerreservation;
 pub mod trip;
 pub mod tripdetails;
 pub mod triptype;
 pub mod user;
 pub mod usertrip;
+pub mod waterlevel;
+pub mod weather;
 
 #[derive(Serialize, Debug)]
 pub struct Day {
     day: NaiveDate,
-    planned_events: Vec<PlannedEventWithUserAndTriptype>,
+    events: Vec<EventWithUserAndTriptype>,
     trips: Vec<TripWithUserAndType>,
     is_pinned: bool,
+    max_waterlevel: Option<WaterlevelDay>,
+    weather: Option<Weather>,
 }
 
 impl Day {
@@ -41,23 +50,27 @@ impl Day {
         if is_pinned {
             Self {
                 day,
-                planned_events: PlannedEvent::get_pinned_for_day(db, day).await,
+                events: Event::get_pinned_for_day(db, day).await,
                 trips: Trip::get_pinned_for_day(db, day).await,
                 is_pinned,
+                max_waterlevel: Waterlevel::max_waterlevel_for_day(db, day).await,
+                weather: Weather::find_by_day(db, day).await,
             }
         } else {
             Self {
                 day,
-                planned_events: PlannedEvent::get_for_day(db, day).await,
+                events: Event::get_for_day(db, day).await,
                 trips: Trip::get_for_day(db, day).await,
                 is_pinned,
+                max_waterlevel: Waterlevel::max_waterlevel_for_day(db, day).await,
+                weather: Weather::find_by_day(db, day).await,
             }
         }
     }
     pub async fn new_guest(db: &SqlitePool, day: NaiveDate, is_pinned: bool) -> Self {
         let mut day = Self::new(db, day, is_pinned).await;
 
-        day.planned_events.retain(|e| e.planned_event.allow_guests);
+        day.events.retain(|e| e.event.allow_guests);
         day.trips.retain(|t| t.trip.allow_guests);
 
         day

src/model/notification.rs

@@ -1,12 +1,13 @@
 use std::ops::DerefMut;
 
 use chrono::NaiveDateTime;
+use regex::Regex;
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
-use super::user::User;
+use super::{role::Role, user::User};
 
-#[derive(FromRow, Debug, Serialize, Deserialize)]
+#[derive(FromRow, Debug, Serialize, Deserialize, Clone)]
 pub struct Notification {
     pub id: i64,
     pub user_id: i64,
@@ -15,11 +16,12 @@ pub struct Notification {
     pub created_at: NaiveDateTime,
     pub category: String,
     pub link: Option<String>,
+    pub action_after_reading: Option<String>,
 }
 
 impl Notification {
     pub async fn find_by_id(db: &SqlitePool, id: i64) -> Option<Self> {
-        sqlx::query_as!(Self, "SELECT  * FROM notification WHERE id like ?", id)
+        sqlx::query_as!(Self, "SELECT id, user_id, message, read_at, created_at, category, link, action_after_reading FROM notification WHERE id like ?", id)
             .fetch_one(db)
             .await
             .ok()
@@ -30,13 +32,15 @@ impl Notification {
         message: &str,
         category: &str,
         link: Option<&str>,
+        action_after_reading: Option<&str>,
     ) {
         sqlx::query!(
-            "INSERT INTO notification(user_id, message, category, link) VALUES (?, ?, ?, ?)",
+            "INSERT INTO notification(user_id, message, category, link, action_after_reading) VALUES (?, ?, ?, ?, ?)",
             user.id,
             message,
             category,
-            link
+            link,
+            action_after_reading
         )
         .execute(db.deref_mut())
         .await
@@ -49,30 +53,77 @@ impl Notification {
         message: &str,
         category: &str,
         link: Option<&str>,
+        action_after_reading: Option<&str>,
     ) {
         let mut tx = db.begin().await.unwrap();
-        Self::create_with_tx(&mut tx, user, message, category, link).await;
+        Self::create_with_tx(&mut tx, user, message, category, link, action_after_reading).await;
+        tx.commit().await.unwrap();
+    }
+
+    pub async fn create_for_role_tx(
+        db: &mut Transaction<'_, Sqlite>,
+        role: &Role,
+        message: &str,
+        category: &str,
+        link: Option<&str>,
+        action_after_reading: Option<&str>,
+    ) {
+        let users = User::all_with_role_tx(db, role).await;
+
+        for user in users {
+            Self::create_with_tx(db, &user, message, category, link, action_after_reading).await;
+        }
+    }
+
+    pub async fn create_for_role(
+        db: &SqlitePool,
+        role: &Role,
+        message: &str,
+        category: &str,
+        link: Option<&str>,
+        action_after_reading: Option<&str>,
+    ) {
+        let mut tx = db.begin().await.unwrap();
+        Self::create_for_role_tx(&mut tx, role, message, category, link, action_after_reading)
+            .await;
         tx.commit().await.unwrap();
     }
 
     pub async fn for_user(db: &SqlitePool, user: &User) -> Vec<Self> {
-        sqlx::query_as!(
-            Self,
+        let rows = sqlx::query!(
             "
-SELECT * FROM notification 
+SELECT id, user_id, message, read_at, datetime(created_at, 'localtime') as created_at, category, link, action_after_reading FROM notification 
 WHERE 
   user_id = ? 
   AND (
     read_at IS NULL 
-    OR read_at >= datetime('now', '-30 days')
+    OR read_at >= datetime('now', '-14 days')
   ) 
+  AND created_at is not NULL
 ORDER BY read_at DESC, created_at DESC;
             ",
             user.id
         )
         .fetch_all(db)
         .await
-        .unwrap()
+        .unwrap();
+
+        rows.into_iter()
+            .map(|rec| Notification {
+                id: rec.id,
+                user_id: rec.user_id,
+                message: rec.message,
+                read_at: rec.read_at,
+                created_at: NaiveDateTime::parse_from_str(
+                    &rec.created_at.unwrap(),
+                    "%Y-%m-%d %H:%M:%S",
+                )
+                .unwrap(),
+                category: rec.category,
+                link: rec.link,
+                action_after_reading: rec.action_after_reading,
+            })
+            .collect()
     }
 
     pub async fn mark_read(self, db: &SqlitePool) {
@@ -83,5 +134,162 @@ ORDER BY read_at DESC, created_at DESC;
         .execute(db)
         .await
         .unwrap();
+
+        if let Some(action) = self.action_after_reading.as_ref() {
+            // User read notification about cancelled trip/event
+            let re = Regex::new(r"^remove_user_trip_with_trip_details_id:(\d+)$").unwrap();
+            if let Some(caps) = re.captures(action) {
+                if let Some(matched) = caps.get(1) {
+                    if let Ok(number) = matched.as_str().parse::<i32>() {
+                        let _ = sqlx::query!(
+                            "DELETE FROM user_trip WHERE user_id = ? AND trip_details_id = ?",
+                            self.user_id,
+                            number
+                        )
+                        .execute(db)
+                        .await
+                        .unwrap();
+                    }
+                }
+            }
+            // Cox read notification about cancelled event
+            let re = Regex::new(r"^remove_trip_by_event:(\d+)$").unwrap();
+            if let Some(caps) = re.captures(action) {
+                if let Some(matched) = caps.get(1) {
+                    if let Ok(number) = matched.as_str().parse::<i32>() {
+                        let _ = sqlx::query!(
+                            "DELETE FROM trip WHERE cox_id = ? AND planned_event_id = ?",
+                            self.user_id,
+                            number
+                        )
+                        .execute(db)
+                        .await
+                        .unwrap();
+                    }
+                }
+            }
+        }
+    }
+    pub(crate) async fn delete_by_action(db: &sqlx::Pool<Sqlite>, action: &str) {
+        sqlx::query!(
+            "DELETE FROM notification WHERE action_after_reading=? and read_at is null",
+            action
+        )
+        .execute(db)
+        .await
+        .unwrap();
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::{
+        model::{
+            event::{Event, EventUpdate, Registration},
+            notification::Notification,
+            trip::Trip,
+            tripdetails::{TripDetails, TripDetailsToAdd},
+            user::{CoxUser, User},
+            usertrip::UserTrip,
+        },
+        testdb,
+    };
+
+    use sqlx::SqlitePool;
+
+    #[sqlx::test]
+    fn event_canceled() {
+        let pool = testdb!();
+
+        // Create event
+        let add_tripdetails = TripDetailsToAdd {
+            planned_starting_time: "10:00",
+            max_people: 4,
+            day: "1970-02-01".into(),
+            notes: None,
+            trip_type: None,
+            allow_guests: false,
+            always_show: false,
+        };
+        let tripdetails_id = TripDetails::create(&pool, add_tripdetails).await;
+        let trip_details = TripDetails::find_by_id(&pool, tripdetails_id)
+            .await
+            .unwrap();
+        Event::create(&pool, "new-event".into(), 2, &trip_details).await;
+        let event = Event::find_by_trip_details(&pool, trip_details.id)
+            .await
+            .unwrap();
+
+        // Rower + Cox joins
+        let rower = User::find_by_name(&pool, "rower").await.unwrap();
+        UserTrip::create(&pool, &rower, &trip_details, None)
+            .await
+            .unwrap();
+        let cox = CoxUser::new(&pool, User::find_by_name(&pool, "cox").await.unwrap())
+            .await
+            .unwrap();
+        Trip::new_join(&pool, &cox, &event).await.unwrap();
+
+        // Cancel Event
+        let cancel_update = EventUpdate {
+            name: &event.name,
+            planned_amount_cox: event.planned_amount_cox as i32,
+            max_people: 0,
+            notes: event.notes.as_deref(),
+            always_show: event.always_show,
+            is_locked: event.is_locked,
+            trip_type_id: None,
+        };
+        event.update(&pool, &cancel_update).await;
+
+        // Rower received notification
+        let notifications = Notification::for_user(&pool, &rower).await;
+        let rower_notification = notifications[0].clone();
+        assert_eq!(rower_notification.category, "Absage Ausfahrt");
+        assert_eq!(
+            rower_notification.action_after_reading.as_deref(),
+            Some("remove_user_trip_with_trip_details_id:3")
+        );
+
+        // Cox received notification
+        let notifications = Notification::for_user(&pool, &cox.user).await;
+        let cox_notification = notifications[0].clone();
+        assert_eq!(cox_notification.category, "Absage Ausfahrt");
+        assert_eq!(
+            cox_notification.action_after_reading.as_deref(),
+            Some("remove_trip_by_event:2")
+        );
+
+        // Notification removed if cancellation is cancelled
+        let update = EventUpdate {
+            name: &event.name,
+            planned_amount_cox: event.planned_amount_cox as i32,
+            max_people: 3,
+            notes: event.notes.as_deref(),
+            always_show: event.always_show,
+            is_locked: event.is_locked,
+            trip_type_id: None,
+        };
+        event.update(&pool, &update).await;
+        assert!(Notification::for_user(&pool, &rower).await.is_empty());
+        assert!(Notification::for_user(&pool, &cox.user).await.is_empty());
+
+        // Cancel event again
+        event.update(&pool, &cancel_update).await;
+
+        // Rower is removed if notification is accepted
+        assert!(event.is_rower_registered(&pool, &rower).await);
+        rower_notification.mark_read(&pool).await;
+        assert!(!event.is_rower_registered(&pool, &rower).await);
+
+        // Cox is removed if notification is accepted
+        let registration = Registration::all_cox(&pool, event.id).await;
+        assert_eq!(registration.len(), 1);
+        assert_eq!(registration[0].name, "cox");
+
+        cox_notification.mark_read(&pool).await;
+
+        let registration = Registration::all_cox(&pool, event.id).await;
+        assert!(registration.is_empty());
     }
 }

src/model/role.rs

@@ -1,5 +1,7 @@
+use std::ops::DerefMut;
+
 use serde::Serialize;
-use sqlx::{FromRow, SqlitePool};
+use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
 #[derive(FromRow, Serialize, Clone)]
 pub struct Role {
@@ -45,6 +47,21 @@ WHERE name like ?
         .ok()
     }
 
+    pub async fn find_by_name_tx(db: &mut Transaction<'_, Sqlite>, name: &str) -> Option<Self> {
+        sqlx::query_as!(
+            Self,
+            "
+SELECT id, name
+FROM role 
+WHERE name like ?
+        ",
+            name
+        )
+        .fetch_one(db.deref_mut())
+        .await
+        .ok()
+    }
+
     pub async fn names_from_role(&self, db: &SqlitePool) -> Vec<String> {
         let query = format!(
             "SELECT u.name

src/model/stat.rs

@@ -17,6 +17,7 @@ pub struct BoatStat {
 pub struct SingleBoatStat {
     name: String,
     location: String,
+    owner: String,
     years: HashMap<String, i32>,
 }
 
@@ -39,7 +40,7 @@ LEFT JOIN
 LEFT JOIN 
     location ON boat.location_id = location.id
 WHERE 
-    boat.name != 'Externes Boot'
+    not boat.external
 GROUP BY 
     boat.id, year
 ORDER BY 
@@ -58,7 +59,7 @@ ORDER BY
             } else {
                 String::from("Verein")
             };
-            let name = format!("{} ({})", boat.name, owner);
+            let name = boat.name.clone();
             let location: String = row.get("location");
             let year: i32 = row.get("year");
             if year == 0 {
@@ -78,6 +79,7 @@ ORDER BY
                 .or_insert(SingleBoatStat {
                     name,
                     location,
+                    owner,
                     years: HashMap::new(),
                 });
             boat_stat.years.insert(year, rowed_km);
@@ -93,7 +95,7 @@ ORDER BY
 #[derive(FromRow, Serialize, Clone)]
 pub struct Stat {
     name: String,
-    rowed_km: i32,
+    pub(crate) rowed_km: i32,
 }
 
 impl Stat {
@@ -113,7 +115,7 @@ LEFT JOIN (
     FROM rower
     GROUP BY logbook_id
 ) m ON l.id = m.logbook_id
-WHERE l.distance_in_km IS NOT NULL AND l.arrival LIKE '{year}-%' AND b.name != 'Externes Boot';
+WHERE l.distance_in_km IS NOT NULL AND l.arrival LIKE '{year}-%' AND not b.external;
 "
         ))
         .fetch_one(db)
@@ -193,6 +195,34 @@ ORDER BY rowed_km DESC, u.name;
         })
         .collect()
     }
+    pub async fn person(db: &SqlitePool, year: Option<i32>, user: &User) -> Stat {
+        let year = match year {
+            Some(year) => year,
+            None => chrono::Local::now().year(),
+        };
+        //TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server)
+        let row = sqlx::query(&format!(
+            "
+SELECT u.name, CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km 
+FROM (
+    SELECT * FROM user 
+    WHERE id={}
+) u
+INNER JOIN rower r ON u.id = r.rower_id
+INNER JOIN logbook l ON r.logbook_id = l.id
+WHERE l.distance_in_km IS NOT NULL AND l.arrival LIKE '{year}-%';
+",
+            user.id
+        ))
+        .fetch_one(db)
+        .await
+        .unwrap();
+
+        Stat {
+            name: row.get("name"),
+            rowed_km: row.get("rowed_km"),
+        }
+    }
 }
 
 #[derive(Debug, Serialize)]
@@ -216,7 +246,7 @@ FROM (
     LEFT JOIN 
         rower r ON l.id = r.logbook_id
     WHERE 
-        l.shipmaster = {0} OR r.rower_id = {0}
+       r.rower_id = {}
     GROUP BY 
         departure_date
 ) as subquery

src/model/trailer.rs

@@ -0,0 +1,31 @@
+use std::ops::DerefMut;
+
+use rocket::serde::{Deserialize, Serialize};
+use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
+
+#[derive(FromRow, Debug, Serialize, Deserialize, Eq, Hash, PartialEq, Clone)]
+pub struct Trailer {
+    pub id: i64,
+    pub name: String,
+}
+
+impl Trailer {
+    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT id, name FROM trailer WHERE id like ?", id)
+            .fetch_one(db)
+            .await
+            .ok()
+    }
+    pub async fn find_by_id_tx(db: &mut Transaction<'_, Sqlite>, id: i32) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT id, name FROM trailer WHERE id like ?", id)
+            .fetch_one(db.deref_mut())
+            .await
+            .ok()
+    }
+    pub async fn all(db: &SqlitePool) -> Vec<Self> {
+        sqlx::query_as!(Self, "SELECT id, name FROM trailer")
+            .fetch_all(db)
+            .await
+            .unwrap()
+    }
+}

src/model/trailerreservation.rs

@@ -0,0 +1,233 @@
+use std::collections::HashMap;
+
+use chrono::NaiveDate;
+use chrono::NaiveDateTime;
+use rocket::serde::{Deserialize, Serialize};
+use sqlx::{FromRow, SqlitePool};
+
+use super::log::Log;
+use super::notification::Notification;
+use super::role::Role;
+use super::trailer::Trailer;
+use super::user::User;
+use crate::tera::trailerreservation::ReservationEditForm;
+
+#[derive(FromRow, Debug, Serialize, Deserialize)]
+pub struct TrailerReservation {
+    pub id: i64,
+    pub trailer_id: i64,
+    pub start_date: NaiveDate,
+    pub end_date: NaiveDate,
+    pub time_desc: String,
+    pub usage: String,
+    pub user_id_applicant: i64,
+    pub user_id_confirmation: Option<i64>,
+    pub created_at: NaiveDateTime,
+}
+
+#[derive(FromRow, Debug, Serialize, Deserialize)]
+pub struct TrailerReservationWithDetails {
+    #[serde(flatten)]
+    reservation: TrailerReservation,
+    trailer: Trailer,
+    user_applicant: User,
+    user_confirmation: Option<User>,
+}
+
+#[derive(Debug)]
+pub struct TrailerReservationToAdd<'r> {
+    pub trailer: &'r Trailer,
+    pub start_date: NaiveDate,
+    pub end_date: NaiveDate,
+    pub time_desc: &'r str,
+    pub usage: &'r str,
+    pub user_applicant: &'r User,
+}
+
+impl TrailerReservation {
+    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
+        sqlx::query_as!(
+            Self,
+            "SELECT id, trailer_id, start_date, end_date, time_desc, usage, user_id_applicant, user_id_confirmation, created_at
+             FROM trailer_reservation
+             WHERE id like ?",
+            id
+        )
+        .fetch_one(db)
+        .await
+        .ok()
+    }
+
+    pub async fn all_future(db: &SqlitePool) -> Vec<TrailerReservationWithDetails> {
+        let trailerreservations = sqlx::query_as!(
+            Self,
+            "
+SELECT id, trailer_id, start_date, end_date, time_desc, usage, user_id_applicant, user_id_confirmation, created_at
+FROM trailer_reservation
+WHERE end_date >= CURRENT_DATE ORDER BY end_date 
+        "
+        )
+        .fetch_all(db)
+        .await
+        .unwrap(); //TODO: fixme
+
+        let mut res = Vec::new();
+        for reservation in trailerreservations {
+            let user_confirmation = match reservation.user_id_confirmation {
+                Some(id) => {
+                    let user = User::find_by_id(db, id as i32).await;
+                    Some(user.unwrap())
+                }
+                None => None,
+            };
+            let user_applicant = User::find_by_id(db, reservation.user_id_applicant as i32)
+                .await
+                .unwrap();
+            let trailer = Trailer::find_by_id(db, reservation.trailer_id as i32)
+                .await
+                .unwrap();
+
+            res.push(TrailerReservationWithDetails {
+                reservation,
+                trailer,
+                user_applicant,
+                user_confirmation,
+            });
+        }
+        res
+    }
+    pub async fn all_future_with_groups(
+        db: &SqlitePool,
+    ) -> HashMap<String, Vec<TrailerReservationWithDetails>> {
+        let mut grouped_reservations: HashMap<String, Vec<TrailerReservationWithDetails>> =
+            HashMap::new();
+
+        let reservations = Self::all_future(db).await;
+        for reservation in reservations {
+            let key = format!(
+                "{}-{}-{}-{}-{}",
+                reservation.reservation.start_date,
+                reservation.reservation.end_date,
+                reservation.reservation.time_desc,
+                reservation.reservation.usage,
+                reservation.user_applicant.name
+            );
+
+            grouped_reservations
+                .entry(key)
+                .or_default()
+                .push(reservation);
+        }
+
+        grouped_reservations
+    }
+
+    pub async fn create(
+        db: &SqlitePool,
+        trailerreservation: TrailerReservationToAdd<'_>,
+    ) -> Result<(), String> {
+        if Self::trailer_reserved_between_dates(
+            db,
+            trailerreservation.trailer,
+            &trailerreservation.start_date,
+            &trailerreservation.end_date,
+        )
+        .await
+        {
+            return Err("Hänger in diesem Zeitraum bereits reserviert.".into());
+        }
+
+        Log::create(
+            db,
+            format!("New trailer reservation: {trailerreservation:?}"),
+        )
+        .await;
+
+        sqlx::query!(
+            "INSERT INTO trailer_reservation(trailer_id, start_date, end_date, time_desc, usage, user_id_applicant) VALUES (?,?,?,?,?,?)",
+            trailerreservation.trailer.id,
+            trailerreservation.start_date,
+            trailerreservation.end_date,
+            trailerreservation.time_desc,
+            trailerreservation.usage,
+            trailerreservation.user_applicant.id,
+        )
+        .execute(db)
+        .await
+        .map_err(|e| e.to_string())?;
+
+        let board =
+            User::all_with_role(db, &Role::find_by_name(db, "Vorstand").await.unwrap()).await;
+        for user in board {
+            let date = if trailerreservation.start_date == trailerreservation.end_date {
+                format!("am {}", trailerreservation.start_date)
+            } else {
+                format!(
+                    "von {} bis {}",
+                    trailerreservation.start_date, trailerreservation.end_date
+                )
+            };
+
+            Notification::create(
+                    db,
+                    &user,
+                    &format!(
+                        "{} hat eine neue Hängerreservierung für Hänger '{}' {} angelegt. Zeit: {}; Zweck: {}",
+                        trailerreservation.user_applicant.name,
+                       trailerreservation.trailer.name,
+                       date,
+                        trailerreservation.time_desc,
+                        trailerreservation.usage
+                    ),
+                    "Neue Hängerreservierung",
+                    None,None
+                )
+                .await;
+        }
+
+        Ok(())
+    }
+
+    pub async fn trailer_reserved_between_dates(
+        db: &SqlitePool,
+        trailer: &Trailer,
+        start_date: &NaiveDate,
+        end_date: &NaiveDate,
+    ) -> bool {
+        sqlx::query!(
+            "SELECT COUNT(*) AS reservation_count
+FROM trailer_reservation 
+WHERE trailer_id = ? 
+AND start_date <= ? AND end_date >= ?;",
+            trailer.id,
+            end_date,
+            start_date
+        )
+        .fetch_one(db)
+        .await
+        .unwrap()
+        .reservation_count
+            > 0
+    }
+
+    pub async fn update(&self, db: &SqlitePool, data: ReservationEditForm) {
+        let time_desc = data.time_desc.trim();
+        let usage = data.usage.trim();
+        sqlx::query!(
+            "UPDATE trailer_reservation SET time_desc = ?, usage = ? where id = ?",
+            time_desc,
+            usage,
+            self.id
+        )
+        .execute(db)
+        .await
+        .unwrap(); //Okay, because we can only create a User of a valid id
+    }
+
+    pub async fn delete(&self, db: &SqlitePool) {
+        sqlx::query!("DELETE FROM trailer_reservation WHERE id=?", self.id)
+            .execute(db)
+            .await
+            .unwrap(); //Okay, because we can only create a Boat of a valid id
+    }
+}

src/model/trip.rs

@@ -3,8 +3,8 @@ use serde::Serialize;
 use sqlx::SqlitePool;
 
 use super::{
+    event::{Event, Registration},
     notification::Notification,
-    planned_event::{PlannedEvent, Registration},
     tripdetails::TripDetails,
     triptype::TripType,
     user::{CoxUser, User},
@@ -30,10 +30,34 @@ pub struct Trip {
 pub struct TripWithUserAndType {
     #[serde(flatten)]
     pub trip: Trip,
-    rower: Vec<Registration>,
+    pub rower: Vec<Registration>,
     trip_type: Option<TripType>,
 }
 
+pub struct TripUpdate<'a> {
+    pub cox: &'a CoxUser,
+    pub trip: &'a Trip,
+    pub max_people: i32,
+    pub notes: Option<&'a str>,
+    pub trip_type: Option<i64>, //TODO: Move to `TripType`
+    pub always_show: bool,
+    pub is_locked: bool,
+}
+
+impl TripWithUserAndType {
+    pub async fn from(db: &SqlitePool, trip: Trip) -> Self {
+        let mut trip_type = None;
+        if let Some(trip_type_id) = trip.trip_type_id {
+            trip_type = TripType::find_by_id(db, trip_type_id).await;
+        }
+        Self {
+            rower: Registration::all_rower(db, trip.trip_details_id.unwrap()).await,
+            trip,
+            trip_type,
+        }
+    }
+}
+
 impl Trip {
     /// Cox decides to create own trip.
     pub async fn new_own(db: &SqlitePool, cox: &CoxUser, trip_details: TripDetails) {
@@ -64,7 +88,8 @@ impl Trip {
                                 "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt",
                                 cox.user.name, trip.day, trip.planned_starting_time
                             ),
-                            "Neue Ausfahrt zur selben Zeit".into(),
+                            "Neue Ausfahrt zur selben Zeit",
+                            None,
                             None,
                         )
                         .await;
@@ -108,24 +133,28 @@ WHERE trip.id=?
         .ok()
     }
 
-    /// Cox decides to help in a planned event.
+    /// Cox decides to help in a event.
     pub async fn new_join(
         db: &SqlitePool,
         cox: &CoxUser,
-        planned_event: &PlannedEvent,
+        event: &Event,
     ) -> Result<(), CoxHelpError> {
-        if planned_event.is_rower_registered(db, cox).await {
+        if event.is_rower_registered(db, cox).await {
             return Err(CoxHelpError::AlreadyRegisteredAsRower);
         }
 
-        if planned_event.trip_details(db).await.is_locked {
+        if event.trip_details(db).await.is_locked {
             return Err(CoxHelpError::DetailsLocked);
         }
 
+        if event.max_people == 0 {
+            return Err(CoxHelpError::CanceledEvent);
+        }
+
         match sqlx::query!(
             "INSERT INTO trip (cox_id, planned_event_id) VALUES(?, ?)",
             cox.id,
-            planned_event.id
+            event.id
         )
         .execute(db)
         .await
@@ -154,15 +183,7 @@ WHERE day=?
 
         let mut ret = Vec::new();
         for trip in trips {
-            let mut trip_type = None;
-            if let Some(trip_type_id) = trip.trip_type_id {
-                trip_type = TripType::find_by_id(db, trip_type_id).await;
-            }
-            ret.push(TripWithUserAndType {
-                rower: Registration::all_rower(db, trip.trip_details_id.unwrap()).await,
-                trip,
-                trip_type,
-            });
+            ret.push(TripWithUserAndType::from(db, trip).await);
         }
         ret
     }
@@ -170,35 +191,82 @@ WHERE day=?
     /// Cox decides to update own trip.
     pub async fn update_own(
         db: &SqlitePool,
-        cox: &CoxUser,
-        trip: &Trip,
-        max_people: i32,
-        notes: Option<&str>,
-        trip_type: Option<i64>, //TODO: Move to `TripType`
-        always_show: bool,
-        is_locked: bool,
+        update: &TripUpdate<'_>,
     ) -> Result<(), TripUpdateError> {
-        if !trip.is_trip_from_user(cox.id) {
+        if !update.trip.is_trip_from_user(update.cox.id) {
             return Err(TripUpdateError::NotYourTrip);
         }
 
-        let Some(trip_details_id) = trip.trip_details_id else {
+        let Some(trip_details_id) = update.trip.trip_details_id else {
             return Err(TripUpdateError::TripDetailsDoesNotExist); //TODO: Remove?
         };
 
+        let tripdetails = TripDetails::find_by_id(db, trip_details_id).await.unwrap();
+        let was_already_cancelled = tripdetails.max_people == 0;
+
         sqlx::query!(
             "UPDATE trip_details SET max_people = ?, notes = ?, trip_type_id = ?, always_show = ?, is_locked = ? WHERE id = ?",
-            max_people,
-            notes,
-            trip_type,
-            always_show,
-            is_locked,
+            update.max_people,
+            update.notes,
+            update.trip_type,
+            update.always_show,
+            update.is_locked,
             trip_details_id
         )
         .execute(db)
         .await
         .unwrap(); //Okay, as trip_details can only be created with proper DB backing
 
+        if update.max_people == 0 && !was_already_cancelled {
+            let rowers = TripWithUserAndType::from(db, update.trip.clone())
+                .await
+                .rower;
+            for user in rowers {
+                if let Some(user) = User::find_by_name(db, &user.name).await {
+                    let notes = match update.notes {
+                        Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
+                        _ => String::from(""),
+                    };
+
+                    Notification::create(
+                        db,
+                        &user,
+                        &format!(
+                            "Die Ausfahrt von {} am {} um {} wurde abgesagt. {}",
+                            update.cox.user.name,
+                            update.trip.day,
+                            update.trip.planned_starting_time,
+                            notes
+                        ),
+                        "Absage Ausfahrt",
+                        None,
+                        Some(&format!(
+                            "remove_user_trip_with_trip_details_id:{}",
+                            trip_details_id
+                        )),
+                    )
+                    .await;
+                }
+            }
+        } else {
+            Notification::delete_by_action(
+                db,
+                &format!("remove_user_trip_with_trip_details_id:{}", trip_details_id),
+            )
+            .await;
+        }
+
+        if update.max_people > 0 && was_already_cancelled {
+            Notification::delete_by_action(
+                db,
+                &format!("remove_user_trip_with_trip_details_id:{}", trip_details_id),
+            )
+            .await;
+        }
+
+        let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap();
+        trip_details.check_free_spaces(db).await;
+
         Ok(())
     }
 
@@ -212,16 +280,16 @@ WHERE day=?
     pub async fn delete_by_planned_event(
         db: &SqlitePool,
         cox: &CoxUser,
-        planned_event: &PlannedEvent,
+        event: &Event,
     ) -> Result<(), TripHelpDeleteError> {
-        if planned_event.trip_details(db).await.is_locked {
+        if event.trip_details(db).await.is_locked {
             return Err(TripHelpDeleteError::DetailsLocked);
         }
 
         let affected_rows = sqlx::query!(
             "DELETE FROM trip WHERE cox_id = ? AND planned_event_id = ?",
             cox.id,
-            planned_event.id
+            event.id
         )
         .execute(db)
         .await
@@ -280,6 +348,7 @@ pub enum CoxHelpError {
     AlreadyRegisteredAsRower,
     AlreadyRegisteredAsCox,
     DetailsLocked,
+    CanceledEvent,
 }
 
 #[derive(Debug, PartialEq)]
@@ -304,8 +373,8 @@ pub enum TripUpdateError {
 mod test {
     use crate::{
         model::{
-            planned_event::PlannedEvent,
-            trip::TripDeleteError,
+            event::Event,
+            trip::{self, TripDeleteError},
             tripdetails::TripDetails,
             user::{CoxUser, User},
             usertrip::UserTrip,
@@ -355,7 +424,7 @@ mod test {
         .await
         .unwrap();
 
-        let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
+        let planned_event = Event::find_by_id(&pool, 1).await.unwrap();
 
         assert!(Trip::new_join(&pool, &cox, &planned_event).await.is_ok());
     }
@@ -371,7 +440,7 @@ mod test {
         .await
         .unwrap();
 
-        let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
+        let planned_event = Event::find_by_id(&pool, 1).await.unwrap();
 
         Trip::new_join(&pool, &cox, &planned_event).await.unwrap();
         assert!(Trip::new_join(&pool, &cox, &planned_event).await.is_err());
@@ -390,11 +459,17 @@ mod test {
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
 
-        assert!(
-            Trip::update_own(&pool, &cox, &trip, 10, None, None, false, false)
-                .await
-                .is_ok()
-        );
+        let update = trip::TripUpdate {
+            cox: &cox,
+            trip: &trip,
+            max_people: 10,
+            notes: None,
+            trip_type: None,
+            always_show: false,
+            is_locked: false,
+        };
+
+        assert!(Trip::update_own(&pool, &update).await.is_ok());
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
         assert_eq!(trip.max_people, 10);
@@ -413,11 +488,16 @@ mod test {
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
 
-        assert!(
-            Trip::update_own(&pool, &cox, &trip, 10, None, Some(1), false, false)
-                .await
-                .is_ok()
-        );
+        let update = trip::TripUpdate {
+            cox: &cox,
+            trip: &trip,
+            max_people: 10,
+            notes: None,
+            trip_type: Some(1),
+            always_show: false,
+            is_locked: false,
+        };
+        assert!(Trip::update_own(&pool, &update).await.is_ok());
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
         assert_eq!(trip.max_people, 10);
@@ -437,11 +517,16 @@ mod test {
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
 
-        assert!(
-            Trip::update_own(&pool, &cox, &trip, 10, None, None, false, false)
-                .await
-                .is_err()
-        );
+        let update = trip::TripUpdate {
+            cox: &cox,
+            trip: &trip,
+            max_people: 10,
+            notes: None,
+            trip_type: None,
+            always_show: false,
+            is_locked: false,
+        };
+        assert!(Trip::update_own(&pool, &update).await.is_err());
         assert_eq!(trip.max_people, 1);
     }
 
@@ -456,7 +541,7 @@ mod test {
         .await
         .unwrap();
 
-        let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
+        let planned_event = Event::find_by_id(&pool, 1).await.unwrap();
 
         Trip::new_join(&pool, &cox, &planned_event).await.unwrap();
 

src/model/tripdetails.rs

@@ -4,6 +4,12 @@ use rocket::FromForm;
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, SqlitePool};
 
+use super::{
+    notification::Notification,
+    trip::{Trip, TripWithUserAndType},
+    triptype::TripType,
+};
+
 #[derive(FromRow, Debug, Serialize, Deserialize)]
 pub struct TripDetails {
     pub id: i64,
@@ -46,6 +52,13 @@ WHERE id like ?
         .ok()
     }
 
+    pub async fn triptype(&self, db: &SqlitePool) -> Option<TripType> {
+        match self.trip_type_id {
+            None => None,
+            Some(id) => TripType::find_by_id(db, id).await,
+        }
+    }
+
     pub async fn find_by_startingdatetime(
         db: &SqlitePool,
         day: String,
@@ -64,6 +77,68 @@ WHERE day = ? AND planned_starting_time = ?
         .await.unwrap()
     }
 
+    /// This function is called when a person registers to a trip or when the cox changes the
+    /// amount of free places.
+    pub async fn check_free_spaces(&self, db: &SqlitePool) {
+        if !self.is_full(db).await {
+            // We still have space for new people, no need to do anything
+            return;
+        }
+
+        if self.max_people == 0 {
+            // Cox cancelled event, thus it's probably bad weather. Don't bother with sending
+            // notifications
+            return;
+        }
+
+        if Trip::find_by_trip_details(db, self.id).await.is_none() {
+            // This trip_details belongs to a planned_event, no need to do anything
+            return;
+        };
+
+        let other_trips_same_time = Self::find_by_startingdatetime(
+            db,
+            self.day.clone(),
+            self.planned_starting_time.clone(),
+        )
+        .await;
+
+        for trip in &other_trips_same_time {
+            if !trip.is_full(db).await {
+                // There are trips on the same time, with open places
+                return;
+            }
+        }
+
+        // We just got fully booked and there are no other trips with remaining rower places. Send
+        // notification to all coxes which are registered as non-cox.
+        for trip_details in other_trips_same_time {
+            let Some(trip) = Trip::find_by_trip_details(db, trip_details.id).await else {
+                // This trip_details belongs to a planned_event, no need to do anything
+                continue;
+            };
+            let pot_coxes = TripWithUserAndType::from(db, trip.clone()).await;
+            let pot_coxes = pot_coxes.rower;
+            for user in pot_coxes {
+                let cox = User::find_by_id(db, trip.cox_id as i32).await.unwrap();
+                let Some(user) = User::find_by_name(db, &user.name).await else {
+                    // User is a guest, no need to bother.
+                    continue;
+                };
+                if !user.has_role(db, "cox").await {
+                    // User is no cox, no need to bother
+                    continue;
+                }
+                if user.id == cox.id {
+                    // User already offers a trip, no need to bother
+                    continue;
+                }
+
+                Notification::create(db, &user, &format!("Du hast dich als Ruderer bei der Ausfahrt von {} am {} um {} angemeldet. Bei allen Ausfahrten zu dieser Zeit sind nun alle Plätze ausgebucht. Damit noch mehr (Nicht-Steuerleute) mitfahren können, wäre es super, wenn du eine eigene Ausfahrt zur selben Zeit ausschreiben könntest.", cox.name, self.day, self.planned_starting_time), "Volle Ausfahrt", None, None).await;
+            }
+        }
+    }
+
     /// Creates a new entry in `trip_details` and returns its id.
     pub async fn create(db: &SqlitePool, tripdetails: TripDetailsToAdd<'_>) -> i64 {
         let query = sqlx::query!(

src/model/triptype.rs

@@ -4,7 +4,7 @@ use sqlx::{FromRow, SqlitePool};
 #[derive(FromRow, Debug, Serialize, Deserialize, Clone)]
 pub struct TripType {
     pub id: i64,
-    name: String,
+    pub name: String,
     desc: String,
     question: String,
     icon: String,

src/model/user.rs

@@ -14,7 +14,10 @@ use rocket::{
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
-use super::{family::Family, log::Log, role::Role, tripdetails::TripDetails, Day};
+use super::{
+    family::Family, log::Log, mail::Mail, notification::Notification, role::Role, stat::Stat,
+    tripdetails::TripDetails, Day,
+};
 use crate::tera::admin::user::UserEditForm;
 
 const RENNRUDERBEITRAG: i32 = 11000;
@@ -25,8 +28,9 @@ const STUDENT_OR_PUPIL: i32 = 8000;
 const REGULAR: i32 = 22000;
 const UNTERSTUETZEND: i32 = 2500;
 const FOERDERND: i32 = 8500;
+pub const SCHECKBUCH: i32 = 3000;
 
-#[derive(FromRow, Serialize, Deserialize, Clone, Debug)]
+#[derive(FromRow, Serialize, Deserialize, Clone, Debug, Eq, Hash, PartialEq)]
 pub struct User {
     pub id: i64,
     pub name: String,
@@ -47,45 +51,25 @@ pub struct User {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct UserWithRoles {
-    #[serde(flatten)]
-    pub user: User,
-    pub roles: Vec<String>,
-}
-
-impl UserWithRoles {
-    pub async fn from_user(user: User, db: &SqlitePool) -> Self {
-        Self {
-            roles: user.roles(db).await,
-            user,
-        }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct UserWithWaterStatus {
+pub struct UserWithDetails {
     #[serde(flatten)]
     pub user: User,
+    pub amount_unread_notifications: i32,
     pub on_water: bool,
     pub roles: Vec<String>,
 }
 
-impl UserWithWaterStatus {
+impl UserWithDetails {
     pub async fn from_user(user: User, db: &SqlitePool) -> Self {
         Self {
             on_water: user.on_water(db).await,
             roles: user.roles(db).await,
+            amount_unread_notifications: user.amount_unread_notifications(db).await,
             user,
         }
     }
 }
 
-impl PartialEq for User {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
 #[derive(Debug)]
 pub enum LoginError {
     InvalidAuthenticationCombo,
@@ -96,7 +80,7 @@ pub enum LoginError {
     NotACox,
     NotATech,
     GuestNotAllowed,
-    NoPasswordSet(User),
+    NoPasswordSet(Box<User>),
     DeserializationError,
 }
 
@@ -157,6 +141,174 @@ impl Fee {
 }
 
 impl User {
+    pub async fn send_welcome_email(&self, db: &SqlitePool, smtp_pw: &str) -> Result<(), String> {
+        let Some(mail) = &self.mail else {
+            return Err(format!(
+                "Could not send welcome mail, because user {} has no email address",
+                self.name
+            ));
+        };
+
+        if self.has_role(db, "Donau Linz").await {
+            self.send_welcome_mail_full_member(db, mail, smtp_pw)
+                .await?;
+        } else if self.has_role(db, "scheckbuch").await {
+            self.send_welcome_mail_scheckbuch(db, mail, smtp_pw).await?;
+        } else if self.has_role(db, "schnupperant").await {
+            self.send_welcome_mail_schnupper(db, mail, smtp_pw).await?;
+        } else {
+            return Err(format!(
+                "Could not send welcome mail, because user {} is not in Donau Linz or scheckbuch or schnupperant group",
+                self.name
+            ));
+        }
+
+        Log::create(
+            db,
+            format!("Willkommensemail wurde an {} versandt", self.name),
+        )
+        .await;
+
+        Ok(())
+    }
+
+    async fn send_welcome_mail_schnupper(
+        &self,
+        db: &SqlitePool,
+        mail: &str,
+        smtp_pw: &str,
+    ) -> Result<(), String> {
+        // 2 things to do:
+        // 1. Send mail to user
+        Mail::send_single(
+            db,
+            mail,
+            "Schnupperrudern beim ASKÖ Ruderverein Donau Linz",
+            format!(
+"Hallo {0},
+
+es freut uns sehr, dich bei unserem Schnupperkurs willkommen heißen zu dürfen. Detaillierte Informationen folgen noch, ich werde sie dir ein paar Tage vor dem Termin zusenden.
+
+Liebe Grüße, Philipp", self.name),
+            smtp_pw,
+        ).await?;
+
+        // 2. Notify all coxes
+        let coxes = Role::find_by_name(db, "schnupper-betreuer").await.unwrap();
+        Notification::create_for_role(
+            db,
+            &coxes,
+            &format!(
+                "Liebe Schnupper-Betreuer, {} nimmt am Schnupperkurs teil.",
+                self.name
+            ),
+            "Neue(r) Schnupperteilnehmer:in ",
+            None,
+            None,
+        )
+        .await;
+
+        Ok(())
+    }
+
+    async fn send_welcome_mail_scheckbuch(
+        &self,
+        db: &SqlitePool,
+        mail: &str,
+        smtp_pw: &str,
+    ) -> Result<(), String> {
+        // 2 things to do:
+        // 1. Send mail to user
+        Mail::send_single(
+            db,
+            mail,
+            "ASKÖ Ruderverein Donau Linz | Dein Scheckbuch wartet auf Dich",
+            format!(
+"Hallo {0},
+
+herzlich willkommen beim ASKÖ Ruderverein Donau Linz! Wir freuen uns sehr, dass Du Dich entschieden hast, das Rudern bei uns auszuprobieren. Mit Deinem Scheckbuch kannst Du jetzt an fünf Ausfahrten teilnehmen und so diesen Sport in seiner vollen Vielfalt erleben. Falls du die {1} € noch nicht bezahlt hast, nimm diese bitte zur nächsten Ausfahrt mit (oder überweise sie auf unser Bankkonto [dieses findest du auf https://rudernlinz.at]).
+
+Für die Organisation unserer Ausfahrten nutzen wir app.rudernlinz.at. Logge Dich bitte mit Deinem Namen ('{0}', ohne Anführungszeichen) ein. Beim ersten Mal kannst Du das Passwortfeld leer lassen. Unter 'Geplante Ausfahrten' kannst Du Dich jederzeit für eine Ausfahrt anmelden. Wir bieten mindestens einmal pro Woche Ausfahrten an, sowohl für Anfänger als auch für Fortgeschrittene (A+F Rudern). Zusätzliche Ausfahrten werden von unseren Steuerleuten ausgeschrieben, öfters reinschauen kann sich also lohnen :-)
+
+Nach deinen 5 Ausfahrten würden wir uns freuen, dich als Mitglied in unserem Verein begrüßen zu dürfen.
+
+Wir freuen uns darauf, Dich bald am Wasser zu sehen und gemeinsam tolle Erfahrungen zu sammeln!
+
+Riemen- & Dollenbruch,
+ASKÖ Ruderverein Donau Linz", self.name, SCHECKBUCH/100),
+            smtp_pw,
+        ).await?;
+
+        // 2. Notify all coxes
+        let coxes = Role::find_by_name(db, "cox").await.unwrap();
+        Notification::create_for_role(
+            db,
+            &coxes,
+            &format!(
+                "Liebe Steuerberechtigte, {} hat nun ein Scheckbuch. Wie immer, freuen wir uns wenn du uns beim A+F Rudern unterstützt oder selber Ausfahrten ausschreibst. Bitte beachte, dass Scheckbuch-Personen nur Ausfahrten sehen, bei denen 'Scheckbuch-Anmeldungen erlauben' ausgewählt wurde.",
+                self.name
+            ),
+            "Neues Scheckbuch",
+            None,None
+        )
+        .await;
+
+        Ok(())
+    }
+
+    async fn send_welcome_mail_full_member(
+        &self,
+        db: &SqlitePool,
+        mail: &str,
+        smtp_pw: &str,
+    ) -> Result<(), String> {
+        // 2 things to do:
+        // 1. Send mail to user
+        Mail::send_single(
+            db,
+            mail,
+            "Willkommen im ASKÖ Ruderverein Donau Linz!",
+            format!(
+"Hallo {0},
+
+herzlich willkommen im ASKÖ Ruderverein Donau Linz! Wir freuen uns sehr, dich als neues Mitglied in unserem Verein begrüßen zu dürfen. 
+
+Um dir den Einstieg zu erleichtern, findest du in unserem Handbuch alle wichtigen Informationen über unseren Verein: https://rudernlinz.at/book. Bei weiteren Fragen stehen dir die Adressen info@rudernlinz.at und it@rudernlinz.at jederzeit zur Verfügung.
+
+Du kannst auch gerne unserer Signal-Gruppe beitreten, um auf dem Laufenden zu bleiben und dich mit anderen Mitgliedern auszutauschen: https://signal.group/#CjQKICFrq6zSsRHxrucS3jEcQn6lknEXacAykwwLV3vNLKxPEhA17jxz7cpjfu3JZokLq1TH
+
+Für die Organisation unserer Ausfahrten nutzen wir app.rudernlinz.at. Logge dich einfach mit deinem Namen ('{0}' ohne Anführungszeichen) ein, beim ersten Mal kannst du das Passwortfeld leer lassen. Unter 'Geplante Ausfahrten' kannst du dich jederzeit zu den Ausfahrten anmelden.
+
+Beim nächsten Treffen im Verein, erinnere mich (Philipp Hofer) bitte daran, deinen Fingerabdruck zu registrieren, damit du eigenständig Zugang zum Bootshaus erhältst.
+
+Außerdem haben wir im Bootshaus ein WLAN für Vereinsmitglieder 'ASKÖ Ruderverein Donau Linz'. Das Passwort dafür lautet 'donau1921' (ohne Anführungszeichen). Bitte gib das Passwort an keine vereinsfremden Personen weiter.
+
+Wir freuen uns darauf, dich bald am Wasser zu sehen und gemeinsam tolle Erfahrungen zu sammeln!
+
+Riemen- & Dollenbruch
+ASKÖ Ruderverein Donau Linz", self.name),
+            smtp_pw,
+        ).await?;
+
+        // 2. Notify all coxes
+        let coxes = Role::find_by_name(db, "cox").await.unwrap();
+        Notification::create_for_role(
+            db,
+            &coxes,
+            &format!(
+                "Liebe Steuerberechtigte, seit {} gibt es ein neues Mitglied: {}",
+                self.member_since_date.clone().unwrap(),
+                self.name
+            ),
+            "Neues Vereinsmitglied",
+            None,
+            None,
+        )
+        .await;
+
+        Ok(())
+    }
+
     pub async fn fee(&self, db: &SqlitePool) -> Option<Fee> {
         if !self.has_role(db, "Donau Linz").await {
             return None;
@@ -237,6 +389,17 @@ impl User {
         .count
     }
 
+    pub async fn amount_unread_notifications(&self, db: &SqlitePool) -> i32 {
+        sqlx::query!(
+            "SELECT COUNT(*) as count FROM notification WHERE user_id = ? AND read_at IS NULL",
+            self.id
+        )
+        .fetch_one(db)
+        .await
+        .unwrap()
+        .count
+    }
+
     pub async fn has_role(&self, db: &SqlitePool, role: &str) -> bool {
         if sqlx::query!(
             "SELECT * FROM user_role WHERE user_id=? AND role_id = (SELECT id FROM role WHERE name = ?)",
@@ -254,6 +417,18 @@ impl User {
         false
     }
 
+    pub async fn has_membership_pdf(&self, db: &SqlitePool) -> bool {
+        match sqlx::query_scalar!("SELECT membership_pdf FROM user WHERE id = ?", self.id)
+            .fetch_one(db)
+            .await
+            .unwrap()
+        {
+            Some(a) if a.is_empty() => false,
+            None => false,
+            _ => true,
+        }
+    }
+
     pub async fn roles(&self, db: &SqlitePool) -> Vec<String> {
         sqlx::query!(
             "SELECT r.name FROM role r JOIN user_role ur ON r.id = ur.role_id JOIN user u ON u.id = ur.user_id WHERE ur.user_id = ? AND u.deleted = 0;",
@@ -313,12 +488,14 @@ WHERE id like ?
     }
 
     pub async fn find_by_name(db: &SqlitePool, name: &str) -> Option<Self> {
+        let name = name.trim().to_lowercase();
+
         sqlx::query_as!(
             Self,
             "
 SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id 
 FROM user 
-WHERE name like ?
+WHERE lower(name)=?
         ",
             name
         )
@@ -370,6 +547,13 @@ ORDER BY last_access DESC
     }
 
     pub async fn all_with_role(db: &SqlitePool, role: &Role) -> Vec<Self> {
+        let mut tx = db.begin().await.unwrap();
+        let ret = Self::all_with_role_tx(&mut tx, role).await;
+        tx.commit().await.unwrap();
+        ret
+    }
+
+    pub async fn all_with_role_tx(db: &mut Transaction<'_, Sqlite>, role: &Role) -> Vec<Self> {
         sqlx::query_as!(
             Self,
             "
@@ -380,7 +564,7 @@ WHERE ur.role_id = ? AND deleted = 0
 ORDER BY name;
         ", role.id
         )
-        .fetch_all(db)
+        .fetch_all(db.deref_mut())
         .await
         .unwrap()
     }
@@ -436,6 +620,7 @@ ORDER BY last_access DESC
     }
 
     pub async fn create(db: &SqlitePool, name: &str) -> bool {
+        let name = name.trim();
         sqlx::query!("INSERT INTO USER(name) VALUES (?)", name)
             .execute(db)
             .await
@@ -449,9 +634,7 @@ ORDER BY last_access DESC
             family_id = Some(Family::insert(db).await)
         }
 
-        let user_with_membershippdf = UserWithMembershipPdf::from(db, self.clone()).await;
-
-        if user_with_membershippdf.membership_pdf.is_none() {
+        if !self.has_membership_pdf(db).await {
             if let Some(membership_pdf) = data.membership_pdf {
                 let mut stream = membership_pdf.open().await.unwrap();
                 let mut buffer = Vec::new();
@@ -526,8 +709,8 @@ ORDER BY last_access DESC
     }
 
     pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> {
-        let name = name.trim(); // just to make sure...
-        let Some(user) = User::find_by_name(db, name).await else {
+        let name = name.trim().to_lowercase(); // just to make sure...
+        let Some(user) = User::find_by_name(db, &name).await else {
             if ![
                 "n-sageder",
                 "p-hofer",
@@ -554,10 +737,11 @@ ORDER BY last_access DESC
                 "n.sageder",
                 "a.almousa",
                 "p.hofer",
+                "philipp-hofer",
                 "d.kortschak",
                 "[login]",
             ]
-            .contains(&name)
+            .contains(&name.as_str())
             {
                 Log::create(db, format!("Username ({name}) not found (tried to login)")).await;
             }
@@ -583,7 +767,7 @@ ORDER BY last_access DESC
             Err(LoginError::InvalidAuthenticationCombo)
         } else {
             info!("User {name} has no PW set");
-            Err(LoginError::NoPasswordSet(user))
+            Err(LoginError::NoPasswordSet(Box::new(user)))
         }
     }
 
@@ -643,7 +827,7 @@ ORDER BY last_access DESC
         for date in TripDetails::pinned_days(db, self.amount_days_to_show(db).await - 1).await {
             if self.has_role(db, "scheckbuch").await {
                 let day = Day::new_guest(db, date, true).await;
-                if !day.planned_events.is_empty() {
+                if !day.events.is_empty() {
                     days.push(day);
                 }
             } else {
@@ -667,6 +851,19 @@ ORDER BY last_access DESC
             6
         }
     }
+
+    pub(crate) async fn close_thousands_trip(&self, db: &SqlitePool) -> Option<String> {
+        let rowed_km = Stat::person(db, None, self).await.rowed_km;
+        if rowed_km % 1000 > 970 {
+            return Some(format!(
+                "{} braucht nur mehr {} km bis die {} km voll sind 🤑",
+                self.name,
+                1000 - rowed_km % 1000,
+                rowed_km + 1000 - (rowed_km % 1000)
+            ));
+        }
+        None
+    }
 }
 
 #[async_trait]
@@ -944,15 +1141,15 @@ impl<'r> FromRequest<'r> for VorstandUser {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct PlannedEventUser(pub(crate) User);
+pub struct EventUser(pub(crate) User);
 
-impl From<PlannedEventUser> for User {
-    fn from(val: PlannedEventUser) -> Self {
+impl From<EventUser> for User {
+    fn from(val: EventUser) -> Self {
         val.0
     }
 }
 
-impl Deref for PlannedEventUser {
+impl Deref for EventUser {
     type Target = User;
 
     fn deref(&self) -> &Self::Target {
@@ -969,12 +1166,7 @@ pub struct UserWithRolesAndMembershipPdf {
 
 impl UserWithRolesAndMembershipPdf {
     pub(crate) async fn from_user(db: &SqlitePool, user: User) -> Self {
-        let membership_pdf: bool =
-            sqlx::query_scalar!("SELECT membership_pdf FROM user WHERE id = $1", user.id)
-                .fetch_optional(db)
-                .await
-                .unwrap()
-                .is_some();
+        let membership_pdf = user.has_membership_pdf(db).await;
 
         Self {
             roles: user.roles(db).await,
@@ -1008,15 +1200,15 @@ impl UserWithMembershipPdf {
 }
 
 #[async_trait]
-impl<'r> FromRequest<'r> for PlannedEventUser {
+impl<'r> FromRequest<'r> for EventUser {
     type Error = LoginError;
 
     async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
         let db = req.rocket().state::<SqlitePool>().unwrap();
         match User::from_request(req).await {
             Outcome::Success(user) => {
-                if user.has_role(db, "planned_event").await {
-                    Outcome::Success(PlannedEventUser(user))
+                if user.has_role(db, "manage_events").await {
+                    Outcome::Success(EventUser(user))
                 } else {
                     Outcome::Error((Status::Forbidden, LoginError::NotACox))
                 }

src/model/usertrip.rs

@@ -27,8 +27,7 @@ impl UserTrip {
         //TODO: Check if user sees the event (otherwise she could forge trip_details_id)
 
         let is_cox = trip_details.user_is_cox(db, user).await;
-        let mut name_newly_registered_person = String::new();
-        if user_note.is_none() {
+        let name_newly_registered_person = if user_note.is_none() {
             if let Yes(action) = is_cox {
                 match action {
                     Action::Helping => return Err(UserTripError::AlreadyRegisteredAsCox),
@@ -49,7 +48,7 @@ impl UserTrip {
             .await
             .unwrap();
 
-            name_newly_registered_person = user.name.clone();
+            user.name.clone()
         } else {
             if !trip_details.user_allowed_to_change(db, user).await {
                 return Err(UserTripError::NotAllowedToAddGuest);
@@ -63,8 +62,8 @@ impl UserTrip {
             .await
             .unwrap();
 
-            name_newly_registered_person = user_note.unwrap();
-        }
+            user_note.unwrap()
+        };
 
         if let Some(trip) = Trip::find_by_trip_details(db, trip_details.id).await {
             let cox = User::find_by_id(db, trip.cox_id as i32).await.unwrap();
@@ -77,8 +76,11 @@ impl UserTrip {
                 ),
                 "Registrierung bei deiner Ausfahrt",
                 None,
+                None,
             )
             .await;
+
+            trip_details.check_free_spaces(db).await;
         }
 
         Ok(name_newly_registered_person)
@@ -148,7 +150,7 @@ pub enum UserTripDeleteError {
 mod test {
     use crate::{
         model::{
-            planned_event::PlannedEvent, trip::Trip, tripdetails::TripDetails, user::CoxUser,
+            event::Event, trip::Trip, tripdetails::TripDetails, user::CoxUser,
             usertrip::UserTripError,
         },
         testdb,
@@ -238,8 +240,8 @@ mod test {
         .await
         .unwrap();
 
-        let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
-        Trip::new_join(&pool, &cox, &planned_event).await.unwrap();
+        let event = Event::find_by_id(&pool, 1).await.unwrap();
+        Trip::new_join(&pool, &cox, &event).await.unwrap();
 
         let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap();
         let result = UserTrip::create(&pool, &cox, &trip_details, None)

src/model/waterlevel.rs

@@ -0,0 +1,93 @@
+use std::ops::DerefMut;
+
+use chrono::NaiveDate;
+use rocket::serde::{Deserialize, Serialize};
+use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
+
+#[derive(FromRow, Debug, Serialize, Deserialize, Eq, Hash, PartialEq, Clone)]
+pub struct Waterlevel {
+    pub id: i64,
+    pub day: NaiveDate,
+    pub time: String,
+    pub max: i64,
+    pub min: i64,
+    pub mittel: i64,
+    pub tumax: i64,
+    pub tumin: i64,
+    pub tumittel: i64,
+}
+
+#[derive(Debug, Serialize)]
+pub struct WaterlevelDay {
+    pub day: NaiveDate,
+    pub avg: i64,
+    pub fluctuation: i64,
+}
+
+pub struct Create {
+    pub day: NaiveDate,
+    pub time: String,
+    pub max: i64,
+    pub min: i64,
+    pub mittel: i64,
+    pub tumax: i64,
+    pub tumin: i64,
+    pub tumittel: i64,
+}
+
+impl Waterlevel {
+    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT * FROM waterlevel WHERE id like ?", id)
+            .fetch_one(db)
+            .await
+            .ok()
+    }
+    pub async fn find_by_id_tx(db: &mut Transaction<'_, Sqlite>, id: i32) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT * FROM waterlevel WHERE id like ?", id)
+            .fetch_one(db.deref_mut())
+            .await
+            .ok()
+    }
+
+    pub async fn create(db: &mut Transaction<'_, Sqlite>, create: &Create) -> Result<(), String> {
+        sqlx::query!(
+            "INSERT INTO waterlevel(day, time, max, min, mittel, tumax, tumin, tumittel) VALUES (?,?,?,?,?,?,?,?)",
+            create.day, create.time, create.max, create.min, create.mittel, create.tumax, create.tumin, create.tumittel
+        )
+        .execute(db.deref_mut())
+        .await
+        .map_err(|e| e.to_string())?;
+        Ok(())
+    }
+
+    pub async fn max_waterlevel_for_day(db: &SqlitePool, day: NaiveDate) -> Option<WaterlevelDay> {
+        let waterlevel = sqlx::query_as!(
+            Waterlevel,
+            "SELECT id, day, time, max, min, mittel, tumax, tumin, tumittel FROM waterlevel WHERE day = ? ORDER BY mittel DESC LIMIT 1",
+            day
+        )
+        .fetch_optional(db)
+        .await.unwrap();
+
+        if let Some(waterlevel) = waterlevel {
+            let max_diff = (waterlevel.mittel - waterlevel.max).abs();
+            let min_diff = (waterlevel.mittel - waterlevel.min).abs();
+            let fluctuation = max_diff.max(min_diff);
+
+            return Some(WaterlevelDay {
+                day: waterlevel.day,
+                avg: waterlevel.mittel,
+                fluctuation,
+            });
+        }
+
+        None
+    }
+
+    pub async fn delete_all(db: &mut Transaction<'_, Sqlite>) {
+        sqlx::query!("DELETE FROM waterlevel;")
+            .execute(db.deref_mut())
+            .await
+            .unwrap();
+    }
+}

src/model/weather.rs

@@ -0,0 +1,56 @@
+use std::ops::DerefMut;
+
+use chrono::NaiveDate;
+use rocket::serde::{Deserialize, Serialize};
+use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
+
+#[derive(FromRow, Debug, Serialize, Deserialize, PartialEq, Clone)]
+pub struct Weather {
+    pub id: i64,
+    pub day: NaiveDate,
+    pub max_temp: f64,
+    pub wind_gust: f64,
+    pub rain_mm: f64,
+}
+
+impl Weather {
+    pub async fn find_by_day(db: &SqlitePool, day: NaiveDate) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT * FROM weather WHERE day = ?", day)
+            .fetch_one(db)
+            .await
+            .ok()
+    }
+    pub async fn find_by_id_tx(db: &mut Transaction<'_, Sqlite>, day: NaiveDate) -> Option<Self> {
+        sqlx::query_as!(Self, "SELECT * FROM weather WHERE day = ?", day)
+            .fetch_one(db.deref_mut())
+            .await
+            .ok()
+    }
+
+    pub async fn create(
+        db: &mut Transaction<'_, Sqlite>,
+        day: NaiveDate,
+        max_temp: f64,
+        wind_gust: f64,
+        rain_mm: f64,
+    ) -> Result<(), String> {
+        sqlx::query!(
+            "INSERT INTO weather(day, max_temp, wind_gust, rain_mm) VALUES (?,?,?,?)",
+            day,
+            max_temp,
+            wind_gust,
+            rain_mm
+        )
+        .execute(db.deref_mut())
+        .await
+        .map_err(|e| e.to_string())?;
+        Ok(())
+    }
+
+    pub async fn delete_all(db: &mut Transaction<'_, Sqlite>) {
+        sqlx::query!("DELETE FROM weather;")
+            .execute(db.deref_mut())
+            .await
+            .unwrap();
+    }
+}

src/scheduled/mod.rs

@@ -0,0 +1,43 @@
+mod waterlevel;
+mod weather;
+
+use std::time::Duration;
+
+use job_scheduler_ng::{Job, JobScheduler};
+use rocket::tokio::{self, task, time};
+use sqlx::SqlitePool;
+
+use crate::tera::Config;
+
+pub fn schedule(db: &SqlitePool, config: &Config) {
+    let db = db.clone();
+    let openweathermap_key = config.openweathermap_key.clone();
+
+    tokio::task::spawn(async {
+        waterlevel::update(&db).await.unwrap();
+        weather::update(&db, &openweathermap_key).await.unwrap();
+
+        let mut sched = JobScheduler::new();
+
+        // Every hour
+        sched.add(Job::new("0 0 * * * * *".parse().unwrap(), move || {
+            let db_clone = db.clone();
+            // Use block_in_place to run async code in the synchronous function; TODO: Make it
+            // nicer one's rust (stable) support async closures
+            task::block_in_place(|| {
+                tokio::runtime::Handle::current().block_on(async {
+                    waterlevel::update(&db_clone).await.unwrap();
+                    weather::update(&db_clone, &openweathermap_key)
+                        .await
+                        .unwrap();
+                });
+            });
+        }));
+
+        let mut interval = time::interval(Duration::from_secs(60));
+        loop {
+            sched.tick();
+            interval.tick().await;
+        }
+    });
+}

src/scheduled/waterlevel.rs

@@ -0,0 +1,118 @@
+use chrono::{DateTime, FixedOffset, NaiveDate, NaiveTime};
+use serde::{Deserialize, Serialize};
+use sqlx::SqlitePool;
+
+use crate::model::waterlevel::{self, Waterlevel};
+
+pub async fn update(db: &SqlitePool) -> Result<(), String> {
+    let mut tx = db.begin().await.unwrap();
+
+    // 1. Delete water levels starting from yesterday
+    Waterlevel::delete_all(&mut tx).await;
+
+    // 2. Fetch
+    let station = fetch()?;
+    for d in station.data {
+        let (Some(max), Some(min), Some(mittel), Some(tumax), Some(tumin), Some(tumittel)) =
+            (d.max, d.min, d.mittel, d.tumax, d.tumin, d.tumittel)
+        else {
+            println!("Ignored invalid values: {d:?}");
+            continue;
+        };
+
+        let Ok(datetime): Result<DateTime<FixedOffset>, _> = d.timestamp.parse() else {
+            return Err("Failed to parse datetime from hydro json".into());
+        };
+        let date: NaiveDate = datetime.naive_utc().date();
+
+        // Extract time component and format as string
+        let time: NaiveTime = datetime.naive_utc().time();
+        let time_str = time.format("%H:%M").to_string();
+
+        let create = waterlevel::Create {
+            day: date,
+            time: time_str,
+            max,
+            min,
+            mittel,
+            tumax,
+            tumin,
+            tumittel,
+        };
+
+        Waterlevel::create(&mut tx, &create).await?
+    }
+
+    // 3. Save in DB
+    tx.commit().await.unwrap();
+
+    Ok(())
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Station {
+    station_no: String,
+    station_latitude: String,
+    station_longitude: String,
+    parametertype_name: String,
+    ts_shortname: String,
+    ts_name: String,
+    ts_unitname: String,
+    ts_unitsymbol: String,
+    ts_precision: String,
+    rows: String,
+    columns: String,
+    data: Vec<Data>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Data {
+    timestamp: String,
+    max: Option<i64>,
+    min: Option<i64>,
+    mittel: Option<i64>,
+    tumax: Option<i64>,
+    tumin: Option<i64>,
+    tumittel: Option<i64>,
+}
+
+fn fetch() -> Result<Station, String> {
+    let url = "https://hydro.ooe.gv.at/daten/internet/stations/OG/207068/S/forecast.json";
+
+    match ureq::get(url).call() {
+        Ok(response) => {
+            let forecast: Result<Vec<Station>, _> = response.into_json();
+
+            if let Ok(data) = forecast {
+                if data.len() == 1 {
+                    Ok(data[0].clone())
+                } else {
+                    Err(format!(
+                        "Expected 1 station (Linz); got {} while fetching from {url}. Maybe the hydro data format changed?",
+                        data.len()
+                    ))
+                }
+            } else {
+                Err(format!(
+                    "Failed to parse the json received by {url}: {}",
+                    forecast.err().unwrap()
+                ))
+            }
+        }
+        Err(_) => Err(format!(
+            "Could not fetch {url}, do you have internet? Maybe their server is down?"
+        )),
+    }
+}
+
+//#[cfg(test)]
+//mod test {
+//    use crate::testdb;
+//
+//    use super::*;
+//    #[sqlx::test]
+//    fn test_fetch_succ() {
+//        let pool = testdb!();
+//        fetch();
+//    }
+//}

src/scheduled/weather.rs

@@ -0,0 +1,118 @@
+use chrono::DateTime;
+use serde::{Deserialize, Serialize};
+use sqlx::SqlitePool;
+
+use crate::model::weather::Weather;
+
+pub async fn update(db: &SqlitePool, api_key: &str) -> Result<(), String> {
+    let mut tx = db.begin().await.unwrap();
+
+    // 1. Delete weather data
+    Weather::delete_all(&mut tx).await;
+
+    // 2. Fetch
+    let data = fetch(api_key)?;
+    for d in data.daily {
+        let Some(date) = DateTime::from_timestamp(d.dt, 0) else {
+            println!("Skipping {} because convertion to datetime failed", d.dt);
+            continue;
+        };
+        let max_temp = d.temp.max;
+        let wind_gust = d.wind_gust;
+        let rain_mm = d.rain.unwrap_or(0.);
+
+        Weather::create(
+            &mut tx,
+            date.naive_utc().into(),
+            max_temp,
+            wind_gust,
+            rain_mm,
+        )
+        .await?
+    }
+
+    // 3. Save in DB
+    tx.commit().await.unwrap();
+
+    Ok(())
+}
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Data {
+    lat: f64,
+    lon: f64,
+    timezone: String,
+    timezone_offset: i64,
+    daily: Vec<Daily>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Daily {
+    dt: i64,
+    sunrise: i64,
+    sunset: i64,
+    moonrise: i64,
+    moonset: i64,
+    moon_phase: f64,
+    summary: String,
+    temp: Temp,
+    feels_like: FeelsLike,
+    pressure: i64,
+    humidity: i64,
+    dew_point: f64,
+    wind_speed: f64,
+    wind_deg: i64,
+    wind_gust: f64,
+    weather: Vec<DailyWeather>,
+    clouds: i64,
+    pop: f64,
+    rain: Option<f64>,
+    uvi: f64,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct Temp {
+    day: f64,
+    min: f64,
+    max: f64,
+    night: f64,
+    eve: f64,
+    morn: f64,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct FeelsLike {
+    day: f64,
+    night: f64,
+    eve: f64,
+    morn: f64,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+struct DailyWeather {
+    id: i64,
+    main: String,
+    description: String,
+    icon: String,
+}
+
+fn fetch(api_key: &str) -> Result<Data, String> {
+    let url = format!("https://api.openweathermap.org/data/3.0/onecall?lat=48.31970&lon=14.29451&units=metric&exclude=current,minutely,hourly,alert&appid={api_key}");
+
+    match ureq::get(&url).call() {
+        Ok(response) => {
+            let data: Result<Data, _> = response.into_json();
+
+            if let Ok(data) = data {
+                Ok(data)
+            } else {
+                Err(format!(
+                    "Failed to parse the json received by {url}: {}",
+                    data.err().unwrap()
+                ))
+            }
+        }
+        Err(_) => Err(format!(
+            "Could not fetch {url}, do you have internet? Maybe their server is down?"
+        )),
+    }
+}

src/tera/admin/boat.rs

@@ -1,7 +1,8 @@
 use crate::model::{
     boat::{Boat, BoatToAdd, BoatToUpdate},
     location::Location,
-    user::{AdminUser, User, UserWithRoles},
+    log::Log,
+    user::{AdminUser, User, UserWithDetails},
 };
 use rocket::{
     form::Form,
@@ -32,15 +33,17 @@ async fn index(
     context.insert("users", &users);
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(admin.user, db).await,
+        &UserWithDetails::from_user(admin.user, db).await,
     );
 
     Template::render("admin/boat/index", context.into_json())
 }
 
 #[get("/boat/<boat>/delete")]
-async fn delete(db: &State<SqlitePool>, _admin: AdminUser, boat: i32) -> Flash<Redirect> {
+async fn delete(db: &State<SqlitePool>, admin: AdminUser, boat: i32) -> Flash<Redirect> {
     let boat = Boat::find_by_id(db, boat).await;
+    Log::create(db, format!("{} deleted boat: {boat:?}", admin.user.name)).await;
+
     match boat {
         Some(boat) => {
             boat.delete(db).await;

src/tera/admin/event.rs

@@ -8,14 +8,14 @@ use serde::Serialize;
 use sqlx::SqlitePool;
 
 use crate::model::{
-    planned_event::PlannedEvent,
+    event::{self, Event},
     tripdetails::{TripDetails, TripDetailsToAdd},
-    user::PlannedEventUser,
+    user::EventUser,
 };
 
 //TODO: add constraints (e.g. planned_amount_cox > 0)
 #[derive(FromForm, Serialize)]
-struct AddPlannedEventForm<'r> {
+struct AddEventForm<'r> {
     name: &'r str,
     planned_amount_cox: i32,
     tripdetails: TripDetailsToAdd<'r>,
@@ -24,8 +24,8 @@ struct AddPlannedEventForm<'r> {
 #[post("/planned-event", data = "<data>")]
 async fn create(
     db: &State<SqlitePool>,
-    data: Form<AddPlannedEventForm<'_>>,
-    _admin: PlannedEventUser,
+    data: Form<AddEventForm<'_>>,
+    _admin: EventUser,
 ) -> Flash<Redirect> {
     let data = data.into_inner();
 
@@ -34,14 +34,14 @@ async fn create(
                                                                                     //just created
                                                                                     //the object
 
-    PlannedEvent::create(db, data.name, data.planned_amount_cox, trip_details).await;
+    Event::create(db, data.name, data.planned_amount_cox, &trip_details).await;
 
     Flash::success(Redirect::to("/planned"), "Event hinzugefügt")
 }
 
 //TODO: add constraints (e.g. planned_amount_cox > 0)
-#[derive(FromForm)]
-struct UpdatePlannedEventForm<'r> {
+#[derive(FromForm, Debug)]
+struct UpdateEventForm<'r> {
     id: i64,
     name: &'r str,
     planned_amount_cox: i32,
@@ -49,27 +49,27 @@ struct UpdatePlannedEventForm<'r> {
     notes: Option<&'r str>,
     always_show: bool,
     is_locked: bool,
+    trip_type: Option<i64>,
 }
 
 #[put("/planned-event", data = "<data>")]
 async fn update(
     db: &State<SqlitePool>,
-    data: Form<UpdatePlannedEventForm<'_>>,
-    _admin: PlannedEventUser,
+    data: Form<UpdateEventForm<'_>>,
+    _admin: EventUser,
 ) -> Flash<Redirect> {
-    match PlannedEvent::find_by_id(db, data.id).await {
+    let update = event::EventUpdate {
+        name: data.name,
+        planned_amount_cox: data.planned_amount_cox,
+        max_people: data.max_people,
+        notes: data.notes,
+        always_show: data.always_show,
+        is_locked: data.is_locked,
+        trip_type_id: data.trip_type,
+    };
+    match Event::find_by_id(db, data.id).await {
         Some(planned_event) => {
-            planned_event
-                .update(
-                    db,
-                    data.name,
-                    data.planned_amount_cox,
-                    data.max_people,
-                    data.notes,
-                    data.always_show,
-                    data.is_locked,
-                )
-                .await;
+            planned_event.update(db, &update).await;
             Flash::success(Redirect::to("/planned"), "Event erfolgreich bearbeitet")
         }
         None => Flash::error(Redirect::to("/planned"), "Planned event id not found"),
@@ -77,13 +77,14 @@ async fn update(
 }
 
 #[get("/planned-event/<id>/delete")]
-async fn delete(db: &State<SqlitePool>, id: i64, _admin: PlannedEventUser) -> Flash<Redirect> {
-    match PlannedEvent::find_by_id(db, id).await {
-        Some(planned_event) => {
-            planned_event.delete(db).await;
-            Flash::success(Redirect::to("/planned"), "Event gelöscht")
-        }
-        None => Flash::error(Redirect::to("/planned"), "PlannedEvent does not exist"),
+async fn delete(db: &State<SqlitePool>, id: i64, _admin: EventUser) -> Flash<Redirect> {
+    let Some(event) = Event::find_by_id(db, id).await else {
+        return Flash::error(Redirect::to("/planned"), "Event does not exist");
+    };
+
+    match event.delete(db).await {
+        Ok(()) => Flash::success(Redirect::to("/planned"), "Event gelöscht"),
+        Err(e) => Flash::error(Redirect::to("/planned"), e),
     }
 }
 
@@ -106,7 +107,7 @@ mod test {
     fn test_delete() {
         let db = testdb!();
 
-        let _ = PlannedEvent::find_by_id(&db, 1).await.unwrap();
+        let _ = Event::find_by_id(&db, 1).await.unwrap();
 
         let rocket = rocket::build().manage(db.clone());
         let rocket = crate::tera::config(rocket);
@@ -131,7 +132,7 @@ mod test {
 
         assert_eq!(flash_cookie.value(), "7:successEvent gelöscht");
 
-        let event = PlannedEvent::find_by_id(&db, 1).await;
+        let event = Event::find_by_id(&db, 1).await;
         assert_eq!(event, None);
     }
 
@@ -160,16 +161,16 @@ mod test {
             .get("_flash")
             .expect("Expected flash cookie");
 
-        assert_eq!(flash_cookie.value(), "5:errorPlannedEvent does not exist");
+        assert_eq!(flash_cookie.value(), "5:errorEvent does not exist");
 
-        let _ = PlannedEvent::find_by_id(&db, 1).await.unwrap();
+        let _ = Event::find_by_id(&db, 1).await.unwrap();
     }
 
     #[sqlx::test]
     fn test_update() {
         let db = testdb!();
 
-        let event = PlannedEvent::find_by_id(&db, 1).await.unwrap();
+        let event = Event::find_by_id(&db, 1).await.unwrap();
         assert_eq!(event.notes, Some("trip_details for a planned event".into()));
 
         let rocket = rocket::build().manage(db.clone());
@@ -201,7 +202,7 @@ mod test {
             "7:successEvent erfolgreich bearbeitet"
         );
 
-        let event = PlannedEvent::find_by_id(&db, 1).await.unwrap();
+        let event = Event::find_by_id(&db, 1).await.unwrap();
         assert_eq!(event.notes, Some("new-planned-event-text".into()));
     }
 
@@ -268,7 +269,7 @@ mod test {
 
         assert_eq!(flash_cookie.value(), "7:successEvent hinzugefügt");
 
-        let event = PlannedEvent::find_by_id(&db, 2).await.unwrap();
+        let event = Event::find_by_id(&db, 2).await.unwrap();
         assert_eq!(event.name, "my-cool-new-event");
     }
 }

src/tera/admin/mail.rs

@@ -10,7 +10,7 @@ use crate::model::log::Log;
 use crate::model::mail::Mail;
 use crate::model::role::Role;
 use crate::model::user::AdminUser;
-use crate::model::user::UserWithRoles;
+use crate::model::user::UserWithDetails;
 use crate::tera::Config;
 
 #[get("/mail")]
@@ -27,7 +27,7 @@ async fn index(
 
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(admin.user, db).await,
+        &UserWithDetails::from_user(admin.user, db).await,
     );
     context.insert("roles", &roles);
 

src/tera/admin/mod.rs

@@ -9,8 +9,9 @@ use crate::{
 };
 
 pub mod boat;
+pub mod event;
 pub mod mail;
-pub mod planned_event;
+pub mod notification;
 pub mod schnupper;
 pub mod user;
 
@@ -77,8 +78,9 @@ pub fn routes() -> Vec<Route> {
     ret.append(&mut user::routes());
     ret.append(&mut schnupper::routes());
     ret.append(&mut boat::routes());
+    ret.append(&mut notification::routes());
     ret.append(&mut mail::routes());
-    ret.append(&mut planned_event::routes());
+    ret.append(&mut event::routes());
     ret.append(&mut routes![rss, show_rss, show_list, list]);
     ret
 }

src/tera/admin/notification.rs

@@ -0,0 +1,116 @@
+use crate::model::{
+    log::Log,
+    notification::Notification,
+    role::Role,
+    user::{AdminUser, User, UserWithDetails},
+};
+use itertools::Itertools;
+use rocket::{
+    form::Form,
+    get, post,
+    request::FlashMessage,
+    response::{Flash, Redirect},
+    routes, FromForm, Route, State,
+};
+use rocket_dyn_templates::{tera::Context, Template};
+use sqlx::SqlitePool;
+
+#[get("/notification")]
+async fn index(
+    db: &State<SqlitePool>,
+    user: AdminUser,
+    flash: Option<FlashMessage<'_>>,
+) -> Template {
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+    context.insert(
+        "loggedin_user",
+        &UserWithDetails::from_user(user.user, db).await,
+    );
+
+    let users: Vec<User> = User::all(db)
+        .await
+        .into_iter()
+        .filter(|u| u.last_access.is_some()) // Not useful to send notifications to people who are
+        // not logging in
+        .sorted_by_key(|u| u.name.clone())
+        .collect();
+
+    context.insert("roles", &Role::all(db).await);
+    context.insert("users", &users);
+
+    Template::render("admin/notification", context.into_json())
+}
+
+#[derive(FromForm, Debug)]
+pub struct NotificationToSendGroup {
+    pub(crate) role_id: i32,
+    pub(crate) category: String,
+    pub(crate) message: String,
+}
+
+#[derive(FromForm, Debug)]
+pub struct NotificationToSendUser {
+    pub(crate) user_id: i32,
+    pub(crate) category: String,
+    pub(crate) message: String,
+}
+
+#[post("/notification/group", data = "<data>")]
+async fn send_group(
+    db: &State<SqlitePool>,
+    data: Form<NotificationToSendGroup>,
+    admin: AdminUser,
+) -> Flash<Redirect> {
+    let d = data.into_inner();
+    Log::create(
+        db,
+        format!("{admin:?} trying to send this notification: {d:?}"),
+    )
+    .await;
+
+    let Some(role) = Role::find_by_id(db, d.role_id).await else {
+        return Flash::error(Redirect::to("/admin/notification"), "Rolle gibt's ned");
+    };
+
+    for user in User::all_with_role(db, &role).await {
+        Notification::create(db, &user, &d.message, &d.category, None, None).await;
+    }
+    Log::create(db, "Notification successfully sent".into()).await;
+    Flash::success(
+        Redirect::to("/admin/notification"),
+        "Nachricht ausgeschickt",
+    )
+}
+
+#[post("/notification/user", data = "<data>")]
+async fn send_user(
+    db: &State<SqlitePool>,
+    data: Form<NotificationToSendUser>,
+    admin: AdminUser,
+) -> Flash<Redirect> {
+    let d = data.into_inner();
+    Log::create(
+        db,
+        format!("{admin:?} trying to send this notification: {d:?}"),
+    )
+    .await;
+
+    let Some(user) = User::find_by_id(db, d.user_id).await else {
+        return Flash::error(Redirect::to("/admin/notification"), "User gibt's ned");
+    };
+
+    Notification::create(db, &user, &d.message, &d.category, None, None).await;
+
+    Log::create(db, "Notification successfully sent".into()).await;
+    Flash::success(
+        Redirect::to("/admin/notification"),
+        "Nachricht ausgeschickt",
+    )
+}
+
+pub fn routes() -> Vec<Route> {
+    routes![index, send_user, send_group]
+}

src/tera/admin/schnupper.rs

@@ -1,32 +1,12 @@
 use crate::model::{
     role::Role,
-    user::{SchnupperBetreuerUser, User, UserWithRoles},
+    user::{SchnupperBetreuerUser, User, UserWithDetails},
 };
 use futures::future::join_all;
-use rocket::{
-    get,
-    http::Status,
-    request::{FlashMessage, FromRequest, Outcome},
-    routes, Request, Route, State,
-};
+use rocket::{get, request::FlashMessage, routes, Route, State};
 use rocket_dyn_templates::{tera::Context, Template};
 use sqlx::SqlitePool;
 
-// Custom request guard to extract the Referer header
-struct Referer(String);
-
-#[rocket::async_trait]
-impl<'r> FromRequest<'r> for Referer {
-    type Error = ();
-
-    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
-        match request.headers().get_one("Referer") {
-            Some(referer) => Outcome::Success(Referer(referer.to_string())),
-            None => Outcome::Error((Status::BadRequest, ())),
-        }
-    }
-}
-
 #[get("/schnupper")]
 async fn index(
     db: &State<SqlitePool>,
@@ -38,9 +18,9 @@ async fn index(
     let user_futures: Vec<_> = User::all_with_role(db, &schnupperant)
         .await
         .into_iter()
-        .map(|u| async move { UserWithRoles::from_user(u, db).await })
+        .map(|u| async move { UserWithDetails::from_user(u, db).await })
         .collect();
-    let users: Vec<UserWithRoles> = join_all(user_futures).await;
+    let users: Vec<UserWithDetails> = join_all(user_futures).await;
 
     let mut context = Context::new();
     if let Some(msg) = flash {
@@ -49,7 +29,7 @@ async fn index(
     context.insert("schnupperanten", &users);
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(user.into(), db).await,
+        &UserWithDetails::from_user(user.into(), db).await,
     );
 
     Template::render("admin/schnupper/index", context.into_json())

src/tera/admin/user.rs

@@ -1,14 +1,17 @@
 use std::collections::HashMap;
 
-use crate::model::{
+use crate::{
+    model::{
         family::Family,
         log::Log,
         logbook::Logbook,
         role::Role,
         user::{
-        AdminUser, User, UserWithMembershipPdf, UserWithRoles, UserWithRolesAndMembershipPdf,
+            AdminUser, User, UserWithDetails, UserWithMembershipPdf, UserWithRolesAndMembershipPdf,
             VorstandUser,
         },
+    },
+    tera::Config,
 };
 use futures::future::join_all;
 use rocket::{
@@ -67,7 +70,7 @@ async fn index(
     context.insert("users", &users);
     context.insert("roles", &roles);
     context.insert("families", &families);
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
 
     Template::render("admin/user/index", context.into_json())
 }
@@ -99,7 +102,7 @@ async fn index_admin(
     context.insert("users", &users);
     context.insert("roles", &roles);
     context.insert("families", &families);
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
 
     Template::render("admin/user/index", context.into_json())
 }
@@ -127,7 +130,7 @@ async fn fees(
     }
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(admin.into(), db).await,
+        &UserWithDetails::from_user(admin.into(), db).await,
     );
 
     Template::render("admin/user/fees", context.into_json())
@@ -147,7 +150,7 @@ async fn scheckbuch(
     for s in scheckbooks {
         scheckbooks_with_roles.push((
             Logbook::completed_with_user(db, &s).await,
-            UserWithRoles::from_user(s, db).await,
+            UserWithDetails::from_user(s, db).await,
         ))
     }
 
@@ -158,7 +161,7 @@ async fn scheckbuch(
     }
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(user.into(), db).await,
+        &UserWithDetails::from_user(user.into(), db).await,
     );
 
     Template::render("admin/user/scheckbuch", context.into_json())
@@ -202,11 +205,36 @@ async fn fees_paid(
     )
 }
 
+#[get("/user/<user>/send-welcome-mail")]
+async fn send_welcome_mail(
+    db: &State<SqlitePool>,
+    _admin: AdminUser,
+    config: &State<Config>,
+    user: i32,
+) -> Flash<Redirect> {
+    let Some(user) = User::find_by_id(db, user).await else {
+        return Flash::error(Redirect::to("/admin/user"), "User does not exist");
+    };
+
+    match user.send_welcome_email(db, &config.smtp_pw).await {
+        Ok(()) => Flash::success(
+            Redirect::to("/admin/user"),
+            format!("Willkommens-Email wurde an {} versandt.", user.name),
+        ),
+        Err(e) => Flash::error(Redirect::to("/admin/user"), e),
+    }
+}
+
 #[get("/user/<user>/reset-pw")]
-async fn resetpw(db: &State<SqlitePool>, _admin: AdminUser, user: i32) -> Flash<Redirect> {
+async fn resetpw(db: &State<SqlitePool>, admin: AdminUser, user: i32) -> Flash<Redirect> {
     let user = User::find_by_id(db, user).await;
     match user {
         Some(user) => {
+            Log::create(
+                db,
+                format!("{} has resetted the pw for {}", admin.user.name, user.name),
+            )
+            .await;
             user.reset_pw(db).await;
             Flash::success(
                 Redirect::to("/admin/user"),
@@ -286,8 +314,8 @@ async fn download_membership_pdf(
     Log::create(
         db,
         format!(
-            "{} downloaded membership application for user: {user:?}",
-            admin.user.name
+            "{} downloaded membership application for user: {}",
+            admin.user.name, user.user.name
         ),
     )
     .await;
@@ -332,6 +360,7 @@ pub fn routes() -> Vec<Route> {
         fees,
         fees_paid,
         scheckbuch,
-        download_membership_pdf
+        download_membership_pdf,
+        send_welcome_mail
     ]
 }

src/tera/auth.rs

@@ -39,7 +39,6 @@ struct LoginForm<'r> {
     password: &'r str,
 }
 
-#[derive(Debug)]
 pub struct UserAgent(String);
 
 #[rocket::async_trait]
@@ -83,8 +82,8 @@ async fn login(
     Log::create(
         db,
         format!(
-            "Succ login of {} with this useragent: {:?}",
-            login.name, agent
+            "Succ login of {} with this useragent: {}",
+            login.name, agent.0
         ),
     )
     .await;

src/tera/board/boathouse.rs

@@ -1,7 +1,7 @@
 use crate::model::{
     boat::Boat,
     boathouse::Boathouse,
-    user::{AdminUser, UserWithRoles, VorstandUser},
+    user::{AdminUser, UserWithDetails, VorstandUser},
 };
 use rocket::{
     form::Form,
@@ -25,14 +25,21 @@ async fn index(
     }
 
     let boats = Boat::all_for_boatshouse(db).await;
-    context.insert("boats", &boats);
+    let mut final_boats = Vec::new();
+    for boat in boats {
+        if boat.boat.boathouse(db).await.is_none() && !boat.boat.external {
+            final_boats.push(boat);
+        }
+    }
+
+    context.insert("boats", &final_boats);
 
     let boathouse = Boathouse::get(db).await;
     context.insert("boathouse", &boathouse);
 
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(admin.into(), db).await,
+        &UserWithDetails::from_user(admin.into(), db).await,
     );
 
     Template::render("board/boathouse", context.into_json())

src/tera/boatdamage.rs

@@ -13,7 +13,7 @@ use crate::{
     model::{
         boat::Boat,
         boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
-        user::{CoxUser, DonauLinzUser, TechUser, User, UserWithRoles},
+        user::{CoxUser, DonauLinzUser, TechUser, User, UserWithDetails},
     },
     tera::log::KioskCookie,
 };
@@ -59,7 +59,7 @@ async fn index(
     context.insert("boats", &boats);
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(user.into(), db).await,
+        &UserWithDetails::from_user(user.into(), db).await,
     );
 
     Template::render("boatdamages", context.into_json())

src/tera/boatreservation.rs

@@ -14,7 +14,8 @@ use crate::{
     model::{
         boat::Boat,
         boatreservation::{BoatReservation, BoatReservationToAdd},
-        user::{DonauLinzUser, User, UserWithRoles},
+        log::Log,
+        user::{DonauLinzUser, User, UserWithDetails},
     },
     tera::log::KioskCookie,
 };
@@ -74,7 +75,7 @@ async fn index(
     context.insert("user", &User::all(db).await);
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(user.into(), db).await,
+        &UserWithDetails::from_user(user.into(), db).await,
     );
 
     Template::render("boatreservations", context.into_json())
@@ -90,7 +91,7 @@ pub struct FormBoatReservationToAdd<'r> {
     pub user_id_applicant: Option<i64>,
 }
 
-#[post("/", data = "<data>", rank = 2)]
+#[post("/new", data = "<data>", rank = 2)]
 async fn create<'r>(
     db: &State<SqlitePool>,
     data: Form<FormBoatReservationToAdd<'r>>,
@@ -115,7 +116,7 @@ async fn create<'r>(
     }
 }
 
-#[post("/", data = "<data>")]
+#[post("/new", data = "<data>")]
 async fn create_from_kiosk<'r>(
     db: &State<SqlitePool>,
     data: Form<FormBoatReservationToAdd<'r>>,
@@ -142,6 +143,50 @@ async fn create_from_kiosk<'r>(
     }
 }
 
+#[derive(FromForm, Debug)]
+pub struct ReservationEditForm {
+    pub(crate) id: i32,
+    pub(crate) time_desc: String,
+    pub(crate) usage: String,
+}
+
+#[post("/", data = "<data>")]
+async fn update(
+    db: &State<SqlitePool>,
+    data: Form<ReservationEditForm>,
+    user: User,
+) -> Flash<Redirect> {
+    let Some(reservation) = BoatReservation::find_by_id(db, data.id).await else {
+        return Flash::error(
+            Redirect::to("/boatreservation"),
+            format!("Reservation with ID {} does not exist!", data.id),
+        );
+    };
+
+    if user.id != reservation.user_id_applicant && !user.has_role(db, "admin").await {
+        return Flash::error(
+            Redirect::to("/boatreservation"),
+            "Not allowed to update reservation (only admins + creator do so).".to_string(),
+        );
+    }
+
+    Log::create(
+        db,
+        format!(
+            "{} updated reservation from {reservation:?} to {data:?}",
+            user.name
+        ),
+    )
+    .await;
+
+    reservation.update(db, data.into_inner()).await;
+
+    Flash::success(
+        Redirect::to("/boatreservation"),
+        "Reservierung erfolgreich bearbeitet",
+    )
+}
+
 #[get("/<reservation_id>/delete")]
 async fn delete<'r>(
     db: &State<SqlitePool>,
@@ -161,11 +206,18 @@ async fn delete<'r>(
     } else {
         Flash::error(
             Redirect::to("/boatreservation"),
-            format!("Nur der Reservierer darf die Reservierung löschen."),
+            "Nur der Reservierer darf die Reservierung löschen.".to_string(),
         )
     }
 }
 
 pub fn routes() -> Vec<Route> {
-    routes![index, index_kiosk, create, create_from_kiosk, delete]
+    routes![
+        index,
+        index_kiosk,
+        create,
+        create_from_kiosk,
+        delete,
+        update
+    ]
 }

src/tera/cox.rs

@@ -7,9 +7,9 @@ use rocket::{
 use sqlx::SqlitePool;
 
 use crate::model::{
+    event::Event,
     log::Log,
-    planned_event::PlannedEvent,
-    trip::{CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
+    trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
     tripdetails::{TripDetails, TripDetailsToAdd},
     user::CoxUser,
 };
@@ -54,18 +54,16 @@ async fn update(
     cox: CoxUser,
 ) -> Flash<Redirect> {
     if let Some(trip) = Trip::find_by_id(db, trip_id).await {
-        match Trip::update_own(
-            db,
-            &cox,
-            &trip,
-            data.max_people,
-            data.notes,
-            data.trip_type,
-            data.always_show,
-            data.is_locked,
-        )
-        .await
-        {
+        let update = trip::TripUpdate {
+            cox: &cox,
+            trip: &trip,
+            max_people: data.max_people,
+            notes: data.notes,
+            trip_type: data.trip_type,
+            always_show: data.always_show,
+            is_locked: data.is_locked,
+        };
+        match Trip::update_own(db, &update).await {
             Ok(_) => Flash::success(
                 Redirect::to("/planned"),
                 "Ausfahrt erfolgreich aktualisiert.",
@@ -84,7 +82,7 @@ async fn update(
 
 #[get("/join/<planned_event_id>")]
 async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
-    if let Some(planned_event) = PlannedEvent::find_by_id(db, planned_event_id).await {
+    if let Some(planned_event) = Event::find_by_id(db, planned_event_id).await {
         match Trip::new_join(db, &cox, &planned_event).await {
             Ok(_) => {
                 Log::create(
@@ -97,6 +95,9 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
                 .await;
                 Flash::success(Redirect::to("/planned"), "Danke für's helfen!")
             }
+            Err(CoxHelpError::CanceledEvent) => {
+                Flash::error(Redirect::to("/planned"), "Die Ausfahrt wurde leider abgesagt...")
+            }
             Err(CoxHelpError::AlreadyRegisteredAsCox) => {
                 Flash::error(Redirect::to("/planned"), "Du hilfst bereits aus!")
             }
@@ -105,7 +106,7 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
                 "Du hast dich bereits als Ruderer angemeldet!",
             ),
             Err(CoxHelpError::DetailsLocked) => {
-                Flash::error(Redirect::to("/planned"), "Boot ist bereits eingeteilt.")
+                Flash::error(Redirect::to("/planned"), "Die Bootseinteilung wurde bereits gemacht. Wenn du noch steuern möchtest, frag bitte bei einer bereits angemeldeten Steuerperson nach, ob das noch möglich ist.")
             }
         }
     } else {
@@ -136,7 +137,7 @@ async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flas
 
 #[get("/remove/<planned_event_id>")]
 async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
-    if let Some(planned_event) = PlannedEvent::find_by_id(db, planned_event_id).await {
+    if let Some(planned_event) = Event::find_by_id(db, planned_event_id).await {
         match Trip::delete_by_planned_event(db, &cox, &planned_event).await {
             Ok(_) => {
                 Log::create(
@@ -151,7 +152,7 @@ async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) ->
                 Flash::success(Redirect::to("/planned"), "Erfolgreich abgemeldet!")
             }
             Err(TripHelpDeleteError::DetailsLocked) => {
-                Flash::error(Redirect::to("/planned"), "Boot bereits eingeteilt")
+                Flash::error(Redirect::to("/planned"), "Die Bootseinteilung wurde bereits gemacht. Wenn du doch nicht steuern kannst, melde dich bitte unbedingt schnellstmöglich bei einer anderen Steuerperson!")
             }
             Err(TripHelpDeleteError::CoxNotHelping) => {
                 Flash::error(Redirect::to("/planned"), "Steuermann hilft nicht aus...")

src/tera/ergo.rs

@@ -18,7 +18,7 @@ use tera::Context;
 
 use crate::model::{
     log::Log,
-    user::{AdminUser, User, UserWithRoles},
+    user::{AdminUser, User, UserWithDetails},
 };
 
 #[derive(Serialize)]
@@ -51,7 +51,7 @@ async fn send(db: &State<SqlitePool>, _user: AdminUser) -> Template {
 
     Template::render(
         "ergo.final",
-        context!(loggedin_user: &UserWithRoles::from_user(_user.user, db).await, thirty, dozen),
+        context!(loggedin_user: &UserWithDetails::from_user(_user.user, db).await, thirty, dozen),
     )
 }
 
@@ -120,7 +120,7 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
     context.insert("users", &users);
     context.insert("thirty", &thirty);
     context.insert("dozen", &dozen);

src/tera/log.rs

@@ -24,10 +24,10 @@ use crate::model::{
         LogbookUpdateError,
     },
     logtype::LogType,
-    user::{AdminUser, DonauLinzUser, User, UserWithRoles, UserWithWaterStatus},
+    user::{AdminUser, DonauLinzUser, User, UserWithDetails},
 };
 
-pub struct KioskCookie(String);
+pub struct KioskCookie(());
 
 #[rocket::async_trait]
 impl<'r> FromRequest<'r> for KioskCookie {
@@ -35,7 +35,7 @@ impl<'r> FromRequest<'r> for KioskCookie {
 
     async fn from_request(request: &'r Request<'_>) -> request::Outcome<KioskCookie, Self::Error> {
         match request.cookies().get_private("kiosk") {
-            Some(cookie) => request::Outcome::Success(KioskCookie(cookie.value().to_string())),
+            Some(_) => request::Outcome::Success(KioskCookie(())),
             None => request::Outcome::Forward(rocket::http::Status::SeeOther),
         }
     }
@@ -49,23 +49,27 @@ async fn index(
 ) -> Template {
     let boats = Boat::for_user(db, &user).await;
 
-    let mut coxes: Vec<UserWithWaterStatus> = futures::future::join_all(
+    let mut coxes: Vec<UserWithDetails> = futures::future::join_all(
         User::cox(db)
             .await
             .into_iter()
-            .map(|user| UserWithWaterStatus::from_user(user, db)),
+            .map(|user| UserWithDetails::from_user(user, db)),
     )
     .await;
-    coxes.retain(|u| u.roles.contains(&"Donau Linz".into()));
+    coxes.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
 
-    let mut users: Vec<UserWithWaterStatus> = futures::future::join_all(
+    let mut users: Vec<UserWithDetails> = futures::future::join_all(
         User::all(db)
             .await
             .into_iter()
-            .map(|user| UserWithWaterStatus::from_user(user, db)),
+            .map(|user| UserWithDetails::from_user(user, db)),
     )
     .await;
-    users.retain(|u| u.roles.contains(&"Donau Linz".into()));
+    users.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
 
     let logtypes = LogType::all(db).await;
     let distances = Logbook::distances(db).await;
@@ -78,13 +82,16 @@ async fn index(
     }
 
     context.insert("boats", &boats);
-    context.insert("reservations", &BoatReservation::all_future(db).await);
+    context.insert(
+        "reservations",
+        &BoatReservation::all_future_with_groups(db).await,
+    );
     context.insert("coxes", &coxes);
     context.insert("users", &users);
     context.insert("logtypes", &logtypes);
     context.insert(
         "loggedin_user",
-        &UserWithRoles::from_user(user.into(), db).await,
+        &UserWithDetails::from_user(user.into(), db).await,
     );
     context.insert("on_water", &on_water);
     context.insert("distances", &distances);
@@ -98,7 +105,7 @@ async fn show(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
 
     Template::render(
         "log.completed",
-        context!(logs, loggedin_user: &UserWithRoles::from_user(user.into(), db).await),
+        context!(logs, loggedin_user: &UserWithDetails::from_user(user.into(), db).await),
     )
 }
 
@@ -108,7 +115,7 @@ async fn show_for_year(db: &State<SqlitePool>, user: AdminUser, year: i32) -> Te
 
     Template::render(
         "log.completed",
-        context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await),
+        context!(logs, loggedin_user: &UserWithDetails::from_user(user.user, db).await),
     )
 }
 
@@ -144,20 +151,30 @@ async fn kiosk(
     _kiosk: KioskCookie,
 ) -> Template {
     let boats = Boat::all(db).await;
-    let coxes: Vec<UserWithWaterStatus> = futures::future::join_all(
+    let mut coxes: Vec<UserWithDetails> = futures::future::join_all(
         User::cox(db)
             .await
             .into_iter()
-            .map(|user| UserWithWaterStatus::from_user(user, db)),
+            .map(|user| UserWithDetails::from_user(user, db)),
     )
     .await;
-    let users: Vec<UserWithWaterStatus> = futures::future::join_all(
+
+    coxes.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
+
+    let mut users: Vec<UserWithDetails> = futures::future::join_all(
         User::all(db)
             .await
             .into_iter()
-            .map(|user| UserWithWaterStatus::from_user(user, db)),
+            .map(|user| UserWithDetails::from_user(user, db)),
     )
     .await;
+
+    users.retain(|u| {
+        u.roles.contains(&"Donau Linz".into()) || u.roles.contains(&"scheckbuch".into())
+    });
+
     let logtypes = LogType::all(db).await;
     let distances = Logbook::distances(db).await;
 
@@ -169,7 +186,10 @@ async fn kiosk(
     }
 
     context.insert("boats", &boats);
-    context.insert("reservations", &BoatReservation::all_future(db).await);
+    context.insert(
+        "reservations",
+        &BoatReservation::all_future_with_groups(db).await,
+    );
     context.insert("coxes", &coxes);
     context.insert("users", &users);
     context.insert("logtypes", &logtypes);
@@ -192,7 +212,7 @@ async fn create_logbook(
     )
     .await
     {
-        Ok(_) => Flash::success(Redirect::to("/log"), "Ausfahrt erfolgreich hinzugefügt"),
+        Ok(msg) => Flash::success(Redirect::to("/log"), format!("Ausfahrt erfolgreich hinzugefügt{msg}")),
         Err(LogbookCreateError::BoatAlreadyOnWater) => Flash::error(Redirect::to("/log"), "Boot schon am Wasser"),
         Err(LogbookCreateError::RowerAlreadyOnWater(rower)) => Flash::error(Redirect::to("/log"), format!("Ruderer {} schon am Wasser", rower.name)),
         Err(LogbookCreateError::BoatLocked) => Flash::error(Redirect::to("/log"),"Boot gesperrt"),
@@ -206,7 +226,8 @@ async fn create_logbook(
         Err(LogbookCreateError::NotYourEntry) => Flash::error(Redirect::to("/log"), "Nicht deine Ausfahrt!"),
         Err(LogbookCreateError::ArrivalSetButNotRemainingTwo) => Flash::error(Redirect::to("/log"), "Ankunftszeit gesetzt aber nicht Distanz + Strecke"),
         Err(LogbookCreateError::OnlyAllowedToEndTripsEndingToday) => Flash::error(Redirect::to("/log"), "Nur Ausfahrten, die in der letzten Woche enden dürfen eingetragen werden. Für einen Nachtrag schreibe alle Daten Philipp (Tel. nr. siehe Signal oder it@rudernlinz.at)."),
-
+        Err(LogbookCreateError::CantChangeHandoperatableStatusForThisBoat) => Flash::error(Redirect::to("/log"), "Handsteuer-Status dieses Boots kann nicht verändert werden."),
+        Err(LogbookCreateError::TooFast(km, min)) => Flash::error(Redirect::to("/log"), format!("KM zu groß für die eingegebene Dauer ({km} km in {min} Minuten). Bitte überprüfe deine Start- und Endzeit und versuche es erneut.")),
     }
 }
 
@@ -241,7 +262,13 @@ async fn create_kiosk(
     } else if let Some(shipmaster) = data.shipmaster {
         User::find_by_id(db, shipmaster as i32).await.unwrap()
     } else {
-        User::find_by_id(db, data.rowers[0] as i32).await.unwrap()
+        let Some(rower) = data.rowers.first() else {
+            return Flash::error(
+                Redirect::to("/log"),
+                "Ausfahrt ohne Benutzer kann nicht angelegt werden.",
+            );
+        };
+        User::find_by_id(db, *rower as i32).await.unwrap()
     };
     Log::create(
         db,
@@ -273,6 +300,7 @@ async fn home_logbook(
         Ok(_) => Flash::success(Redirect::to("/log"), "Ausfahrt korrekt eingetragen"),
         Err(LogbookUpdateError::TooManyRowers(expected, actual)) => Flash::error(Redirect::to("/log"), format!("Zu viele Ruderer (Boot fasst maximal {expected}, es wurden jedoch {actual} Ruderer ausgewählt)")),
         Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday) => Flash::error(Redirect::to("/log"), "Nur Ausfahrten, die heute enden dürfen eingetragen werden. Für einen Nachtrag schreibe alle Daten Philipp (Tel. nr. siehe Signal oder it@rudernlinz.at)."),
+        Err(LogbookUpdateError::TooFast(km, min)) => Flash::error(Redirect::to("/log"), format!("KM zu groß für die eingegebene Dauer ({km} km in {min} Minuten). Bitte überprüfe deine Start- und Endzeit und versuche es erneut.")),
         Err(e) => Flash::error(
             Redirect::to("/log"),
             format!("Eintrag {logbook_id} konnte nicht abgesendet werden (Fehler: {e:?})!"),

src/tera/misc.rs

@@ -1,12 +1,12 @@
 use rocket::{get, http::ContentType, routes, Route, State};
 use sqlx::SqlitePool;
 
-use crate::model::planned_event::PlannedEvent;
+use crate::model::event::Event;
 
 #[get("/cal")]
 async fn cal(db: &State<SqlitePool>) -> (ContentType, String) {
     //TODO: add unit test once proper functionality is there
-    (ContentType::Calendar, PlannedEvent::get_ics_feed(db).await)
+    (ContentType::Calendar, Event::get_ics_feed(db).await)
 }
 
 pub fn routes() -> Vec<Route> {

src/tera/mod.rs

@@ -1,6 +1,9 @@
+use std::{fs::OpenOptions, io::Write};
+
+use chrono::Local;
 use rocket::{
     catch, catchers,
-    fairing::AdHoc,
+    fairing::{AdHoc, Fairing, Info, Kind},
     form::Form,
     fs::FileServer,
     get,
@@ -10,7 +13,7 @@ use rocket::{
     response::{Flash, Redirect},
     routes,
     time::{Duration, OffsetDateTime},
-    Build, FromForm, Request, Rocket, State,
+    Build, Data, FromForm, Request, Rocket, State,
 };
 use rocket_dyn_templates::Template;
 use serde::Deserialize;
@@ -18,16 +21,17 @@ use sqlx::SqlitePool;
 use tera::Context;
 
 use crate::model::{
+    logbook::Logbook,
     notification::Notification,
     role::Role,
-    user::{User, UserWithRoles},
+    user::{User, UserWithDetails, SCHECKBUCH},
 };
 
 pub(crate) mod admin;
 mod auth;
 pub(crate) mod board;
 mod boatdamage;
-mod boatreservation;
+pub(crate) mod boatreservation;
 mod cox;
 mod ergo;
 mod log;
@@ -35,6 +39,7 @@ mod misc;
 mod notification;
 mod planned;
 mod stat;
+pub(crate) mod trailerreservation;
 
 #[derive(FromForm, Debug)]
 struct LoginForm<'r> {
@@ -49,11 +54,29 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
         context.insert("flash", &msg.into_inner());
     }
 
+    if user.has_role(db, "scheckbuch").await {
+        let last_trips = Logbook::completed_with_user(db, &user).await;
+        context.insert("last_trips", &last_trips);
+    }
+
     context.insert("notifications", &Notification::for_user(db, &user).await);
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
+    context.insert("costs_scheckbuch", &SCHECKBUCH);
+
     Template::render("index", context.into_json())
 }
 
+#[get("/impressum")]
+async fn impressum(db: &State<SqlitePool>, user: Option<User>) -> Template {
+    let mut context = Context::new();
+
+    if let Some(user) = user {
+        context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
+    }
+
+    Template::render("impressum", context.into_json())
+}
+
 #[get("/steering")]
 async fn steering(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_>>) -> Template {
     let mut context = Context::new();
@@ -66,13 +89,13 @@ async fn steering(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage
 
     let mut coxes = User::all_with_role(db, &Role::find_by_name(db, "cox").await.unwrap()).await;
 
-    coxes.retain(|user| !bootskundige.contains(&user)); // Remove bootskundige from coxes list
-    coxes.retain(|user| user.name != String::from("Externe Steuerperson"));
+    coxes.retain(|user| !bootskundige.contains(user)); // Remove bootskundige from coxes list
+    coxes.retain(|user| user.name != "Externe Steuerperson");
 
     context.insert("coxes", &coxes);
     context.insert("bootskundige", &bootskundige);
 
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
     Template::render("steering", context.into_json())
 }
 
@@ -100,16 +123,75 @@ fn forbidden_error() -> Flash<Redirect> {
     Flash::error(Redirect::to("/"), "Keine Berechtigung für diese Aktion. Wenn du der Meinung bist, dass du das machen darfst, melde dich bitte bei it@rudernlinz.at.")
 }
 
+struct Usage {}
+
+#[rocket::async_trait]
+impl Fairing for Usage {
+    fn info(&self) -> Info {
+        Info {
+            name: "Usage stats of website",
+            kind: Kind::Request,
+        }
+    }
+
+    // Increment the counter for `GET` and `POST` requests.
+    async fn on_request(&self, req: &mut Request<'_>, _: &mut Data<'_>) {
+        let timestamp = Local::now().format("%Y-%m-%dT%H:%M:%S");
+
+        let user = match req.cookies().get_private("loggedin_user") {
+            Some(user_id) => match user_id.value().parse::<i32>() {
+                Ok(user_id) => {
+                    let db = req.rocket().state::<SqlitePool>().unwrap();
+                    if let Some(user) = User::find_by_id(db, user_id).await {
+                        format!("User: {}", user.name)
+                    } else {
+                        format!("USER ID {user_id} NOT EXISTS")
+                    }
+                }
+                Err(_) => format!("INVALID USER ID ({user_id})"),
+            },
+            None => "NOT LOGGED IN".to_string(),
+        };
+
+        let uri = req.uri().to_string();
+
+        if !uri.ends_with(".css")
+            && !uri.ends_with(".js")
+            && !uri.ends_with(".ico")
+            && !uri.ends_with(".json")
+            && !uri.ends_with(".png")
+        {
+            let config = req.rocket().state::<Config>().unwrap();
+            let Ok(mut file) = OpenOptions::new()
+                .append(true)
+                .open(config.usage_log_path.clone())
+            else {
+                eprintln!(
+                    "File {} can't be found, not saving usage logs",
+                    config.usage_log_path.clone()
+                );
+                return;
+            };
+
+            if let Err(e) = writeln!(file, "{timestamp};{user};{uri}") {
+                eprintln!("Couldn't write to file: {}", e);
+            }
+        }
+    }
+}
+
 #[derive(Deserialize)]
 #[serde(crate = "rocket::serde")]
 pub struct Config {
     rss_key: String,
     smtp_pw: String,
+    usage_log_path: String,
+    pub openweathermap_key: String,
 }
 
 pub fn config(rocket: Rocket<Build>) -> Rocket<Build> {
     rocket
-        .mount("/", routes![index, steering])
+        .mount("/", routes![index, steering, impressum])
         .mount("/auth", auth::routes())
         .mount("/wikiauth", routes![wikiauth])
         .mount("/log", log::routes())
@@ -119,6 +201,7 @@ pub fn config(rocket: Rocket<Build>) -> Rocket<Build> {
         .mount("/stat", stat::routes())
         .mount("/boatdamage", boatdamage::routes())
         .mount("/boatreservation", boatreservation::routes())
+        .mount("/trailerreservation", trailerreservation::routes())
         .mount("/cox", cox::routes())
         .mount("/admin", admin::routes())
         .mount("/board", board::routes())
@@ -127,6 +210,7 @@ pub fn config(rocket: Rocket<Build>) -> Rocket<Build> {
         .register("/", catchers![unauthorized_error, forbidden_error])
         .attach(Template::fairing())
         .attach(AdHoc::config::<Config>())
+        .attach(Usage {})
 }
 
 #[cfg(test)]

src/tera/planned.rs

@@ -10,10 +10,9 @@ use tera::Context;
 
 use crate::model::{
     log::Log,
-    logbook::Logbook,
     tripdetails::TripDetails,
     triptype::TripType,
-    user::{AllowedForPlannedTripsUser, User, UserWithRoles},
+    user::{AllowedForPlannedTripsUser, User, UserWithDetails},
     usertrip::{UserTrip, UserTripDeleteError, UserTripError},
 };
 
@@ -27,16 +26,11 @@ async fn index(
 
     let mut context = Context::new();
 
-    if user.has_role(db, "cox").await || user.has_role(db, "planned_event").await {
+    if user.has_role(db, "cox").await || user.has_role(db, "manage_events").await {
         let triptypes = TripType::all(db).await;
         context.insert("trip_types", &triptypes);
     }
 
-    if user.has_role(db, "scheckbuch").await {
-        let last_trips = Logbook::completed_with_user(db, &user).await;
-        context.insert("last_trips", &last_trips);
-    }
-
     let days = user.get_days(db).await;
 
     if let Some(msg) = flash {
@@ -44,7 +38,7 @@ async fn index(
     }
 
     context.insert("fee", &user.fee(db).await);
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &UserWithDetails::from_user(user, db).await);
     context.insert("days", &days);
     Template::render("planned", context.into_json())
 }
@@ -107,7 +101,7 @@ async fn join(
         ),
         Err(UserTripError::DetailsLocked) => Flash::error(
             Redirect::to("/planned"),
-            "Das Boot ist bereits eingeteilt. Bitte kontaktiere den Schiffsführer (Nummern siehe Signalgruppe) falls du dich doch abmelden willst.",
+            "Die Bootseinteilung wurde bereits gemacht. Wenn du noch mitrudern möchtest, frag bitte bei einer angemeldeten Steuerperson nach, ob das noch möglich ist.",
         ),
     }
 }
@@ -148,7 +142,7 @@ async fn remove_guest(
             )
             .await;
 
-            Flash::error(Redirect::to("/planned"), "Das Boot ist bereits eingeteilt. Bitte kontaktiere den Schiffsführer (Nummern siehe Signalgruppe) falls du dich doch abmelden willst.")
+            Flash::error(Redirect::to("/planned"), "Die Bootseinteilung wurde bereits gemacht. Wenn du doch nicht mitrudern kannst, melde dich bitte unbedingt schnellstmöglich bei einer angemeldeten Steuerperson!")
         }
         Err(UserTripDeleteError::GuestNotParticipating) => {
             Flash::error(Redirect::to("/planned"), "Gast nicht angemeldet.")

src/tera/stat.rs

@@ -4,7 +4,7 @@ use sqlx::SqlitePool;
 
 use crate::model::{
     stat::{self, BoatStat, Stat},
-    user::{DonauLinzUser, UserWithRoles},
+    user::{DonauLinzUser, UserWithDetails},
 };
 
 use super::log::KioskCookie;
@@ -16,7 +16,7 @@ async fn index_boat(db: &State<SqlitePool>, user: DonauLinzUser) -> Template {
 
     Template::render(
         "stat.boats",
-        context!(loggedin_user: &UserWithRoles::from_user(user.into(), db).await, stat, kiosk),
+        context!(loggedin_user: &UserWithDetails::from_user(user.into(), db).await, stat, kiosk),
     )
 }
 
@@ -38,7 +38,7 @@ async fn index(db: &State<SqlitePool>, user: DonauLinzUser, year: Option<i32>) -
 
     Template::render(
         "stat.people",
-        context!(loggedin_user: &UserWithRoles::from_user(user.into(), db).await, stat, personal, kiosk, guest_km, club_km),
+        context!(loggedin_user: &UserWithDetails::from_user(user.into(), db).await, stat, personal, kiosk, guest_km, club_km),
     )
 }
 

src/tera/trailerreservation.rs

@@ -0,0 +1,211 @@
+use chrono::NaiveDate;
+use rocket::{
+    form::Form,
+    get, post,
+    request::FlashMessage,
+    response::{Flash, Redirect},
+    routes, FromForm, Route, State,
+};
+use rocket_dyn_templates::Template;
+use sqlx::SqlitePool;
+use tera::Context;
+
+use crate::{
+    model::{
+        log::Log,
+        trailer::Trailer,
+        trailerreservation::{TrailerReservation, TrailerReservationToAdd},
+        user::{DonauLinzUser, User, UserWithDetails},
+    },
+    tera::log::KioskCookie,
+};
+
+#[get("/")]
+async fn index_kiosk(
+    db: &State<SqlitePool>,
+    flash: Option<FlashMessage<'_>>,
+    _kiosk: KioskCookie,
+) -> Template {
+    let trailerreservations = TrailerReservation::all_future(db).await;
+
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+
+    context.insert("trailerreservations", &trailerreservations);
+    context.insert("trailers", &Trailer::all(db).await);
+    context.insert("user", &User::all(db).await);
+    context.insert("show_kiosk_header", &true);
+
+    Template::render("trailerreservations", context.into_json())
+}
+
+#[get("/", rank = 2)]
+async fn index(
+    db: &State<SqlitePool>,
+    flash: Option<FlashMessage<'_>>,
+    user: DonauLinzUser,
+) -> Template {
+    let trailerreservations = TrailerReservation::all_future(db).await;
+
+    let mut context = Context::new();
+    if let Some(msg) = flash {
+        context.insert("flash", &msg.into_inner());
+    }
+
+    context.insert("trailerreservations", &trailerreservations);
+    context.insert("trailers", &Trailer::all(db).await);
+    context.insert("user", &User::all(db).await);
+    context.insert(
+        "loggedin_user",
+        &UserWithDetails::from_user(user.into(), db).await,
+    );
+
+    Template::render("trailerreservations", context.into_json())
+}
+
+#[derive(Debug, FromForm)]
+pub struct FormTrailerReservationToAdd<'r> {
+    pub trailer_id: i64,
+    pub start_date: &'r str,
+    pub end_date: &'r str,
+    pub time_desc: &'r str,
+    pub usage: &'r str,
+    pub user_id_applicant: Option<i64>,
+}
+
+#[post("/new", data = "<data>", rank = 2)]
+async fn create<'r>(
+    db: &State<SqlitePool>,
+    data: Form<FormTrailerReservationToAdd<'r>>,
+    user: DonauLinzUser,
+) -> Flash<Redirect> {
+    let user_applicant: User = user.into();
+    let trailer = Trailer::find_by_id(db, data.trailer_id as i32)
+        .await
+        .unwrap();
+    let trailerreservation_to_add = TrailerReservationToAdd {
+        trailer: &trailer,
+        start_date: NaiveDate::parse_from_str(data.start_date, "%Y-%m-%d").unwrap(),
+        end_date: NaiveDate::parse_from_str(data.end_date, "%Y-%m-%d").unwrap(),
+        time_desc: data.time_desc,
+        usage: data.usage,
+        user_applicant: &user_applicant,
+    };
+    match TrailerReservation::create(db, trailerreservation_to_add).await {
+        Ok(_) => Flash::success(
+            Redirect::to("/trailerreservation"),
+            "Reservierung erfolgreich hinzugefügt",
+        ),
+        Err(e) => Flash::error(Redirect::to("/trailerreservation"), format!("Fehler: {e}")),
+    }
+}
+
+#[post("/new", data = "<data>")]
+async fn create_from_kiosk<'r>(
+    db: &State<SqlitePool>,
+    data: Form<FormTrailerReservationToAdd<'r>>,
+    _kiosk: KioskCookie,
+) -> Flash<Redirect> {
+    let user_applicant: User = User::find_by_id(db, data.user_id_applicant.unwrap() as i32)
+        .await
+        .unwrap();
+    let trailer = Trailer::find_by_id(db, data.trailer_id as i32)
+        .await
+        .unwrap();
+    let trailerreservation_to_add = TrailerReservationToAdd {
+        trailer: &trailer,
+        start_date: NaiveDate::parse_from_str(data.start_date, "%Y-%m-%d").unwrap(),
+        end_date: NaiveDate::parse_from_str(data.end_date, "%Y-%m-%d").unwrap(),
+        time_desc: data.time_desc,
+        usage: data.usage,
+        user_applicant: &user_applicant,
+    };
+    match TrailerReservation::create(db, trailerreservation_to_add).await {
+        Ok(_) => Flash::success(
+            Redirect::to("/trailerreservation"),
+            "Reservierung erfolgreich hinzugefügt",
+        ),
+        Err(e) => Flash::error(Redirect::to("/trailerreservation"), format!("Fehler: {e}")),
+    }
+}
+
+#[derive(FromForm, Debug)]
+pub struct ReservationEditForm {
+    pub(crate) id: i32,
+    pub(crate) time_desc: String,
+    pub(crate) usage: String,
+}
+
+#[post("/", data = "<data>")]
+async fn update(
+    db: &State<SqlitePool>,
+    data: Form<ReservationEditForm>,
+    user: User,
+) -> Flash<Redirect> {
+    let Some(reservation) = TrailerReservation::find_by_id(db, data.id).await else {
+        return Flash::error(
+            Redirect::to("/trailerreservation"),
+            format!("Reservation with ID {} does not exist!", data.id),
+        );
+    };
+
+    if user.id != reservation.user_id_applicant && !user.has_role(db, "admin").await {
+        return Flash::error(
+            Redirect::to("/trailerreservation"),
+            "Not allowed to update reservation (only admins + creator do so).".to_string(),
+        );
+    }
+
+    Log::create(
+        db,
+        format!(
+            "{} updated reservation from {reservation:?} to {data:?}",
+            user.name
+        ),
+    )
+    .await;
+
+    reservation.update(db, data.into_inner()).await;
+
+    Flash::success(
+        Redirect::to("/trailerreservation"),
+        "Reservierung erfolgreich bearbeitet",
+    )
+}
+
+#[get("/<reservation_id>/delete")]
+async fn delete<'r>(
+    db: &State<SqlitePool>,
+    reservation_id: i32,
+    user: DonauLinzUser,
+) -> Flash<Redirect> {
+    let reservation = TrailerReservation::find_by_id(db, reservation_id)
+        .await
+        .unwrap();
+
+    if user.id == reservation.user_id_applicant || user.has_role(db, "admin").await {
+        reservation.delete(db).await;
+        Flash::success(
+            Redirect::to("/trailerreservation"),
+            "Reservierung erfolgreich gelöscht",
+        )
+    } else {
+        Flash::error(
+            Redirect::to("/trailerreservation"),
+            "Nur der Reservierer darf die Reservierung löschen.".to_string(),
+        )
+    }
+}
+
+pub fn routes() -> Vec<Route> {
+    routes![
+        index,
+        index_kiosk,
+        create,
+        create_from_kiosk,
+        delete,
+        update
+    ]
+}

staging-diff.sql

@@ -0,0 +1,5 @@
+-- test user
+INSERT INTO user(name) VALUES('Marie');
+INSERT INTO "user_role" (user_id, role_id) VALUES((SELECT id from user where name = 'Marie'),(SELECT id FROM role where name = 'Donau Linz'));
+INSERT INTO user(name) VALUES('Philipp');
+INSERT INTO "user_role" (user_id, role_id) VALUES((SELECT id from user where name = 'Philipp'),(SELECT id FROM role where name = 'Donau Linz'));

stats/.gitignore

@@ -0,0 +1 @@
+tmp/

stats/s.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rf tmp
+mkdir tmp
+scp root@128.140.64.118:"/var/log/nginx/access.log*" ./tmp/
+zcat -f ./tmp/access.log* | goaccess --log-format=COMBINED

templates/admin/mail.html.tera

@@ -7,13 +7,19 @@
         <div class="grid ">
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
-                <h2 class="h2">Mail senden</h2>
-                <form action="/admin/mail" method="post" enctype="multipart/form-data">
+                <h2 class="h2">Mail versenden</h2>
+                <form action="/admin/mail"
+                      method="post"
+                      enctype="multipart/form-data"
+                      class="grid gap-3 p-3">
                     {{ macros::select(label="Gruppe", data=roles, name="role_id") }}
                     {{ macros::input(label="Betreff", name="subject", type="text", required=true) }}
-                    <textarea name="body" rows="4" cols="50" class="dark:text-white"></textarea>
+                    <div class="">
+                        <label for="content" class=" text-sm text-gray-600 dark:text-white ">Inhalt</label>
+                        <textarea id="content" name="body" rows="4" cols="50" class="input rounded-md"></textarea>
+                    </div>
                     <input type="file" name="files" multiple />
-                    <input type="submit" value="Abschicken" />
+                    <input type="submit" class="btn btn-primary" value="Abschicken" />
                 </form>
             </div>
         </div>

templates/admin/notification.html.tera

@@ -0,0 +1,34 @@
+{% import "includes/macros" as macros %}
+{% import "includes/forms/boat" as boat %}
+{% extends "base" %}
+{% block content %}
+    <div class="max-w-screen-lg w-full dark:text-white">
+        <h1 class="h1">Nachricht senden</h1>
+        <div class="grid ">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Gruppe</h2>
+                <form action="/admin/notification/group"
+                      method="post"
+                      class="grid gap-3 p-3">
+                    {{ macros::select(label="Gruppe", data=roles, name="role_id") }}
+                    {{ macros::input(label="Überschrift", name="category", type="text", required=true) }}
+                    {{ macros::input(label="Nachricht", name="message", type="text", required=true) }}
+                    <input type="submit" class="btn btn-primary" value="Abschicken" />
+                </form>
+            </div>
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Person</h2>
+                <form action="/admin/notification/user"
+                      method="post"
+                      class="grid gap-3 p-3">
+                    {{ macros::select(label="Person", data=users, name="user_id") }}
+                    {{ macros::input(label="Überschrift", name="category", type="text", required=true) }}
+                    {{ macros::input(label="Nachricht", name="message", type="text", required=true) }}
+                    <input type="submit" class="btn btn-primary" value="Abschicken" />
+                </form>
+            </div>
+        </div>
+    </div>
+{% endblock content %}

templates/admin/user/index.html.tera

@@ -58,6 +58,10 @@
                                     <a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
                                        href="/admin/user/{{ user.id }}/reset-pw">Passwort zurücksetzen</a>
                                 {% endif %}
+                                {% if not user.last_access and "admin" in loggedin_user.roles %}
+                                    <a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
+                                       href="/admin/user/{{ user.id }}/send-welcome-mail">Willkommensmail verschicken</a>
+                                {% endif %}
                             </div>
                             <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
                                 {% for role in roles %}

templates/base.html.tera

@@ -6,7 +6,20 @@
               content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <link rel="manifest" href="public/manifest.json" />
         <link rel="stylesheet" href="/public/main.css" />
-        <link rel="icon" type="image/x-icon" href="/public/images/favicon.ico">
+        <link rel="apple-touch-icon"
+              sizes="180x180"
+              href="/public/images/apple-touch-icon.png">
+        <link rel="icon"
+              type="image/png"
+              sizes="32x32"
+              href="/public/images/favicon-32x32.png">
+        <link rel="icon"
+              type="image/png"
+              sizes="16x16"
+              href="/public/images/favicon-16x16.png">
+        <link rel="manifest" href="/public/images/site.webmanifest">
+        <meta name="msapplication-TileColor" content="#da532c">
+        <meta name="theme-color" content="#ffffff">
         <title>Ruderassistent - ASKÖ Ruderverein Donau Linz</title>
     </head>
     <body class="bg-gray-100 dark:bg-black">
@@ -23,6 +36,7 @@
                     <a href="/stat/boats" class="px-2">Bootsauswertung</a>
                     <a href="/boatdamage" class="px-2">Bootsschaden</a>
                     <a href="/boatreservation" class="px-2">Bootsreservierung</a>
+                    <a href="/trailerreservation" class="px-2">Hängerreservierung</a>
                 </div>
             </header>
         {% endif %}
@@ -42,5 +56,3 @@
         <script src="/public/main.js"></script>
     </body>
 </html>
-</body>
-</html>

templates/board/boathouse.html.tera

@@ -7,8 +7,11 @@
         {% set aisle = aisle_name ~ "-aisle" %}
         {% set place = boathouse[aisle][side_name] %}
         {% if place[level] %}
-            {{ place[level].1.name }} <a class="btn btn-primary absolute end-0"
+            {{ place[level].1.name }}
+            {% if "admin" in loggedin_user.roles %}
+                <a class="btn btn-primary absolute end-0"
                    href="/board/boathouse/{{ place[level].0 }}/delete">X</a>
+            {% endif %}
         {% elif boats | length > 0 %}
             {% if "admin" in loggedin_user.roles %}
                 <details>

templates/boatdamages.html.tera

@@ -81,7 +81,7 @@
                         {% endif %}
                     {% endif %}
                     {% if boatdamage.verified_at %}
-                        <small class="block text-gray-600 dark:text-gray-100">Verifziert von {{ boatdamage.user_verified.name }} am/um {{ boatdamage.verified_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
+                        <small class="block text-gray-600 dark:text-gray-100">Verifiziert von {{ boatdamage.user_verified.name }} am/um {{ boatdamage.verified_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
                     {% else %}
                         {% if loggedin_user and "tech" in loggedin_user.roles and boatdamage.fixed_at %}
                             <form action="/boatdamage/{{ boatdamage.id }}/verified"

templates/boatreservations.html.tera

@@ -18,7 +18,7 @@
         </h2>
         <div class="hidden">
             <div id="new-reservation">
-                <form action="/boatreservation" method="post" class="grid gap-3">
+                <form action="/boatreservation/new" method="post" class="grid gap-3">
                     {{ log::boat_select(only_ones=false, id='boat') }}
                     {% if not loggedin_user %}{{ macros::select(label='Reserviert von', data=user, name='user_id_applicant') }}{% endif %}
                     {{ macros::input(label='Beginn', name='start_date', type='date', required=true, wrapper_class='col-span-4') }}
@@ -41,6 +41,12 @@
         </div>
         <div id="filter-result-js" class="search-result"></div>
         {% for reservation in boatreservations %}
+            {% set allowed_to_edit = false %}
+            {% if loggedin_user %}
+                {% if loggedin_user.id == reservation.user_applicant.id or "admin" in loggedin_user.roles %}
+                    {% set allowed_to_edit = true %}
+                {% endif %}
+            {% endif %}
             <div data-filterable="true"
                  data-filter="{{ reservation.user_applicant.name }} {{ reservation.boat.name }}"
                  class="w-full border-t bg-white dark:bg-primary-900 text-black dark:text-white p-3">
@@ -58,13 +64,22 @@
                         {{ reservation.end_date }}
                     {% endif %}
                     <br />
+                    {% if not allowed_to_edit %}
                         <strong>Uhrzeit:</strong>
                         {{ reservation.time_desc }}
                         <br />
                         <strong>Zweck:</strong>
                         {{ reservation.usage }}
-                    {% if loggedin_user %}
-                        {% if loggedin_user.id == reservation.user_applicant.id or "admin" in loggedin_user.roles %}
+                    {% endif %}
+                    {% if allowed_to_edit %}
+                        <form action="/boatreservation"
+                              method="post"
+                              class="bg-white dark:bg-primary-900 pt-3 rounded-md w-full">
+                            <div class="w-full grid gap-3">
+                                <input type="hidden" name="id" value="{{ reservation.id }}" />
+                                {{ macros::input(label='Uhrzeit', name='time_desc', id=loop.index, type="text", value=reservation.time_desc, readonly=false) }}
+                                {{ macros::input(label='Zweck', name='usage', id=loop.index, type="text", value=reservation.usage, readonly=false) }}
+                            </div>
                             <div class="mt-3 text-right">
                                 <a href="/boatreservation/{{ reservation.id }}/delete"
                                    class="w-28 btn btn-alert"
@@ -72,8 +87,9 @@
                                     {% include "includes/delete-icon" %}
                                     Löschen
                                 </a>
+                                <input value="Ändern" type="submit" class="w-28 btn btn-primary ml-1" />
                             </div>
-                        {% endif %}
+                        </form>
                     {% endif %}
                 </div>
             </div>

templates/forms/event.html.tera

@@ -9,7 +9,7 @@
         {{ macros::input(label='Startzeit', name='tripdetails.planned_starting_time', type='time', required=true) }}
         {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', required=true, min='0') }}
         {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='tripdetails.max_people', type='number', required=true, min='0') }}
-        {{ macros::checkbox(label='Gäste erlauben', name='tripdetails.allow_guests') }}
+        {{ macros::checkbox(label='Scheckbuch-Anmeldungen erlauben', name='tripdetails.allow_guests') }}
         {{ macros::checkbox(label='Immer anzeigen', name='tripdetails.always_show') }}
         {{ macros::input(label='Anmerkungen', name='tripdetails.notes', type='input') }}
         {{ macros::select(label='Typ', data=trip_types, name='tripdetails.trip_type', default='Reguläre Ausfahrt') }}

templates/forms/trip.html.tera

@@ -4,7 +4,7 @@
         <input class="day-js" type="hidden" name="day" value="" />
         {{ macros::input(label='Startzeit (zB "10:00")', name='planned_starting_time', type='time', required=true) }}
         {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }}
-        {{ macros::checkbox(label='Gäste erlauben', name='allow_guests') }}
+        {{ macros::checkbox(label='Scheckbuch-Anmeldungen erlauben', name='allow_guests') }}
         {{ macros::checkbox(label='Immer anzeigen', name='always_show') }}
         {{ macros::input(label='Anmerkungen', name='notes', type='input') }}
         {{ macros::select(label='Typ', data=trip_types, name='trip_type', default='Reguläre Ausfahrt') }}

templates/impressum.html.tera

@@ -0,0 +1,113 @@
+{% extends "base" %}
+{% block content %}
+    <div class="max-w-screen-lg w-full">
+        <h1 class="h1">Impressum</h1>
+        <div class="grid gap-3 my-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Allgemein</h2>
+                <div class="p-3">
+                    Die Website wird vom ASKÖ Ruderverein Donau Linz betrieben.
+                    <br />
+                    <strong>Postanschrift:</strong>
+                    <br />
+                    ASKÖ Ruderverein Donau Linz
+                    <br />
+                    Heilhamerweg 2
+                    <br />
+                    4040 Linz
+                    <br />
+                    ZVR: 363903285
+                </div>
+            </div>
+        </div>
+        <div class="grid gap-3 my-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Datenschutz</h2>
+                <div class="p-3">
+                    Folgende Daten werden verarbeitet:
+                    <ul>
+                        <li>
+                            Server-Log Files: IP-Adresse, Adresse der besuchten Seite, Browseragent, Datum und Uhrzeit. Wir nutzen diese Daten nicht und geben Sie in der Regel nicht weiter, können jedoch nicht ausschließen, dass diese Daten beim Vorliegen von rechtswidrigem Verhalten eingesehen werden.
+                        </li>
+                        <li>
+                            Cookie: Diese Website verwendet nur einen Cookie (loggedin_user), der verschlüsselte Informationen über den Login-Status speichert. Weitere Cookies werden nicht verwendet.
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        {% if loggedin_user %}
+            <div class="grid gap-3 my-5">
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Daten</h2>
+                    <div class="p-3">
+                        Folgende personenbezogenen haben wir von dir gespeichert:
+                        <ul>
+                            <li>
+                                <strong>Name:</strong> {{ loggedin_user.name }}
+                            </li>
+                            <li>
+                                <strong>Passwort:</strong> (verschlüsselt als argon Hash)
+                            </li>
+                            <li>
+                                <strong>Letzter Zugriff:</strong> {{ loggedin_user.last_access }}
+                            </li>
+                            <li>
+                                <strong>Mitglied seit:</strong> {{ loggedin_user.member_since_date }}
+                            </li>
+                            <li>
+                                <strong>Geburtsdatum:</strong> {{ loggedin_user.birthdate }}
+                            </li>
+                            <li>
+                                <strong>Mail:</strong> {{ loggedin_user.mail }}
+                            </li>
+                            {% if loggedin_user.nickname %}
+                                <li>
+                                    <strong>Spitzname:</strong> {{ loggedin_user.nickname }}
+                                </li>
+                            {% endif %}
+                            <li>
+                                <strong>Telefonnummer:</strong> {{ loggedin_user.phone }}
+                            </li>
+                            <li>
+                                <strong>Adresse:</strong> {{ loggedin_user.address }}
+                            </li>
+                            <li>(Beitrittserklärung)</li>
+                            {% if loggedin_user.family_id %}
+                                <li>Verbindung zu Familienmitglied (gespeichert um Familientarif anstatt Vollmitglied zu haben)</li>
+                            {% endif %}
+                            <li>
+                                <strong>Rollen:</strong> {{ loggedin_user.roles }} (werden für verschiedene Funktionen im Ruderassistenten verwendet)
+                            </li>
+                            <li>Anmeldungen zu Ausfahrten</li>
+                            <li>Anmeldungen zu Events (zB Fetzenfahrt, Anrudern, USI-Rudern, ...)</li>
+                            <li>Logbucheinträge</li>
+                            <li>Selber eingetragene Bootsschäden, solange sie nicht > 1 Monat verifiziert und repariert wurden</li>
+                            <li>Selber eingetragene Bootsreservierung</li>
+                            <li>Boote, sofern es welche im Privatbesitz gibt</li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+        <div class="grid gap-3 my-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                 role="alert">
+                <h2 class="h2">Lizenzen</h2>
+                <div class="p-3">
+                    <ul>
+                        <li>
+                            Die <strong>Wetterdaten</strong> werden von <a class="underline" href="https://openweathermap.org">OpenWeather</a> bereitgestellt.
+                        </li>
+                        <li>
+                            <strong>Wasserstandsvorhersagen:</strong> Die Vorhersagen werden stündlich vom <a class="underline" href="https://hydro.ooe.gv.at">Hydrographischen Dienstes Oberösterreich</a> geladen und zwischengespeichert, der höchste Tages-Mittelwert wird gemeinsam mit der Schwankungsbreite bei den geplanten Ausfahrten angezeigt. Es handelt sich hierbei um ungeprüfte Rohdaten. Rohdatenfehler können durch betriebliche Störungen an den Messgeräten, Fernübertragungseinrichtungen u. dgl. entstehen. Die Vorhersagen sind daher mit Unsicherheiten behaftet! Mit der Länge des Vorhersagezeitraumeszeitraumes werden diese Unsicherheiten größer! Es wird keine Gewähr für die Vollständigkeit, Richtigkeit und Genauigkeit der dargestellten Daten übernommen. Gewährleistungs- und Haftungsansprüche werden ausdrücklich ausgeschlossen (sowohl vom Hydrographischen Dienstes Oberösterreich als auch vom ASKÖ Ruderverein Donau Linz).
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock content %}

templates/includes/footer.html.tera

@@ -1,9 +1,10 @@
 <footer class="bg-primary-950 dark:bg-primary-900 text-white w-full flex justify-center p-3">
-    <div class="max-w-screen-xl w-full flex justify-between items-center">
+    <div class="max-w-screen-xl w-full">
+        <div class="w-full flex justify-between items-center">
             <div>
                 <span class="text-[#ff0000]">&hearts;</span>
-            Erstellt vom ASKÖ Ruderverein Donau Linz <a onclick="alert('Wir suchen kreative und motivierte Köpfe, die diesen Ruderassistenten mitgestalten möchten. Das Backend ist in Rust (Rocket), das Frontend in TypeScript und Teraform, wobei wir mit dem Gedanken spielen, zu Svelte(Kit) zu wechseln.\n\nWenn du Lust hast, deine Skills in ein Projekt zu stecken, das Wellen schlagen wird, dann komm an Bord! Wir sind offen für frische Ideen, haben jedoch auch selber noch genügend; langweilig wird uns bestimmt nicht.\n\nWirf den Anker bei uns ausi und melde dich bei Marie oder Philipp oder it@rudernlinz.at – für eine Zukunft ohne optische Kenterung in Form von hässlichen Alerts ;)');"
-    style="text-decoration:underline">... und dir?</a>
+                Erstellt vom ASKÖ Ruderverein Donau Linz <a class="underline"
+    onclick="alert('Wir suchen kreative und motivierte Köpfe, die diesen Ruderassistenten mitgestalten möchten. Das Backend ist in Rust (Rocket), das Frontend in TypeScript und Teraform, wobei wir mit dem Gedanken spielen, zu Svelte(Kit) zu wechseln.\n\nWenn du Lust hast, deine Skills in ein Projekt zu stecken, das Wellen schlagen wird, dann komm an Bord! Wir sind offen für frische Ideen, haben jedoch auch selber noch genügend; langweilig wird uns bestimmt nicht.\n\nWirf den Anker bei uns ausi und melde dich bei Marie oder Philipp oder it@rudernlinz.at – für eine Zukunft ohne optische Kenterung in Form von hässlichen Alerts ;)');">... und dir?</a>
             </div>
             <div>
                 <button id="theme-toggle-js"
@@ -31,4 +32,8 @@
                 </button>
             </div>
         </div>
+        <div class="mt-3">
+            <a class="underline" href="/impressum">Impressum</a>
+        </div>
+    </div>
 </footer>

templates/includes/forms/boat.html.tera

@@ -24,6 +24,7 @@
                     {{ macros::input(label='Default destination', name='default_destination', type='text') }}
                     <div>
                         {{ macros::checkbox(label="handgesteuert", name="default_shipmaster_only_steering") }}
+                        {{ macros::checkbox(label="Umbau Hand-/Fußsteuerung möglich", name="convert_handoperated_possible") }}
                         {{ macros::checkbox(label="Skull", name="skull", checked=true) }}
                         {{ macros::checkbox(label="Externes Boot (anderer Verein)", name="external") }}
                     </div>
@@ -66,6 +67,7 @@
                     {{ macros::input(label='Baujahr', name='year_built', type='number', min=1950, value=boat.year_built) }}
                     {{ macros::input(label='Bootsbauer', name='boatbuilder', type='text', value=boat.boatbuilder) }}
                     {{ macros::checkbox(label='handgesteuert', name='default_shipmaster_only_steering', id=uuid , checked=boat.default_shipmaster_only_steering) }}
+                    {{ macros::checkbox(label='Umbau Hand-/Fußsteuerung möglich', name='convert_handoperated_possible', id=uuid , checked=boat.convert_handoperated_possible) }}
                     {{ macros::input(label='Default destination', name='default_destination', type='text', value=boat.default_destination) }}
                     {{ macros::checkbox(label='Skull', name='skull', id=uuid , checked=boat.skull) }}
                     {{ macros::checkbox(label='Externes Boot', name='external', id=uuid , checked=boat.external) }}

templates/includes/forms/log.html.tera

@@ -3,14 +3,16 @@
    Inputs: boats
  #}
 {% macro show_boats() %}
-    {% for amount_seats, grouped_boats in boats | group_by(attribute="amount_seats") %}
-        <div class="pb-2">
-            <div class="bg-gray-100 dark:bg-primary-600 text-primary-950 dark:text-white text-center text-sm mb-2">
-                <strong>{{ amount_seats }}x</strong>
-            </div>
+    {% for cat, grouped_boats in boats | group_by(attribute="cat") %}
+        <details>
+            <summary class="font-bold cursor-pointer text-primary-900 dark:text-white border-t p-3 hover:bg-gray-100 dark:hover:bg-primary-950">
+                <span>{{ cat }}</span>
+                <small class="text-gray-500 dark:text-gray-100">({{ grouped_boats | length }})</small>
+            </summary>
+            <div class="pb-3">
                 {% for boat in grouped_boats | sort(attribute="name") %}
                     <div id="boat-{{ boat.id }}"
-                     class="px-3 boats-js text-black dark:text-white {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 {% endif %}"
+                         class="py-3 mx-3 boats-js text-black dark:text-white border-t {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-primary-950 {% endif %}"
                          {% if boat.damage != 'locked' and not boat.on_water %} data-seats="{{ boat.amount_seats }}" data-default_shipmaster_only_steering="{{ boat.default_shipmaster_only_steering }}" data-default-destination="{{ boat.default_destination }}" data-onclick="true" {% endif %}
                          data-id="{{ boat.id }}">
                         <span class="status-damage status-damage-{{ boat.damage }}"></span>
@@ -20,6 +22,7 @@
                     </div>
                 {% endfor %}
             </div>
+        </details>
     {% endfor %}
 {% endmacro show_boats %}
 {# Shows the form for creating a new logbook entry. #}
@@ -28,7 +31,7 @@
           method="post"
           id="form"
           class="grid grid-cols-4 gap-3"
-          onsubmit="Array.from(this.elements).forEach(e=>!e.value.trim()&&(e.disabled=true));">
+          onsubmit="if (!this.elements['boat_id'].value) { alert('Kein Boot ausgewählt'); return false; }Array.from(this.elements).forEach(e=>!e.value.trim()&&(e.disabled=true));">
         {{ log::boat_select() }}
         <div class="col-span-4 md:col-span-1">
             <div class="text-sm text-gray-600 dark:text-gray-100">Bootssteuerung</div>
@@ -67,7 +70,7 @@
     </form>
 {% endmacro new %}
 {% macro boat_select(id="boat_id") %}
-    {{ macros::select(label="Boot", data=boats, name="boat_id", id=id, display=["name", " (","amount_seats", " x)"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water", "default_destination"], wrapper_class="col-span-4", show_seats=true) }}
+    {{ macros::select(label="Boot", data=boats, name="boat_id", required=true, id=id, display=["name", " (","cat",")"], extras=["default_shipmaster_only_steering", "amount_seats", "on_water", "default_destination"], wrapper_class="col-span-4", show_seats=true, nonSelectableDefault=" -- Wähle ein Boot aus ---") }}
 {% endmacro boat_select %}
 {% macro rower_select(id, selected, amount_seats='', class='', init='false', cox_on_boat='', steering_person_id='') %}
     {#{% if not amount_seats or amount_seats > 1 %}#}
@@ -139,7 +142,7 @@
                                 {% if rower.id == log.shipmaster or rower.id == log.steering_person %}
                                     <small class="text-gray-600 dark:text-primary-100">(
                                         {%- if rower.id == log.shipmaster %}Schiffsführer
-                                        {% endif -%}
+                                        {%- endif -%}
                                         {% if rower.id == log.shipmaster and rower.id == log.steering_person %}/{% endif %}
                                         {%- if rower.id == log.steering_person %}Steuerperson
                                         {%- endif -%}
@@ -149,7 +152,7 @@
                         {% endfor %}
                         {% set amount_rowers = log.rowers | length %}
                         {% set amount_guests = log.boat.amount_seats - amount_rowers %}
-                        {% if amount_guests > 0 %}
+                        {% if amount_guests > 0 and not log.boat.external %}
                             Gäste
                             <small class="text-gray-600">(ohne Account)</small>:
                             {{ amount_guests }}
@@ -188,7 +191,7 @@
             <small class="text-gray-600 dark:text-gray-100">({{ log.shipmaster_user.name -}}
                 {% if log.shipmaster_only_steering %}
                     - handgesteuert
-                {% endif -%}
+                {%- endif -%}
             )</small>
             <small class="block text-gray-600 dark:text-gray-100">
                 {% if state == "completed" and log.departure | date(format='%d.%m.%Y') == log.arrival | date(format='%d.%m.%Y') %}
@@ -218,13 +221,16 @@
                     {% if log.comments %}<span class="text-sm italic">- "{{ log.comments }}"</span>{% endif %}
                 </div>
                 {% if amount_guests > 0 or log.rowers | length > 0 %}
+                    {% if not log.boat.amount_seats == 1 %}
                         <div class="text-sm text-gray-600 dark:text-gray-100">
                             Ruderer:
                             {% for rower in log.rowers -%}
-                            {{ rower.name -}}
-                            {% if not loop.last or amount_guests > 0 and log.boat.name != 'Externes Boot' %},{% endif %}
-                        {% endfor %}
-                        {% if amount_guests > 0 and log.boat.name != 'Externes Boot' %}
+                                {{ rower.name }}
+                                {%- if rower.id == log.steering_user.id and rower.id != log.shipmaster_user.id %}
+                                    (Steuerperson){%- endif -%}
+                                    {%- if not loop.last or amount_guests > 0 and not log.boat.external %},{% endif %}
+                                {% endfor -%}
+                                {% if amount_guests > 0 and not log.boat.external %}
                                     Gäste
                                     <small class="text-gray-600 dark:text-gray-100">(ohne Account)</small>:
                                     {{ amount_guests }}
@@ -232,10 +238,11 @@
                             </div>
                         {% endif %}
                     {% endif %}
+                {% endif %}
             </div>
         </div>
-{% endmacro show_old %}
-{% macro home(log) %}
+    {% endmacro show_old %}
+    {% macro home(log) %}
         <form class="grid grid-cols-1 gap-3"
               action="/log/{{ log.id }}"
               method="post">
@@ -272,4 +279,8 @@
             </details>
             <input class="btn btn-primary" type="submit" value="Ausfahrt beenden" />
         </form>
-{% endmacro home %}
+        <a href="/log/{{ log.id }}/delete"
+           class="btn btn-alert w-full absolute bottom-0 left-0"
+           style="border-radius: 0"
+           onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren');">Löschen</a>
+    {% endmacro home %}

templates/includes/macros.html.tera

@@ -2,7 +2,8 @@
     <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2 mt-3">
         <h2 class="h2">Reservierungen ({{ reservations | length }})</h2>
         <div class="grid grid-cols-1 gap-3 mb-3 w-full">
-            {% for reservation in reservations %}
+            {% for _, reservations_for_event in reservations %}
+                {% set reservation = reservations_for_event[0] %}
                 <div class="pt-2 px-3 border-t text-primary-900 dark:text-white">
                     <strong class="block">
                         {{ reservation.start_date | date(format="%d.%m.%Y") }}
@@ -13,7 +14,10 @@
                         <small>({{ reservation.time_desc }})</small>
                     </strong>
                     <span class="block">
+                        {% for reservation in reservations_for_event %}
                             {{ reservation.boat.name }}
+                            {% if not loop.last %}+{% endif %}
+                        {% endfor %}
                         <small>({{ reservation.user_applicant.name }})</small>
                     </span>
                     <span class="text-sm italic">{{ reservation.usage }}</span>
@@ -33,24 +37,24 @@
                     {{ loggedin_user.name }}
                 </a>
             </div>
-            <div>
-                {% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
-                    <a href="#"
-                       class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
-                       data-sidebar="true"
-                       data-trigger="sidebar"
-                       data-header="Ergo Challenge"
-                       data-body="#mobile-menu-guest">
-                        {% include "includes/book" %}
-                        <span class="sr-only">Ergo</span>
+            <div class="flex items-center">
+                {% if loggedin_user.amount_unread_notifications > 0 %}
+                    <a href="/#notification"
+                       class="relative inline-flex items-end ms-2 me-3">
+                        <svg height="20"
+                             width="24"
+                             aria-hidden="true"
+                             xmlns="http://www.w3.org/2000/svg"
+                             fill="currentColor"
+                             viewBox="0 0 20 24">
+                            <path d="M1.5 8.67v8.58a3 3 0 0 0 3 3h15a3 3 0 0 0 3-3V8.67l-8.928 5.493a3 3 0 0 1-3.144 0L1.5 8.67Z" />
+                            <path d="M22.5 6.908V6.75a3 3 0 0 0-3-3h-15a3 3 0 0 0-3 3v.158l9.714 5.978a1.5 1.5 0 0 0 1.572 0L22.5 6.908Z" />
+                        </svg>
+                        <small class="bg-red-500 rounded-full w-3 h-3 inline-flex justify-center items-center absolute p-1 notification">
+                            {{ loggedin_user.amount_unread_notifications }}
+                        </small>
                     </a>
-                    <div class="hidden">
-                        <div id="mobile-menu-guest">
-                            <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
-                        </div>
-                    </div>
                 {% endif %}
-                {% if "scheckbuch" not in loggedin_user.roles %}
                 <a href="#"
                    class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
                    data-sidebar="true"
@@ -62,33 +66,34 @@
                 </a>
                 <div class="hidden">
                     <div id="mobile-menu">
+                        {% if "Donau Linz" in loggedin_user.roles %}
                             <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
                             <a href="/log" class="block w-100 py-2 hover:text-primary-600 border-t">Ausfahrt eintragen</a>
                             <a href="/log/show"
                                class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a>
-                            {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
-                                <a href="/admin/user"
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
-                            {% endif %}
-                            {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
-                                <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
-                            {% endif %}
                             <a href="/stat" class="block w-100 py-2 hover:text-primary-600 border-t">Statistik</a>
                             <a href="/stat/boats"
                                class="block w-100 py-2 hover:text-primary-600 border-t">Bootsauswertung</a>
-                            {% if "admin" in loggedin_user.roles %}
-                                <a href="/admin/boat"
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
-                            {% endif %}
                             <a href="/boatdamage"
                                class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
                             <a href="/boatreservation"
                                class="block w-100 py-2 hover:text-primary-600 border-t">Bootsreservierung</a>
-                        </div>
-                    </div>
+                            <a href="/trailerreservation"
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Hängerreservierung</a>
+                        {% endif %}
+                        {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
+                            <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
+                        {% endif %}
+                        {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
+                            <a href="/admin/user"
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
+                        {% endif %}
+                        {% if "admin" in loggedin_user.roles %}
+                            <a href="/admin/boat"
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
                         {% endif %}
                         <a href="/auth/logout"
-                   class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
+                           class="block w-100 py-2 hover:text-primary-600 border-t">Ausloggen
                             <svg class="inline h-4"
                                  width="24"
                                  height="24"
@@ -103,10 +108,11 @@
                                 <polyline points="16 17 21 12 16 7"></polyline>
                                 <line x1="21" y1="12" x2="9" y2="12"></line>
                             </svg>
-                    <span class="sr-only">Ausloggen</span>
                         </a>
                     </div>
                 </div>
+            </div>
+        </div>
     </header>
     <div class="h-8"></div>
 {% endmacro header %}
@@ -143,7 +149,7 @@
         {{ label }}
     </label>
 {% endmacro checkbox %}
-{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='') %}
+{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='', nonSelectableDefault=false) %}
     <div class="{{ wrapper_class }}">
         <label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
         {% if display == '' %}
@@ -154,8 +160,9 @@
                 class="input rounded-md {{ class }}"
                 {% if required %}required="required"{% endif %}>
             {% if default %}<option selected value>{{ default }}</option>{% endif %}
+            {% if nonSelectableDefault %}<option disabled selected value>{{ nonSelectableDefault }}</option>{% endif %}
             {% for d in data %}
-                <option value="{{ d.id }}" {% if d.id == selected_id %}selected{% endif %} {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data- {{ extra }}={{ d[extra] }} {% else %} {% if d[extra] %}disabled{% endif %} {% endif %} {% endfor %} {% endif %} {% if show_seats %} data-custom-properties='{"amount_seats": {{ d["amount_seats"] }}, "owner": "{{ d["owner"] }}", "default_destination": "{{ d["default_destination"] }}", "boat_in_ottensheim": {{ d["location_id"] == 2 }}, "boat_reserved_today": {{ d["reserved_today"] }}}' {% endif %}>
+                <option value="{{ d.id }}" {% if d.id == selected_id %}selected{% endif %} {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data- {{ extra }}={{ d[extra] }} {% else %} {% if d[extra] %}disabled{% endif %} {% endif %} {% endfor %} {% endif %} {% if show_seats %} data-custom-properties='{"amount_seats": {{ d["amount_seats"] }}, "owner": "{{ d["owner"] }}", "default_destination": "{{ d["default_destination"] }}", "boat_in_ottensheim": {{ d["location_id"] == 2 }}, "boat_reserved_today": {{ d["reserved_today"] }}, "convert_handoperated_possible": {{ d["convert_handoperated_possible"] }}, "default_handoperated": {{ d["default_shipmaster_only_steering"] }}}' {% endif %}>
                     {% for displa in display -%}
                         {%- if d[displa] -%}
                             {{- d[displa] -}}
@@ -180,18 +187,28 @@
     <div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md">
         {% if participants | length > 0 %}
             {% for rower in participants %}
+                <div class="relative">
                     {{ rower.name }}
                     {% if rower.is_guest %}<small class="text-gray-600 dark:text-gray-100">(Scheckbuch)</small>{% endif %}
                     {% if rower.is_real_guest %}
                         <small class="text-gray-600 dark:text-gray-100">(Gast)</small>
                         {% if allow_removing %}
-                        <a href="/planned/remove/{{ trip_details_id }}/{{ rower.name }}"
-                           class="btn btn-attention btn-fw">Abmelden</a>
+                            <a href="/planned/remove/{{ trip_details_id }}/{{ rower.name | urlencode }}"
+                               class="absolute r-0 bg-red-500 w-5 h-5 text-white rounded-full flex items-center justify-center transform rotate-45 top-0 right-0">
+                                <svg class="inline h-5 w-5"
+                                     width="16"
+                                     height="16"
+                                     fill="currentColor"
+                                     viewBox="0 0 16 16">
+                                    <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"></path>
+                                </svg>
+                                <span class="sr-only">Abmelden</span>
+                            </a>
                         {% endif %}
                     {% endif %}
                     <span class="hidden">(angemeldet seit
                     {{ rower.registered_at }})</span>
-                <br />
+                </div>
             {% endfor %}
         {% else %}
             {{ text }}

templates/index.html.tera

@@ -1,8 +1,9 @@
 {% import "includes/macros" as macros %}
+{% import "includes/forms/log" as log %}
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
-        <h1 class="h1">Ruderassistent</h1>
+        <h1 class="h1">Ruder&shy;assistent</h1>
         <div class="grid gap-3 my-5">
             <div class="m-auto">
                 <a href="/planned"
@@ -11,18 +12,25 @@
                     <span class="text-xl px-3">Geplante Ausfahrten</span>
                 </a>
             </div>
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+            {% if notifications %}
+                <div id="notification"
+                     class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                      role="alert">
                     <h2 class="h2">Nachrichten</h2>
+                    {% if loggedin_user.amount_unread_notifications > 10 %}
+                        <div class="text-primary-950 dark:text-white bg-gray-200 dark:bg-primary-950 bg-opacity-80 text-center pb-3 px-3">
+                            Du hast viele ungelesene Benachrichtigungen. Um deine Oberfläche übersichtlich zu halten und wichtige Updates nicht zu verpassen, nimm dir bitte einen Moment Zeit sie zu überprüfen und als gelesen zu markieren (&#10003;).
+                        </div>
+                    {% endif %}
                     <div class="divide-y">
                         {% for notification in notifications %}
                             {% if not notification.read_at %}
                                 <div class="relative flex justify-between items-center p-3">
                                     <div class="grow me-4">
                                         <small class="uppercase text-gray-600 dark:text-gray-100">
-                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M",) }}
+                                            <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M",) }}
                                         </small>
-                                    <div class="mt-1">{{ notification.message }}</div>
+                                        <div class="mt-1">{{ notification.message | safe }}</div>
                                     </div>
                                     <div>
                                         {% if not notification.read_at %}
@@ -38,22 +46,23 @@
                             {% endif %}
                         {% endfor %}
                     </div>
-                <details class="py-3 bg-gray-200 dark:bg-primary-950 rounded-b-md">
-                    <summary class="px-3">Vergangene Nachrichten</summary>
+                    <details class="py-3 border-t rounded-b-md">
+                        <summary class="px-3 cursor-pointer">Vergangene Nachrichten (14 Tage)</summary>
                         <div class="divide-y text-sm">
                             {% for notification in notifications %}
                                 {% if notification.read_at %}
                                     <div class="p-3 relative">
                                         <small class="uppercase text-gray-600 dark:text-gray-100">
-                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(timezone="Europe/Vienna", format="%d.%m.%Y %H:%M") }}
+                                            <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
                                         </small>
-                                    <div class="mt-1">{{ notification.message }}</div>
+                                        <div class="mt-1">{{ notification.message | safe }}</div>
                                     </div>
                                 {% endif %}
                             {% endfor %}
                         </div>
                     </details>
                 </div>
+            {% endif %}
             {% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
                 <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                      role="alert">
@@ -81,6 +90,10 @@
                             <a href="/boatreservation"
                                class="block w-100 py-2 hover:text-primary-600">Bootsreservierung</a>
                         </li>
+                        <li class="py-1">
+                            <a href="/trailerreservation"
+                               class="block w-100 py-2 hover:text-primary-600">Hängerreservierung</a>
+                        </li>
                         <li class="py-1">
                             <a href="/steering" class="block w-100 py-2 hover:text-primary-600">Steuerleute & Co</a>
                         </li>
@@ -88,14 +101,26 @@
                 </div>
             {% endif %}
             {% if "scheckbuch" in loggedin_user.roles %}
+                <div class="grid gap-3 mb-4">
                     <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                          role="alert">
                         <h2 class="h2">Scheckbuch</h2>
-                    <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
-                        <li class="py-1">
-                            <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
-                        </li>
-                    </ul>
+                        {% if "paid" not in loggedin_user.roles %}
+                            <div class="p-3 dark:text-white bg-white dark:bg-primary-900">
+                                Bitte nimm zur nächsten Ausfahrt die {{ costs_scheckbuch / 100 }}&nbsp;€ für das Scheckbuch mit. Falls du das bereits gemacht hast, gibt uns bitte kurz Bescheid, dass dies noch nicht eingetragen wurde.
+                            </div>
+                        {% endif %}
+                        <div class="text-sm p-3 bg-gray-200 bg-opacity-80 dark:bg-primary-950 dark:text-white text-primary-950">
+                            <h3>Du hast bisher an {{ last_trips | length }} deiner 5 Scheckbuch-Ausfahrten teilgenommen.</h3>
+                            {% if last_trips %}
+                                <ol class="mt-3">
+                                    {% for last_trip in last_trips %}
+                                        <li>{{ log::show_old(log=last_trip, state="completed", only_ones=false, index=loop.index) }}</li>
+                                    {% endfor %}
+                                </ol>
+                            {% endif %}
+                        </div>
+                    </div>
                 </div>
             {% endif %}
             {% if "schnupper-betreuer" in loggedin_user.roles %}
@@ -145,7 +170,7 @@
                             <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
                         </li>
                         <li class="py-1">
-                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail (beautifully layouted)</a>
+                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail</a>
                         </li>
                         <li class="py-1">
                             <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
@@ -153,6 +178,10 @@
                         <li class="py-1">
                             <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
                         </li>
+                        <li class="py-1">
+                            <a href="/admin/notification"
+                               class="block w-100 py-2 hover:text-primary-600">Nachricht ausschreiben</a>
+                        </li>
                     </ul>
                 </div>
             {% endif %}

templates/kiosk.html.tera

@@ -15,11 +15,30 @@
                     <h2 class="h2">Boote</h2>
                     <div>{{ log::show_boats(only_ones=false) }}</div>
                 </div>
+                <div class="bg-white dark:bg-primary-900 rounded-md hidden lg:block shadow mt-3">
+                    <h2 class="h2">Schnellauswahl</h2>
+                    <div>
+                        {% for boat in boats | reverse %}
+                            {% if boat.id in [42, 36] %}
+                                <div class="p-3 boats-js text-black dark:text-white border-t {% if boat.damage != 'locked' and not boat.on_water %} cursor-pointer hover:text-primary-900 dark:hover:text-gray-100 hover:bg-gray-100 dark:hover:bg-primary-950 {% endif %}"
+                                     {% if boat.damage != 'locked' and not boat.on_water %} data-seats="{{ boat.amount_seats }}" data-default_shipmaster_only_steering="{{ boat.default_shipmaster_only_steering }}" data-default-destination="{{ boat.default_destination }}" data-onclick="true" {% endif %}
+                                     data-id="{{ boat.id }}">
+                                    <span class="status-damage status-damage-{{ boat.damage }}"></span>
+                                    <span {% if boat.damage == 'locked' or boat.on_water %}class="opacity-50"{% endif %}>{{ boat.name }}
+                                        {% if boat.owner %}<span class="opacity-50">(privat)</span>{% endif %}
+                                    </span>
                                 </div>
-            <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
+                            {% endif %}
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+            <div class="lg:col-span-3">
+                <div class="bg-white dark:bg-primary-900 rounded-md shadow">
                     <h2 class="h2">Neue Ausfahrt</h2>
                     <div class="p-3">{{ log::new(only_ones=false, shipmaster=-1) }}</div>
                 </div>
+            </div>
             <div>
                 <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2">
                     <h2 class="h2">Am Wasser</h2>

templates/log.html.tera

@@ -6,15 +6,17 @@
         <h1 class="h1">Logbuch</h1>
         <div class="w-full grid lg:grid-cols-5 gap-3 mt-5">
             <div>
-                <div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
+                <div class="bg-white dark:bg-primary-900 rounded-md hidden lg:block shadow">
                     <h2 class="h2">Boote</h2>
                     <div>{{ log::show_boats(only_ones=false) }}</div>
                 </div>
             </div>
-            <div class="lg:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
+            <div class="lg:col-span-3">
+                <div class="bg-white dark:bg-primary-900 rounded-md shadow">
                     <h2 class="h2">Neue Ausfahrt</h2>
                     <div class="p-3">{{ log::new(shipmaster=loggedin_user.id) }}</div>
                 </div>
+            </div>
             <div>
                 <div class="bg-white dark:bg-primary-900 rounded-md shadow pb-2">
                     <h2 class="h2">Am Wasser</h2>
@@ -36,5 +38,6 @@
             </div>
         </div>
     </div>
+    {% if loggedin_user %}<script>var loggedin_user_id = "{{ loggedin_user.id }}";</script>{% endif %}
     <script src="/public/logbook.js"></script>
 {% endblock content %}

templates/planned.html.tera

@@ -3,22 +3,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-xl w-full grid sm:grid-cols-2 lg:grid-cols-3 gap-4">
-        {% if "scheckbuch" in loggedin_user.roles %}
-            <div class="grid gap-3 sm:col-span-2 lg:col-span-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Scheckbuch</h2>
-                    <div class="text-sm p-3">
-                        <h3>Du hast bisher {{ last_trips | length }} deiner 5 Scheckbuch-Ausfahrten gemacht:</h3>
-                        <ol>
-                            {% for last_trip in last_trips %}
-                                <li>{{ log::show_old(log=last_trip, state="completed", only_ones=false, index=loop.index) }}</li>
-                            {% endfor %}
-                        </ol>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
         {% if "paid" not in loggedin_user.roles and "Donau Linz" in loggedin_user.roles %}
             <div class="grid gap-3 sm:col-span-2 lg:col-span-3">
                 <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
@@ -74,11 +58,11 @@
         <h1 class="h1 sm:col-span-2 lg:col-span-3">Ausfahrten</h1>
         {% include "includes/buttons" %}
         {% for day in days %}
-            {% set amount_trips = day.planned_events | length + day.trips | length %}
+            {% set amount_trips = day.events | length + day.trips | length %}
             {% set_global day_cox_needed = false %}
-            {% if day.planned_events | length > 0 %}
-                {% for planned_event in day.planned_events %}
-                    {% if planned_event.cox_needed %}
+            {% if day.events | length > 0 %}
+                {% for event in day.events %}
+                    {% if event.cox_needed %}
                         {% set_global day_cox_needed = true %}
                     {% endif %}
                 {% endfor %}
@@ -91,74 +75,95 @@
                 <div>
                     <h2 class="font-bold uppercase tracking-wide text-center rounded-t-md  {% if day.is_pinned %} text-white bg-primary-950 {% else %} text-primary-950 dark:text-white bg-gray-200 dark:bg-primary-950 bg-opacity-80 {% endif %} text-lg px-3 py-3 ">
                         {{ day.day| date(format="%d.%m.%Y") }}
-                        <small class="inline-block ml-1 text-xs {% if day.is_pinned %} text-gray-200 {% else %} text-gray-500 dark:text-gray-100 {% endif %}">{{ day.day | date(format="%A", locale="de_AT") }}</small>
+                        <small class="inline-block ml-1 text-xs {% if day.is_pinned %} text-gray-200 {% else %} text-gray-500 dark:text-gray-100 {% endif %}">{{ day.day | date(format="%A", locale="de_AT") }}
+                            {% if day.max_waterlevel %}
+                                &bullet; <a href="https://hydro.ooe.gv.at/#/overview/Wasserstand/station/16668/Linz/Wasserstand"
+    target="_blank"
+    title="Prognostizierter maximaler Wasserstand am {{ day.day | date(format="%A", locale="de_AT") }}: {{ day.max_waterlevel.avg }} ± {{ day.max_waterlevel.fluctuation }} cm (ungeprüfte Rohdaten, für Details siehe die Infos dazu im Impressum)">🌊{{ day.max_waterlevel.avg }} ± {{ day.max_waterlevel.fluctuation }} cm</a>
+                            {% endif %}
+                        </small>
+                        {% if day.weather %}
+                            <small class="inline-block text-xs {% if day.is_pinned %} text-gray-200 {% else %} text-gray-500 dark:text-gray-100 {% endif %}">
+                                Temp:&nbsp;{{ day.weather.max_temp | round }}° &bullet; Windböe:&nbsp;{{ day.weather.wind_gust | round }}&nbsp;km/h &bullet; Regen:&nbsp;{{ day.weather.rain_mm | round }}&nbsp;mm
+                            </small>
+                        {% endif %}
                     </h2>
-                    {% if day.planned_events | length > 0 or  day.trips | length > 0 %}
+                    {% if day.events | length > 0 or  day.trips | length > 0 %}
                         <div class="grid grid-cols-1 gap-3 mb-3">
                             {# --- START Events --- #}
-                            {% if day.planned_events | length > 0 %}
-                                {% for planned_event in day.planned_events | sort(attribute="planned_starting_time") %}
-                                    {% set amount_cur_cox = planned_event.cox | length %}
-                                    {% set amount_cox_missing = planned_event.planned_amount_cox - amount_cur_cox %}
+                            {% if day.events | length > 0 %}
+                                {% for event in day.events | sort(attribute="planned_starting_time") %}
+                                    {% set amount_cur_cox = event.cox | length %}
+                                    {% set amount_cox_missing = event.planned_amount_cox - amount_cur_cox %}
                                     <div class="pt-2 px-3 border-t border-gray-200"
-                                         style="order: {{ planned_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="mr-1">
-                                                <strong class="text-primary-900 dark:text-white">
-                                                    {{ planned_event.planned_starting_time }}
+                                                {% if event.max_people == 0 %}
+                                                    <strong class="text-[#f43f5e]">&#9888; Absage
+                                                        {{ event.planned_starting_time }}
                                                         Uhr
                                                     </strong>
-                                                <small class="text-gray-600 dark:text-gray-100">({{ planned_event.name }}
-                                                    {%- if planned_event.trip_type %}
-                                                        - {{ planned_event.trip_type.icon | safe }} {{ planned_event.trip_type.name }}
+                                                    <small class="text-[#f43f5e]">({{ event.name }}
+                                                        {%- if event.trip_type %}
+                                                            - {{ event.trip_type.icon | safe }}&nbsp;{{ event.trip_type.name }}
                                                         {%- endif -%}
                                                     )</small>
+                                                {% else %}
+                                                    <strong class="text-primary-900 dark:text-white">
+                                                        {{ event.planned_starting_time }}
+                                                        Uhr
+                                                    </strong>
+                                                    <small class="text-gray-600 dark:text-gray-100">({{ event.name }}
+                                                        {%- if event.trip_type %}
+                                                            - {{ event.trip_type.icon | safe }}&nbsp;{{ event.trip_type.name }}
+                                                        {%- endif -%}
+                                                    )</small>
+                                                {% endif %}
                                                 <br />
-                                                <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>{{ planned_event.planned_starting_time }} Uhr</strong> ({{ planned_event.name }})
-                                                    {% if planned_event.trip_type %}<small class='block'>{{ planned_event.trip_type.desc }}</small>{% endif %}
-                                                    {% if planned_event.notes %}<small class='block'>{{ planned_event.notes }}</small>{% endif %}
-                                                    " data-body="#event{{ planned_event.trip_details_id }}" class="inline-block link-primary mr-3">
+                                                <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>{{ event.planned_starting_time }} Uhr</strong> ({{ event.name }})
+                                                    {% if event.trip_type %}<small class='block'>{{ event.trip_type.desc }}</small>{% endif %}
+                                                    {% if event.notes %}<small class='block'>{{ event.notes }}</small>{% endif %}
+                                                    " data-body="#event{{ event.trip_details_id }}" class="inline-block link-primary mr-3">
                                                     Details
                                                 </a>
                                             </div>
                                             <div class="text-right grid gap-2">
                                                 {# --- START Row Buttons --- #}
                                                 {% set_global cur_user_participates = false %}
-                                                {% for rower in planned_event.rower %}
+                                                {% for rower in event.rower %}
                                                     {% if rower.name == loggedin_user.name %}
                                                         {% set_global cur_user_participates = true %}
                                                     {% endif %}
                                                 {% endfor %}
                                                 {% if cur_user_participates %}
-                                                    <a href="/planned/remove/{{ planned_event.trip_details_id }}"
+                                                    <a href="/planned/remove/{{ event.trip_details_id }}"
                                                        class="btn btn-attention btn-fw">Abmelden</a>
                                                 {% endif %}
-                                                {% if planned_event.max_people > planned_event.rower | length %}
-                                                    {% if cur_user_participates == false %}
-                                                        <a href="/planned/join/{{ planned_event.trip_details_id }}"
+                                                {% if event.max_people > event.rower | length and cur_user_participates == false %}
+                                                    <a href="/planned/join/{{ event.trip_details_id }}"
                                                        class="btn btn-primary btn-fw"
-                                                           {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>Mitrudern</a>
-                                                    {% endif %}
+                                                       {% if event.trip_type %}onclick="return confirm('{{ event.trip_type.question }}');"{% endif %}>Mitrudern</a>
                                                 {% endif %}
                                                 {# --- END Row Buttons --- #}
                                                 {# --- START Cox Buttons --- #}
                                                 {% if "cox" in loggedin_user.roles %}
                                                     {% set_global cur_user_participates = false %}
-                                                    {% for cox in planned_event.cox %}
+                                                    {% for cox in event.cox %}
                                                         {% if cox.name == loggedin_user.name %}
                                                             {% set_global cur_user_participates = true %}
                                                         {% endif %}
                                                     {% endfor %}
                                                     {% if cur_user_participates %}
-                                                        <a href="/cox/remove/{{ planned_event.id }}"
+                                                        <a href="/cox/remove/{{ event.id }}"
                                                            class="block btn btn-attention btn-fw">
                                                             {% include "includes/cox-icon" %}
                                                             Abmelden
                                                         </a>
-                                                    {% else %}
-                                                        <a href="/cox/join/{{ planned_event.id }}"
+                                                    {% elif event.planned_amount_cox > 0 %}
+                                                        <a href="/cox/join/{{ event.id }}"
                                                            class="block btn {% if amount_cox_missing > 0 %} btn-dark {% else %} btn-gray {% endif %} btn-fw"
-                                                           {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>
+                                                           {% if event.trip_type %}onclick="return confirm('{{ event.trip_type.question }}');"{% endif %}>
                                                             {% include "includes/cox-icon" %}
                                                             Steuern
                                                         </a>
@@ -169,59 +174,88 @@
                                         </div>
                                         {# --- START Sidebar Content --- #}
                                         <div class="hidden">
-                                            <div id="event{{ planned_event.trip_details_id }}">
+                                            <div id="event{{ event.trip_details_id }}">
                                                 {# --- START List Coxes --- #}
-                                                {% if planned_event.planned_amount_cox > 0 %}
-                                                    {% if amount_cox_missing > 0 %}
-                                                        {{ macros::box(participants=planned_event.cox, empty_seats=planned_event.planned_amount_cox - amount_cur_cox, header='Noch benötigte Steuerleute:', text='Keine Steuerleute angemeldet') }}
+                                                {% if event.planned_amount_cox > 0 %}
+                                                    {% if event.max_people == 0 %}
+                                                        {{ macros::box(participants=event.cox, empty_seats="", header='Absage', bg='[#f43f5e]') }}
                                                     {% else %}
-                                                        {{ macros::box(participants=planned_event.cox, empty_seats="", header='Genügend Steuerleute haben sich angemeldet :-)', text='Keine Steuerleute angemeldet') }}
+                                                        {% if amount_cox_missing > 0 %}
+                                                            {{ macros::box(participants=event.cox, empty_seats=event.planned_amount_cox - amount_cur_cox, header='Noch benötigte Steuerleute:', text='Keine Steuerleute angemeldet') }}
+                                                        {% else %}
+                                                            {{ macros::box(participants=event.cox, empty_seats="", header='Genügend Steuerleute haben sich angemeldet :-)', text='Keine Steuerleute angemeldet') }}
+                                                        {% endif %}
                                                     {% endif %}
                                                 {% endif %}
                                                 {# --- END List Coxes --- #}
                                                 {# --- START List Rowers --- #}
-                                                {% if planned_event.max_people > 0 %}
-                                                    {% set amount_cur_rower = planned_event.rower | length %}
-                                                    {{ macros::box(participants=planned_event.rower, empty_seats=planned_event.max_people - amount_cur_rower, bg='primary-100', color='black', trip_details_id=planned_event.trip_details_id, allow_removing="planned_event" in loggedin_user.roles) }}
+                                                {% set amount_cur_rower = event.rower | length %}
+                                                {% if event.max_people == 0 %}
+                                                    {{ macros::box(header='Absage', bg='[#f43f5e]', participants=event.rower, trip_details_id=event.trip_details_id, allow_removing="manage_events" in loggedin_user.roles) }}
+                                                {% else %}
+                                                    {{ macros::box(participants=event.rower, empty_seats=event.max_people - amount_cur_rower, bg='primary-100', color='black', trip_details_id=event.trip_details_id, allow_removing="manage_events" in loggedin_user.roles) }}
                                                 {% endif %}
                                                 {# --- END List Rowers --- #}
-                                                {% if "planned_event" in loggedin_user.roles %}
-                                                    <form action="/planned/join/{{ planned_event.trip_details_id }}"
-                                                          method="get" />
+                                                {% if "manage_events" in loggedin_user.roles %}
+                                                    <form action="/planned/join/{{ event.trip_details_id }}" method="get" />
                                                     {{ macros::input(label='Gast', class="input rounded-t", name='user_note', type='text', required=true) }}
                                                     <input value="Gast hinzufügen"
                                                            class="btn btn-primary w-full rounded-t-none-important"
                                                            type="submit" />
                                                 </form>
                                             {% endif %}
-                                            {% if planned_event.allow_guests %}
+                                            {% if event.allow_guests %}
                                                 <div class="text-primary-900 bg-primary-50 text-center p-1 mb-4">Gäste willkommen!</div>
                                             {% endif %}
-                                            {% if "planned_event" in loggedin_user.roles %}
+                                            {% if "manage_events" in loggedin_user.roles %}
                                                 {# --- START Edit Form --- #}
                                                 <div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
                                                     <h3 class="text-primary-950 dark:text-white font-bold uppercase tracking-wide mb-2">Ausfahrt bearbeiten</h3>
                                                     <form action="/admin/planned-event" method="post" class="grid gap-3">
                                                         <input type="hidden" name="_method" value="put" />
-                                                        <input type="hidden" name="id" value="{{ planned_event.id }}" />
-                                                        {{ macros::input(label='Titel', name='name', type='input', value=planned_event.name) }}
-                                                        {{ macros::input(label='Anzahl Ruderer', name='max_people', type='number', required=true, value=planned_event.max_people, min='0') }}
-                                                        {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', value=planned_event.planned_amount_cox, required=true, min='0') }}
-                                                        {{ macros::checkbox(label='Immer anzeigen', name='always_show', id=planned_event.id,checked=planned_event.always_show) }}
-                                                        {{ macros::checkbox(label='Gesperrt', name='is_locked', id=planned_event.id,checked=planned_event.is_locked) }}
-                                                        {{ macros::input(label='Anmerkungen', name='notes', type='input', value=planned_event.notes) }}
+                                                        <input type="hidden" name="id" value="{{ event.id }}" />
+                                                        {{ macros::input(label='Titel', name='name', type='input', value=event.name) }}
+                                                        {{ macros::input(label='Anzahl Ruderer', name='max_people', type='number', required=true, value=event.max_people, min='1') }}
+                                                        {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', value=event.planned_amount_cox, required=true, min='0') }}
+                                                        {{ macros::checkbox(label='Immer anzeigen', name='always_show', id=event.id,checked=event.always_show) }}
+                                                        {{ macros::checkbox(label='Gesperrt', name='is_locked', id=event.id,checked=event.is_locked) }}
+                                                        {{ macros::select(label='Typ', name='trip_type', data=trip_types, default='Reguläre Ausfahrt', selected_id=event.trip_type_id) }}
+                                                        {{ macros::input(label='Anmerkungen', name='notes', type='input', value=event.notes) }}
                                                         <input value="Speichern" class="btn btn-primary" type="submit" />
                                                     </form>
                                                 </div>
                                                 {# --- END Edit Form --- #}
                                                 {# --- START Delete Btn --- #}
-                                                <div class="text-right">
-                                                    <a href="/admin/planned-event/{{ planned_event.id }}/delete"
+                                                {% if event.rower | length == 0 and amount_cur_cox == 0 %}
+                                                    <div class="text-right mt-6">
+                                                        <a href="/admin/planned-event/{{ event.id }}/delete"
                                                            class="inline-block btn btn-alert">
                                                             {% include "includes/delete-icon" %}
                                                             Termin löschen
                                                         </a>
                                                     </div>
+                                                {% else %}
+                                                    {% if event.max_people == 0 %}
+                                                        Wenn du deine Absage absagen (:^)) willst, einfach entsprechende Anzahl an Ruderer oben eintragen.
+                                                    {% else %}
+                                                        <div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
+                                                            <h3 class="text-primary-950 dark:text-white font-bold uppercase tracking-wide mb-2">Event absagen</h3>
+                                                            <form action="/admin/planned-event" method="post" class="grid">
+                                                                <input type="hidden" name="_method" value="put" />
+                                                                <input type="hidden" name="id" value="{{ event.id }}" />
+                                                                {{ macros::input(label='Grund der Absage', name='notes', type='input', value='') }}
+                                                                {{ macros::input(label='', name='max_people', type='hidden', value=0) }}
+                                                                {{ macros::input(label='', name='name', type='hidden', value=event.name) }}
+                                                                {{ macros::input(label='', name='max_people', type='hidden', value=event.max_people) }}
+                                                                {{ macros::input(label='', name='planned_amount_cox', type='hidden', value=event.planned_amount_cox) }}
+                                                                {{ macros::input(label='', name='always_show', type='hidden', value=event.always_show) }}
+                                                                {{ macros::input(label='', name='is_locked', type='hidden', value=event.is_locked) }}
+                                                                {{ macros::input(label='', name='trip_type', type='hidden', value=event.trip_type_id) }}
+                                                                <input value="Ausfahrt absagen" class="btn btn-alert" type="submit" />
+                                                            </form>
+                                                        </div>
+                                                    {% endif %}
+                                                {% endif %}
                                             {% endif %}
                                             {# --- END Delete Btn --- #}
                                         </div>
@@ -247,16 +281,16 @@
                                                     {{ trip.cox_name -}}
                                                     {% if trip.trip_type %}
                                                         -
-                                                        {{ trip.trip_type.icon | safe }}{{ trip.trip_type.name }}
-                                                    {% endif -%}
+                                                        {{ trip.trip_type.icon | safe }}&nbsp;{{ trip.trip_type.name }}
+                                                    {%- endif -%}
                                                 )</small>
                                             {% else %}
                                                 <strong class="text-primary-900 dark:text-white">{{ trip.planned_starting_time }}
                                                 Uhr</strong>
                                                 <small class="text-gray-600 dark:text-gray-100">({{ trip.cox_name -}}
                                                     {% if trip.trip_type %}
-                                                        - {{ trip.trip_type.icon | safe }} {{ trip.trip_type.name }}
-                                                    {% endif -%}
+                                                        - {{ trip.trip_type.icon | safe }}&nbsp;{{ trip.trip_type.name }}
+                                                    {%- endif -%}
                                                 )</small>
                                             {% endif %}
                                             <br />
@@ -310,7 +344,7 @@
                                             <div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
                                                 <h3 class="text-primary-950 dark:text-white font-bold uppercase tracking-wide mb-2">Ausfahrt bearbeiten</h3>
                                                 <form action="/cox/trip/{{ trip.id }}" method="post" class="grid gap-3">
-                                                    {{ macros::input(label='Anzahl Ruderer', name='max_people', type='number', required=true, value=trip.max_people, min='0') }}
+                                                    {{ macros::input(label='Anzahl Ruderer', name='max_people', type='number', required=true, value=trip.max_people, min=trip.rower | length) }}
                                                     {{ macros::input(label='Anmerkungen', name='notes', type='input', value=trip.notes) }}
                                                     {{ macros::checkbox(label='Immer anzeigen', name='always_show', id=trip.id,checked=trip.always_show) }}
                                                     {{ macros::checkbox(label='Gesperrt', name='is_locked', id=trip.id,checked=trip.is_locked) }}
@@ -326,6 +360,22 @@
                                                         Termin löschen
                                                     </a>
                                                 </div>
+                                            {% else %}
+                                                {% if trip.max_people == 0 %}
+                                                    Wenn du deine Absage absagen (:^)) willst, einfach entsprechende Anzahl an Ruderer oben eintragen.
+                                                {% else %}
+                                                    <div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
+                                                        <h3 class="text-primary-950 dark:text-white font-bold uppercase tracking-wide mb-2">Ausfahrt absagen</h3>
+                                                        <form action="/cox/trip/{{ trip.id }}" method="post" class="grid">
+                                                            {{ macros::input(label='', name='max_people', type='hidden', value=0) }}
+                                                            {{ macros::input(label='Grund der Absage', name='notes', type='input', value='') }}
+                                                            {{ macros::input(label='', name='always_show', type='hidden', value=trip.always_show) }}
+                                                            {{ macros::input(label='', name='is_locked', type='hidden', value=trip.is_locked) }}
+                                                            {{ macros::input(label='', name='trip_type', type='hidden', value=trip.trip_type_id) }}
+                                                            <input value="Ausfahrt absagen" class="btn btn-alert" type="submit" />
+                                                        </form>
+                                                    </div>
+                                                {% endif %}
                                             {% endif %}
                                         {% endif %}
                                         {# --- END Edit Form --- #}
@@ -340,9 +390,9 @@
             {% endif %}
         </div>
         {# --- START Add Buttons --- #}
-        {% if "planned_event" in loggedin_user.roles or "cox" in loggedin_user.roles %}
-            <div class="grid {% if "planned_event" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
-                {% if "planned_event" in loggedin_user.roles %}
+        {% if "manage_events" in loggedin_user.roles or "cox" in loggedin_user.roles %}
+            <div class="grid {% if "manage_events" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
+                {% if "manage_events" in loggedin_user.roles %}
                     <a href="#"
                        data-sidebar="true"
                        data-trigger="sidebar"
@@ -356,7 +406,7 @@
                 {% endif %}
                 {% if "cox" in loggedin_user.roles %}
                     <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Ausfahrt</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#sidebarForm" class="relative inline-block w-full py-2 text-primary-900 hover:text-primary-950 dark:bg-primary-600 dark:text-white dark:hover:bg-primary-500 dark:hover:text-white focus:text-primary-950 text-sm font-semibold bg-gray-100 hover:bg-gray-200 focus:bg-gray-200
-                        {% if "planned_event" in loggedin_user.roles %}
+                        {% if "manage_events" in loggedin_user.roles %}
                             rounded-br-md
                         {% else %}
                             rounded-b-md
@@ -376,7 +426,7 @@
 {% if "cox" in loggedin_user.roles %}
     {% include "forms/trip" %}
 {% endif %}
-{% if "planned_event" in loggedin_user.roles %}
+{% if "manage_events" in loggedin_user.roles %}
     {% include "forms/event" %}
 {% endif %}
 {% endblock content %}

templates/stat.boats.html.tera

@@ -1,21 +1,7 @@
 {% import "includes/macros" as macros %}
 {% extends "base" %}
 {% block content %}
-    <style>
-	.dt-input {
-		color: black;
-	}
-	.dt-selector {
-		width: 70px;
-	}
-	.dt-table th{
-	min-width: 100px;
-	}
-	.dt-table td {
-		border: 1px gray solid;
-	}
-}
-    </style>
+    <link rel="stylesheet" href="/public/table.css" />
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">Bootsauswertung</h1>
         <div class="text-black dark:text-white">
@@ -23,6 +9,7 @@
                 <thead>
                     <tr>
                         <th>Name</th>
+                        <th>Eigentümer</th>
                         <th>Ort</th>
                         {% for year in stat.pot_years | sort | reverse %}<th>{{ year }}</th>{% endfor %}
                     </tr>
@@ -31,6 +18,7 @@
                     {% for boat in stat.boats %}
                         <tr>
                             <td>{{ boat.name }}</td>
+                            <td>{{ boat.owner }}</td>
                             <td>{{ boat.location }}</td>
                             {% for year in stat.pot_years | sort | reverse %}
                                 <td>
@@ -48,12 +36,5 @@
         </div>
     </div>
     <script src="/public/jstable.min.js"></script>
-    <script>new JSTable("#basic", {
-		perPage: 100,
-		perPageSelect: [10,100],
-		labels: {
-			placeholder: 'Suchen (zB "Linz")'
-		}
-	});
-    </script>
+    <script src="/public/table.js"></script>
 {% endblock content %}