#322 - More navigations.

From trends to year overview. From month category overview to month trends.
maraf · May 18, 2021 · 925f9ed · 925f9ed
1 parent b38d2da
commit 925f9ed
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/src/Money.Blazor.Host/Pages/Overview.razor b/src/Money.Blazor.Host/Pages/Overview.razor
@@ -3,6 +3,18 @@
 <Title Icon="calendar" Main="@Title" Sub="@SubTitle">
     <ButtonContent>
         <ExpenseCreateButton OnClick="CreateModal.Show" />
+        @{
+            var trendsButton = TrendsTitleUrl();
+        }
+        @if (trendsButton != null)
+        {
+            <button class="btn btn-secondary" @onclick="(() => Navigator.Open(trendsButton.Value.url))">
+                <Icon Prefix="fas" Identifier="chart-bar" />
+                <span class="d-none d-md-inline">
+                    @trendsButton.Value.title
+                </span>
+            </button>
+        }
     </ButtonContent>
 </Title>
 <ExceptionPanel />
@@ -14,7 +26,7 @@
     <Loading Context="@Loading" IsOverlay="true">
         @{
             var incomeUrl = ListIncomeUrl();
-            var trendsUrl = TrendsUrl();
+            var trendsUrl = TrendsSelectedPeriodUrl();
         }
         @if (incomeUrl != null || trendsUrl != null)
         {
@@ -64,4 +76,4 @@
 
 <OutcomeAmount @ref="AmountEditModal" OutcomeKey="@SelectedItem?.Key" Amount="@(SelectedItem?.Amount?.Value ?? 0)" Currency="@SelectedItem?.Amount?.Currency" />
 <OutcomeDescription @ref="DescriptionEditModal" OutcomeKey="@SelectedItem?.Key" Description="@SelectedItem?.Description" />
-<OutcomeWhen @ref="WhenEditModal" OutcomeKey="@SelectedItem?.Key" When="@(SelectedItem?.When ?? DateTime.MinValue)" />
+<OutcomeWhen @ref="       DescriptionEditModal" OutcomeKey="@SelectedItem?.Key" When="@(SelectedItem?.When ?? DateTime.MinValue)" />
diff --git a/src/Money.Blazor.Host/Pages/Overview.razor.cs b/src/Money.Blazor.Host/Pages/Overview.razor.cs
@@ -102,7 +102,10 @@ protected virtual T CreateSelectedItemFromParameters()
         protected virtual string ListIncomeUrl()
             => null;
 
-        protected virtual string TrendsUrl()
+        protected virtual string TrendsSelectedPeriodUrl()
+            => null;
+
+        protected virtual (string title, string url)? TrendsTitleUrl()
             => null;
 
         protected async void Reload()

diff --git a/src/Money.Blazor.Host/Pages/OverviewMonth.cs b/src/Money.Blazor.Host/Pages/OverviewMonth.cs
@@ -53,5 +53,13 @@ protected override string ListIncomeUrl()
 
             return null;
         }
+
+        protected override (string title, string url)? TrendsTitleUrl()
+        {
+            if (CategoryKey.IsEmpty)
+                return null;
+
+            return ("Month trends", Navigator.UrlTrends(new YearModel(SelectedPeriod.Year), CategoryKey));
+        }
     }
 }
diff --git a/src/Money.Blazor.Host/Pages/OverviewYear.cs b/src/Money.Blazor.Host/Pages/OverviewYear.cs
@@ -40,7 +40,7 @@ protected override IQuery<List<OutcomeOverviewModel>> CreateItemsQuery(int pageI
         protected override bool IsContained(DateTime when)
             => SelectedPeriod == when;
 
-        protected override string TrendsUrl()
+        protected override string TrendsSelectedPeriodUrl()
         {
             if (CategoryKey.IsEmpty)
                 return null;

diff --git a/src/Money.Blazor.Host/Pages/TrendsMonth.razor b/src/Money.Blazor.Host/Pages/TrendsMonth.razor
@@ -1,6 +1,13 @@
 @page "/{Year:int}/trends/{CategoryGuid:guid}"
 
-<Title Main="@($"Trends of category {CategoryName} in {Year}")" Sub="See how the category expenses change in time" />
+<Title Main="@($"Trends of category {CategoryName} in {Year}")" Sub="See how the category expenses change in time">
+    <ButtonContent>
+        <button class="btn btn-secondary" @onclick="(() => Navigator.OpenOverview(SelectedPeriod, CategoryKey))">
+            <Icon Prefix="fas" Identifier="list-ul" />
+            Year overview
+        </button>
+    </ButtonContent>
+</Title>
 
 @if (Models == null)
 {