migration.sql

@@ -15,12 +15,7 @@ CREATE TABLE IF NOT EXISTS "user" (
 	"nickname" text,
 	"notes" text,
 	"phone" text,
-	"address" text,
+	"address" text
-	"family_id" INTEGER REFERENCES family(id)
-);
-
-CREATE TABLE IF NOT EXISTS "family" (
-	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT
 );
 
 CREATE TABLE IF NOT EXISTS "role" (

src/model/family.rs

@@ -1,55 +0,0 @@
-use serde::Serialize;
-use sqlx::{sqlite::SqliteQueryResult, FromRow, SqlitePool};
-
-#[derive(FromRow, Serialize, Clone)]
-pub struct Family {
-    id: i64,
-}
-
-#[derive(Serialize, Clone)]
-pub struct FamilyWithMembers {
-    id: i64,
-    names: Option<String>,
-}
-
-impl Family {
-    pub async fn all(db: &SqlitePool) -> Vec<Self> {
-        sqlx::query_as!(Self, "SELECT id FROM role")
-            .fetch_all(db)
-            .await
-            .unwrap()
-    }
-
-    pub async fn new(db: &SqlitePool) -> i64 {
-        let result: SqliteQueryResult = sqlx::query("INSERT INTO family DEFAULT VALUES")
-            .execute(db)
-            .await
-            .unwrap();
-
-        result.last_insert_rowid()
-    }
-
-    pub async fn all_with_members(db: &SqlitePool) -> Vec<FamilyWithMembers> {
-        sqlx::query_as!(
-            FamilyWithMembers,
-            "
-SELECT
-    family.id as id,
-    GROUP_CONCAT(user.name, ', ') as names
-FROM family
-LEFT JOIN
-    user ON family.id = user.family_id
-GROUP BY family.id;"
-        )
-        .fetch_all(db)
-        .await
-        .unwrap()
-    }
-
-    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
-        sqlx::query_as!(Self, "SELECT id FROM family WHERE id like ?", id)
-            .fetch_one(db)
-            .await
-            .ok()
-    }
-}

src/model/mod.rs

@@ -9,7 +9,6 @@ use self::{
 
 pub mod boat;
 pub mod boatdamage;
-pub mod family;
 pub mod location;
 pub mod log;
 pub mod logbook;

src/model/rower.rs

@@ -16,7 +16,7 @@ impl Rower {
         sqlx::query_as!(
             User,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address, family_id
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user
 WHERE id in (SELECT rower_id FROM rower WHERE logbook_id=?)
         ",

src/model/user.rs

@@ -13,7 +13,7 @@ use rocket::{
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
-use super::{family::Family, log::Log, tripdetails::TripDetails, Day};
+use super::{log::Log, tripdetails::TripDetails, Day};
 use crate::tera::admin::user::UserEditForm;
 
 #[derive(FromRow, Debug, Serialize, Deserialize)]
@@ -33,7 +33,6 @@ pub struct User {
     pub notes: Option<String>,
     pub phone: Option<String>,
     pub address: Option<String>,
-    pub family_id: Option<i64>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -162,7 +161,7 @@ impl User {
         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
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user 
 WHERE id like ?
         ",
@@ -177,7 +176,7 @@ WHERE id like ?
         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
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user 
 WHERE id like ?
         ",
@@ -192,7 +191,7 @@ WHERE id like ?
         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
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user 
 WHERE name like ?
         ",
@@ -234,7 +233,7 @@ WHERE name like ?
         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
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user
 WHERE deleted = 0
 ORDER BY last_access DESC
@@ -249,7 +248,7 @@ ORDER BY last_access DESC
         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
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user
 WHERE deleted = 0 AND dob != '' and weight != '' and sex != ''
 ORDER BY name 
@@ -264,7 +263,7 @@ ORDER BY name
         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
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user
 WHERE deleted = 0 AND (SELECT COUNT(*) FROM user_role WHERE user_id=user.id AND role_id = (SELECT id FROM role WHERE name = 'cox')) > 0
 ORDER BY last_access DESC
@@ -283,14 +282,8 @@ ORDER BY last_access DESC
     }
 
     pub async fn update(&self, db: &SqlitePool, data: UserEditForm) {
-        let mut family_id = data.family_id;
-
-        if family_id.is_some_and(|x| x == -1) {
-            family_id = Some(Family::new(db).await)
-        }
-
         sqlx::query!(
-            "UPDATE user SET dob = ?, weight = ?, sex = ?, member_since_date=?, birthdate=?, mail=?, nickname=?, notes=?, phone=?, address=?, family_id = ? where id = ?",
+            "UPDATE user SET dob = ?, weight = ?, sex = ?, member_since_date=?, birthdate=?, mail=?, nickname=?, notes=?, phone=?, address=? where id = ?",
             data.dob,
             data.weight,
             data.sex,
@@ -301,7 +294,6 @@ ORDER BY last_access DESC
             data.notes,
             data.phone,
             data.address,
-            family_id,
             self.id
         )
         .execute(db)
@@ -722,7 +714,6 @@ mod test {
                 notes: None,
                 phone: None,
                 address: None,
-                family_id: None,
             },
         )
         .await;

src/tera/admin/user.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use crate::model::{
-    family::Family,
     role::Role,
     user::{AdminUser, User, UserWithRoles},
 };
@@ -31,7 +30,6 @@ async fn index(
     let users: Vec<UserWithRoles> = join_all(user_futures).await;
 
     let roles = Role::all(db).await;
-    let families = Family::all_with_members(db).await;
 
     let mut context = Context::new();
     if let Some(msg) = flash {
@@ -39,7 +37,6 @@ async fn index(
     }
     context.insert("users", &users);
     context.insert("roles", &roles);
-    context.insert("families", &families);
     context.insert(
         "loggedin_user",
         &UserWithRoles::from_user(admin.user, db).await,
@@ -92,7 +89,6 @@ pub struct UserEditForm {
     pub(crate) notes: Option<String>,
     pub(crate) phone: Option<String>,
     pub(crate) address: Option<String>,
-    pub(crate) family_id: Option<i64>,
 }
 
 #[post("/user", data = "<data>")]

staging-diff.sql

@@ -1,5 +0,0 @@
-CREATE TABLE IF NOT EXISTS "family" (
-	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
-);
-
-ALTER TABLE "user" ADD COLUMN "family_id" INTEGER REFERENCES family(id);

templates/admin/user/index.html.tera

@@ -72,7 +72,6 @@
                 {{ macros::input(label='Notizen', name='notes', id=loop.index, type="text", value=user.notes) }}
                 {{ macros::input(label='Telefon', name='phone', id=loop.index, type="text", value=user.phone) }}
                 {{ macros::input(label='Adresse', name='address', id=loop.index, type="text", value=user.address) }}
-          	{{ macros::select(label="Familie", data=families, name='family_id', selected_id=user.family_id, display=['names'], default="Keine Familie", new_last_entry='Neue Familie anlegen') }}
               </div>
             </div>
             <div class="mt-3 text-right">

templates/includes/macros.html.tera

@@ -164,7 +164,7 @@
 	</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) %}
 	<div class="{{wrapper_class}}">
 		<label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
 		{% if display == '' %}
@@ -185,13 +185,11 @@
 					{%- endfor %}
 				</option>
 			{% endfor %}
-			{% if new_last_entry %}
-				<option value="-1">{{ new_last_entry }}</option>
-			{% endif %}
 		</select>
 	</div>
 {% endmacro select %}
 
+
 {% macro alert(message, type, class='') %}
 	<div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center">
 		{{ message }}