@@ -36,6 +29,22 @@
+
+@code {
+ private record StoreModel(Guid Id, string Name);
+
+ private string datetime = DateTime.Now.ToString("s");
+ private StoreModel[] stores = [];
+
+ protected override async Task OnInitializedAsync()
+ {
+ stores = await DbContext.Stores
+ .OrderBy(store => store.Retailer!.Name)
+ .ThenBy(store => store.Name)
+ .Select(store => new StoreModel(store.Id, string.Concat(store.Retailer!.Name, " ", store.Name)))
+ .ToArrayAsync();
+ }
+}
diff --git a/Groceries/Transactions/NewTransactionPromotion.cshtml b/Groceries/Transactions/NewTransactionPromotion.cshtml
deleted file mode 100644
index 6146e7a..0000000
--- a/Groceries/Transactions/NewTransactionPromotion.cshtml
+++ /dev/null
@@ -1,26 +0,0 @@
-@using Groceries.Data;
-@using Microsoft.EntityFrameworkCore;
-
-@model Transaction
-@inject AppDbContext dbContext
-@{
- ViewBag.Title = "New Transaction Promotion";
-
- var store = await dbContext.Stores
- .Where(store => store.Id == Model.StoreId)
- .Select(store => string.Concat(store.Retailer!.Name, " ", store.Name))
- .SingleAsync();
-}
-
-
New Transaction Promotion
-
-
@Model.CreatedAt.ToShortDateString() @Model.CreatedAt.ToShortTimeString() – @store
-
-
diff --git a/Groceries/Transactions/NewTransactionPromotionModal.razor b/Groceries/Transactions/NewTransactionPromotionModal.razor
new file mode 100644
index 0000000..a805f38
--- /dev/null
+++ b/Groceries/Transactions/NewTransactionPromotionModal.razor
@@ -0,0 +1,17 @@
+@using Groceries.Data
+
+@layout Modal
+
+
New Transaction Promotion
+
+
+
+
+
+@code {
+ [Parameter]
+ public required Transaction Transaction { get; set; }
+}
diff --git a/Groceries/Transactions/NewTransactionPromotionPage.razor b/Groceries/Transactions/NewTransactionPromotionPage.razor
new file mode 100644
index 0000000..1b29a8a
--- /dev/null
+++ b/Groceries/Transactions/NewTransactionPromotionPage.razor
@@ -0,0 +1,36 @@
+@using Groceries.Data
+@using Microsoft.EntityFrameworkCore
+
+@layout Layout
+
+@inject AppDbContext DbContext
+
+
Groceries – New Transaction Promotion
+
+
New Transaction Promotion
+
+
+ @Transaction.CreatedAt.ToShortDateString() @Transaction.CreatedAt.ToLongTimeString() – @store
+
+
+
+
+
+
+@code {
+ [Parameter]
+ public required Transaction Transaction { get; set; }
+
+ private string store = string.Empty;
+
+ protected override async Task OnParametersSetAsync()
+ {
+ store = await DbContext.Stores
+ .Where(store => store.Id == Transaction.StoreId)
+ .Select(store => string.Concat(store.Retailer!.Name, " ", store.Name))
+ .SingleAsync();
+ }
+}
diff --git a/Groceries/Transactions/NewTransactionPromotion_Modal.cshtml b/Groceries/Transactions/NewTransactionPromotion_Modal.cshtml
deleted file mode 100644
index 7820e70..0000000
--- a/Groceries/Transactions/NewTransactionPromotion_Modal.cshtml
+++ /dev/null
@@ -1,16 +0,0 @@
-@using Groceries.Data
-
-@model Transaction
-@{
- Layout = "_Modal";
- ViewBag.Title = "New Transaction Promotion";
-}
-
-
-
-
diff --git a/Groceries/Transactions/NewTransactionPromotions.cshtml b/Groceries/Transactions/NewTransactionPromotionsPage.razor
similarity index 57%
rename from Groceries/Transactions/NewTransactionPromotions.cshtml
rename to Groceries/Transactions/NewTransactionPromotionsPage.razor
index 96863a3..c685de5 100644
--- a/Groceries/Transactions/NewTransactionPromotions.cshtml
+++ b/Groceries/Transactions/NewTransactionPromotionsPage.razor
@@ -1,26 +1,23 @@
-@using Groceries.Data;
-@using Microsoft.EntityFrameworkCore;
+@using Groceries.Data
+@using Microsoft.EntityFrameworkCore
-@model Transaction
-@inject AppDbContext dbContext
-@{
- ViewBag.Title = "New Transaction";
+@layout Layout
- var store = await dbContext.Stores
- .Where(store => store.Id == Model.StoreId)
- .Select(store => string.Concat(store.Retailer!.Name, " ", store.Name))
- .SingleAsync();
-}
+@inject AppDbContext DbContext
+
+
Groceries – New Transaction
New Transaction
-
@Model.CreatedAt.ToShortDateString() @Model.CreatedAt.ToLongTimeString() – @store
+
+ @Transaction.CreatedAt.ToShortDateString() @Transaction.CreatedAt.ToLongTimeString() – @store
+
-