From d5f1554949321f2ebfda89efe39b0477a6ff2e55 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 8 Feb 2026 15:15:24 +0000 Subject: task-085: transactions view has transactions --- schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index 5ed4b30..e526dc5 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -197,7 +197,7 @@ impl MainScreen { balances_view: BalancesView::new(Vec::new()), buckets: Vec::new(), buckets_view: BucketsView::new(Vec::new(), "Hello, buckets!"), - transactions_view: TransactionsView::new(Vec::new(), "Hello, transactions!"), + transactions_view: TransactionsView::new(Vec::new(), Vec::new()), active_view: View::Balances, view_navigation: Navigation::new(Some(View::Balances), View::views()), } -- cgit v1.2.3 From 5b592ca899ad5a9090c1acd5776221f79e44d121 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 8 Feb 2026 15:16:13 +0000 Subject: task-085: rename SelectNextTransaction -> SelectNext Account as this was always a mis-nomer --- schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index e526dc5..0e8d084 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -130,7 +130,7 @@ impl<'a> Component<'a, Message, Action> for MainScreen { } View::Transactions => { self.transactions_view - .update(transactions_view::Message::SelectNextTransaction); + .update(transactions_view::Message::SelectNextAccount); Action::None } }, @@ -147,7 +147,7 @@ impl<'a> Component<'a, Message, Action> for MainScreen { } View::Transactions => { self.transactions_view - .update(transactions_view::Message::SelectPrevTransaction); + .update(transactions_view::Message::SelectPrevAccount); Action::None } }, -- cgit v1.2.3 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/screens/main_screen/main_screen.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index 0e8d084..0a2c355 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -4,7 +4,7 @@ use iced::{ widget::{row, Container}, Element, Length, }; -use schist_models::{Account, Bucket}; +use schist_models::{Account, Bucket, Transaction}; use crate::{ gui::components::{ @@ -36,6 +36,7 @@ pub enum Message { SelectView(View), SetAccounts(Vec), SetBuckets(Vec), + SetTransactions(Vec), ViewNavigationMessage(navigation::Message), } @@ -118,6 +119,12 @@ impl<'a> Component<'a, Message, Action> for MainScreen { Action::None } + Message::SetTransactions(transactions) => { + self.transactions_view + .update(transactions_view::Message::SetTransactions(transactions)); + Action::None + } + Message::NextItem => match self.active_view { View::Balances => { self.balances_view -- cgit v1.2.3 From 97b413aa5962bded37dedb380034fa7b97bdc06c Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 8 Feb 2026 20:26:30 +0000 Subject: task-085: display transaction data in tables --- schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index 0a2c355..9852b53 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -204,7 +204,7 @@ impl MainScreen { balances_view: BalancesView::new(Vec::new()), buckets: Vec::new(), buckets_view: BucketsView::new(Vec::new(), "Hello, buckets!"), - transactions_view: TransactionsView::new(Vec::new(), Vec::new()), + transactions_view: TransactionsView::new(&[], &[]), active_view: View::Balances, view_navigation: Navigation::new(Some(View::Balances), View::views()), } -- cgit v1.2.3 From 3c8a428c195da414171bd6e9064f26c4a66ffe61 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Thu, 12 Feb 2026 19:07:31 +0000 Subject: task-085: upgrade iced 0.13.1 -> 0.14.0 --- schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index 9852b53..86ce910 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -65,7 +65,7 @@ impl<'a> Viewable<'a, Message> for MainScreen { ] .align_y(alignment::Vertical::Center) .height(Length::Fill) - .spacing(SPACING_LG) + .spacing(u32::from(SPACING_LG)) .into() } } -- cgit v1.2.3 From 6137e4bec5fd7f34c66162b32424343a30b3c5f2 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Sun, 22 Feb 2026 08:49:25 +0000 Subject: task-085: formats bucket cells --- schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index 86ce910..038d65f 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -109,7 +109,9 @@ impl<'a> Component<'a, Message, Action> for MainScreen { self.balances_view .update(balances_view::Message::SetBuckets(buckets.clone())); self.buckets_view - .update(buckets_view::Message::SetBuckets(buckets)); + .update(buckets_view::Message::SetBuckets(buckets.clone())); + self.transactions_view + .update(transactions_view::Message::SetBuckets(buckets)); Action::None } @@ -204,7 +206,7 @@ impl MainScreen { balances_view: BalancesView::new(Vec::new()), buckets: Vec::new(), buckets_view: BucketsView::new(Vec::new(), "Hello, buckets!"), - transactions_view: TransactionsView::new(&[], &[]), + transactions_view: TransactionsView::new(&[], &[], &[]), active_view: View::Balances, view_navigation: Navigation::new(Some(View::Balances), View::views()), } -- 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 --- .../src/gui/screens/main_screen/main_screen.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'schist_desktop_gui/src/gui/screens') diff --git a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs index 038d65f..6580758 100644 --- a/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs +++ b/schist_desktop_gui/src/gui/screens/main_screen/main_screen.rs @@ -4,7 +4,7 @@ use iced::{ widget::{row, Container}, Element, Length, }; -use schist_models::{Account, Bucket, Transaction}; +use schist_models::{Account, AccountTransfer, Bucket, Transaction}; use crate::{ gui::components::{ @@ -35,6 +35,7 @@ pub enum Message { TransactionsViewMessage(transactions_view::Message), SelectView(View), SetAccounts(Vec), + SetAccountTransfers(Vec), SetBuckets(Vec), SetTransactions(Vec), ViewNavigationMessage(navigation::Message), @@ -121,6 +122,14 @@ impl<'a> Component<'a, Message, Action> for MainScreen { Action::None } + Message::SetAccountTransfers(account_transfers) => { + self.transactions_view + .update(transactions_view::Message::SetAccountTransfers( + account_transfers, + )); + Action::None + } + Message::SetTransactions(transactions) => { self.transactions_view .update(transactions_view::Message::SetTransactions(transactions)); @@ -206,7 +215,7 @@ impl MainScreen { balances_view: BalancesView::new(Vec::new()), buckets: Vec::new(), buckets_view: BucketsView::new(Vec::new(), "Hello, buckets!"), - transactions_view: TransactionsView::new(&[], &[], &[]), + transactions_view: TransactionsView::new(&[], &[], &[], &[]), active_view: View::Balances, view_navigation: Navigation::new(Some(View::Balances), View::views()), } -- cgit v1.2.3