Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Compare commits

base: Ruderverein-Donau-Linz:412c45a9df2571fdead3e1c3fa3042c81daa742d
Branches Tags
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:test
..
compare: Ruderverein-Donau-Linz:5d01d18e7072db80c52e1a335c81641f0317dcab
Branches Tags
Ruderverein-Donau-Linz:main
Ruderverein-Donau-Linz:staging
Ruderverein-Donau-Linz:test

No commits in common. "412c45a9df2571fdead3e1c3fa3042c81daa742d" and "5d01d18e7072db80c52e1a335c81641f0317dcab" have entirely different histories.
412c45a9df ... 5d01d18e70

4 changed files with 5 additions and 18 deletions
Show Stats Expand all files Collapse all files

1
seeds.sql
View File

@ -10,7 +10,6 @@ INSERT INTO "role" (name) VALUES ('Vorstand');
INSERT INTO "role" (name) VALUES ('Bootsführer');
INSERT INTO "role" (name) VALUES ('schnupperant');
INSERT INTO "role" (name) VALUES ('kassier');
INSERT INTO "role" (name) VALUES ('no-einschreibgebuehr');
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);

6
src/model/event.rs
View File

@ -9,7 +9,11 @@ use serde::Serialize;
use sqlx::{FromRow, Row, SqlitePool};
use super::{
notification::Notification, role::Role, tripdetails::TripDetails, triptype::TripType,
notification::Notification,
role::Role,
trip,
tripdetails::{self, TripDetails},
triptype::TripType,
user::User,
};

12
src/model/user.rs
View File

@ -29,7 +29,6 @@ const REGULAR: i32 = 22000;
const UNTERSTUETZEND: i32 = 2500;
const FOERDERND: i32 = 8500;
pub const SCHECKBUCH: i32 = 3000;
const EINSCHREIBGEBUEHR: i32 = 3500;
#[derive(FromRow, Serialize, Deserialize, Clone, Debug, Eq, Hash, PartialEq)]
pub struct User {
@ -362,17 +361,6 @@ ASKÖ Ruderverein Donau Linz", self.name),
);
}
if let Some(member_since_date) = &self.member_since_date {
if let Ok(member_since_date) = NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
{
if member_since_date.year() == Local::now().year()
&& !self.has_role(db, "no-einschreibgebuehr").await
{
fee.add("Einschreibgebühr".into(), EINSCHREIBGEBUEHR);
}
}
}
let halfprice = if let Some(member_since_date) = &self.member_since_date {
if let Ok(member_since_date) = NaiveDate::parse_from_str(member_since_date, "%Y-%m-%d")
{

4
src/tera/admin/user.rs
View File

@ -437,10 +437,6 @@ async fn schnupper_to_scheckbuch(
let scheckbuch = Role::find_by_name(db, "scheckbuch").await.unwrap();
user.add_role(db, &scheckbuch).await;
if let Some(no_einschreibgebuehr) = Role::find_by_name(db, "no-einschreibgebuehr").await {
user.add_role(db, &no_einschreibgebuehr).await;
}
user.send_welcome_email(db, &config.smtp_pw).await.unwrap();
Log::create(