From 5d33ed945c5be832d6a6e08eda4e35dde00ac362 Mon Sep 17 00:00:00 2001 From: Benedict Börger Date: Fri, 28 Jun 2019 21:41:23 +0200 Subject: [web_fronted] added new site asset/risk_chart --- src/banking/account.rs | 8 ++++---- src/banking/asset.rs | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src/banking') diff --git a/src/banking/account.rs b/src/banking/account.rs index 95cb71b..b13e72f 100644 --- a/src/banking/account.rs +++ b/src/banking/account.rs @@ -7,12 +7,12 @@ pub struct Account { pub transactions : Vec, pub institute : String, pub groupFile : String, - pub category : String - + pub category : String, + pub riskCategory : String } impl Account { - pub fn new(name : String, iban : String, transactions : Vec, institute : String, groupFile : String, category : String) -> Account { + pub fn new(name : String, iban : String, transactions : Vec, institute : String, groupFile : String, category : String, riskCategory : String) -> Account { let mut trans = Vec::new(); if institute == "SpecialParser" { } @@ -29,7 +29,7 @@ impl Account { } } } - Account { name : name, iban : iban, transactions : trans, institute : institute, groupFile : groupFile, category : category } + Account { name : name, iban : iban, transactions : trans, institute : institute, groupFile : groupFile, category : category, riskCategory : riskCategory } } pub fn get_balance(&self, date : chrono::NaiveDate) -> f32 { diff --git a/src/banking/asset.rs b/src/banking/asset.rs index 642f153..3255b29 100644 --- a/src/banking/asset.rs +++ b/src/banking/asset.rs @@ -59,6 +59,14 @@ impl Asset { if let Some(i) = tmp.get(0) { category = i.to_string(); } + match config.get("RiskCategory") { + Some(i) => tmp = i, + None => panic!("asset: ini file: no \"RiskCategory\" for account: {}", account_name) + } + let mut risk_category = String::from(""); + if let Some(i) = tmp.get(0) { + risk_category = i.to_string(); + } match config.get("IBAN") { Some(i) => tmp = i, None => panic!("asset: no name for account {}", account_name) @@ -75,7 +83,7 @@ impl Asset { if let Some(i) = tmp.get(0) { groupFile = i.to_string(); } - accounts.push(Account::new(account_name, iban, trans_files.to_vec(), institute, groupFile, category)); + accounts.push(Account::new(account_name, iban, trans_files.to_vec(), institute, groupFile, category, risk_category)); } -- cgit v1.2.3-70-g09d2