find and prepare to correct picker selected item in edit pages

gwalus · May 26, 2024 · c198243 · c198243
1 parent 64b412b
commit c198243
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 30 deletions.
diff --git a/src/Dollet.Infrastructure/DAL/Repositories/ExpensesRepository.cs b/src/Dollet.Infrastructure/DAL/Repositories/ExpensesRepository.cs
@@ -31,6 +31,7 @@ public async Task<IEnumerable<Expense>> GetAllAsync(DateOnly? from = null, DateO
         {
             var query = _dbContext.Expenses
                 .Include(x => x.Category)
+                .Include(x => x.Account)
                 .AsQueryable();
 
             if (from.HasValue && to.HasValue)

diff --git a/src/Dollet.Presentation/Maui/ViewModels/Transactions/Expenses/EditExpensePageViewModel.cs b/src/Dollet.Presentation/Maui/ViewModels/Transactions/Expenses/EditExpensePageViewModel.cs
@@ -17,40 +17,21 @@ public partial class EditExpensePageViewModel(IUnitOfWork unitOfWork) : Observab
 
         private int id;
 
-        private decimal amount;
-        public decimal Amount 
-        {
-            get => amount; 
-            set => SetProperty(ref amount, value);
-        }
+        [ObservableProperty]
+        decimal _amount;
 
-        private Account selectedAccount;
-        public Account SelectedAccount 
-        {
-            get => selectedAccount; 
-            set => SetProperty(ref selectedAccount, value);
-        }
+        [ObservableProperty]
+        Account _selectedAccount;
 
-        private Category selectedCategory;
-        public Category SelectedCategory 
-        {
-            get => selectedCategory; 
-            set => SetProperty(ref selectedCategory, value);
-        }
+        [ObservableProperty]
+        Category _selectedCategory;
 
-        private DateTime date;
-        public DateTime Date 
-        {
-            get => date; 
-            set => SetProperty(ref date, value);
-        }
+        [ObservableProperty]
+        DateTime _date;
+
+        [ObservableProperty]
+        string _comment;
 
-        private string comment;
-        public string Comment 
-        {
-            get => comment; 
-            set => SetProperty(ref comment, value);
-        }
         public DateTime MaximumDate { get; } = DateTime.Now;
 
         public ObservableRangeCollection<Account> Accounts { get; } = [];
@@ -77,6 +58,7 @@ async Task Appearing()
             Accounts.ReplaceRange(accounts);
             Categories.ReplaceRange(categories);
 
+            // Doesn't work because we need to set the SelectedAccount property as Obserbable Property, in dto model
             SelectedAccount = initialAccount;
         }