From b9244f6049c685c2b983632359676521506f8772 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 8 Feb 2026 15:22:50 +0000 Subject: task-085: fetches transactions from database --- schist_desktop_gui/src/gui.rs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'schist_desktop_gui/src/gui.rs') diff --git a/schist_desktop_gui/src/gui.rs b/schist_desktop_gui/src/gui.rs index 26f147b..9648ff0 100644 --- a/schist_desktop_gui/src/gui.rs +++ b/schist_desktop_gui/src/gui.rs @@ -7,8 +7,10 @@ use std::{path::PathBuf, str::FromStr}; use diesel::SqliteConnection; use iced::{Element, Task}; -use schist_models::{Account, Bucket}; -use schist_queries::{accounts::get_all_accounts, buckets::get_all_buckets}; +use schist_models::{Account, Bucket, Transaction}; +use schist_queries::{ + accounts::get_all_accounts, buckets::get_all_buckets, transactions::get_all_transactions, +}; use crate::{ cache::{put_to_cache, remove_from_cache, CACHE_KEYS}, @@ -32,6 +34,7 @@ pub enum Message { MainScreenMessage(main_screen::Message), RefetchedAccounts(FetchResult>), RefetchedBuckets(FetchResult>), + RefetchedTransactions(FetchResult>), } pub type FetchResult = std::result::Result; @@ -185,6 +188,16 @@ impl Gui { } iced::Task::none() } + Message::RefetchedTransactions(transactions) => { + match transactions { + Ok(transactions) => { + self.main_screen + .update(main_screen::Message::SetTransactions(transactions)); + } + Err(err) => println!("Failed to get transactions: {:?}", err.message), + }; + Task::none() + } Message::FilesScreenMessage(message) => self.update_files_screen(message), Message::FailedToCreateFile(err) => { self.update_files_screen(files_screen::Message::ReportFailedToCreateFile(err)) @@ -226,6 +239,7 @@ impl Gui { ) -> Task { let buckets = get_all_buckets(&mut connection).map_err(FetchError::new); let accounts = get_all_accounts(&mut connection).map_err(FetchError::new); + let transactions = get_all_transactions(&mut connection).map_err(FetchError::new); self.connection = Some(connection); self.active_screen = Screen::MainScreen; if let Some(path) = path.to_str() { @@ -236,6 +250,7 @@ impl Gui { iced::Task::batch(vec![ self.update(Message::RefetchedBuckets(buckets)), self.update(Message::RefetchedAccounts(accounts)), + self.update(Message::RefetchedTransactions(transactions)), ]) } -- cgit v1.2.3 From 4030a63ac6fe61df87dca07e4143a6b84a9e8475 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 22 Feb 2026 21:34:24 +0000 Subject: task-085: include account transfers --- schist_desktop_gui/src/gui.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'schist_desktop_gui/src/gui.rs') diff --git a/schist_desktop_gui/src/gui.rs b/schist_desktop_gui/src/gui.rs index 9648ff0..78fea11 100644 --- a/schist_desktop_gui/src/gui.rs +++ b/schist_desktop_gui/src/gui.rs @@ -7,9 +7,10 @@ use std::{path::PathBuf, str::FromStr}; use diesel::SqliteConnection; use iced::{Element, Task}; -use schist_models::{Account, Bucket, Transaction}; +use schist_models::{Account, AccountTransfer, Bucket, Transaction}; use schist_queries::{ - accounts::get_all_accounts, buckets::get_all_buckets, transactions::get_all_transactions, + account_transfers::get_all_account_transfers, accounts::get_all_accounts, + buckets::get_all_buckets, transactions::get_all_transactions, }; use crate::{ @@ -33,6 +34,7 @@ pub enum Message { FilesScreenMessage(files_screen::Message), MainScreenMessage(main_screen::Message), RefetchedAccounts(FetchResult>), + RefetchedAccountTransfers(FetchResult>), RefetchedBuckets(FetchResult>), RefetchedTransactions(FetchResult>), } @@ -188,6 +190,16 @@ impl Gui { } iced::Task::none() } + Message::RefetchedAccountTransfers(account_transfers) => { + match account_transfers { + Ok(account_transfers) => { + self.main_screen + .update(main_screen::Message::SetAccountTransfers(account_transfers)); + } + Err(err) => println!("Failed to get account transfers: {:?}", err.message), + } + iced::Task::none() + } Message::RefetchedTransactions(transactions) => { match transactions { Ok(transactions) => { @@ -239,6 +251,7 @@ impl Gui { ) -> Task { let buckets = get_all_buckets(&mut connection).map_err(FetchError::new); let accounts = get_all_accounts(&mut connection).map_err(FetchError::new); + let account_transfers = get_all_account_transfers(&mut connection).map_err(FetchError::new); let transactions = get_all_transactions(&mut connection).map_err(FetchError::new); self.connection = Some(connection); self.active_screen = Screen::MainScreen; @@ -250,6 +263,7 @@ impl Gui { iced::Task::batch(vec![ self.update(Message::RefetchedBuckets(buckets)), self.update(Message::RefetchedAccounts(accounts)), + self.update(Message::RefetchedAccountTransfers(account_transfers)), self.update(Message::RefetchedTransactions(transactions)), ]) } -- cgit v1.2.3