save commit

wealth-wave · Jan 20, 2024 · 42cab04 · 42cab04
1 parent 4b2f0db
commit 42cab04
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 28 deletions.
diff --git a/lib/presentation/create_basket_presenter.dart b/lib/presentation/create_basket_presenter.dart
@@ -51,6 +51,7 @@ class CreateBasketPresenter extends Presenter<CreateBasketViewState> {
     updateViewState((viewState) {
       viewState.name = basketToUpdate.name;
       viewState.description = basketToUpdate.description ?? '';
+      viewState.onBasketFetched = SingleEvent(null);
     });
   }
 }
@@ -59,6 +60,7 @@ class CreateBasketViewState {
   String name = '';
   String description = '';
   SingleEvent<void>? onBasketCreated;
+  SingleEvent<void>? onBasketFetched;
 
   bool isValid() {
     return name.isNotEmpty;

diff --git a/lib/presentation/create_investment_transaction_presenter.dart b/lib/presentation/create_investment_transaction_presenter.dart
@@ -64,17 +64,19 @@ class CreateInvestmentTransactionPresenter
     updateViewState((viewState) => viewState.investedDate = date);
   }
 
-  void setTransaction(Transaction transactionToUpdate) {
+  void _setTransaction(Transaction transactionToUpdate) {
     updateViewState((viewState) {
       viewState.amount = transactionToUpdate.amount;
       viewState.investedDate = transactionToUpdate.createdOn;
+      viewState.description = transactionToUpdate.description ?? '';
+      viewState.onTransactionLoaded = SingleEvent(null);
     });
   }
 
   void fetchTransaction({required int id}) {
     _transactionService
         .getBy(id: id)
-        .then((transaction) => setTransaction(transaction));
+        .then((transaction) => _setTransaction(transaction));
   }
 }
 
@@ -83,6 +85,7 @@ class CreateTransactionViewState {
   double amount = 0;
   DateTime investedDate = DateTime.now();
   SingleEvent<void>? onTransactionCreated;
+  SingleEvent<void>? onTransactionLoaded;
 
   bool isValid() {
     return amount > 0;

diff --git a/lib/presentation/create_sip_presenter.dart b/lib/presentation/create_sip_presenter.dart
@@ -78,18 +78,19 @@ class CreateSipPresenter extends Presenter<CreateSipViewState> {
     updateViewState((viewState) => viewState.frequency = frequency);
   }
 
-  void setSip(SIP sipToUpdate) {
+  void _setSip(SIP sipToUpdate) {
     updateViewState((viewState) {
       viewState.description = sipToUpdate.description ?? '';
       viewState.amount = sipToUpdate.amount;
       viewState.startDate = sipToUpdate.startDate;
       viewState.endDate = sipToUpdate.endDate;
       viewState.frequency = sipToUpdate.frequency;
+      viewState.onSipLoaded = SingleEvent(null);
     });
   }
 
   void fetchSip({required int id}) {
-    _sipService.getBy(id: id).then((sip) => setSip(sip));
+    _sipService.getBy(id: id).then((sip) => _setSip(sip));
   }
 }
 
@@ -100,6 +101,7 @@ class CreateSipViewState {
   DateTime? endDate = DateTime.now().add(const Duration(days: 365));
   SipFrequency frequency = SipFrequency.monthly;
   SingleEvent<void>? onSipCreated;
+  SingleEvent<void>? onSipLoaded;
 
   bool isValid() {
     final endDate = this.endDate;

diff --git a/lib/ui/pages/investments_page.dart b/lib/ui/pages/investments_page.dart
@@ -152,7 +152,7 @@ class _InvestmentsPage extends PageState<InvestmentsViewState, InvestmentsPage,
                     children: [
                       Text(formatToPercentage(investmentVO.irr),
                           style: Theme.of(context).textTheme.bodyMedium),
-                      Text('(Growth Per Yearl)',
+                      Text('(Growth Per Year)',
                           style: Theme.of(context).textTheme.labelSmall),
                     ],
                   ),

diff --git a/lib/ui/widgets/create_basket_dialog.dart b/lib/ui/widgets/create_basket_dialog.dart
@@ -29,6 +29,10 @@ class _CreateBasketPage extends PageState<CreateBasketViewState,
   void initState() {
     super.initState();
 
+    final viewState = presenter.getViewState();
+    _nameController.text = viewState.name;
+    _descriptionController.text = viewState.description;
+
     int? basketIdToUpdate = widget.basketIdTOUpdate;
     if (basketIdToUpdate != null) {
       presenter.fetchBasket(id: basketIdToUpdate);
@@ -49,6 +53,10 @@ class _CreateBasketPage extends PageState<CreateBasketViewState,
       snapshot.onBasketCreated?.consume((_) {
         Navigator.of(context).pop();
       });
+      snapshot.onBasketFetched?.consume((_) {
+        _nameController.text = snapshot.name;
+        _descriptionController.text = snapshot.description;
+      });
     });
 
     return AlertDialog(

diff --git a/lib/ui/widgets/create_goal_dialog.dart b/lib/ui/widgets/create_goal_dialog.dart
@@ -37,13 +37,17 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
   void initState() {
     super.initState();
 
+    final viewState = presenter.getViewState();
+    _nameController.text = viewState.name;
+    _descriptionController.text = viewState.description;
+    _amountController.text = formatToCurrency(viewState.amount);
+    _currentDateController.text = formatDate(viewState.date);
+    _targetDateController.text = formatDate(viewState.targetDate);
+    _inflationController.text = viewState.inflation.toString();
+
     int? goalIdToUpdate = widget.goalIdToUpdate;
     if (goalIdToUpdate != null) {
       presenter.fetchGoal(id: goalIdToUpdate);
-    } else {
-      _currentDateController.text = formatDate(DateTime.now());
-      _targetDateController.text =
-          formatDate(DateTime.now().add(const Duration(days: 365)));
     }
 
     _nameController.addListener(() {
@@ -80,6 +84,15 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
       snapshot.onGoalCreated?.consume((_) {
         Navigator.of(context).pop();
       });
+
+      snapshot.onDataLoaded?.consume((_) {
+        _nameController.text = snapshot.name;
+        _descriptionController.text = snapshot.description;
+        _amountController.text = formatToCurrency(snapshot.amount);
+        _currentDateController.text = formatDate(snapshot.date);
+        _targetDateController.text = formatDate(snapshot.targetDate);
+        _inflationController.text = snapshot.inflation.toString();
+      });
     });
 
     return AlertDialog(
@@ -117,29 +130,23 @@ class _CreateGoalPage extends PageState<CreateGoalViewState, _CreateGoalDialog,
               textInputAction: TextInputAction.next,
               controller: _amountController,
               keyboardType: TextInputType.number,
-              inputFormatters: [
-                CurrencyTextInputFormatter()
-              ],
+              inputFormatters: [CurrencyTextInputFormatter()],
               decoration: const InputDecoration(
                   labelText: 'Amount', border: OutlineInputBorder()),
             ),
             const SizedBox(height: AppDimen.defaultPadding),
             TextFormField(
               textInputAction: TextInputAction.next,
               controller: _currentDateController,
-              inputFormatters: [
-                DateTextInputFormatter()
-              ],
+              inputFormatters: [DateTextInputFormatter()],
               decoration: const InputDecoration(
                   labelText: 'Date (DD/MM/YYYY)', border: OutlineInputBorder()),
             ),
             const SizedBox(height: AppDimen.defaultPadding),
             TextFormField(
               textInputAction: TextInputAction.next,
               controller: _targetDateController,
-              inputFormatters: [
-                DateTextInputFormatter()
-              ],
+              inputFormatters: [DateTextInputFormatter()],
               decoration: const InputDecoration(
                   labelText: 'Target Date (DD/MM/YYYY)',
                   border: OutlineInputBorder()),

diff --git a/lib/ui/widgets/create_investment_dialog.dart b/lib/ui/widgets/create_investment_dialog.dart
@@ -37,6 +37,14 @@ class _CreateInvestmentPage extends PageState<CreateInvestmentViewState,
   void initState() {
     super.initState();
 
+    final viewState = presenter.getViewState();
+    _nameController.text = viewState.name;
+    _descriptionController.text = viewState.description;
+    _irrController.text = viewState.irr?.toString() ?? '';
+    _valueController.text = viewState.value?.toString() ?? '';
+    _valueUpdatedDateController.text =
+        viewState.valueUpdatedAt != null ? formatDate(viewState.valueUpdatedAt!) : '';
+
     int? investmentIdToUpdate = widget.investmentIdToUpdate;
     if (investmentIdToUpdate != null) {
       presenter.fetchInvestment(id: investmentIdToUpdate);

diff --git a/lib/ui/widgets/create_sip_dialog.dart b/lib/ui/widgets/create_sip_dialog.dart
@@ -41,6 +41,13 @@ class _CreateTransactionPage extends PageState<CreateSipViewState,
   void initState() {
     super.initState();
 
+    final viewState = presenter.getViewState();
+    _valueController.text = formatToCurrency(viewState.amount);
+    _descriptionController.text = viewState.description;
+    _startDateController.text = formatDate(viewState.startDate);
+    _endDateController.text =
+        viewState.endDate != null ? formatDate(viewState.endDate!) : '';
+
     int? sipIdToUpdate = widget.sipIdToUpdate;
     if (sipIdToUpdate != null) {
       presenter.fetchSip(id: sipIdToUpdate);
@@ -66,6 +73,13 @@ class _CreateTransactionPage extends PageState<CreateSipViewState,
       snapshot.onSipCreated?.consume((_) {
         Navigator.of(context).pop();
       });
+      snapshot.onSipLoaded?.consume((_) {
+        _valueController.text = formatToCurrency(snapshot.amount);
+        _descriptionController.text = snapshot.description;
+        _startDateController.text = formatDate(snapshot.startDate);
+        _endDateController.text =
+            snapshot.endDate != null ? formatDate(snapshot.endDate!) : '';
+      });
     });
 
     return AlertDialog(

diff --git a/lib/ui/widgets/create_transaction_dialog.dart b/lib/ui/widgets/create_transaction_dialog.dart
@@ -45,6 +45,11 @@ class _CreateTransactionPage extends PageState<CreateTransactionViewState,
   void initState() {
     super.initState();
 
+    final viewState = presenter.getViewState();
+    _valueController.text = formatToCurrency(viewState.amount);
+    _descriptionController.text = viewState.description;
+    _valueUpdatedDateController.text = formatDate(viewState.investedDate);
+
     int? transactionIdToUpdate = widget._transactionIdToUpdate;
     if (transactionIdToUpdate != null) {
       presenter.fetchTransaction(id: transactionIdToUpdate);
@@ -71,6 +76,11 @@ class _CreateTransactionPage extends PageState<CreateTransactionViewState,
       snapshot.onTransactionCreated?.consume((_) {
         Navigator.of(context).pop();
       });
+      snapshot.onTransactionLoaded?.consume((_) {
+        _descriptionController.text = snapshot.description;
+        _valueController.text = formatToCurrency(snapshot.amount);
+        _valueUpdatedDateController.text = formatDate(snapshot.investedDate);
+      });
     });
 
     return AlertDialog(
@@ -117,9 +127,7 @@ class _CreateTransactionPage extends PageState<CreateTransactionViewState,
             TextFormField(
               textInputAction: TextInputAction.next,
               controller: _valueUpdatedDateController,
-              inputFormatters: [
-                DateTextInputFormatter()
-              ],
+              inputFormatters: [DateTextInputFormatter()],
               decoration: const InputDecoration(
                   labelText: 'Date (DD/MM/YYYY)', border: OutlineInputBorder()),
             ),

diff --git a/pubspec.lock b/pubspec.lock
@@ -165,10 +165,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -362,18 +362,18 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -715,6 +715,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
   web_socket_channel:
     dependency: transitive
     description:
@@ -756,5 +764,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.0.6 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
   flutter: ">=3.10.0"