diff --git a/LawCompany/LawCompany.sln b/LawCompany/LawCompany.sln index ce170c6..efbc327 100644 --- a/LawCompany/LawCompany.sln +++ b/LawCompany/LawCompany.sln @@ -3,24 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34723.18 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyDataModels", "LawCompany\LawCompanyDataModels.csproj", "{E38D3745-25B2-45EC-B47E-14C6100C9413}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyContracts", "LawCompanyContracts\LawCompanyContracts.csproj", "{DD8E5EB4-CA20-4C49-9DBF-F9778202331B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyBusinessLogic", "LawCompanyBusinessLogic\LawCompanyBusinessLogic.csproj", "{14D20CC6-D50F-4674-AC2A-4F80C85EDB4D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawCompanyDatabaseImplement", "LawCompanyDatabaseImplement\LawCompanyDatabaseImplement.csproj", "{9A4CBD1F-020F-4036-A71D-AB6BF3489EE0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LawCompanyDataModels", "LawCompanyDataModels\LawCompanyDataModels.csproj", "{152E41DA-5E16-41FE-BA0A-20488C16AA34}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E38D3745-25B2-45EC-B47E-14C6100C9413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E38D3745-25B2-45EC-B47E-14C6100C9413}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E38D3745-25B2-45EC-B47E-14C6100C9413}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E38D3745-25B2-45EC-B47E-14C6100C9413}.Release|Any CPU.Build.0 = Release|Any CPU {DD8E5EB4-CA20-4C49-9DBF-F9778202331B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD8E5EB4-CA20-4C49-9DBF-F9778202331B}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD8E5EB4-CA20-4C49-9DBF-F9778202331B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -33,6 +29,10 @@ Global {9A4CBD1F-020F-4036-A71D-AB6BF3489EE0}.Debug|Any CPU.Build.0 = Debug|Any CPU {9A4CBD1F-020F-4036-A71D-AB6BF3489EE0}.Release|Any CPU.ActiveCfg = Release|Any CPU {9A4CBD1F-020F-4036-A71D-AB6BF3489EE0}.Release|Any CPU.Build.0 = Release|Any CPU + {152E41DA-5E16-41FE-BA0A-20488C16AA34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {152E41DA-5E16-41FE-BA0A-20488C16AA34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {152E41DA-5E16-41FE-BA0A-20488C16AA34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {152E41DA-5E16-41FE-BA0A-20488C16AA34}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LawCompany/LawCompanyBusinessLogic/LawCompanyBusinessLogic.csproj b/LawCompany/LawCompanyBusinessLogic/LawCompanyBusinessLogic.csproj index 6aa3279..fb20491 100644 --- a/LawCompany/LawCompanyBusinessLogic/LawCompanyBusinessLogic.csproj +++ b/LawCompany/LawCompanyBusinessLogic/LawCompanyBusinessLogic.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/LawCompany/LawCompanyContracts/LawCompanyContracts.csproj b/LawCompany/LawCompanyContracts/LawCompanyContracts.csproj index d3920aa..97797bd 100644 --- a/LawCompany/LawCompanyContracts/LawCompanyContracts.csproj +++ b/LawCompany/LawCompanyContracts/LawCompanyContracts.csproj @@ -7,7 +7,7 @@ - + diff --git a/LawCompany/LawCompanyDataModels/Enums/CaseStatus.cs b/LawCompany/LawCompanyDataModels/Enums/CaseStatus.cs new file mode 100644 index 0000000..65e52d4 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Enums/CaseStatus.cs @@ -0,0 +1,11 @@ +namespace LawCompanyDataModels.Enums +{ + public enum CaseStatus + { + Неизвестен = -1, + Принято = 0, + АнализДелаИПодготовкаДокументов = 1, + СлушанияДела = 2, + ЗакрытиеДела = 3 + } +} diff --git a/LawCompany/LawCompanyDataModels/IId.cs b/LawCompany/LawCompanyDataModels/IId.cs new file mode 100644 index 0000000..0db43c3 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/IId.cs @@ -0,0 +1,7 @@ +namespace LawCompanyDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/LawCompanyDataModels.csproj b/LawCompany/LawCompanyDataModels/LawCompanyDataModels.csproj new file mode 100644 index 0000000..7830c43 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/LawCompanyDataModels.csproj @@ -0,0 +1,16 @@ + + + + net6.0 + enable + enable + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/LawCompany/LawCompanyDataModels/Models/ICaseModel.cs b/LawCompany/LawCompanyDataModels/Models/ICaseModel.cs new file mode 100644 index 0000000..ca3240f --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/ICaseModel.cs @@ -0,0 +1,15 @@ +using LawCompanyDataModels.Enums; + +namespace LawCompanyDataModels.Models +{ + public interface ICaseModel : IId + { + Dictionary CaseClients { get; } + string Name { get; } + CaseStatus Status { get; } + string CaseType { get; } + DateTime DateCreate { get; } + DateTime? DateImplement { get; } + public int ExecutorId { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/IClientModel.cs b/LawCompany/LawCompanyDataModels/Models/IClientModel.cs new file mode 100644 index 0000000..08d1af9 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/IClientModel.cs @@ -0,0 +1,10 @@ +namespace LawCompanyDataModels.Models +{ + public interface IClientModel : IId + { + string FIO { get; } + string Phone { get; } + string Email { get; } + public int ExecutorId { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/IConsultationModel.cs b/LawCompany/LawCompanyDataModels/Models/IConsultationModel.cs new file mode 100644 index 0000000..318c80b --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/IConsultationModel.cs @@ -0,0 +1,11 @@ +namespace LawCompanyDataModels.Models +{ + public interface IConsultationModel : IId + { + Dictionary ConsultationLawyers { get; } + double Cost { get; } + DateTime ConsultationDate { get; } + public int CaseId { get; } + public int GuarantorId { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/IExecutorModel.cs b/LawCompany/LawCompanyDataModels/Models/IExecutorModel.cs new file mode 100644 index 0000000..e4414e5 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/IExecutorModel.cs @@ -0,0 +1,9 @@ +namespace LawCompanyDataModels.Models +{ + public interface IExecutorModel : IId + { + string FIO { get; } + string Email { get; } + string Password { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/IGuarantorModel.cs b/LawCompany/LawCompanyDataModels/Models/IGuarantorModel.cs new file mode 100644 index 0000000..e0b78f4 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/IGuarantorModel.cs @@ -0,0 +1,9 @@ +namespace LawCompanyDataModels.Models +{ + public interface IGuarantorModel : IId + { + string FIO { get; } + string Email { get; } + string Password { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/IHearingModel.cs b/LawCompany/LawCompanyDataModels/Models/IHearingModel.cs new file mode 100644 index 0000000..d253f9f --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/IHearingModel.cs @@ -0,0 +1,10 @@ +namespace LawCompanyDataModels.Models +{ + public interface IHearingModel : IId + { + Dictionary HearingLawyers { get; } + DateTime HearingDate { get; } + string Judge { get; } + public int GuarantorId { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/ILawyerModel.cs b/LawCompany/LawCompanyDataModels/Models/ILawyerModel.cs new file mode 100644 index 0000000..00ce840 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/ILawyerModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawCompanyDataModels.Models +{ + public interface ILawyerModel : IId + { + string FIO { get; } + string Phone { get; } + string Email { get; } + public int GuarantorId { get; } + } +} diff --git a/LawCompany/LawCompanyDataModels/Models/IVisitModel.cs b/LawCompany/LawCompanyDataModels/Models/IVisitModel.cs new file mode 100644 index 0000000..4a6e9c9 --- /dev/null +++ b/LawCompany/LawCompanyDataModels/Models/IVisitModel.cs @@ -0,0 +1,10 @@ +namespace LawCompanyDataModels.Models +{ + public interface IVisitModel : IId + { + Dictionary VisitClients { get; } + DateTime VisitDate { get; } + int HearingId { get; } + public int ExecutorId { get; } + } +} diff --git a/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabase.cs b/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabase.cs index 3c5f7a9..a9fd10e 100644 --- a/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabase.cs +++ b/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabase.cs @@ -15,7 +15,7 @@ namespace LawCompanyDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - // optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-6GNIALH9\SQLEXPRESS;Initial Catalog=LawCompanyDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-6GNIALH9\SQLEXPRESS;Initial Catalog=LawCompanyDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabaseImplement.csproj b/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabaseImplement.csproj index 2778cd2..689e8a4 100644 --- a/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabaseImplement.csproj +++ b/LawCompany/LawCompanyDatabaseImplement/LawCompanyDatabaseImplement.csproj @@ -13,7 +13,7 @@ - +