sofiaivv/PIbd23_Ivanova_Yakobchuk_CourseWork_LawCompany
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

правки

Browse Source
This commit is contained in:
Софья Якобчук 2024-05-01 23:48:28 +04:00
parent 65decf8f3f
commit 0e7a46e2e1
28 changed files with 725 additions and 770 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LawCompany/LawCompanyBusinessLogic/BusinessLogics/ClientLogic.cs
View File

@ -142,8 +142,6 @@ namespace LawCompanyBusinessLogic.BusinessLogics
FIO = model.FIO,
Phone = model.Phone,
Email = model.Email,
ExecutorId = model.ExecutorId,
});
if (element != null && element.Id != model.Id)
{

4
LawCompany/LawCompanyBusinessLogic/BusinessLogics/ConsultationLogic.cs
View File

@ -1,9 +1,9 @@
using LawCompanyContracts.BindingModels;
using LawCompanyDataModels.Models;
using LawCompanyContracts.BindingModels;
using LawCompanyContracts.BusinessLogicContracts;
using LawCompanyContracts.SearchModels;
using LawCompanyContracts.StoragesContracts;
using LawCompanyContracts.ViewModels;
using LawCompanyDataModels.Models;
using Microsoft.Extensions.Logging;
namespace LawCompanyBusinessLogic.BusinessLogics

2
LawCompany/LawCompanyBusinessLogic/BusinessLogics/ExecutorLogic.cs
View File

@ -17,7 +17,7 @@ namespace LawCompanyBusinessLogic.BusinessLogics
private readonly ILogger _logger;
private readonly IExecutorStorage _executorStorage;
public ExecutorLogic(ILogger logger, IExecutorStorage executorStorage)
public ExecutorLogic(ILogger<ExecutorLogic> logger, IExecutorStorage executorStorage)
{
_logger = logger;
_executorStorage = executorStorage;

2
LawCompany/LawCompanyBusinessLogic/BusinessLogics/GuarantorLogic.cs
View File

@ -12,7 +12,7 @@ namespace LawCompanyBusinessLogic.BusinessLogics
private readonly ILogger _logger;
private readonly IGuarantorStorage _guarantorStorage;
public GuarantorLogic(ILogger logger, IGuarantorStorage guarantorStorage)
public GuarantorLogic(ILogger<GuarantorLogic> logger, IGuarantorStorage guarantorStorage)
{
_logger = logger;
_guarantorStorage = guarantorStorage;

1
LawCompany/LawCompanyBusinessLogic/BusinessLogics/LawyerLogic.cs
View File

@ -142,7 +142,6 @@ namespace LawCompanyBusinessLogic.BusinessLogics
FIO = model.FIO,
Phone = model.Phone,
Email = model.Email,
GuarantorId = model.GuarantorId,
});
if (element != null && element.Id != model.Id)

4
LawCompany/LawCompanyContracts/BusinessLogicContracts/IConsultationLogic.cs
View File

@ -1,5 +1,5 @@
using LawCompanyContracts.BindingModels;
using LawCompanyDataModels.Models;
using LawCompanyDataModels.Models;
using LawCompanyContracts.BindingModels;
using LawCompanyContracts.SearchModels;
using LawCompanyContracts.ViewModels;

5
LawCompany/LawCompanyContracts/BusinessLogicContracts/IGuarantorLogic.cs
View File

@ -1,11 +1,6 @@
using LawCompanyContracts.BindingModels;
using LawCompanyContracts.SearchModels;
using LawCompanyContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.BusinessLogicContracts
{

9
LawCompany/LawCompanyContracts/BusinessLogicContracts/IHearingLogic.cs
View File

@ -1,12 +1,7 @@
using LawCompanyContracts.BindingModels;
using LawCompanyDataModels.Models;
using LawCompanyDataModels.Models;
using LawCompanyContracts.BindingModels;
using LawCompanyContracts.SearchModels;
using LawCompanyContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.BusinessLogicContracts
{

5
LawCompany/LawCompanyContracts/BusinessLogicContracts/ILawyerLogic.cs
View File

@ -1,11 +1,6 @@
using LawCompanyContracts.BindingModels;
using LawCompanyContracts.SearchModels;
using LawCompanyContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.BusinessLogicContracts
{

2
LawCompany/LawCompanyContracts/SearchModels/ConsultationSearchModel.cs
View File

@ -5,6 +5,8 @@
public int? Id { get; set; }
public double? Cost { get; set; }
public DateTime? ConsultationDate { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
public int? CaseId { get; set; }
public int? GuarantorId { get; set; }
}

8
LawCompany/LawCompanyContracts/SearchModels/GuarantorSearchModel.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.SearchModels
namespace LawCompanyContracts.SearchModels
{
public class GuarantorSearchModel
{

10
LawCompany/LawCompanyContracts/SearchModels/HearingSearchModel.cs
View File

@ -1,15 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.SearchModels
namespace LawCompanyContracts.SearchModels
{
public class HearingSearchModel
{
public int? Id { get; set; }
public DateTime? HearingDate { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
public int? GuarantorId { get; set; }
}
}

8
LawCompany/LawCompanyContracts/SearchModels/LawyerSearchModel.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.SearchModels
namespace LawCompanyContracts.SearchModels
{
public class LawyerSearchModel
{

8
LawCompany/LawCompanyContracts/SearchModels/VisitSearchModel.cs
View File

@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyContracts.SearchModels
namespace LawCompanyContracts.SearchModels
{
public class VisitSearchModel
{

2
LawCompany/LawCompanyContracts/StoragesContracts/IHearingStorage.cs
View File

@ -4,7 +4,7 @@ using LawCompanyContracts.ViewModels;
namespace LawCompanyContracts.StoragesContracts
{
public class IHearingStorage
public interface IHearingStorage
{
List<HearingViewModel> GetFullList();
List<HearingViewModel> GetFilteredList(HearingSearchModel model);

2
LawCompany/LawCompanyContracts/StoragesContracts/ILawyerStorage.cs
View File

@ -4,7 +4,7 @@ using LawCompanyContracts.ViewModels;
namespace LawCompanyContracts.StoragesContracts
{
public class ILawyerStorage
public interface ILawyerStorage
{
List<LawyerViewModel> GetFullList();
List<LawyerViewModel> GetFilteredList(LawyerSearchModel model);

2
LawCompany/LawCompanyContracts/ViewModels/ConsultationViewModel.cs
View File

@ -14,8 +14,6 @@ namespace LawCompanyContracts.ViewModels
[DisplayName("Дело")]
public string CaseName { get; set; } = string.Empty;
public int CaseId { get; set; }
[DisplayName("Имя поручителя")]
public string GuarantorName { get; set; } = string.Empty;
public int GuarantorId { get; set; }
public Dictionary<int, ILawyerModel> ConsultationLawyers { get; set; } = new();
}

7
LawCompany/LawCompanyDatabaseImplement/Implements/GuarantorStorage.cs
View File

@ -3,11 +3,6 @@ using LawCompanyContracts.SearchModels;
using LawCompanyContracts.StoragesContracts;
using LawCompanyContracts.ViewModels;
using LawCompanyDatabaseImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace LawCompanyDatabaseImplement.Implements
{
@ -64,7 +59,7 @@ namespace LawCompanyDatabaseImplement.Implements
public GuarantorViewModel? Insert(GuarantorBindingModel model)
{
using var context = new LawCompanyDatabase();
var newGuarantor = Guarantor.Create(model);
var newGuarantor = Guarantor.Create(context, model);
if (newGuarantor == null)
{
return null;

2
LawCompany/LawCompanyDatabaseImplement/Implements/LawyerStorage.cs
View File

@ -61,7 +61,7 @@ namespace LawCompanyDatabaseImplement.Implements
public LawyerViewModel? Insert(LawyerBindingModel model)
{
using var context = new LawCompanyDatabase();
var newLawyer = Lawyer.Create(model);
var newLawyer = Lawyer.Create(context, model);
if (newLawyer == null)
{
return null;

2
LawCompany/LawCompanyDatabaseImplement/Models/Guarantor.cs
View File

@ -3,7 +3,7 @@ using LawCompanyContracts.BindingModels;
using LawCompanyContracts.ViewModels;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using LawFirmDatabaseImplement.Models;
using LawCompanyDatabaseImplement.Models;
namespace LawCompanyDatabaseImplement.Models
{