Merge branch 'CourseWork' of http://student.git.athene.tech/AnnZhimol/CourseWork_Hotel into CourseWork
This commit is contained in:
commit
9d1081da98
@ -92,8 +92,6 @@ namespace HotelBusinessLogic.BusinessLogics
|
||||
OrganiserId = model.OrganiserId,
|
||||
});
|
||||
|
||||
double sum = 0;
|
||||
|
||||
foreach (var mealPlan in listMealPlans)
|
||||
{
|
||||
foreach (var mp in mealPlan.MealPlanMembers.Values)
|
||||
|
||||
@ -29,9 +29,19 @@ namespace HotelBusinessLogic.OfficePackage
|
||||
});
|
||||
foreach (var member in info.Members)
|
||||
{
|
||||
bool IsDate = true;
|
||||
if (member.StartDate.ToShortDateString() == "01.01.0001")
|
||||
{
|
||||
IsDate = false;
|
||||
}
|
||||
bool IsCost = true;
|
||||
if (member.MealPlanPrice.ToString() == "0")
|
||||
{
|
||||
IsCost = false;
|
||||
}
|
||||
CreateRow(new PdfRowParameters
|
||||
{
|
||||
Texts = new List<string> { member.MemberFIO, member.ConferenceName, member.StartDate.ToShortDateString(), member.MealPlanName, member.MealPlanPrice.ToString() },
|
||||
Texts = new List<string> { member.MemberFIO, member.ConferenceName, IsDate is true ? member.StartDate.ToShortDateString() : string.Empty, member.MealPlanName, IsCost is true ? member.MealPlanPrice.ToString() : string.Empty },
|
||||
Style = "Normal",
|
||||
ParagraphAlignment = PdfParagraphAlignmentType.Left
|
||||
});
|
||||
|
||||
@ -9,7 +9,7 @@ namespace HotelDataBaseImplement
|
||||
{
|
||||
if (optionsBuilder.IsConfigured == false)
|
||||
{
|
||||
optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-V0ON61E\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
|
||||
optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-VG5USAH\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
|
||||
}
|
||||
base.OnConfiguring(optionsBuilder);
|
||||
}
|
||||
|
||||
@ -11,6 +11,7 @@ using HotelBusinessLogic.BusinessLogics;
|
||||
using HotelContracts.BusinessLogicsContracts;
|
||||
using System.Linq;
|
||||
using DocumentFormat.OpenXml.Wordprocessing;
|
||||
using DocumentFormat.OpenXml.Bibliography;
|
||||
|
||||
namespace HotelOrganiserApp.Controllers
|
||||
{
|
||||
@ -154,6 +155,7 @@ namespace HotelOrganiserApp.Controllers
|
||||
_logger.LogError(ex, "Ошибка создания отчета");
|
||||
throw;
|
||||
}
|
||||
|
||||
double sum = 0;
|
||||
string table = "";
|
||||
table += $"<h2 class=\"u-text u-text-custom-color-1 u-text-default u-text-1\">Предварительный отчет</h2>";
|
||||
@ -176,13 +178,23 @@ namespace HotelOrganiserApp.Controllers
|
||||
table += "</thead>";
|
||||
foreach (var report in result)
|
||||
{
|
||||
bool IsDate = true;
|
||||
if (report.StartDate.ToShortDateString() == "01.01.0001")
|
||||
{
|
||||
IsDate = false;
|
||||
}
|
||||
bool IsCost = true;
|
||||
if (report.MealPlanPrice.ToString() == "0")
|
||||
{
|
||||
IsCost = false;
|
||||
}
|
||||
table += "<tbody class=\"u-table-body\">";
|
||||
table += "<tr style=\"height: 75px\">";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.MemberFIO}</td>";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.ConferenceName}</td>";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.StartDate}</td>";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{(IsDate is true ? report.StartDate.ToShortDateString() : string.Empty)}</td>";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.MealPlanName}</td>";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{report.MealPlanPrice}</td>";
|
||||
table += $"<td class=\"u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell\">{(IsCost is true ? report.MealPlanPrice.ToString(): string.Empty)}</td>";
|
||||
table += "</tr>";
|
||||
table += "</tbody>";
|
||||
sum+= report.MealPlanPrice;
|
||||
@ -361,7 +373,6 @@ namespace HotelOrganiserApp.Controllers
|
||||
}
|
||||
return View(Tuple.Create(APIClient.GetRequest<List<MealPlanViewModel>>($"api/main/getmealplanlist?organiserId={APIClient.Organiser.Id}"),
|
||||
APIClient.GetRequest<List<MemberViewModel>>($"api/main/getmemberlist?organiserId={APIClient.Organiser.Id}")));
|
||||
return View();
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
@ -647,22 +658,24 @@ namespace HotelOrganiserApp.Controllers
|
||||
{
|
||||
return Redirect("~/Home/Enter");
|
||||
}
|
||||
ViewBag.Conferences = APIClient.GetRequest<List<ConferenceViewModel>>($"api/main/getconferencelist?organiserId={APIClient.Organiser.Id}");
|
||||
ViewBag.Members = APIClient.GetRequest<List<MemberViewModel>>($"api/main/getmemberlist?organiserId={APIClient.Organiser.Id}");
|
||||
return View();
|
||||
return View(Tuple.Create(APIClient.GetRequest<List<ConferenceViewModel>>($"api/main/getconferencelist?organiserId={APIClient.Organiser.Id}"),
|
||||
APIClient.GetRequest<List<MemberViewModel>>($"api/main/getmemberlist?organiserId={APIClient.Organiser.Id}")));
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
public void AddMemberToConference(int conference, int member)
|
||||
public void AddMemberToConference(int conference, int[] member)
|
||||
{
|
||||
if (APIClient.Organiser == null)
|
||||
{
|
||||
throw new Exception("Необходима авторизация");
|
||||
}
|
||||
APIClient.PostRequest("api/main/AddMemberToConference", Tuple.Create(
|
||||
new ConferenceSearchModel() { Id = conference },
|
||||
new MemberViewModel() { Id = member }
|
||||
));
|
||||
for (int i = 0; i < member.Length; i++)
|
||||
{
|
||||
APIClient.PostRequest("api/main/AddMemberToConference", Tuple.Create(
|
||||
new ConferenceSearchModel() { Id = conference },
|
||||
new MemberViewModel() { Id = member[i] }
|
||||
));
|
||||
}
|
||||
Response.Redirect("ListConferences");
|
||||
}
|
||||
|
||||
|
||||
@ -5,23 +5,73 @@
|
||||
ViewData["Title"] = "AddMemberToConference";
|
||||
}
|
||||
|
||||
@model Dictionary<int, IMemberModel>
|
||||
@model Tuple<List<ConferenceViewModel>, List<MemberViewModel>>
|
||||
|
||||
<form method="post">
|
||||
<div class="u-form-group u-form-name u-label-top">
|
||||
<label class="u-label u-text-custom-color-1 u-label-1">Конференция: </label>
|
||||
<label class="u-label u-text-custom-color-1 u-label-1">Конференции: </label>
|
||||
<div class="u-input u-input-rectangle">
|
||||
<select id="conference" name="conference" class="form-control" asp-items="@(new SelectList(@ViewBag.Conferences, "Id", "ConferenceName"))"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="u-form-group u-form-name u-label-top">
|
||||
<label class="u-label u-text-custom-color-1 u-label-1">Участник: </label>
|
||||
<div class="u-input u-input-rectangle">
|
||||
<select id="member" name="member" class="form-control" asp-items="@(new SelectList(@ViewBag.Members, "Id", "MemberFIO"))"></select>
|
||||
<select id="conference" name="conference" class="form-control">
|
||||
@foreach (var conference in Model.Item1)
|
||||
{
|
||||
<option value="@conference.Id">
|
||||
@Html.DisplayFor(modelItem => conference.ConferenceName)
|
||||
</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<label class="u-label u-text-custom-color-1 u-label-1">Участники: </label>
|
||||
<div class="u-container-style u-layout-cell u-size-48 u-layout-cell-1">
|
||||
<div class="u-container-layout u-container-layout-1">
|
||||
<div class="u-table u-table-responsive u-table-1">
|
||||
<table class="u-table-entity">
|
||||
<colgroup>
|
||||
<col width="9.8%" />
|
||||
<col width="62.9%" />
|
||||
<col width="27.3%" />
|
||||
</colgroup>
|
||||
<thead
|
||||
class="u-custom-color-1 u-table-header u-table-header-1">
|
||||
<tr style="height: 31px">
|
||||
<th class="u-border-1 u-border-grey-50 u-table-cell">
|
||||
|
||||
</th>
|
||||
<th class="u-border-1 u-border-grey-50 u-table-cell">
|
||||
ФИО участника
|
||||
</th>
|
||||
<th class="u-border-1 u-border-grey-50 u-table-cell">
|
||||
Гражданство
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="u-table-body">
|
||||
@foreach (var item in Model.Item2)
|
||||
{
|
||||
<tr style="height: 75px">
|
||||
<td
|
||||
class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell">
|
||||
<input type="checkbox" class="form-check-input" name="member[]" value="@item.Id" id="@item.Id">
|
||||
</td>
|
||||
<td
|
||||
class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell"
|
||||
>
|
||||
@Html.DisplayFor(modelItem => item.MemberFIO)
|
||||
</td>
|
||||
<td
|
||||
class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell"
|
||||
>
|
||||
@Html.DisplayFor(modelItem => item.Citizenship)
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="u-align-right u-form-group u-form-submit u-label-top">
|
||||
<div class="col-8"></div>
|
||||
<div class="col-4"><input type="submit" value="Добавить участника" class="u-active-custom-color-6 u-border-none u-btn u-btn-submit u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1" /></div>
|
||||
<div class="col-4"><input type="submit" value="Добавить участников" class="u-active-custom-color-6 u-border-none u-btn u-btn-submit u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1" /></div>
|
||||
</div>
|
||||
</form>
|
||||
@ -84,7 +84,7 @@
|
||||
asp-area="" asp-controller="Home" asp-action="AddMemberToConference"
|
||||
style="padding: 10 px"
|
||||
class="u-active-custom-color-6 u-border-none u-btn u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1"
|
||||
>Добавить участника</a>
|
||||
>Добавить участников</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user