Buckets that have been marked as inactive no longer display Want #108

TheAxelander · Dec 1, 2022 · 9f6a55b · 9f6a55b
1 parent 31a271e
commit 9f6a55b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 * [Fixed] App Startup will now wait for availability of MySql database [#50](https://github.com/TheAxelander/OpenBudgeteer/issues/50)
 * [Fixed] Rules disappear after Cancel All [#102](https://github.com/TheAxelander/OpenBudgeteer/issues/102)
 * [Fixed] Correct number of months shown on Report Page (e.g. should show past 24 months but displays 25 months)
+* [Fixed] Buckets that have been marked as inactive no longer display Want [#108](https://github.com/TheAxelander/OpenBudgeteer/issues/108)
 
 ### 1.5.2 (2022-03-26)
 

diff --git a/OpenBudgeteer.Core/ViewModels/ItemViewModels/BucketViewModelItem.cs b/OpenBudgeteer.Core/ViewModels/ItemViewModels/BucketViewModelItem.cs
@@ -365,25 +365,28 @@ private void CalculateValues()
 
         #region Want
 
-        switch (BucketVersion.BucketType)
+        if (!Bucket.IsInactive)
         {
-            case 2:
-                var newWant = BucketVersion.BucketTypeYParam - In;
-                Want = newWant < 0 ? 0 : newWant;
-                break;
-            case 3:
-                var nextTargetDate = BucketVersion.BucketTypeZParam;
-                while (nextTargetDate < _currentYearMonth)
-                {
-                    nextTargetDate = nextTargetDate.AddMonths(BucketVersion.BucketTypeXParam);
-                }
-                Want = CalculateWant(nextTargetDate);
-                break;
-            case 4:
-                Want = CalculateWant(BucketVersion.BucketTypeZParam);
-                break;
-            default:
-                break;
+            switch (BucketVersion.BucketType)
+            {
+                case 2:
+                    var newWant = BucketVersion.BucketTypeYParam - In;
+                    Want = newWant < 0 ? 0 : newWant;
+                    break;
+                case 3:
+                    var nextTargetDate = BucketVersion.BucketTypeZParam;
+                    while (nextTargetDate < _currentYearMonth)
+                    {
+                        nextTargetDate = nextTargetDate.AddMonths(BucketVersion.BucketTypeXParam);
+                    }
+                    Want = CalculateWant(nextTargetDate);
+                    break;
+                case 4:
+                    Want = CalculateWant(BucketVersion.BucketTypeZParam);
+                    break;
+                default:
+                    break;
+            }
         }
 
         decimal CalculateWant(DateTime targetDate)