RunasSudo/DrCr
1
Fork 0
Code Issues 1 Pull Requests Releases Activity

Restore account links to dynamic reports

Browse Source
This commit is contained in:
RunasSudo 2025-05-28 00:33:54 +10:00
parent d326b3ae43
commit 0d680275df
Signed by: RunasSudo
GPG Key ID: 7234E476BF21C61A
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db.rs
View File

@ -73,13 +73,13 @@ impl DbConnection {
// System accounts
account_configurations.push(AccountConfiguration {
id: None,
account: "Current Year Earnings".to_string(),
account: crate::CURRENT_YEAR_EARNINGS.to_string(),
kind: "drcr.equity".to_string(),
data: None,
});
account_configurations.push(AccountConfiguration {
id: None,
account: "Retained Earnings".to_string(),
account: crate::RETAINED_EARNINGS.to_string(),
kind: "drcr.equity".to_string(),
data: None,
});

6
src/lib.rs
View File

@ -5,4 +5,10 @@ pub mod reporting;
pub mod serde;
pub mod util;
/// Data type used to represent transaction and account quantities
pub type QuantityInt = i64;
// Magic strings
// TODO: Make this configurable
pub const CURRENT_YEAR_EARNINGS: &'static str = "Current Year Earnings";
pub const RETAINED_EARNINGS: &'static str = "Retained Earnings";

12
src/reporting/dynamic_report.rs
View File

@ -535,13 +535,23 @@ pub fn entries_for_kind(
.map(|b| b.get(account).unwrap_or(&0) * if invert { -1 } else { 1 })
.collect::<Vec<_>>();
// Some exceptions for the link
let link;
if account == crate::CURRENT_YEAR_EARNINGS {
link = Some("/income-statement".to_string());
} else if account == crate::RETAINED_EARNINGS {
link = None
} else {
link = Some(format!("/transactions/{}", account));
}
let entry = LiteralRow {
text: account.to_string(),
quantity: quantities,
id: None,
visible: true,
auto_hide: true,
link: None,
link,
heading: false,
bordered: false,
};

6
src/reporting/steps.rs
View File

@ -951,7 +951,7 @@ impl ReportingStep for CurrentYearEarningsToEquity {
id: None,
transaction_id: None,
description: None,
account: "Current Year Earnings".to_string(),
account: crate::CURRENT_YEAR_EARNINGS.to_string(),
quantity: *balance,
commodity: context.reporting_commodity.clone(),
quantity_ascost: None,
@ -1511,7 +1511,7 @@ impl ReportingStep for RetainedEarningsToEquity {
id: None,
transaction_id: None,
description: None,
account: "Retained Earnings".to_string(),
account: crate::RETAINED_EARNINGS.to_string(),
quantity: *balance,
commodity: context.reporting_commodity.clone(),
quantity_ascost: None,
@ -1648,7 +1648,7 @@ impl ReportingStep for TrialBalance {
id: None,
visible: true,
auto_hide: true,
link: None,
link: Some(format!("/transactions/{}", account)),
heading: false,
bordered: false,
}));