Merge pull request 'nxdata' (#109) from nxdata into main

Reviewed-on: #109

src/model/rower.rs

@@ -16,7 +16,7 @@ impl Rower {
         sqlx::query_as!(
             User,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+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/trip.rs

@@ -49,7 +49,7 @@ impl Trip {
         sqlx::query_as!(
             Self,
             "
-SELECT trip.id, cox_id, user.name as cox_name, trip_details_id, planned_starting_time, max_people, day, notes, allow_guests, trip_type_id, always_show, is_locked
+SELECT trip.id, cox_id, user.name as cox_name, trip_details_id, planned_starting_time, max_people, day, trip_details.notes, allow_guests, trip_type_id, always_show, is_locked
 FROM trip 
 INNER JOIN trip_details ON trip.trip_details_id = trip_details.id
 INNER JOIN user ON trip.cox_id = user.id
@@ -94,7 +94,7 @@ WHERE trip.id=?
         let trips = sqlx::query_as!(
             Trip,
             "
-SELECT trip.id, cox_id, user.name as cox_name, trip_details_id, planned_starting_time, max_people, day, notes, allow_guests, trip_type_id, always_show, is_locked
+SELECT trip.id, cox_id, user.name as cox_name, trip_details_id, planned_starting_time, max_people, day, trip_details.notes, allow_guests, trip_type_id, always_show, is_locked
 FROM trip 
 INNER JOIN trip_details ON trip.trip_details_id = trip_details.id
 INNER JOIN user ON trip.cox_id = user.id

src/model/user.rs

@@ -26,6 +26,13 @@ pub struct User {
     pub sex: Option<String>,
     pub deleted: bool,
     pub last_access: Option<chrono::NaiveDateTime>,
+    pub member_since_date: Option<String>,
+    pub birthdate: Option<String>,
+    pub mail: Option<String>,
+    pub nickname: Option<String>,
+    pub notes: Option<String>,
+    pub phone: Option<String>,
+    pub address: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -154,7 +161,7 @@ impl User {
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user 
 WHERE id like ?
         ",
@@ -169,7 +176,7 @@ WHERE id like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user 
 WHERE id like ?
         ",
@@ -184,7 +191,7 @@ WHERE id like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, deleted, last_access, dob, weight, sex, member_since_date, birthdate, mail, nickname, notes, phone, address
 FROM user 
 WHERE name like ?
         ",
@@ -226,7 +233,7 @@ WHERE name like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+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
@@ -241,7 +248,7 @@ ORDER BY last_access DESC
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+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 
@@ -256,7 +263,7 @@ ORDER BY name
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+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
@@ -276,10 +283,17 @@ ORDER BY last_access DESC
 
     pub async fn update(&self, db: &SqlitePool, data: UserEditForm) {
         sqlx::query!(
-            "UPDATE user SET dob = ?, weight = ?, sex = ? 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,
+            data.member_since_date,
+            data.birthdate,
+            data.mail,
+            data.nickname,
+            data.notes,
+            data.phone,
+            data.address,
             self.id
         )
         .execute(db)
@@ -653,6 +667,13 @@ mod test {
                 weight: None,
                 sex: Some("m".into()),
                 roles: HashMap::new(),
+                member_since_date: None,
+                birthdate: None,
+                mail: None,
+                nickname: None,
+                notes: None,
+                phone: None,
+                address: None,
             },
         )
         .await;

src/tera/admin/user.rs

@@ -82,6 +82,13 @@ pub struct UserEditForm {
     pub(crate) weight: Option<String>,
     pub(crate) sex: Option<String>,
     pub(crate) roles: HashMap<String, String>,
+    pub(crate) member_since_date: Option<String>,
+    pub(crate) birthdate: Option<String>,
+    pub(crate) mail: Option<String>,
+    pub(crate) nickname: Option<String>,
+    pub(crate) notes: Option<String>,
+    pub(crate) phone: Option<String>,
+    pub(crate) address: Option<String>,
 }
 
 #[post("/user", data = "<data>")]