Решил конфликты + исправил

This commit is contained in:
maxnes3 2023-03-26 19:33:40 +04:00
commit 28ebd2f868
17 changed files with 283 additions and 3 deletions

View File

@ -1,4 +1,5 @@
using System; using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -6,7 +7,22 @@ using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels namespace CaseAccountingContracts.BindingModels
{ {
public class CaseBindingModel public class CaseBindingModel : ICaseModel
{ {
public int Id { get; set; }
public string Name { get; set; } = string.Empty;
public string Applicant { get; set; } = string.Empty;
public string Defendant { get; set; } = string.Empty;
public string Annotation { get; set; } = string.Empty;
public DateTime Date { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
public int SpecializationId { get; set; }
public int UserId { get; set; }
} }
} }

View File

@ -0,0 +1,20 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class ContractBindingModel : IContractModel
{
public string Service { get; set; } = string.Empty;
public decimal Coast { get; set; }
public DateTime Date { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
public int Id { get; set; }
}
}

View File

@ -0,0 +1,20 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class DealBindingModel : IDealModel
{
public string Subject { get; set; } = string.Empty;
public string Responsibilities { get; set; } = string.Empty;
public DateTime Date { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
public int Id { get; set; }
}
}

View File

@ -0,0 +1,20 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class HearingBindingModel : IHearingModel
{
public string Information { get; set; } = string.Empty;
public DateTime Date { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc);
public int CaseId { get; set; }
public int Id { get; set; }
}
}

View File

@ -0,0 +1,24 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class LawyerBindingModel : ILawyerModel
{
public string Name { get; set; } = string.Empty;
public string Surname { get; set; } = string.Empty;
public string Patronymic { get; set; } = string.Empty;
public int Experience { get; set; }
public int SpecializationId { get; set; }
public int Id { get; set; }
}
}

View File

@ -0,0 +1,16 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class RoleBindingModel : IRoleModel
{
public string Name { get; set; } = string.Empty;
public int Id { get; set; }
}
}

View File

@ -0,0 +1,16 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class SpecializationBindingModel : ISpecializationModel
{
public string Name { get; set; } = string.Empty;
public int Id { get; set; }
}
}

View File

@ -0,0 +1,20 @@
using CaseAccountingDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.BindingModels
{
public class UserBindingModel : IUserModel
{
public string Login { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
public int RoleId { get; set; }
public int Id { get; set; }
}
}

View File

@ -6,4 +6,8 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\CaseAccountingDataModels\CaseAccountingDataModels.csproj" />
</ItemGroup>
</Project> </Project>

View File

@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class CaseSearchModel
{
public int? Id { get; set; }
public string? Name { get; set; }
public string? Applicant { get; set; }
public string? Defendant { get; set; }
public DateTime? Date { get; set; }
}
}

View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class ContractSearchModel
{
public int? Id { get; set; }
public DateTime? Date { get; set; }
}
}

View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class DealSearchModel
{
public int? Id { get; set; }
public DateTime? Date { get; set; }
}
}

View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class HearingModel
{
public int? Id { get; set; }
public DateTime? Date { get; set; }
public int? CaseId { get; set; }
}
}

View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class LawyerSearchModel
{
public int? Id { get; set; }
public int SpecializationId { get; set; }
}
}

View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class RoleSearchModel
{
public int? Id { get; set; }
public string? Name { get; set; }
}
}

View File

@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class SpecializationSearchModel
{
public int? Id { get; set; }
public string? Name { get; set; }
}
}

View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CaseAccountingContracts.SearchModels
{
public class UserSearchModel
{
public int? Id { get; set; }
}
}