diff --git a/CarCenter/CarCenter.sln b/BeautySalon/BeautySalon.sln similarity index 71% rename from CarCenter/CarCenter.sln rename to BeautySalon/BeautySalon.sln index 7bdac3e..5a653d5 100644 --- a/CarCenter/CarCenter.sln +++ b/BeautySalon/BeautySalon.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34714.143 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarCenterDataModels", "CarCenterDataModels\CarCenterDataModels.csproj", "{0DF028FA-4404-46D3-9752-6B993A5E17DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeautySalonDataModels", "CarCenterDataModels\BeautySalonDataModels.csproj", "{0DF028FA-4404-46D3-9752-6B993A5E17DD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarCenterContracts", "CarCenterContracts\CarCenterContracts.csproj", "{35B11D95-5D0B-4D63-99E2-3ABF76178FDA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeautySalonContracts", "CarCenterContracts\BeautySalonContracts.csproj", "{35B11D95-5D0B-4D63-99E2-3ABF76178FDA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarCenterBusinessLogic", "CarCenterBusinessLogic\CarCenterBusinessLogic.csproj", "{F7C378AF-AFFA-4E6B-8F21-D1A607B43B9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeautySalonBusinessLogic", "CarCenterBusinessLogic\BeautySalonBusinessLogic.csproj", "{F7C378AF-AFFA-4E6B-8F21-D1A607B43B9A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarCenterDatabaseImplement", "CarCenterDatabaseImplement\CarCenterDatabaseImplement.csproj", "{B441CCEB-C6EB-4573-87D6-A06F42623199}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeautySalonDatabaseImplement", "CarCenterDatabaseImplement\BeautySalonDatabaseImplement.csproj", "{B441CCEB-C6EB-4573-87D6-A06F42623199}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarCenterStorekeeperApp", "CarCenterStorekeeperApp\CarCenterStorekeeperApp.csproj", "{6CF38151-471F-42EE-9A68-6A5FA1F87BD1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeautySalonStorekeeperApp", "CarCenterStorekeeperApp\BeautySalonStorekeeperApp.csproj", "{6CF38151-471F-42EE-9A68-6A5FA1F87BD1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarCenterWorkerApp", "CarCenterWorkerApp\CarCenterWorkerApp.csproj", "{557BE753-F505-4566-87FF-A0947CD8C52F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeautySalonWorkerApp", "CarCenterWorkerApp\BeautySalonWorkerApp.csproj", "{557BE753-F505-4566-87FF-A0947CD8C52F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj b/BeautySalon/CarCenterBusinessLogic/BeautySalonBusinessLogic.csproj similarity index 88% rename from CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj rename to BeautySalon/CarCenterBusinessLogic/BeautySalonBusinessLogic.csproj index 89a1c68..6a96865 100644 --- a/CarCenter/CarCenterBusinessLogic/CarCenterBusinessLogic.csproj +++ b/BeautySalon/CarCenterBusinessLogic/BeautySalonBusinessLogic.csproj @@ -15,7 +15,7 @@ - + diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/CosmeticLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/CosmeticLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/CosmeticLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/CosmeticLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/LaborCostLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/LaborCostLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/LaborCostLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/LaborCostLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/OrderLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/OrderLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/OrderLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/OrderLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/ProcedureLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/ProcedureLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/ProcedureLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/ProcedureLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/RatingLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/RatingLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/RatingLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/RatingLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/ServiceLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/ServiceLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/ServiceLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/ServiceLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/StorekeeperLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/StorekeeperLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/StorekeeperLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/StorekeeperLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/BusinessLogics/WorkerLogic.cs b/BeautySalon/CarCenterBusinessLogic/BusinessLogics/WorkerLogic.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/BusinessLogics/WorkerLogic.cs rename to BeautySalon/CarCenterBusinessLogic/BusinessLogics/WorkerLogic.cs diff --git a/CarCenter/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs b/BeautySalon/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs rename to BeautySalon/CarCenterBusinessLogic/MailWorker/AbstractMailWorker.cs diff --git a/CarCenter/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs b/BeautySalon/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs rename to BeautySalon/CarCenterBusinessLogic/MailWorker/MailKitWorker.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcel.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdf.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs similarity index 93% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs index 0f488d3..9ed930c 100644 --- a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs +++ b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfStorekeeper.cs @@ -22,7 +22,7 @@ namespace CarCenterBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { "Номер комплектации", "Покупка" }, + Texts = new List { "Номер услуги", "Заказ" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -41,7 +41,7 @@ namespace CarCenterBusinessLogic.OfficePackage }); CreateRow(new PdfRowParameters { - Texts = new List { "", "Особенности" }, + Texts = new List { "", "Трудозатраты" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWord.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfo.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfStorekeeper.cs diff --git a/CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs b/BeautySalon/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs rename to BeautySalon/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordStorekeeper.cs diff --git a/CarCenter/CarCenterContracts/CarCenterContracts.csproj b/BeautySalon/CarCenterContracts/BeautySalonContracts.csproj similarity index 73% rename from CarCenter/CarCenterContracts/CarCenterContracts.csproj rename to BeautySalon/CarCenterContracts/BeautySalonContracts.csproj index 97673d7..86bca93 100644 --- a/CarCenter/CarCenterContracts/CarCenterContracts.csproj +++ b/BeautySalon/CarCenterContracts/BeautySalonContracts.csproj @@ -7,7 +7,7 @@ - + diff --git a/CarCenter/CarCenterContracts/BindingModels/CosmeticBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/CosmeticBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/CosmeticBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/CosmeticBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/LaborCostBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/LaborCostBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/LaborCostBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/LaborCostBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/MailConfigModel.cs b/BeautySalon/CarCenterContracts/BindingModels/MailConfigModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/MailConfigModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/MailConfigModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/MailSendInfoModel.cs b/BeautySalon/CarCenterContracts/BindingModels/MailSendInfoModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/MailSendInfoModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/MailSendInfoModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/OrderBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/OrderBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/OrderBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/OrderBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/ProcedureBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/ProcedureBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/ProcedureBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/ProcedureBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/RatingBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/RatingBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/RatingBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/RatingBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/ReportBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/ReportBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/ReportBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/ReportBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/ServiceBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/ServiceBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/ServiceBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/ServiceBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/StorekeeperBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/StorekeeperBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/StorekeeperBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/StorekeeperBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BindingModels/WorkerBindingModel.cs b/BeautySalon/CarCenterContracts/BindingModels/WorkerBindingModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/BindingModels/WorkerBindingModel.cs rename to BeautySalon/CarCenterContracts/BindingModels/WorkerBindingModel.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/ICosmeticLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/ICosmeticLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/ICosmeticLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/ICosmeticLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/ILaborCostLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/ILaborCostLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/ILaborCostLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/ILaborCostLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IOrderLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IOrderLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IOrderLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IOrderLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IProcedureLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IProcedureLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IProcedureLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IProcedureLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IRatingLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IRatingLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IRatingLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IRatingLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IReportLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IServiceLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IServiceLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IServiceLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IServiceLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IStorekeeperLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IStorekeeperLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IStorekeeperLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IStorekeeperLogic.cs diff --git a/CarCenter/CarCenterContracts/BusinessLogicsContracts/IWorkerLogic.cs b/BeautySalon/CarCenterContracts/BusinessLogicsContracts/IWorkerLogic.cs similarity index 100% rename from CarCenter/CarCenterContracts/BusinessLogicsContracts/IWorkerLogic.cs rename to BeautySalon/CarCenterContracts/BusinessLogicsContracts/IWorkerLogic.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/CosmeticSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/CosmeticSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/CosmeticSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/CosmeticSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/LaborCostSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/LaborCostSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/LaborCostSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/LaborCostSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/OrderSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/OrderSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/ProcedureSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/ProcedureSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/ProcedureSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/ProcedureSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/RatingSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/RatingSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/RatingSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/RatingSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/ServiceSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/ServiceSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/ServiceSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/ServiceSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/StorekeeperSearchModel.cs diff --git a/CarCenter/CarCenterContracts/SearchModels/WorkerSearchModel.cs b/BeautySalon/CarCenterContracts/SearchModels/WorkerSearchModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/SearchModels/WorkerSearchModel.cs rename to BeautySalon/CarCenterContracts/SearchModels/WorkerSearchModel.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/ICosmeticStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/ICosmeticStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/ICosmeticStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/ICosmeticStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/ILaborCostStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/ILaborCostStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/ILaborCostStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/ILaborCostStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/IOrderStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/IOrderStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/IOrderStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/IOrderStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/IProcedureStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/IProcedureStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/IProcedureStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/IProcedureStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/IRatingStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/IRatingStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/IRatingStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/IRatingStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/IServiceStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/IServiceStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/IServiceStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/IServiceStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/IStorekeeperStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/IStorekeeperStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/IStorekeeperStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/IStorekeeperStorage.cs diff --git a/CarCenter/CarCenterContracts/StoragesContracts/IWorkerStorage.cs b/BeautySalon/CarCenterContracts/StoragesContracts/IWorkerStorage.cs similarity index 100% rename from CarCenter/CarCenterContracts/StoragesContracts/IWorkerStorage.cs rename to BeautySalon/CarCenterContracts/StoragesContracts/IWorkerStorage.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/CosmeticViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/CosmeticViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/CosmeticViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/CosmeticViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/LaborCostViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/LaborCostViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/LaborCostViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/LaborCostViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/OrderViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/OrderViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/OrderViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/OrderViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/ProcedureViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/ProcedureViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/ProcedureViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/ProcedureViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/RatingViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/RatingViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/RatingViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/RatingViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportCosmeticViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/ReportCosmeticViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/ReportCosmeticViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/ReportCosmeticViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/ReportOrderViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/ReportOrderViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportProcedureViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/ReportProcedureViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/ReportProcedureViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/ReportProcedureViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/ReportServiceViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/ReportServiceViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/ReportServiceViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/ReportServiceViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/ServiceViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/ServiceViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/ServiceViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/ServiceViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/StorekeeperReportViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/StorekeeperReportViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/StorekeeperReportViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/StorekeeperReportViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/StorekeeperViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/StorekeeperViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/StorekeeperViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/StorekeeperViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/WorkerReportViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/WorkerReportViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/WorkerReportViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/WorkerReportViewModel.cs diff --git a/CarCenter/CarCenterContracts/ViewModels/WorkerViewModel.cs b/BeautySalon/CarCenterContracts/ViewModels/WorkerViewModel.cs similarity index 100% rename from CarCenter/CarCenterContracts/ViewModels/WorkerViewModel.cs rename to BeautySalon/CarCenterContracts/ViewModels/WorkerViewModel.cs diff --git a/CarCenter/CarCenterDataModels/CarCenterDataModels.csproj b/BeautySalon/CarCenterDataModels/BeautySalonDataModels.csproj similarity index 100% rename from CarCenter/CarCenterDataModels/CarCenterDataModels.csproj rename to BeautySalon/CarCenterDataModels/BeautySalonDataModels.csproj diff --git a/CarCenter/CarCenterDataModels/Enums/CarClass.cs b/BeautySalon/CarCenterDataModels/Enums/CarClass.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/CarClass.cs rename to BeautySalon/CarCenterDataModels/Enums/CarClass.cs diff --git a/CarCenter/CarCenterDataModels/Enums/CosmeticBrand.cs b/BeautySalon/CarCenterDataModels/Enums/CosmeticBrand.cs similarity index 58% rename from CarCenter/CarCenterDataModels/Enums/CosmeticBrand.cs rename to BeautySalon/CarCenterDataModels/Enums/CosmeticBrand.cs index 2255496..76be1eb 100644 --- a/CarCenter/CarCenterDataModels/Enums/CosmeticBrand.cs +++ b/BeautySalon/CarCenterDataModels/Enums/CosmeticBrand.cs @@ -9,13 +9,13 @@ namespace CarCenterDataModels.Enums public enum CosmeticBrand { Неизвестно = -1, - Лада = 0, - Тойота = 1, - Опель = 2, - Митсубиси = 3, - Субару = 4, - Форд = 5, - Лексус = 6, - Шевроле = 7, + CHANEL = 0, + VERSACE = 1, + LANCOME = 2, + MAYBELLINE = 3, + VIVIEN_SABO = 4, + LOREAL = 5, + LUXVISAGE = 6, + BVLGLARI_DIOR = 7, } } diff --git a/CarCenter/CarCenterDataModels/Enums/Difficulties.cs b/BeautySalon/CarCenterDataModels/Enums/Difficulties.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/Difficulties.cs rename to BeautySalon/CarCenterDataModels/Enums/Difficulties.cs diff --git a/CarCenter/CarCenterDataModels/Enums/DriveTypes.cs b/BeautySalon/CarCenterDataModels/Enums/DriveTypes.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/DriveTypes.cs rename to BeautySalon/CarCenterDataModels/Enums/DriveTypes.cs diff --git a/CarCenter/CarCenterDataModels/Enums/EquipmentPackage.cs b/BeautySalon/CarCenterDataModels/Enums/EquipmentPackage.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/EquipmentPackage.cs rename to BeautySalon/CarCenterDataModels/Enums/EquipmentPackage.cs diff --git a/CarCenter/CarCenterDataModels/Enums/NumberHours.cs b/BeautySalon/CarCenterDataModels/Enums/NumberHours.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/NumberHours.cs rename to BeautySalon/CarCenterDataModels/Enums/NumberHours.cs diff --git a/CarCenter/CarCenterDataModels/Enums/PaymentStatus.cs b/BeautySalon/CarCenterDataModels/Enums/PaymentStatus.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/PaymentStatus.cs rename to BeautySalon/CarCenterDataModels/Enums/PaymentStatus.cs diff --git a/CarCenter/CarCenterDataModels/Enums/PaymentType.cs b/BeautySalon/CarCenterDataModels/Enums/PaymentType.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/PaymentType.cs rename to BeautySalon/CarCenterDataModels/Enums/PaymentType.cs diff --git a/CarCenter/CarCenterDataModels/Enums/ProcedureStatus.cs b/BeautySalon/CarCenterDataModels/Enums/ProcedureStatus.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/ProcedureStatus.cs rename to BeautySalon/CarCenterDataModels/Enums/ProcedureStatus.cs diff --git a/CarCenter/CarCenterDataModels/Enums/RequestTypes.cs b/BeautySalon/CarCenterDataModels/Enums/RequestTypes.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/RequestTypes.cs rename to BeautySalon/CarCenterDataModels/Enums/RequestTypes.cs diff --git a/CarCenter/CarCenterDataModels/Enums/TirePackage.cs b/BeautySalon/CarCenterDataModels/Enums/TirePackage.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/TirePackage.cs rename to BeautySalon/CarCenterDataModels/Enums/TirePackage.cs diff --git a/CarCenter/CarCenterDataModels/Enums/ToolKit.cs b/BeautySalon/CarCenterDataModels/Enums/ToolKit.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Enums/ToolKit.cs rename to BeautySalon/CarCenterDataModels/Enums/ToolKit.cs diff --git a/CarCenter/CarCenterDataModels/IId.cs b/BeautySalon/CarCenterDataModels/IId.cs similarity index 100% rename from CarCenter/CarCenterDataModels/IId.cs rename to BeautySalon/CarCenterDataModels/IId.cs diff --git a/CarCenter/CarCenterDataModels/Models/ICosmeticModel.cs b/BeautySalon/CarCenterDataModels/Models/ICosmeticModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/ICosmeticModel.cs rename to BeautySalon/CarCenterDataModels/Models/ICosmeticModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/ILaborCostModel.cs b/BeautySalon/CarCenterDataModels/Models/ILaborCostModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/ILaborCostModel.cs rename to BeautySalon/CarCenterDataModels/Models/ILaborCostModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/IOrderModel.cs b/BeautySalon/CarCenterDataModels/Models/IOrderModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/IOrderModel.cs rename to BeautySalon/CarCenterDataModels/Models/IOrderModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/IProcedureModel.cs b/BeautySalon/CarCenterDataModels/Models/IProcedureModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/IProcedureModel.cs rename to BeautySalon/CarCenterDataModels/Models/IProcedureModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/IRatingModel.cs b/BeautySalon/CarCenterDataModels/Models/IRatingModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/IRatingModel.cs rename to BeautySalon/CarCenterDataModels/Models/IRatingModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/IServiceModel.cs b/BeautySalon/CarCenterDataModels/Models/IServiceModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/IServiceModel.cs rename to BeautySalon/CarCenterDataModels/Models/IServiceModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/IStorekeeperModel.cs b/BeautySalon/CarCenterDataModels/Models/IStorekeeperModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/IStorekeeperModel.cs rename to BeautySalon/CarCenterDataModels/Models/IStorekeeperModel.cs diff --git a/CarCenter/CarCenterDataModels/Models/IWorkerModel.cs b/BeautySalon/CarCenterDataModels/Models/IWorkerModel.cs similarity index 100% rename from CarCenter/CarCenterDataModels/Models/IWorkerModel.cs rename to BeautySalon/CarCenterDataModels/Models/IWorkerModel.cs diff --git a/CarCenter/CarCenterDatabaseImplement/CarCenterDatabaseImplement.csproj b/BeautySalon/CarCenterDatabaseImplement/BeautySalonDatabaseImplement.csproj similarity index 77% rename from CarCenter/CarCenterDatabaseImplement/CarCenterDatabaseImplement.csproj rename to BeautySalon/CarCenterDatabaseImplement/BeautySalonDatabaseImplement.csproj index 0ff0dc2..90ba37c 100644 --- a/CarCenter/CarCenterDatabaseImplement/CarCenterDatabaseImplement.csproj +++ b/BeautySalon/CarCenterDatabaseImplement/BeautySalonDatabaseImplement.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -16,8 +16,8 @@ - - + + diff --git a/CarCenter/CarCenterDatabaseImplement/CarCenterDatabase.cs b/BeautySalon/CarCenterDatabaseImplement/CarCenterDatabase.cs similarity index 91% rename from CarCenter/CarCenterDatabaseImplement/CarCenterDatabase.cs rename to BeautySalon/CarCenterDatabaseImplement/CarCenterDatabase.cs index bb307aa..7c3263f 100644 --- a/CarCenter/CarCenterDatabaseImplement/CarCenterDatabase.cs +++ b/BeautySalon/CarCenterDatabaseImplement/CarCenterDatabase.cs @@ -22,7 +22,7 @@ namespace CarCenterDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=PRETTYNAME;Initial Catalog=BeautySalonDatabaseTesting;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=PRETTYNAME;Initial Catalog=CarCenterDatabaseTesting;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/CosmeticStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/CosmeticStorage.cs similarity index 98% rename from CarCenter/CarCenterDatabaseImplement/Implements/CosmeticStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/CosmeticStorage.cs index 99cfdad..54c5fe6 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/CosmeticStorage.cs +++ b/BeautySalon/CarCenterDatabaseImplement/Implements/CosmeticStorage.cs @@ -96,6 +96,7 @@ namespace CarCenterDatabaseImplement.Implements return null; } cosm.Update(model); + cosm.UpdateServices(context, model); context.SaveChanges(); return context.Cosmetics .Include(x => x.Services) diff --git a/BeautySalon/CarCenterDatabaseImplement/Implements/DataRepository.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/DataRepository.cs new file mode 100644 index 0000000..7cd2cc8 --- /dev/null +++ b/BeautySalon/CarCenterDatabaseImplement/Implements/DataRepository.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCenterDatabaseImplement.Implements +{ + public class DataRepository + { + private readonly CarCenterDatabase _context; + + public DataRepository(CarCenterDatabase context) + { + _context = context; + } + + public Dictionary GetServiceNames(List serviceIds) + { + return _context.Services + .Where(s => serviceIds.Contains(s.Id)) + .ToDictionary(s => s.Id, s => s.ServiceName); + } + } +} diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/LaborCostStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/LaborCostStorage.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Implements/LaborCostStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/LaborCostStorage.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/OrderStorage.cs similarity index 99% rename from CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/OrderStorage.cs index a6dd925..f77ee8e 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs +++ b/BeautySalon/CarCenterDatabaseImplement/Implements/OrderStorage.cs @@ -158,5 +158,7 @@ namespace CarCenterDatabaseImplement.Implements .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; } + + } } diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/ProcedureStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/ProcedureStorage.cs similarity index 97% rename from CarCenter/CarCenterDatabaseImplement/Implements/ProcedureStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/ProcedureStorage.cs index 2790274..8e03367 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/ProcedureStorage.cs +++ b/BeautySalon/CarCenterDatabaseImplement/Implements/ProcedureStorage.cs @@ -103,8 +103,8 @@ namespace CarCenterDatabaseImplement.Implements return null; } proc.Update(model); - proc.UpdateBundlings(context, model); - proc.UpdateBundlings(context, model); + proc.UpdateServices(context, model); + proc.UpdateRatings(context, model); context.SaveChanges(); return context.Procedures .Include(x => x.Services) diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/RatingStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/RatingStorage.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Implements/RatingStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/RatingStorage.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/ServiceStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/ServiceStorage.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Implements/ServiceStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/ServiceStorage.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/StorekeeperStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/StorekeeperStorage.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Implements/StorekeeperStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/StorekeeperStorage.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/WorkerStorage.cs b/BeautySalon/CarCenterDatabaseImplement/Implements/WorkerStorage.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Implements/WorkerStorage.cs rename to BeautySalon/CarCenterDatabaseImplement/Implements/WorkerStorage.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.Designer.cs b/BeautySalon/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.Designer.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.Designer.cs rename to BeautySalon/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.Designer.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.cs b/BeautySalon/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.cs rename to BeautySalon/CarCenterDatabaseImplement/Migrations/20240826190814_InitialCreate.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Migrations/CarCenterDatabaseModelSnapshot.cs b/BeautySalon/CarCenterDatabaseImplement/Migrations/CarCenterDatabaseModelSnapshot.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Migrations/CarCenterDatabaseModelSnapshot.cs rename to BeautySalon/CarCenterDatabaseImplement/Migrations/CarCenterDatabaseModelSnapshot.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Cosmetic.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Cosmetic.cs similarity index 86% rename from CarCenter/CarCenterDatabaseImplement/Models/Cosmetic.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Cosmetic.cs index ee25d12..a932bed 100644 --- a/CarCenter/CarCenterDatabaseImplement/Models/Cosmetic.cs +++ b/BeautySalon/CarCenterDatabaseImplement/Models/Cosmetic.cs @@ -72,18 +72,22 @@ namespace CarCenterDatabaseImplement.Models }; } - public void UpdateBundlings(CarCenterDatabase context, CosmeticBindingModel model) + public void UpdateServices(CarCenterDatabase context, CosmeticBindingModel model) { - var cosmetic = context.Cosmetics.First(x => x.Id == Id); + var cosmetic = context.Cosmetics.First(x => x.Id == Id); foreach (var pc in model.CosmeticServices) { - context.CosmeticServices.Add(new CosmeticServices + if (!context.CosmeticServices.Any(ps => ps.CosmeticId == cosmetic.Id && ps.ServiceId == pc.Value.Id)) { - Cosmetic = cosmetic, - Service = context.Services.First(x => x.Id == pc.Key), - }); - context.SaveChanges(); + context.CosmeticServices.Add(new CosmeticServices + { + Cosmetic = cosmetic, + Service = context.Services.First(x => x.Id == pc.Key), + }); + } + } + context.SaveChanges(); _cosmeticServices = null; } diff --git a/CarCenter/CarCenterDatabaseImplement/Models/CosmeticServices.cs b/BeautySalon/CarCenterDatabaseImplement/Models/CosmeticServices.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/CosmeticServices.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/CosmeticServices.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/LaborCost.cs b/BeautySalon/CarCenterDatabaseImplement/Models/LaborCost.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/LaborCost.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/LaborCost.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Order.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Order.cs similarity index 92% rename from CarCenter/CarCenterDatabaseImplement/Models/Order.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Order.cs index 1002ddb..247b954 100644 --- a/CarCenter/CarCenterDatabaseImplement/Models/Order.cs +++ b/BeautySalon/CarCenterDatabaseImplement/Models/Order.cs @@ -80,11 +80,13 @@ namespace CarCenterDatabaseImplement.Models return; } WorkerId = model.WorkerId; - PaymentDate = model.PaymentDate; - PaymentType = model.PaymentType; + PaymentStatus = model.PaymentStatus; + if(PaymentStatus == PaymentStatus.Оплачено) + PaymentDate = model.PaymentDate; + PaymentType = model.PaymentType; Sum = model.Sum; } - public void UpdatePresales(CarCenterDatabase context, OrderBindingModel model) + public void UpdateProcedures(CarCenterDatabase context, OrderBindingModel model) { var order = context.Orders.First(x => x.Id == Id); foreach (var pc in model.OrderProcedures) diff --git a/CarCenter/CarCenterDatabaseImplement/Models/OrderProcedures.cs b/BeautySalon/CarCenterDatabaseImplement/Models/OrderProcedures.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/OrderProcedures.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/OrderProcedures.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Procedure.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Procedure.cs similarity index 80% rename from CarCenter/CarCenterDatabaseImplement/Models/Procedure.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Procedure.cs index d81dd79..df232a9 100644 --- a/CarCenter/CarCenterDatabaseImplement/Models/Procedure.cs +++ b/BeautySalon/CarCenterDatabaseImplement/Models/Procedure.cs @@ -74,31 +74,37 @@ namespace CarCenterDatabaseImplement.Models return procedure; } - public void UpdateBundlings(CarCenterDatabase context, ProcedureBindingModel model) + public void UpdateRatings(CarCenterDatabase context, ProcedureBindingModel model) { var procedure = context.Procedures.First(x => x.Id == Id); foreach (var rating in model.Ratings) { var rat = context.Ratings.FirstOrDefault(x => x.Id == rating.Value.Id); - if (rat != null) + if (rat != null && !procedure.Ratings.Contains(rat)) { procedure.Ratings.Add(rat); } } } - public void UpdateRequests(CarCenterDatabase context, ProcedureBindingModel model) + public void UpdateServices(CarCenterDatabase context, ProcedureBindingModel model) { - var procedure = context.Procedures.First(x => x.Id == Id); + var procedure = context.Procedures.First(x => x.Id == model.Id); + foreach (var pc in model.ProcedureServices) { - context.ProcedureServices.Add(new ProcedureServices + // Проверяем, существует ли уже запись-связь + if (!context.ProcedureServices.Any(ps => ps.ProcedureId == procedure.Id && ps.ServiceId == pc.Value.Id)) { - Procedure = procedure, - Service = context.Services.First(x => x.Id == pc.Value.Id), - }); - context.SaveChanges(); + context.ProcedureServices.Add(new ProcedureServices + { + Procedure = procedure, + Service = context.Services.First(x => x.Id == pc.Value.Id), + }); + } } + + context.SaveChanges(); // Сохраняем изменения только один раз _procedureServices = null; } public void Update(ProcedureBindingModel? model) diff --git a/CarCenter/CarCenterDatabaseImplement/Models/ProcedureServices.cs b/BeautySalon/CarCenterDatabaseImplement/Models/ProcedureServices.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/ProcedureServices.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/ProcedureServices.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Rating.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Rating.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/Rating.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Rating.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Service.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Service.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/Service.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Service.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Storekeeper.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Storekeeper.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/Storekeeper.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Storekeeper.cs diff --git a/CarCenter/CarCenterDatabaseImplement/Models/Worker.cs b/BeautySalon/CarCenterDatabaseImplement/Models/Worker.cs similarity index 100% rename from CarCenter/CarCenterDatabaseImplement/Models/Worker.cs rename to BeautySalon/CarCenterDatabaseImplement/Models/Worker.cs diff --git a/CarCenter/CarCenterStorekeeperApp/CarCenterStorekeeperApp.csproj b/BeautySalon/CarCenterStorekeeperApp/BeautySalonStorekeeperApp.csproj similarity index 68% rename from CarCenter/CarCenterStorekeeperApp/CarCenterStorekeeperApp.csproj rename to BeautySalon/CarCenterStorekeeperApp/BeautySalonStorekeeperApp.csproj index 14229a3..a34fa63 100644 --- a/CarCenter/CarCenterStorekeeperApp/CarCenterStorekeeperApp.csproj +++ b/BeautySalon/CarCenterStorekeeperApp/BeautySalonStorekeeperApp.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/CarCenter/CarCenterStorekeeperApp/CarCenterStorekeeperApp - Backup.csproj b/BeautySalon/CarCenterStorekeeperApp/CarCenterStorekeeperApp - Backup.csproj similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/CarCenterStorekeeperApp - Backup.csproj rename to BeautySalon/CarCenterStorekeeperApp/CarCenterStorekeeperApp - Backup.csproj diff --git a/CarCenter/CarCenterStorekeeperApp/Controllers/HomeController.cs b/BeautySalon/CarCenterStorekeeperApp/Controllers/HomeController.cs similarity index 98% rename from CarCenter/CarCenterStorekeeperApp/Controllers/HomeController.cs rename to BeautySalon/CarCenterStorekeeperApp/Controllers/HomeController.cs index f7e98d9..17065e1 100644 --- a/CarCenter/CarCenterStorekeeperApp/Controllers/HomeController.cs +++ b/BeautySalon/CarCenterStorekeeperApp/Controllers/HomeController.cs @@ -214,11 +214,11 @@ namespace CarCenterStorekeeperApp.Controllers return View(new CosmeticViewModel()); } [HttpPost] - public IActionResult CreateCosmetic(int id, CosmeticBrand Brand, string CosmeticName, int LaborCostId, int[] serviceIds) + public IActionResult CreateCosmetic(int id, CosmeticBrand CosmeticBrand, string CosmeticName, int LaborCostId, int[] serviceIds) { CosmeticBindingModel model = new CosmeticBindingModel(); model.Id = id; - model.Brand = Brand; + model.Brand = CosmeticBrand; model.CosmeticName = CosmeticName; model.LaborCostID = LaborCostId; model.DateCreate = DateTime.Now; diff --git a/CarCenter/CarCenterStorekeeperApp/Models/ErrorViewModel.cs b/BeautySalon/CarCenterStorekeeperApp/Models/ErrorViewModel.cs similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Models/ErrorViewModel.cs rename to BeautySalon/CarCenterStorekeeperApp/Models/ErrorViewModel.cs diff --git a/CarCenter/CarCenterStorekeeperApp/Program.cs b/BeautySalon/CarCenterStorekeeperApp/Program.cs similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Program.cs rename to BeautySalon/CarCenterStorekeeperApp/Program.cs diff --git a/CarCenter/CarCenterStorekeeperApp/Properties/launchSettings.json b/BeautySalon/CarCenterStorekeeperApp/Properties/launchSettings.json similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Properties/launchSettings.json rename to BeautySalon/CarCenterStorekeeperApp/Properties/launchSettings.json diff --git a/CarCenter/CarCenterStorekeeperApp/StorekeeperData.cs b/BeautySalon/CarCenterStorekeeperApp/StorekeeperData.cs similarity index 82% rename from CarCenter/CarCenterStorekeeperApp/StorekeeperData.cs rename to BeautySalon/CarCenterStorekeeperApp/StorekeeperData.cs index 43f7c15..76e3c9a 100644 --- a/CarCenter/CarCenterStorekeeperApp/StorekeeperData.cs +++ b/BeautySalon/CarCenterStorekeeperApp/StorekeeperData.cs @@ -5,6 +5,9 @@ using CarCenterContracts.StoragesContracts; using CarCenterContracts.SearchModels; using CarCenterBusinessLogic.MailWorker; using CarCenterBusinessLogic.OfficePackage; +using CarCenterDatabaseImplement.Models; +using System.Linq; +using CarCenterDataModels.Models; namespace StorekeeperApp { @@ -120,6 +123,14 @@ namespace StorekeeperApp { return _cosmeticLogic.Delete(new() { Id = carId }); } + public List? GetProcedures() + { + return _procedureLogic.ReadList(null); + } + public List? GetOrders() + { + return _orderLogic.ReadList(null); + } public List GetTimeReport(DateTime? startDate, DateTime? endDate, int UserId) { var services = _serviceLogic.ReadList(new() { DateFrom = startDate, DateTo = endDate, StorekeeperId = UserId }); @@ -140,26 +151,44 @@ namespace StorekeeperApp } return serviceTimeReports; } - public List? GetProcedures() - { - return _procedureLogic.ReadList(null); - } - public List? GetOrders() - { - return _orderLogic.ReadList(null); - } - public List? GetProcedureReports(List services) + public List? GetProcedureReports(List cosmetics) { List reports = new(); - foreach (int i in services) + foreach (int i in cosmetics) { ReportCosmeticViewModel report = new(); - var service = _cosmeticLogic.ReadElement(new() { Id = i }); - report.CosmeticName = service!.CosmeticName; - var procedures = _procedureLogic.ReadList(new() { CosmeticId = i }); - if (procedures != null) - report.Procedures = procedures.Select(w => w.Id.ToString()).ToList(); + var cosmetic = _cosmeticLogic.ReadElement(new() { Id = i }); + report.CosmeticName = cosmetic!.CosmeticName; + var procedures = _procedureLogic.ReadList(null); + + List filteredProcedures = new List(); + + if (cosmetic.CosmeticServices != null && procedures != null) + { + var servicesC = new HashSet(cosmetic.CosmeticServices.Values); + + foreach (var procedure in procedures) + { + if (procedure.ProcedureServices != null) + { + var servicesP = new HashSet(procedure.ProcedureServices.Values); + foreach (IServiceModel serv in servicesP) + { + foreach(IServiceModel s in servicesC) + { + if (s.Id == serv.Id) + { + filteredProcedures.Add(procedure); + break; + } + } + } + } + } + } + + report.Procedures = filteredProcedures.Select(w => w.ProcedureName).ToList(); reports.Add(report); } return reports; @@ -210,5 +239,8 @@ namespace StorekeeperApp byte[] report = stream.GetBuffer(); _mail.MailSendAsync(new() { MailAddress = UserStorekeeper.user!.Email, Subject = "Отчет", FileName = "PdfReport.pdf", Pdf = report }); } + + + } } diff --git a/CarCenter/CarCenterStorekeeperApp/UserStorekeeper.cs b/BeautySalon/CarCenterStorekeeperApp/UserStorekeeper.cs similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/UserStorekeeper.cs rename to BeautySalon/CarCenterStorekeeperApp/UserStorekeeper.cs diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/AddServicesCosmetic.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/AddServicesCosmetic.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/AddServicesCosmetic.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/AddServicesCosmetic.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/CosmeticProcedureChoose.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CosmeticProcedureChoose.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/CosmeticProcedureChoose.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/CosmeticProcedureChoose.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/CosmeticProcedureReport.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CosmeticProceduresReport.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/CosmeticProcedureReport.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/CosmeticProceduresReport.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/CreateCosmetic.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateCosmetic.cshtml similarity index 96% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/CreateCosmetic.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateCosmetic.cshtml index ddc5c1d..737e338 100644 --- a/CarCenter/CarCenterStorekeeperApp/Views/Home/CreateCosmetic.cshtml +++ b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateCosmetic.cshtml @@ -24,10 +24,10 @@
-
Модель:
+
Название:
- - + +
diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/CreateLaborCost.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateLaborCost.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/CreateLaborCost.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateLaborCost.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/CreateService.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateService.cshtml similarity index 87% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/CreateService.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateService.cshtml index a3f7e75..417568f 100644 --- a/CarCenter/CarCenterStorekeeperApp/Views/Home/CreateService.cshtml +++ b/BeautySalon/CarCenterStorekeeperApp/Views/Home/CreateService.cshtml @@ -10,17 +10,24 @@
+
+
Название:
+
+ + +
+
@if (ViewBag.AllProcedures != null && ViewBag.AllProcedures.Count != 0) {
-
Услуги
+
Процедуры
- - + + @@ -76,7 +83,7 @@ } }); if (exists) { - alert('Эта услуга уже добавлена.'); + alert('Эта процедура уже добавлена.'); return; } @@ -104,10 +111,10 @@ updateSum(); } else { - alert('Выберите услугу для добавления'); + alert('Выберите процедуру для добавления'); } }); - $('#bundlinglForm').submit(function (event) { + $('#serviceForm').submit(function (event) { var Price = $('#Price').val(); var isValid = true; diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/Enter.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/Enter.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/Enter.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/Enter.cshtml diff --git a/BeautySalon/CarCenterStorekeeperApp/Views/Home/Index.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/Index.cshtml new file mode 100644 index 0000000..61163ea --- /dev/null +++ b/BeautySalon/CarCenterStorekeeperApp/Views/Home/Index.cshtml @@ -0,0 +1,16 @@ +@{ + ViewData["Title"] = "Home Page"; +} + +
+

Главное меню

+

Добро пожаловать на страницу Кладовщика

+ +
diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/IndexCosmetic.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexCosmetic.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/IndexCosmetic.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexCosmetic.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/IndexLaborCost.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexLaborCost.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/IndexLaborCost.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexLaborCost.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/IndexNonReg.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexNonReg.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/IndexNonReg.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexNonReg.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/IndexService.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexService.cshtml similarity index 93% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/IndexService.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexService.cshtml index db164e8..57fabc0 100644 --- a/CarCenter/CarCenterStorekeeperApp/Views/Home/IndexService.cshtml +++ b/BeautySalon/CarCenterStorekeeperApp/Views/Home/IndexService.cshtml @@ -33,10 +33,10 @@ Цена diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/Privacy.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/Privacy.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/Privacy.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/Privacy.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/Register.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/Register.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/Register.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/Register.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/ReportCosmeticProcedures.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/ReportCosmeticProcedures.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/ReportCosmeticProcedures.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/ReportCosmeticProcedures.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/ReportMenu.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/ReportMenu.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/ReportMenu.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/ReportMenu.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/ServiceTimeChoose.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/ServiceTimeChoose.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/ServiceTimeChoose.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/ServiceTimeChoose.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/ServiceTimeReport.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Home/ServiceTimeReport.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Home/ServiceTimeReport.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Home/ServiceTimeReport.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Shared/Error.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Shared/Error.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Shared/Error.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Shared/Error.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml similarity index 95% rename from CarCenter/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml index eac80e7..cc642b8 100644 --- a/CarCenter/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml +++ b/BeautySalon/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - CosmeticCenterStorekeeperApp + @ViewData["Title"] - BeautySalonStorekeeperApp diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml.css b/BeautySalon/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml.css rename to BeautySalon/CarCenterStorekeeperApp/Views/Shared/_Layout.cshtml.css diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Shared/_ValidationScriptsPartial.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/Shared/_ValidationScriptsPartial.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/_ViewImports.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/_ViewImports.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/_ViewImports.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/_ViewImports.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/Views/_ViewStart.cshtml b/BeautySalon/CarCenterStorekeeperApp/Views/_ViewStart.cshtml similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/Views/_ViewStart.cshtml rename to BeautySalon/CarCenterStorekeeperApp/Views/_ViewStart.cshtml diff --git a/CarCenter/CarCenterStorekeeperApp/appsettings.Development.json b/BeautySalon/CarCenterStorekeeperApp/appsettings.Development.json similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/appsettings.Development.json rename to BeautySalon/CarCenterStorekeeperApp/appsettings.Development.json diff --git a/CarCenter/CarCenterStorekeeperApp/appsettings.json b/BeautySalon/CarCenterStorekeeperApp/appsettings.json similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/appsettings.json rename to BeautySalon/CarCenterStorekeeperApp/appsettings.json diff --git a/CarCenter/CarCenterStorekeeperApp/log4net.config b/BeautySalon/CarCenterStorekeeperApp/log4net.config similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/log4net.config rename to BeautySalon/CarCenterStorekeeperApp/log4net.config diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/Images/cat.png b/BeautySalon/CarCenterStorekeeperApp/wwwroot/Images/cat.png similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/Images/cat.png rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/Images/cat.png diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/css/site.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/css/site.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/css/site.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/css/site.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/favicon.ico b/BeautySalon/CarCenterStorekeeperApp/wwwroot/favicon.ico similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/favicon.ico rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/favicon.ico diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/js/site.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/js/site.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/js/site.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/js/site.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/LICENSE b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/LICENSE rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/LICENSE diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/LICENSE.md b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/LICENSE.md rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/LICENSE.txt b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/LICENSE.txt rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/LICENSE.txt diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.js b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.js rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.map b/BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from CarCenter/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.map rename to BeautySalon/CarCenterStorekeeperApp/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/BeautySalon/CarCenterWorkerApp/BeautySalonWorkerApp.csproj b/BeautySalon/CarCenterWorkerApp/BeautySalonWorkerApp.csproj new file mode 100644 index 0000000..2d3469d --- /dev/null +++ b/BeautySalon/CarCenterWorkerApp/BeautySalonWorkerApp.csproj @@ -0,0 +1,16 @@ + + + + net7.0 + enable + enable + + + + + + + + + + diff --git a/CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs b/BeautySalon/CarCenterWorkerApp/Controllers/HomeController.cs similarity index 53% rename from CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs rename to BeautySalon/CarCenterWorkerApp/Controllers/HomeController.cs index 75b1dcd..40c6e11 100644 --- a/CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs +++ b/BeautySalon/CarCenterWorkerApp/Controllers/HomeController.cs @@ -5,6 +5,7 @@ using CarCenterDataModels.Enums; using CarCenterWorkerApp.Models; using Microsoft.AspNetCore.Mvc; using System.Diagnostics; +using System.Globalization; using WorkerApp; namespace CarCenterWorkerApp.Controllers @@ -238,10 +239,9 @@ namespace CarCenterWorkerApp.Controllers model.OrderProcedures.Add(i, procedure); } model.WorkerId = UserWorker.user!.Id; - if(double.TryParse(Sum, out double val)) - { - model.Sum = val; - } + model.Sum = double.Parse(Sum, CultureInfo.InvariantCulture); + if (model.PaymentStatus == PaymentStatus.Оплачено) + model.PaymentDate = DateTime.Now; bool changed = false; if (model.OrderProcedures.Count > 0) { @@ -262,5 +262,174 @@ namespace CarCenterWorkerApp.Controllers return View(model); } } + + + [HttpGet] + public IActionResult Privacy() + { + if (IsLoggedIn) + return View(UserWorker.user); + return RedirectToAction("IndexNonReg"); + } + [HttpPost] + public IActionResult Privacy(int id, string surname, string email, string password, string name) + { + if (!IsLoggedIn) + return RedirectToAction("IndexNonReg"); + WorkerBindingModel user = new() + { + Id = id, + Email = email, + Name = name, + Surname = surname, + }; + if (_data.UpdateUser(user)) + { + UserWorker.user = new WorkerViewModel + { + Id = id, + Email = email, + Name = name, + Surname = surname, + }; + } + return View(user); + } + /* [HttpGet] + public IActionResult OrderTimeChoose() + { + if (!IsLoggedIn) + return RedirectToAction("IndexNonReg"); + return View(); + } + [HttpPost] + public IActionResult SendReport(DateTime startDate, DateTime endDate) + { + + return Ok(); + } + [HttpGet] + public IActionResult OrderTimeReport() + { + var startDateStr = HttpContext.Session.GetString("StartDate"); + var endDateStr = HttpContext.Session.GetString("EndDate"); + + if (string.IsNullOrEmpty(startDateStr) || string.IsNullOrEmpty(endDateStr)) + { + return RedirectToAction("OrderTimeChoose"); + } + + var startDate = DateTime.Parse(startDateStr); + var endDate = DateTime.Parse(endDateStr).AddDays(1); + + var values = _data.GetTimeReport(startDate, endDate, UserId); + + ViewBag.StartDate = startDate; + ViewBag.EndDate = endDate; + + return View(values); + } + [HttpPost] + public IActionResult TimeReportWeb(DateTime startDate, DateTime endDate) + { + if (!IsLoggedIn) + return RedirectToAction("IndexNonReg"); + + HttpContext.Session.SetString("StartDate", startDate.ToString("yyyy-MM-dd")); + HttpContext.Session.SetString("EndDate", endDate.ToString("yyyy-MM-dd")); + + return RedirectToAction("OrderTimeReport"); + } + [HttpPost] + public void OrderTimeMail() + { + var startDateStr = HttpContext.Session.GetString("StartDate"); + var endDateStr = HttpContext.Session.GetString("EndDate"); + var startDate = DateTime.Parse(startDateStr); + var endDate = DateTime.Parse(endDateStr).AddDays(1); + using (MemoryStream memoryStream = new MemoryStream()) + { + _data.SendMailReport(startDate, endDate, UserId, memoryStream); + } + Response.Redirect("OrderTimeReport"); + } + [HttpGet] + public IActionResult ProcedureCosmeticChoose() + { + if (!IsLoggedIn) + return RedirectToAction("IndexNonReg"); + var details = _data.GetProcedure(UserId); + return View(details); + } + [HttpPost] + public IActionResult ProcedureCosmeticChoose(List selectedItems, string reportType) + { + string value = string.Join("/", selectedItems); + HttpContext.Session.SetString("Procedures", value); + if (reportType.Equals("default")) + return RedirectToAction("ProcedureCosmeticsReport"); + else if (reportType.Equals("excel")) + return RedirectToAction("ExcelGenerate"); + else + return RedirectToAction("WordGenerate"); + } + public async Task ExcelGenerate() + { + var value = HttpContext.Session.GetString("Procedures"); + if (value != null) + { + List rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList(); + using (MemoryStream memoryStream = new MemoryStream()) + { + _data.SaveReportExcel(rawReports, memoryStream); + memoryStream.Seek(0, SeekOrigin.Begin); + var outputStream = new MemoryStream(); + await memoryStream.CopyToAsync(outputStream); + outputStream.Seek(0, SeekOrigin.Begin); + return File(outputStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "ReportExcel.xlsx"); + } + } + return RedirectToAction("ProcedureCosmeticChoose"); + } + public async Task WordGenerate() + { + var value = HttpContext.Session.GetString("Procedures"); + if (value != null) + { + List rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList(); + using (MemoryStream memoryStream = new MemoryStream()) + { + _data.SaveReportWord(rawReports, memoryStream); + memoryStream.Seek(0, SeekOrigin.Begin); + var outputStream = new MemoryStream(); + await memoryStream.CopyToAsync(outputStream); + outputStream.Seek(0, SeekOrigin.Begin); + return File(outputStream, "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "ReportWord.docx"); + } + } + return RedirectToAction("ProcedureCosmeticChoose"); + } + [HttpGet] + public IActionResult ProcedureCosmeticReport() + { + var value = HttpContext.Session.GetString("Procedures"); + if (value != null) + { + List rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList(); + var reports = _data.GetCosmeticReports(rawReports); + return View(reports); + } + return View(new List()); + } + public IActionResult ReportMenu() + { + return View(); + } + + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() + { + return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); + }*/ } } \ No newline at end of file diff --git a/CarCenter/CarCenterWorkerApp/Models/ErrorViewModel.cs b/BeautySalon/CarCenterWorkerApp/Models/ErrorViewModel.cs similarity index 100% rename from CarCenter/CarCenterWorkerApp/Models/ErrorViewModel.cs rename to BeautySalon/CarCenterWorkerApp/Models/ErrorViewModel.cs diff --git a/CarCenter/CarCenterWorkerApp/Program.cs b/BeautySalon/CarCenterWorkerApp/Program.cs similarity index 100% rename from CarCenter/CarCenterWorkerApp/Program.cs rename to BeautySalon/CarCenterWorkerApp/Program.cs diff --git a/CarCenter/CarCenterWorkerApp/Properties/launchSettings.json b/BeautySalon/CarCenterWorkerApp/Properties/launchSettings.json similarity index 100% rename from CarCenter/CarCenterWorkerApp/Properties/launchSettings.json rename to BeautySalon/CarCenterWorkerApp/Properties/launchSettings.json diff --git a/CarCenter/CarCenterWorkerApp/UserWorker.cs b/BeautySalon/CarCenterWorkerApp/UserWorker.cs similarity index 100% rename from CarCenter/CarCenterWorkerApp/UserWorker.cs rename to BeautySalon/CarCenterWorkerApp/UserWorker.cs diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml similarity index 84% rename from CarCenter/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml index fdb2bed..dbf1642 100644 --- a/CarCenter/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml +++ b/BeautySalon/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml @@ -174,17 +174,17 @@ var procedurePrice = selectedProcedure.data('price'); var newRow = ` - - - - - - - - `; + + + + + + + + `; $('#proceduresTable tbody').append(newRow); $('.deleteProcedure').off('click').on('click', function () { @@ -220,17 +220,17 @@ var cosmeticPrice = selectedCosmetic.data('price'); var newRow = ` - - - - - - - - `; + + + + + + + + `; $('#cosmeticsTable tbody').append(newRow); $('.deleteCosmetic').off('click').on('click', function () { diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/CreateProcedure.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/CreateProcedure.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/CreateProcedure.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/CreateProcedure.cshtml index 77c0ac5..a57a999 100644 --- a/CarCenter/CarCenterWorkerApp/Views/Home/CreateProcedure.cshtml +++ b/BeautySalon/CarCenterWorkerApp/Views/Home/CreateProcedure.cshtml @@ -33,6 +33,13 @@ +
+
Цена процедуры:
+
+ + +
+
Оценки
@@ -106,13 +113,6 @@
-
-
Цена процедуры:
-
- - -
-
Сумма:
diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/CreateRating.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/CreateRating.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/CreateRating.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/CreateRating.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/Enter.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/Enter.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/Enter.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/Enter.cshtml diff --git a/BeautySalon/CarCenterWorkerApp/Views/Home/Index.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/Index.cshtml new file mode 100644 index 0000000..86354e7 --- /dev/null +++ b/BeautySalon/CarCenterWorkerApp/Views/Home/Index.cshtml @@ -0,0 +1,20 @@ +@{ + ViewData["Title"] = "Home Page"; +} + +
+

Главное меню

+

Добро пожаловать на страницу Работника

+ + + +
diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/IndexNonReg.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/IndexNonReg.cshtml similarity index 69% rename from CarCenter/CarCenterWorkerApp/Views/Home/IndexNonReg.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/IndexNonReg.cshtml index 3d737d5..158c6d5 100644 --- a/CarCenter/CarCenterWorkerApp/Views/Home/IndexNonReg.cshtml +++ b/BeautySalon/CarCenterWorkerApp/Views/Home/IndexNonReg.cshtml @@ -3,6 +3,8 @@ }
+

Добро пожаловать на сайт Работника

+

Войдите или зарегистрируйтесь

Вход Регистрация diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/IndexOrder.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/IndexOrder.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/IndexOrder.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/IndexOrder.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/IndexProcedure.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/IndexProcedure.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/IndexProcedure.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/IndexProcedure.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/IndexRating.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/IndexRating.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/IndexRating.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/IndexRating.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/OrderTimeChoose.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/OrderTimeChoose.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/OrderTimeChoose.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/OrderTimeChoose.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/OrderTimeReport.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/OrderTimeReport.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/OrderTimeReport.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/OrderTimeReport.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/Privacy.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/Privacy.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/Privacy.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/Privacy.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/ProcedureCosmeticChoose.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/ProcedureCosmeticChoose.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/ProcedureCosmeticChoose.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/ProcedureCosmeticChoose.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/Register.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/Register.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/Register.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/Register.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/ReportCosmeticsProcedure.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/ReportCosmeticsProcedure.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/ReportCosmeticsProcedure.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/ReportCosmeticsProcedure.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/ReportMenu.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/ReportMenu.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/ReportMenu.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/ReportMenu.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/ReportOrders.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Home/ReportOrders.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Home/ReportOrders.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Home/ReportOrders.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Shared/Error.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Shared/Error.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Shared/Error.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Shared/Error.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/Shared/_Layout.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Shared/_Layout.cshtml similarity index 96% rename from CarCenter/CarCenterWorkerApp/Views/Shared/_Layout.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Shared/_Layout.cshtml index 026d6ee..ee7d1b8 100644 --- a/CarCenter/CarCenterWorkerApp/Views/Shared/_Layout.cshtml +++ b/BeautySalon/CarCenterWorkerApp/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - CarCenterWorkerApp + @ViewData["Title"] - BeautySalonWorkerApp diff --git a/CarCenter/CarCenterWorkerApp/Views/Shared/_Layout.cshtml.css b/BeautySalon/CarCenterWorkerApp/Views/Shared/_Layout.cshtml.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Shared/_Layout.cshtml.css rename to BeautySalon/CarCenterWorkerApp/Views/Shared/_Layout.cshtml.css diff --git a/CarCenter/CarCenterWorkerApp/Views/Shared/_ValidationScriptsPartial.cshtml b/BeautySalon/CarCenterWorkerApp/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/Shared/_ValidationScriptsPartial.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/_ViewImports.cshtml b/BeautySalon/CarCenterWorkerApp/Views/_ViewImports.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/_ViewImports.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/_ViewImports.cshtml diff --git a/CarCenter/CarCenterWorkerApp/Views/_ViewStart.cshtml b/BeautySalon/CarCenterWorkerApp/Views/_ViewStart.cshtml similarity index 100% rename from CarCenter/CarCenterWorkerApp/Views/_ViewStart.cshtml rename to BeautySalon/CarCenterWorkerApp/Views/_ViewStart.cshtml diff --git a/BeautySalon/CarCenterWorkerApp/WorkerData.cs b/BeautySalon/CarCenterWorkerApp/WorkerData.cs new file mode 100644 index 0000000..f7d8eeb --- /dev/null +++ b/BeautySalon/CarCenterWorkerApp/WorkerData.cs @@ -0,0 +1,204 @@ +using CarCenterContracts.BusinessLogicsContracts; +using CarCenterContracts.ViewModels; +using CarCenterContracts.BindingModels; +using CarCenterContracts.StoragesContracts; +using CarCenterContracts.SearchModels; +using CarCenterBusinessLogic.BusinessLogics; +using DocumentFormat.OpenXml.ExtendedProperties; +using DocumentFormat.OpenXml.Spreadsheet; + +namespace WorkerApp +{ + public class WorkerData + { + private readonly ILogger _logger; + private readonly IWorkerLogic _storekeeperLogic; + private readonly IProcedureLogic _procedureLogic; + private readonly IRatingLogic _ratingLogic; + private readonly IOrderLogic _orderLogic; + private readonly ICosmeticLogic _cosmeticLogic; + private readonly IServiceLogic _serviceLogic; + + public WorkerData(ILogger logger, IWorkerLogic storekeeperLogic, IProcedureLogic procedureLogic, + IRatingLogic ratingLogic, IOrderLogic orderLogic, IServiceLogic serviceLogic, ICosmeticLogic cosmeticLogic) + { + _logger = logger; + _storekeeperLogic = storekeeperLogic; + _procedureLogic = procedureLogic; + _ratingLogic = ratingLogic; + _orderLogic = orderLogic; + _serviceLogic = serviceLogic; + _cosmeticLogic = cosmeticLogic; + } + + public WorkerViewModel? Login(string email, string password) + { + return _storekeeperLogic.ReadElement(new() + { + Email = email, + Password = password + }); + } + public bool Register(WorkerBindingModel model) + { + return _storekeeperLogic.Create(model); + } + public bool UpdateUser(WorkerBindingModel model) + { + return _storekeeperLogic.Update(model); + } + + public List? GetProcedures(int userId) + { + return _procedureLogic.ReadList(new ProcedureSearchModel() { WorkerId = userId }); + } + public bool DeleteProcedure(int procedureId) + { + return _procedureLogic.Delete(new() { Id = procedureId }); + } + public bool CreateProcedure(ProcedureBindingModel model) + { + return _procedureLogic.Create(model); + } + public bool UpdateProcedure(ProcedureBindingModel model) + { + return _procedureLogic.Update(model); + } + public ProcedureViewModel? GetProcedure(int id) + { + return _procedureLogic.ReadElement(new() { Id = id }); + } + public List? GetRatings(int userId) + { + return _ratingLogic.ReadList(new RatingSearchModel() { WorkerId = userId }); + } + public bool DeleteRating(int procedureId) + { + return _ratingLogic.Delete(new() { Id = procedureId }); + } + public bool CreateRating(RatingBindingModel model) + { + return _ratingLogic.Create(model); + } + public bool UpdateRating(RatingBindingModel model) + { + return _ratingLogic.Update(model); + } + public RatingViewModel? GetRating(int id) + { + return _ratingLogic.ReadElement(new() { Id = id }); + } + public List? GetOrders(int userId) + { + return _orderLogic.ReadList(new() { WorkerId = userId }); + } + public OrderViewModel? GetOrder(int id) + { + return _orderLogic.ReadElement(new() { Id = id }); + } + public bool CreateOrder(OrderBindingModel model) + { + return _orderLogic.Create(model); + } + public bool UpdateOrder(OrderBindingModel model) + { + return _orderLogic.Update(model); + } + public bool DeleteOrder(int orderId) + { + return _orderLogic.Delete(new() { Id = orderId }); + } + public List? GetServices() + { + return _serviceLogic.ReadList(null); + } + + public List? GetCosmetics() + { + return _cosmeticLogic.ReadList(null); + } + /* + public List GetTimeReport(DateTime? startDate, DateTime? endDate, int UserId) + { + var orders = _orderLogic.ReadList(new() { DateFrom = startDate, DateTo = endDate, WorkerId = UserId }); + if (orders == null) + return new(); + List orderTimeReports = new List(); + foreach (var order in orders) + { + var report = new ReportOrderViewModel(); + report.Id = order.Id; + var ratings = _ratingLogic.ReadList(new() { Id = order.Id, WorkerId = UserId }); + if (ratings != null) + report.Ratings = ratings.Select(p => p.Id.ToString()).ToList(); + var orders = _orderLogic.ReadList(new() { ServiceId = service.Id, WorkerId = UserId }); + if (orders != null) + report.Orders = orders.Select(p => p.Id.ToString()).ToList(); + serviceTimeReports.Add(report); + } + return serviceTimeReports; + } + + public List? GetProcedureReports(List services) + { + List reports = new(); + foreach (int i in services) + { + ReportCosmeticViewModel report = new(); + var service = _cosmeticLogic.ReadElement(new() { Id = i }); + report.CosmeticName = service!.CosmeticName; + var procedures = _procedureLogic.ReadList(new() { CosmeticId = i }); + if (procedures != null) + report.Procedures = procedures.Select(w => w.Id.ToString()).ToList(); + reports.Add(report); + } + return reports; + } + + public void SaveReportExcel(List services, MemoryStream stream) + { + var reports = GetProcedureReports(services); + if (reports == null) + return; + int maxsize = 0; + foreach (var report in reports) { maxsize = Math.Max(maxsize, report.Procedures.Count); } + _excel.CreateReport(new() + { + cosmeticProceduresReport = reports, + Title = "Отчет КосметикаПроцедуры", + memoryStream = stream, + maxleng = maxsize + }); + } + + public void SaveReportWord(List services, MemoryStream stream) + { + var reports = GetProcedureReports(services); + if (reports == null) + return; + _word.CreateDoc(new() + { + memoryStream = stream, + Title = "Отчет. КосметикаПроцедуры", + cosmeticProceduresReport = reports + }); + } + + public void SendMailReport(DateTime? startDate, DateTime? endDate, int UserId, MemoryStream stream) + { + var reports = GetTimeReport(startDate, endDate, UserId); + if (reports == null) + return; + _pdf.CreateDoc(new() + { + DateFrom = startDate!.Value, + DateTo = endDate!.Value, + FileName = stream, + reportService = reports, + Title = "Отчет" + }); + byte[] report = stream.GetBuffer(); + _mail.MailSendAsync(new() { MailAddress = UserStorekeeper.user!.Email, Subject = "Отчет", FileName = "PdfReport.pdf", Pdf = report }); + }*/ + } +} diff --git a/CarCenter/CarCenterWorkerApp/appsettings.Development.json b/BeautySalon/CarCenterWorkerApp/appsettings.Development.json similarity index 100% rename from CarCenter/CarCenterWorkerApp/appsettings.Development.json rename to BeautySalon/CarCenterWorkerApp/appsettings.Development.json diff --git a/CarCenter/CarCenterWorkerApp/appsettings.json b/BeautySalon/CarCenterWorkerApp/appsettings.json similarity index 100% rename from CarCenter/CarCenterWorkerApp/appsettings.json rename to BeautySalon/CarCenterWorkerApp/appsettings.json diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/Images/cat.png b/BeautySalon/CarCenterWorkerApp/wwwroot/Images/cat.png similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/Images/cat.png rename to BeautySalon/CarCenterWorkerApp/wwwroot/Images/cat.png diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/css/site.css b/BeautySalon/CarCenterWorkerApp/wwwroot/css/site.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/css/site.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/css/site.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/favicon.ico b/BeautySalon/CarCenterWorkerApp/wwwroot/favicon.ico similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/favicon.ico rename to BeautySalon/CarCenterWorkerApp/wwwroot/favicon.ico diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/js/site.js b/BeautySalon/CarCenterWorkerApp/wwwroot/js/site.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/js/site.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/js/site.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/LICENSE b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/LICENSE similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/LICENSE rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/LICENSE diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/LICENSE.md b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/LICENSE.md rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/LICENSE.txt b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/LICENSE.txt similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/LICENSE.txt rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/LICENSE.txt diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.js b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.js similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.js rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.js diff --git a/CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.map b/BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.map similarity index 100% rename from CarCenter/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.map rename to BeautySalon/CarCenterWorkerApp/wwwroot/lib/jquery/dist/jquery.min.map diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/Index.cshtml b/CarCenter/CarCenterStorekeeperApp/Views/Home/Index.cshtml deleted file mode 100644 index 4b97317..0000000 --- a/CarCenter/CarCenterStorekeeperApp/Views/Home/Index.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - -
-

Главное меню

-

Добро пожаловать на страницу Кладовщика

- -
diff --git a/CarCenter/CarCenterStorekeeperApp/Views/Home/ReportService.cshtml b/CarCenter/CarCenterStorekeeperApp/Views/Home/ReportService.cshtml deleted file mode 100644 index 14494a2..0000000 --- a/CarCenter/CarCenterStorekeeperApp/Views/Home/ReportService.cshtml +++ /dev/null @@ -1,58 +0,0 @@ -@using CarCenterContracts.ViewModels -@model List -@{ - ViewData["Title"] = "Report"; -} -
-

Отчёт по услугам

-
-
- - @{ - if (Model == null) - { -

Войдите!

- return; - } -
-
Формат получения:
-
- - - - -
-
-
-
Начальная дата:
-
- -
-
-
-
Конечная дата:
-
- -
-
-
-
Выберите услуги:
-
- -
-
-
-
-
-
- -
-
- } - -
\ No newline at end of file diff --git a/CarCenter/CarCenterWorkerApp/CarCenterWorkerApp.csproj b/CarCenter/CarCenterWorkerApp/CarCenterWorkerApp.csproj deleted file mode 100644 index 8d36ff6..0000000 --- a/CarCenter/CarCenterWorkerApp/CarCenterWorkerApp.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net7.0 - enable - enable - - - - - - - - - - diff --git a/CarCenter/CarCenterWorkerApp/Views/Home/Index.cshtml b/CarCenter/CarCenterWorkerApp/Views/Home/Index.cshtml deleted file mode 100644 index 017ef69..0000000 --- a/CarCenter/CarCenterWorkerApp/Views/Home/Index.cshtml +++ /dev/null @@ -1,17 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - -
-

Главное меню

-

Добро пожаловать на страницу Работника

- -
diff --git a/CarCenter/CarCenterWorkerApp/WorkerData.cs b/CarCenter/CarCenterWorkerApp/WorkerData.cs deleted file mode 100644 index 4ca4163..0000000 --- a/CarCenter/CarCenterWorkerApp/WorkerData.cs +++ /dev/null @@ -1,119 +0,0 @@ -using CarCenterContracts.BusinessLogicsContracts; -using CarCenterContracts.ViewModels; -using CarCenterContracts.BindingModels; -using CarCenterContracts.StoragesContracts; -using CarCenterContracts.SearchModels; -using CarCenterBusinessLogic.BusinessLogics; - -namespace WorkerApp -{ - public class WorkerData - { - private readonly ILogger _logger; - private readonly IWorkerLogic _storekeeperLogic; - private readonly IProcedureLogic _procedureLogic; - private readonly IRatingLogic _ratingLogic; - private readonly IOrderLogic _orderLogic; - private readonly ICosmeticLogic _cosmeticLogic; - private readonly IServiceLogic _serviceLogic; - - public WorkerData(ILogger logger, IWorkerLogic storekeeperLogic, IProcedureLogic procedureLogic, - IRatingLogic ratingLogic, IOrderLogic orderLogic, IServiceLogic serviceLogic, ICosmeticLogic cosmeticLogic) - { - _logger = logger; - _storekeeperLogic = storekeeperLogic; - _procedureLogic = procedureLogic; - _ratingLogic = ratingLogic; - _orderLogic = orderLogic; - _serviceLogic = serviceLogic; - _cosmeticLogic = cosmeticLogic; - } - - public WorkerViewModel? Login(string email, string password) - { - return _storekeeperLogic.ReadElement(new() - { - Email = email, - Password = password - }); - } - public bool Register(WorkerBindingModel model) - { - return _storekeeperLogic.Create(model); - } - public bool UpdateUser(WorkerBindingModel model) - { - return _storekeeperLogic.Update(model); - } - - public List? GetProcedures(int userId) - { - return _procedureLogic.ReadList(new ProcedureSearchModel() { WorkerId = userId }); - } - public bool DeleteProcedure(int procedureId) - { - return _procedureLogic.Delete(new() { Id = procedureId }); - } - public bool CreateProcedure(ProcedureBindingModel model) - { - return _procedureLogic.Create(model); - } - public bool UpdateProcedure(ProcedureBindingModel model) - { - return _procedureLogic.Update(model); - } - public ProcedureViewModel? GetProcedure(int id) - { - return _procedureLogic.ReadElement(new() { Id = id }); - } - public List? GetRatings(int userId) - { - return _ratingLogic.ReadList(new RatingSearchModel() { WorkerId = userId }); - } - public bool DeleteRating(int procedureId) - { - return _ratingLogic.Delete(new() { Id = procedureId }); - } - public bool CreateRating(RatingBindingModel model) - { - return _ratingLogic.Create(model); - } - public bool UpdateRating(RatingBindingModel model) - { - return _ratingLogic.Update(model); - } - public RatingViewModel? GetRating(int id) - { - return _ratingLogic.ReadElement(new() { Id = id }); - } - public List? GetOrders(int userId) - { - return _orderLogic.ReadList(new() { WorkerId = userId }); - } - public OrderViewModel? GetOrder(int id) - { - return _orderLogic.ReadElement(new() { Id = id }); - } - public bool CreateOrder(OrderBindingModel model) - { - return _orderLogic.Create(model); - } - public bool UpdateOrder(OrderBindingModel model) - { - return _orderLogic.Update(model); - } - public bool DeleteOrder(int orderId) - { - return _orderLogic.Delete(new() { Id = orderId }); - } - public List? GetServices() - { - return _serviceLogic.ReadList(null); - } - - public List? GetCosmetics() - { - return _cosmeticLogic.ReadList(null); - } - } -}
ID услуги ID процедуры Удалить
- Изменить комплектацию + Изменить услугу - Удалить комплектацию + Удалить услугу
- - ${procedureId} - ${procedurePrice}
+ + ${procedureId} + ${procedurePrice}
- - ${cosmeticId} - ${cosmeticPrice}
+ + ${cosmeticId} + ${cosmeticPrice}