progress
Some checks failed
CI/CD Pipeline / deploy-staging (push) Has been cancelled
CI/CD Pipeline / deploy-main (push) Has been cancelled
CI/CD Pipeline / test (push) Has been cancelled

This commit is contained in:
2025-05-01 20:08:05 +02:00
parent c2b57583cf
commit 73c79fb008
5 changed files with 121 additions and 8 deletions

View File

@ -7,8 +7,9 @@ use crate::{
logbook::Logbook,
role::Role,
user::{
member::Member, AdminUser, AllowedToEditPaymentStatusUser, ManageUserUser, User,
UserWithDetails, UserWithMembershipPdf, UserWithRolesAndMembershipPdf, VorstandUser,
member::Member, scheckbuch::ScheckbuchUser, AdminUser, AllowedToEditPaymentStatusUser,
ManageUserUser, User, UserWithDetails, UserWithMembershipPdf,
UserWithRolesAndMembershipPdf, VorstandUser,
},
},
tera::Config,
@ -813,6 +814,68 @@ struct UserAddScheckbuchForm<'r> {
// Flash::success(Redirect::to("/admin/schnupper"), format!("Scheckbuch erfolgreich erstellt. Eine E-Mail in der alles erklärt wird, wurde an {} verschickt.", user.mail.unwrap()))
//}
#[derive(FromForm, Debug)]
pub struct ScheckToRegularForm<'a> {
member_since: String,
birthdate: String,
phone: String,
address: String,
membership_pdf: TempFile<'a>,
}
#[post("/user/<id>/scheckbook-to-regular", data = "<data>")]
async fn scheckbook_to_regular(
db: &State<SqlitePool>,
data: Form<ScheckToRegularForm<'_>>,
admin: ManageUserUser,
id: i32,
) -> Flash<Redirect> {
let Some(user) = User::find_by_id(db, id).await else {
return Flash::error(
Redirect::to("/admin/user"),
format!("User with ID {} does not exist!", id),
);
};
let Ok(birthdate) = NaiveDate::parse_from_str(&data.birthdate, "%Y-%m-%d") else {
return Flash::error(
Redirect::to("/admin/user/{id}"),
format!("Datum {} ist nicht im YYYY-MM-DD Format", &data.birthdate),
);
};
let Ok(member_since) = NaiveDate::parse_from_str(&data.member_since, "%Y-%m-%d") else {
return Flash::error(
Redirect::to("/admin/user/{id}"),
format!("Datum {} ist nicht im YYYY-MM-DD Format", &data.birthdate),
);
};
let Some(user) = ScheckbuchUser::new(db, &user).await else {
return Flash::error(
Redirect::to("/admin/user/{id}"),
"User ist kein Scheckbuchuser",
);
};
match user
.convert_to_regular_user(
db,
&admin,
&member_since,
&birthdate,
&data.phone,
&data.address,
&data.membership_pdf,
)
.await
{
Ok(_) => Flash::success(
Redirect::to(format!("/admin/user/{}", id)),
"Mitgliedstyp umgewandelt und Infos versendet",
),
Err(e) => Flash::error(Redirect::to(format!("/admin/user/{}", id)), e),
}
}
pub fn routes() -> Vec<Route> {
routes![
index,
@ -840,5 +903,7 @@ pub fn routes() -> Vec<Route> {
add_membership_pdf,
add_role,
remove_role,
//
scheckbook_to_regular,
]
}