v2.2.1-alpha (#156)

* Update README.md * Update README.md * revert version * revert comments * companyname * Update README.md * #114 Implemented CssUtil.GetDueClass & tests (#123) * #114 Implemented CssUtil.GetDueClass & tests * #114 Added semicolor to css rule * #114 Changed placement of css rule. * #114 removed dots from string result. * #114 PR review changes. * #115 Added call to GetDueClass method in monthly page. (#124) * add mockups for icons and colors * Adds font color to due period depending on severity. (#126) * Adds font color to due period depending on severity. * Returns text-end class for Index page. * Preserves newline in subscription description (#131) * Introduces subscription background color. (#135) * Adds background color to the database * Adds a control to select background color for a subscription * Updates tests to include background color * Updates migration scripts * Update subtrack.MAUI/Utilities/CssUtil.cs Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Minor updates * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/UpsertSubscription.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Minor adjustments --------- Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * #128 make labels less visible (#136) * #128 make labels less visible * Update subtrack.MAUI/wwwroot/css/app.css Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Update subtrack.MAUI/Pages/SubscriptionDetails.razor Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> --------- Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * #125 Added US Culture as a constant (#144) * #142 Fixed descriptions not displayed correctly. (#145) * update roadmap * make nav buttons larger and remove outline on back save and edit buttons (#143) * btn outline => btn filled * navbar simplification * resolve comments * format and remove non existing css class * remove default styling --------- Co-authored-by: ChrisK00 <christian.khalil2000@gmail.com> Co-authored-by: chrisK00 <72318023+chrisK00@users.noreply.github.com> * Adds subscription icon and secondary color (#149) * Adds database columns for icon and secondary color * Adds controls for saving icon and secondary color for subscriptions * Use subscription icon and secondary colors in the UI * Updates migration scripts * Minor updates to UI * Minor UI updates * Updates subscription details title * Updates subscription details title * fix flaky test * Revert "fix flaky test" This reverts commit b3bb61d. * Feature/improve subscription card design poc (#150) * fix create sub bug. New style for cards. use dot instead of comma * fix overflow color picker input. fix currency on index showing on newline * fix flaky test * fix flaky test * roadmap * order by year (#154) * readme merge master * fix * return url on delete --------- Co-authored-by: Konstantinos Grontis <grodiscostas@hotmail.com> Co-authored-by: denislavh <53407843+denislavh@users.noreply.github.com> Co-authored-by: Ashwin Thyagarajan <ashwin031192@gmail.com> Co-authored-by: Penguine-Os <yenebeb.df@gmail.com>
Code2Gether-Discord · Nov 5, 2023 · a1a64dc · a1a64dc
1 parent 2c867da
commit a1a64dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@ After making changes to any entity you need to add a migration and update the da
 ## Creating a Release
 - Check if there are any open issues that are required for the release
 - Briefly test the app's functionality on the dev branch and open any necessary issues
+- Merge master in to dev locally and push the merge
 - Open a PR from dev to master branch that should contain the release number in the title  
   - Update the Roadmap
 - Git pull master

diff --git a/subtrack.MAUI/Pages/SubscriptionDetails.razor b/subtrack.MAUI/Pages/SubscriptionDetails.razor
@@ -155,8 +155,9 @@ else
             _deleteButtonClicked = true;
             return;
         }
+
         await subscriptionService.Delete(Id);
-        navigationManager.NavigateTo("/", replace: true);
+        navigationManager.NavigateTo(ReturnUrl, replace: true);
     }
     private string GetOccurrenceText()
     {

diff --git a/subtrack.MAUI/Services/MonthlyPageCalculator.cs b/subtrack.MAUI/Services/MonthlyPageCalculator.cs
@@ -36,7 +36,10 @@ public IDictionary<int, List<SubscriptionsMonthResponse>> GetMonthlySubscription
                           MonthDate = new DateTime(g.Key.Year, g.Key.Month, 1),
                           Subscriptions = g.OrderBy(s => s.LastPayment).ToList(),
                           Cost = _subscriptionsCalculator.GetTotalCost(g)
-                      }).GroupBy(r => r.MonthDate.Year).ToDictionary(k => k.Key, v => v.ToList());
+                      })
+                 .OrderBy(r => r.MonthDate)
+                 .GroupBy(r => r.MonthDate.Year)
+                 .ToDictionary(k => k.Key, v => v.ToList());
         }
     }
 }