Target goal total 3034 (#3035)

* refactor: goal total calculation * remove .bak files accidentially committed
toolkit-for-ynab · Jan 28, 2023 · f337420 · f337420
1 parent 907007e
commit f337420
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/extension/features/budget/display-target-goal-amount/index.js b/src/extension/features/budget/display-target-goal-amount/index.js
@@ -46,8 +46,20 @@ export class DisplayTargetGoalAmount extends Feature {
 
       if (category) {
         category.subCategories.forEach((subcategory) => {
-          if (subcategory.goalTargetAmount) {
-            categorySum += subcategory.goalTargetAmount;
+          if (subcategory.monthlySubCategoryBudgetCalculation) {
+            if (subcategory.monthlySubCategoryBudgetCalculation.isGoalValidForMonth) {
+              switch (subcategory.goalType) {
+                case ynab.constants.SubCategoryGoalType.TargetBalance:
+                  categorySum += subcategory.goalTargetAmount || 0;
+                  break;
+                case ynab.constants.SubCategoryGoalType.MonthlyFunding:
+                case ynab.constants.SubCategoryGoalType.Needed:
+                case ynab.constants.SubCategoryGoalType.TargetBalanceOnDate:
+                case ynab.constants.SubCategoryGoalType.DebtPayment:
+                  categorySum += subcategory.monthlySubCategoryBudgetCalculation.goalTarget;
+                  break;
+              }
+            }
           }
         });
       }

diff --git a/src/extension/features/budget/goal-indicator/index.css b/src/extension/features/budget/goal-indicator/index.css
@@ -6,3 +6,7 @@
 .tk-goal-indicator:last-child {
   padding-right: 0.5em;
 }
+
+.is-master-category .tk-budget-table-cell-goal .tk-goal-sum-amount {
+  margin-right: 1.5em;
+}
diff --git a/src/extension/features/budget/utils.styles.scss b/src/extension/features/budget/utils.styles.scss
@@ -11,7 +11,7 @@
 .tk-budget-table-cell-goal {
   display: flex;
   align-items: center;
-  font-size: 0.8em;
+  font-size: 0.8rem;
   margin-left: auto;
 
   width: 18%;