From 165a8ff96c2f48039175025d599e6fd7610ed21f Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 28 Apr 2024 11:31:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=B4=D1=80=D0=B5=D0=B2=D1=8C?= =?UTF-8?q?=D1=8E,=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B2=D1=8C=D1=8E=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B8=20=D0=B2=20=D1=81=D0=BE=D0=BE=D1=82=D0=B2?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B2=D0=B8=D0=B8=20=D1=81=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B8=D0=BC=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogicsContracts/IMedicamentLogic.cs | 4 ++-- .../BusinessLogicsContracts/IProcedureLogic.cs | 4 ++-- .../BusinessLogicsContracts/IRecipeLogic.cs | 4 ++-- .../StoragesContracts/IMedicamentStorage.cs | 12 ++++++------ .../StoragesContracts/IProcedureStorage.cs | 12 ++++++------ .../StoragesContracts/IRecipeStorage.cs | 12 ++++++------ .../{MedicamentView.cs => MedicamentViewModel.cs} | 2 +- .../{ProcedureView.cs => ProcedureViewModel.cs} | 2 +- .../ViewModels/{RecipeView.cs => RecipeViewModel.cs} | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) rename Polyclinic/PolyclinicContracts/ViewModels/{MedicamentView.cs => MedicamentViewModel.cs} (89%) rename Polyclinic/PolyclinicContracts/ViewModels/{ProcedureView.cs => ProcedureViewModel.cs} (88%) rename Polyclinic/PolyclinicContracts/ViewModels/{RecipeView.cs => RecipeViewModel.cs} (90%) diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs index 223fbd5..c3b1789 100644 --- a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs +++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IMedicamentLogic.cs @@ -6,8 +6,8 @@ namespace PolyclinicContracts.BusinessLogicsContracts { public interface IMedicamentLogic { - List? ReadList(MedicamentSearchModel? model); - MedicamentView? ReadElement(MedicamentSearchModel model); + List? ReadList(MedicamentSearchModel? model); + MedicamentViewModel? ReadElement(MedicamentSearchModel model); bool Create(MedicamentBindingModel model); bool Update(MedicamentBindingModel model); bool Delete(MedicamentBindingModel model); diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs index 2096c73..9928c08 100644 --- a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs +++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IProcedureLogic.cs @@ -6,8 +6,8 @@ namespace PolyclinicContracts.BusinessLogicsContracts { public interface IProcedureLogic { - List? ReadList(ProcedureSearchModel? model); - ProcedureView? ReadElement(ProcedureSearchModel model); + List? ReadList(ProcedureSearchModel? model); + ProcedureViewModel? ReadElement(ProcedureSearchModel model); bool Create(ProcedureBindingModel model); bool Update(ProcedureBindingModel model); bool Delete(ProcedureBindingModel model); diff --git a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs index d419c56..e5cd24c 100644 --- a/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs +++ b/Polyclinic/PolyclinicContracts/BusinessLogicsContracts/IRecipeLogic.cs @@ -6,8 +6,8 @@ namespace PolyclinicContracts.BusinessLogicsContracts { public interface IRecipeLogic { - List? ReadList(RecipeSearchModel? model); - RecipeView? ReadElement(RecipeSearchModel model); + List? ReadList(RecipeSearchModel? model); + RecipeViewModel? ReadElement(RecipeSearchModel model); bool Create(RecipeBindingModel model); bool Update(RecipeBindingModel model); bool Delete(RecipeBindingModel model); diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs index f903268..1229447 100644 --- a/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs +++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IMedicamentStorage.cs @@ -6,11 +6,11 @@ namespace PolyclinicContracts.StoragesContracts { public interface IMedicamentStorage { - List GetFullList(); - List GetFilteredList(MedicamentSearchModel model); - MedicamentView? GetElement(MedicamentSearchModel model); - MedicamentView? Insert(MedicamentBindingModel model); - MedicamentView? Update(MedicamentBindingModel model); - MedicamentView? Delete(MedicamentBindingModel model); + List GetFullList(); + List GetFilteredList(MedicamentSearchModel model); + MedicamentViewModel? GetElement(MedicamentSearchModel model); + MedicamentViewModel? Insert(MedicamentBindingModel model); + MedicamentViewModel? Update(MedicamentBindingModel model); + MedicamentViewModel? Delete(MedicamentBindingModel model); } } diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs index f60040c..59e8430 100644 --- a/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs +++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IProcedureStorage.cs @@ -6,11 +6,11 @@ namespace PolyclinicContracts.StoragesContracts { public interface IProcedureStorage { - List GetFullList(); - List GetFilteredList(ProcedureSearchModel model); - ProcedureView? GetElement(ProcedureSearchModel model); - ProcedureView? Insert(ProcedureBindingModel model); - ProcedureView? Update(ProcedureBindingModel model); - ProcedureView? Delete(ProcedureBindingModel model); + List GetFullList(); + List GetFilteredList(ProcedureSearchModel model); + ProcedureViewModel? GetElement(ProcedureSearchModel model); + ProcedureViewModel? Insert(ProcedureBindingModel model); + ProcedureViewModel? Update(ProcedureBindingModel model); + ProcedureViewModel? Delete(ProcedureBindingModel model); } } \ No newline at end of file diff --git a/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs b/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs index 8479f8c..ce1b9d3 100644 --- a/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs +++ b/Polyclinic/PolyclinicContracts/StoragesContracts/IRecipeStorage.cs @@ -6,11 +6,11 @@ namespace PolyclinicContracts.StoragesContracts { public interface IRecipeStorage { - List GetFullList(); - List GetFilteredList(RecipeSearchModel model); - RecipeView? GetElement(RecipeSearchModel model); - RecipeView? Insert(RecipeBindingModel model); - RecipeView? Update(RecipeBindingModel model); - RecipeView? Delete(RecipeBindingModel model); + List GetFullList(); + List GetFilteredList(RecipeSearchModel model); + RecipeViewModel? GetElement(RecipeSearchModel model); + RecipeViewModel? Insert(RecipeBindingModel model); + RecipeViewModel? Update(RecipeBindingModel model); + RecipeViewModel? Delete(RecipeBindingModel model); } } diff --git a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs similarity index 89% rename from Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs rename to Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs index 475e7ab..1847baa 100644 --- a/Polyclinic/PolyclinicContracts/ViewModels/MedicamentView.cs +++ b/Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel; namespace PolyclinicContracts.ViewModels { - public class MedicamentView : IMedicamentModel + public class MedicamentViewModel : IMedicamentModel { public int Id { get; set; } public int ProcedureId { get; set; } diff --git a/Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs b/Polyclinic/PolyclinicContracts/ViewModels/ProcedureViewModel.cs similarity index 88% rename from Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs rename to Polyclinic/PolyclinicContracts/ViewModels/ProcedureViewModel.cs index 46feac8..40c4d06 100644 --- a/Polyclinic/PolyclinicContracts/ViewModels/ProcedureView.cs +++ b/Polyclinic/PolyclinicContracts/ViewModels/ProcedureViewModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel; namespace PolyclinicContracts.ViewModels { - public class ProcedureView : IProcedureModel + public class ProcedureViewModel : IProcedureModel { public int Id { get; set; } diff --git a/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs b/Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs similarity index 90% rename from Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs rename to Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs index 96a0a26..c2e0a4d 100644 --- a/Polyclinic/PolyclinicContracts/ViewModels/RecipeView.cs +++ b/Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel; namespace PolyclinicContracts.ViewModels { - public class RecipeView : IRecipeModel + public class RecipeViewModel : IRecipeModel { public int Id { get; set; }