Merge branch 'CourseWork' of http://student.git.athene.tech/AnnZhimol/CourseWork_Hotel into CourseWork
This commit is contained in:
commit
c64501d59a
@ -552,7 +552,7 @@ namespace HostrelHeadwaiterApp.Controllers
|
||||
NameHall = conferenceBookingElem.NameHall,
|
||||
HeadwaiterId = conferenceBookingElem.HeadwaiterId,
|
||||
});
|
||||
Response.Redirect("ListConferences");
|
||||
Response.Redirect("ListConferenceBookings");
|
||||
}
|
||||
}
|
||||
}
|
@ -7,19 +7,19 @@
|
||||
|
||||
<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>
|
||||
<label class="u-label u-text-custom-color-1 u-label-1">Зал концеренций: </label>
|
||||
<div class="u-input u-input-rectangle">
|
||||
<select id="conferenceBooking" name="conferenceBooking" class="form-control" asp-items="@(new SelectList(@ViewBag.ConferenceBookings, "Id", "NameHall"))"></select>
|
||||
</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>
|
||||
<br>
|
||||
<div class="u-container-layout u-container-layout-2">
|
||||
<input type="submit" value="Добавить конференцию" class="btn btn-outline-dark text-center d-flex justify-content-md-center" />
|
||||
</div>
|
||||
</form>
|
@ -25,6 +25,9 @@
|
||||
<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">
|
||||
@ -39,6 +42,11 @@
|
||||
class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell"
|
||||
>
|
||||
@Html.DisplayFor(modelItem => item.NameHall)
|
||||
</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.ConferenceId)
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user