Gerimovich_Ilya/PIbd-22_Gerimovich_I.M._Tyorkin_D.V._CourseWork_TravelAgency
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.is.ulstu.ru/Gerimovich_Ilya/PIbd-22_Gerimovich_I.M._Tyorkin_D.V._CourseWork_TravelAgency

Browse Source
This commit is contained in:
platoff aeeee 2024-04-30 21:49:06 +04:00
commit 7d946fe3fd
7 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TravelCompany/TravelCompanyContracts/BindingModels/Contractor/ExcursionGroupBindingModel.cs
View File

@ -14,5 +14,6 @@ namespace TravelCompanyContracts.BindingModels.Contractor
public string ExcursionGroupName { get; set; } = string.Empty;
public int PeopleAmount { get; set; }
public int ContractorID { get; set; }
public Dictionary<int, ITourModel> ExcursionGroupTours { get; set; } = new();
}
}

1
TravelCompany/TravelCompanyContracts/ViewModels/Contractor/ViewModels/ExcursionGroupViewModel.cs
View File

@ -16,5 +16,6 @@ namespace TravelCompanyContracts.ViewModels.Contractor.ViewModels
[DisplayName("Количество людей")]
public int PeopleAmount { get; set; }
public int ContractorID { get; set; }
public Dictionary<int, ITourModel> ExcursionGroupTours { get; set; } = new();
}
}

1
TravelCompany/TravelCompanyDataModels/Models/Contractor/IExcursionGroupModel.cs
View File

@ -11,5 +11,6 @@ namespace TravelCompanyDataModels.Models.Contractor
string ExcursionGroupName { get; }
int PeopleAmount { get; }
int ContractorID { get; }
Dictionary<int, ITourModel> ExcursionGroupTours { get; }
}
}

2
TravelCompany/TravelCompanyDatabaseImplement/Implements/ContractorImplements/ContractorStorage.cs
View File

@ -4,10 +4,12 @@ using System.Diagnostics.Contracts;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.SearchModels.Contractor;
using TravelCompanyContracts.StoragesModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDatabaseImplement.Models.ContractorModels;
namespace TravelCompanyDatabaseImplement.Implements.ContractorImplements
{

4
TravelCompany/TravelCompanyDatabaseImplement/Implements/ContractorImplements/ExcursionGroupStorage.cs
View File

@ -3,10 +3,12 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.SearchModels.Contractor;
using TravelCompanyContracts.StoragesModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDatabaseImplement.Models.ContractorModels;
namespace TravelCompanyDatabaseImplement.Implements.ContractorImplements
{
@ -37,7 +39,7 @@ namespace TravelCompanyDatabaseImplement.Implements.ContractorImplements
{
return context.ExcursionGroups
.Include(x => x.Contractor)
.Where(x => x.UserId.Equals(model.ContractorID))
.Where(x => x.ContractorID.Equals(model.ContractorID))
.ToList()
.Select(x => x.GetViewModel)
.ToList();

2
TravelCompany/TravelCompanyDatabaseImplement/Implements/ContractorImplements/ExcursionStorage.cs
View File

@ -3,10 +3,12 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.SearchModels.Contractor;
using TravelCompanyContracts.StoragesModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDatabaseImplement.Models.ContractorModels;
namespace TravelCompanyDatabaseImplement.Implements.ContractorImplements
{

4
TravelCompany/TravelCompanyDatabaseImplement/Implements/ContractorImplements/TourStorage.cs
View File

@ -3,10 +3,12 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using TravelCompanyContracts.BindingModels.Contractor;
using TravelCompanyContracts.SearchModels.Contractor;
using TravelCompanyContracts.StoragesModels.Contractor;
using TravelCompanyContracts.ViewModels.Contractor.ViewModels;
using TravelCompanyDatabaseImplement.Models.ContractorModels;
namespace TravelCompanyDatabaseImplement.Implements.ContractorImplements
{
@ -36,7 +38,7 @@ namespace TravelCompanyDatabaseImplement.Implements.ContractorImplements
{
return context.Tours
.Include(x => x.Contractor)
.Where(x => x.UserId.Equals(model.ContractorID))
.Where(x => x.ContractorID.Equals(model.ContractorID))
.Select(x => x.GetViewModel)
.ToList();
}