EinsatzOnline
/
EinsatzOnline
1
0
Fork 0
Code Issues 19 Pull Requests Projects 5 Releases Wiki Activity

FEA: allow setting up names for lump sum and money for time

This commit is contained in:
Keanu D?lle 2022-04-21 21:30:28 +02:00
parent ff6fa999e4
commit cc1e3fe334
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/default.toml
View File

@ -36,4 +36,6 @@ default_pagination_limit = 20
#If set true members don't need billing related permissions if they are member_responsible for specific event
member_responsible_overwrites_permissions = true
send_personnel_billing_to_email = true
personnel_billing_emails = "receiver@localhost,receiver2@localhost"
personnel_billing_emails = "receiver@localhost,receiver2@localhost"
lump_sum_name = "Lump Sum"
money_for_time_name = "Money for Time"

4
config/development.toml
View File

@ -37,4 +37,6 @@ default_pagination_limit = 20
#If set true members don't need billing related permissions if they are member_responsible for specific event
member_responsible_overwrites_permissions = true
send_personnel_billing_to_email = true
personnel_billing_emails = "receiver@localhost,receiver2@localhost"
personnel_billing_emails = "receiver@localhost,receiver2@localhost"
lump_sum_name = "Lump Sum"
money_for_time_name = "Money for Time"

4
src/helper/settings.rs
View File

@ -43,7 +43,9 @@ pub struct Api {
pub struct Billing {
pub member_responsible_overwrites_permissions: bool,
pub send_personnel_billing_to_email: bool,
pub personnel_billing_email: String,
pub personnel_billing_emails: String,
pub lump_sum_name: String,
pub money_for_time_name: String,
}
#[derive(Debug, Deserialize, Default, Clone)]

2
src/modules/event_billing/generate_billing_csv.rs
View File

@ -110,7 +110,7 @@ pub fn generate_billing_csv(settings: &State<Settings>, event_id: uuid::Uuid) ->
res.push_str(&format!("Abrechnungssatz:,{},{},Pauschale:,{},€/Stunde:,{}\n", sanitize(billing_rate.name), sanitize(billing_rate.description.unwrap_or(String::from(""))), sanitize(format!("{} €", billing_rate.lump_sum)), sanitize(format!("{} €", billing_rate.payment_per_hour))));
}
res.push_str(&format!("{},{},{},{},{},{},{},{},{}\n", String::from("Personalnummer"), String::from("Vorname"), String::from("Nachname"), String::from("Von"), String::from("Bis"), String::from("Stunden"), String::from("Pauschale"), String::from("Stundengeld"), String::from("Gesamt")));
res.push_str(&format!("{},{},{},{},{},{},{},{},{}\n", String::from("Personalnummer"), String::from("Vorname"), String::from("Nachname"), String::from("Von"), String::from("Bis"), String::from("Stunden"), settings.billing.lump_sum_name, settings.billing.money_for_time_name, String::from("Gesamt")));
let position_instances = get_position_instances(settings, instance.instance_id)?;