From 497cdddbb41cd5a5d27e83cc39021a3519c29b6d Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Mon, 4 Oct 2021 10:31:16 +0330 Subject: [PATCH] #217 adding numberings in UI --- GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml | 39 +++++++++++++++- .../Areas/Admin/Pages/CatUtils.cshtml.cs | 44 +++++++++++++++++++ RMuseum/Controllers/NumberingController.cs | 2 +- 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml index 70b03c2a..cb48aae4 100644 --- a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml +++ b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml @@ -188,12 +188,49 @@ @numbering.EndCatId - @numbering.LastCountingDate.ToLongPersianDateTimeString() + @if(numbering.LastCountingDate != DateTime.MinValue) + { + @numbering.LastCountingDate.ToLongPersianDateTimeString() + } } +
+ + + + + + + + + + + + + + + + +
+ عنوان: + + +
+ شناسهٔ ابتدا + + +
+ شناسهٔ انتها + + +
+ +
+
+ diff --git a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs index 1c0ac5aa..b7460d28 100644 --- a/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs +++ b/GanjooRazor/Areas/Admin/Pages/CatUtils.cshtml.cs @@ -66,6 +66,12 @@ namespace GanjooRazor.Areas.Admin.Pages /// public GanjoorNumbering[] Numberings { get; set; } + /// + /// numbering model + /// + [BindProperty] + public GanjoorNumbering NumberingModel { get; set; } + private async Task GetInformationAsync() { @@ -106,6 +112,13 @@ namespace GanjooRazor.Areas.Admin.Pages Simulate = true }; + NumberingModel = new GanjoorNumbering() + { + Name = Cat.Cat.Title, + StartCatId = Cat.Cat.Id, + EndCatId = Cat.Cat.Id + }; + return Page(); } @@ -118,6 +131,13 @@ namespace GanjooRazor.Areas.Admin.Pages { await GetInformationAsync(); + NumberingModel = new GanjoorNumbering() + { + Name = Cat.Cat.Title, + StartCatId = Cat.Cat.Id, + EndCatId = Cat.Cat.Id + }; + using (HttpClient secureClient = new HttpClient()) { await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response); @@ -133,6 +153,30 @@ namespace GanjooRazor.Areas.Admin.Pages return Page(); } + public async Task OnPostNumberingAsync(GanjoorNumbering NumberingModel) + { + using (HttpClient secureClient = new HttpClient()) + { + await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response); + + HttpResponseMessage response = await secureClient.PostAsync($"{APIRoot.Url}/api/numberings", new StringContent(JsonConvert.SerializeObject(NumberingModel), Encoding.UTF8, "application/json")); + response.EnsureSuccessStatusCode(); + + } + + await GetInformationAsync(); + + NamingModel = new GanjoorBatchNamingModel() + { + StartWithNotIncludingSpaces = "شمارهٔ ", + RemovePreviousPattern = true, + RemoveSetOfCharacters = ".-", + Simulate = true + }; + + return Page(); + } + public async Task OnPostStartRhymeAnalysisAsync(int id) { using (HttpClient secureClient = new HttpClient()) diff --git a/RMuseum/Controllers/NumberingController.cs b/RMuseum/Controllers/NumberingController.cs index f6517056..f46ac796 100644 --- a/RMuseum/Controllers/NumberingController.cs +++ b/RMuseum/Controllers/NumberingController.cs @@ -74,7 +74,7 @@ namespace RMuseum.Controllers } foreach (var numbering in res2.Result) { - if(combined.Where(n => n.Id == numbering.Id).FirstOrDefault() == numbering) + if(combined.Where(n => n.Id == numbering.Id).FirstOrDefault() == null) { combined.Add(numbering); }