From bbb29596c77193e73ddbd2f09751ec0f980036a9 Mon Sep 17 00:00:00 2001 From: Yunusov_Niyaz Date: Thu, 2 May 2024 12:15:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C:=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D0=BB=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B4=D0=B0=D1=82?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogic/PurchaseLogic.cs | 18 +++++++++++++++++- .../BindingModels/PurchaseBindingModel.cs | 2 +- .../BindingModels/VisitBindingModel.cs | 2 +- .../BusinessLogicContracts/IPurchaseLogic.cs | 1 + .../Models/IPurchaseModel.cs | 2 +- .../VeterinaryDataModels/Models/IVisitModel.cs | 2 +- .../Controllers/PurchaseController.cs | 15 +++++++++++++++ .../Views/Home/Purchases.cshtml | 2 ++ 8 files changed, 39 insertions(+), 5 deletions(-) diff --git a/VeterinaryView/VeterinaryBusinessLogic/BusinessLogic/PurchaseLogic.cs b/VeterinaryView/VeterinaryBusinessLogic/BusinessLogic/PurchaseLogic.cs index 38aebd6..7894ace 100644 --- a/VeterinaryView/VeterinaryBusinessLogic/BusinessLogic/PurchaseLogic.cs +++ b/VeterinaryView/VeterinaryBusinessLogic/BusinessLogic/PurchaseLogic.cs @@ -58,7 +58,23 @@ namespace VeterinaryBusinessLogic.BusinessLogic } return true; } - // dateImplement + public bool ChangeDateImplement(PurchaseBindingModel model) + { + CheckModel(model); + var element = _purchaseStorage.GetElement(new PurchaseSearchModel { Id = model.Id }); + if (element == null) + { + _logger.LogWarning("Read operation failed"); + return false; + } + if(element.DateCreate > DateTime.Now) + { + _logger.LogWarning("DateImplement change operation failed"); + } + model.DateImplement = DateTime.Now; + _purchaseStorage.Update(model); + return true; + } private void CheckModel(PurchaseBindingModel model, bool withParams = true) { if (model == null) diff --git a/VeterinaryView/VeterinaryContracts/BindingModels/PurchaseBindingModel.cs b/VeterinaryView/VeterinaryContracts/BindingModels/PurchaseBindingModel.cs index 3fee9c2..e0ed857 100644 --- a/VeterinaryView/VeterinaryContracts/BindingModels/PurchaseBindingModel.cs +++ b/VeterinaryView/VeterinaryContracts/BindingModels/PurchaseBindingModel.cs @@ -10,7 +10,7 @@ namespace VeterinaryContracts.BindingModels public int Count { get; set; } public double Sum { get; set; } public DateTime DateCreate { get; set; } - public DateTime DateImplement { get; set; } + public DateTime? DateImplement { get; set; } public Dictionary PurchasePet { get; set; } = new(); } } diff --git a/VeterinaryView/VeterinaryContracts/BindingModels/VisitBindingModel.cs b/VeterinaryView/VeterinaryContracts/BindingModels/VisitBindingModel.cs index e1cc943..accead9 100644 --- a/VeterinaryView/VeterinaryContracts/BindingModels/VisitBindingModel.cs +++ b/VeterinaryView/VeterinaryContracts/BindingModels/VisitBindingModel.cs @@ -6,7 +6,7 @@ namespace VeterinaryContracts.BindingModels { public int Id { get; set; } public int OwnerId { get; set; } - public int? DoctorId { get; set; } = null; + public int DoctorId { get; set; } public string VisitName { get; set; } = string.Empty; public DateTime DateVisit { get; set; } public Dictionary VisitPet { get; set; } = new(); diff --git a/VeterinaryView/VeterinaryContracts/BusinessLogicContracts/IPurchaseLogic.cs b/VeterinaryView/VeterinaryContracts/BusinessLogicContracts/IPurchaseLogic.cs index 9066477..575cb4b 100644 --- a/VeterinaryView/VeterinaryContracts/BusinessLogicContracts/IPurchaseLogic.cs +++ b/VeterinaryView/VeterinaryContracts/BusinessLogicContracts/IPurchaseLogic.cs @@ -9,5 +9,6 @@ namespace VeterinaryContracts.BusinessLogicContracts List? ReadList(PurchaseSearchModel? model); PurchaseViewModel? ReadElement(PurchaseSearchModel model); bool CreatePurchase(PurchaseBindingModel model); + bool ChangeDateImplement(PurchaseBindingModel model); } } diff --git a/VeterinaryView/VeterinaryDataModels/Models/IPurchaseModel.cs b/VeterinaryView/VeterinaryDataModels/Models/IPurchaseModel.cs index 39bb826..beaa5bf 100644 --- a/VeterinaryView/VeterinaryDataModels/Models/IPurchaseModel.cs +++ b/VeterinaryView/VeterinaryDataModels/Models/IPurchaseModel.cs @@ -7,7 +7,7 @@ int Count { get; } double Sum { get; } DateTime DateCreate { get; } - DateTime DateImplement { get; } + DateTime? DateImplement { get; } Dictionary PurchasePet { get; } } } diff --git a/VeterinaryView/VeterinaryDataModels/Models/IVisitModel.cs b/VeterinaryView/VeterinaryDataModels/Models/IVisitModel.cs index 42bc64c..63066bd 100644 --- a/VeterinaryView/VeterinaryDataModels/Models/IVisitModel.cs +++ b/VeterinaryView/VeterinaryDataModels/Models/IVisitModel.cs @@ -3,7 +3,7 @@ public interface IVisitModel : IId { int OwnerId { get; } - int? DoctorId { get; } + int DoctorId { get; } string VisitName { get; } DateTime DateVisit { get; } Dictionary VisitPet { get; } diff --git a/VeterinaryView/VeterinaryRestApi/Controllers/PurchaseController.cs b/VeterinaryView/VeterinaryRestApi/Controllers/PurchaseController.cs index 33aafb9..2fd05c0 100644 --- a/VeterinaryView/VeterinaryRestApi/Controllers/PurchaseController.cs +++ b/VeterinaryView/VeterinaryRestApi/Controllers/PurchaseController.cs @@ -3,6 +3,7 @@ using VeterinaryContracts.BindingModels; using VeterinaryContracts.BusinessLogicContracts; using VeterinaryContracts.SearchModels; using VeterinaryContracts.ViewModels; +using VeterinaryDatabaseImplement.Models; namespace VeterinaryRestApi.Controllers { @@ -59,5 +60,19 @@ namespace VeterinaryRestApi.Controllers throw; } } + [HttpPost] + public bool ChangeDateImplement(PurchaseBindingModel model) + { + try + { + _purchase.ChangeDateImplement(model); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Не удалось обновить покупку"); + throw; + } + } } } diff --git a/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/Purchases.cshtml b/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/Purchases.cshtml index bb56de6..4edc322 100644 --- a/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/Purchases.cshtml +++ b/VeterinaryView/VeterinaryShowOwnerApp/Views/Home/Purchases.cshtml @@ -39,6 +39,7 @@ + }