вливаю всё, что было создано на 5, 6, 7 этапах в ветку main #12

Merged
ekallin merged 180 commits from stage7_user_web_interface_prototype into main 2024-05-01 19:15:20 +04:00
6 changed files with 136 additions and 67 deletions
Showing only changes of commit fe442d1c2f - Show all commits

View File

@ -5,4 +5,93 @@
}
<div class="text-center mt-3 mb-3">
<h2 class="display-4">Создание препарата</h2>
</div>
</div>
<form method="post" class="form-create-medicament d-flex flex-row justify-content-around align-items-center">
<div class="d-flex flex-column mb-5 mt-5">
<div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
<h3 class="col-3">
Название:
</h3>
<input class="col-6" type="text" style="width: 45vh" />
</div>
<div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
<h3 class="col-3">
Комментарий:
</h3>
<textarea class="col-6" id="comment" name="comment" style="width: 45vh">
</textarea>
</div>
<div class="d-flex flex-row mb-5 justify-content-between align-items-center">
<h3 class="col-3">
Выбор процедуры:
</h3>
<select id="procedureId" name="procedureId" style="width: 45vh">
@* <option value="">Выберите процедуру/ы</option> *@
@{
int count = 3;
for (int i = 1; i <= count; i++)
{
<option value="@i">процедура "@i"</option>
}
}
</select>
<h3 class="col-3">
Выбор симптома:
</h3>
<select id="symptomId" name="symptomId" style="width: 45vh">
@* <option value="">Выберите процедуру/ы</option> *@
@{
for (int i = 1; i <= count; i++)
{
<option value="@i">процедура "@i"</option>
}
}
</select>
</div>
</div>
@* <div class="d-flex flex-column overflow-auto" style="max-height: 30vh">
<table class="table-recipe-create table">
<thead>
<tr>
<th>
Выбранное из процедур:
</th>
</tr>
</thead>
<tbody>
@{
int cRows = 20;
for (int i = 1; i <= cRows; i++)
{
<tr>
<td>Процедура № @i </td>
<td>
<svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M44.5 123C4.99995 119.5 -11.8431 56.4293 24 19.5C40.5 2.50001 72.5 -5.5 101.5 27.5L115.5 14.5" stroke="#D10000" stroke-width="8" stroke-linecap="round" />
<path d="M65.2123 159.963L56 60.0001C88.0236 76.3307 119.521 77.4194 149 60.0001C141.63 142.346 140.08 160.953 140.226 159.963H65.2123Z" stroke="#D10000" stroke-width="8" />
<path d="M121 36L101.582 55L75 31" stroke="#D10000" stroke-width="8" stroke-linecap="round" />
</svg>
</td>
</tr>
}
}
</tbody>
</table>
</div> *@
<div class="d-flex flex-column mb-5 mt-5">
<div class="col-8"></div>
<div class="col-4">
<input type="submit" value="Сохранить" class="button-save-medicament btn" asp-action="Medicaments" />
</div>
</div>
</form>

View File

@ -5,4 +5,8 @@
}
<div class="text-center mt-3 mb-3">
<h2 class="display-4">Создание процедуры</h2>
</div>
<div class="d-flex flex-column align-content-center justify-content-around">
</div>

View File

@ -28,22 +28,6 @@
</div>
@* <div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
<h3 class="col-3">
Курс приема препарата:
</h3>
<select id="courseId" name="courseId" style="width: 45vh">
<option value="">Выберите курс приема</option>
@{
int countCourse = 10;
for (int i = 0; i < countCourse; i++)
{
<option value="@i">Курс составляет @i дней, имя у него @i</option>
}
}
</select>
</div> *@
<div class="d-flex flex-row mb-5 justify-content-between align-items-center">
<h3 class="col-3">
Выбор процедуры:
@ -91,45 +75,10 @@
</table>
</div>
@* <div class="row">
<div class="col-4">Количество процедур:</div>
<div class="col-8">
<input type="text" name="count" id="count" />
<div class="d-flex flex-column mb-5 mt-5">
<div class="col-8"></div>
<div class="col-4">
<input type="submit" value="Сохранить" class="button-save-recipe btn" asp-action="Recipes" />
</div>
</div>
</div>
<div class="row">
<div class="col-4">Комментарий:</div>
<div class="col-8">
<input type="text" id="sum" name="sum" readonly />
</div>
</div>
<div class="row">
<div class="col-4">Процедуры:</div>
<div class="col-8">
<select id="procedure" name="procedure" class="form-control">
<option value="">Выберите рецепт/ы</option>
@{
int count = 3;
for (int i = 1; i <= count; i++)
{
<option value="@i">рецепт "@i"</option>
}
}
</select>
</select>
</div>
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4">
<input type="submit" value="Создать" class="btn btn-primary" />
</div>
</div> *@
</form>

View File

@ -1,8 +1,9 @@
@using PolyclinicContracts.ViewModels
@model List<MedicamentViewModel>
@{
ViewBag.SelectedSiteMenuItem = SiteMenuItems.Medicaments;
ViewData["Title"] = "Medicaments";
}
<div class="text-center">
<h1 class="display-4">Препараты</h1>
</div>
@ -60,10 +61,11 @@
При особом неврозе употребляйте каждый день и спина не будет болеть
</td>
<td>
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M105.5 26L37 114.5C34.5 117 16.3 121.7 7.5 122.5C79.1 34.1 101 5.5 102 4C104.833 4.5 119.3 14.6 122.5 21C105 44 98.5 55 111.5 58.5" stroke="#008315" stroke-width="6" stroke-linecap="round" />
</svg>
<a a asp-action="CreateMedicament">
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M105.5 26L37 114.5C34.5 117 16.3 121.7 7.5 122.5C79.1 34.1 101 5.5 102 4C104.833 4.5 119.3 14.6 122.5 21C105 44 98.5 55 111.5 58.5" stroke="#008315" stroke-width="6" stroke-linecap="round" />
</svg>
</a>
</td>
<td>
<svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg">

View File

@ -52,10 +52,11 @@
4
</td>
<td>
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M105.5 26L37 114.5C34.5 117 16.3 121.7 7.5 122.5C79.1 34.1 101 5.5 102 4C104.833 4.5 119.3 14.6 122.5 21C105 44 98.5 55 111.5 58.5" stroke="#008315" stroke-width="6" stroke-linecap="round" />
</svg>
<a asp-action="CreateRecipe">
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M105.5 26L37 114.5C34.5 117 16.3 121.7 7.5 122.5C79.1 34.1 101 5.5 102 4C104.833 4.5 119.3 14.6 122.5 21C105 44 98.5 55 111.5 58.5" stroke="#008315" stroke-width="6" stroke-linecap="round" />
</svg>
</a>
</td>
<td>
<svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg">

View File

@ -47,7 +47,7 @@ body {
}
.bi-cart-delete:hover {
transform: scale(1.5);
transform: scale(1.3);
}
.svg-icon {
@ -57,4 +57,28 @@ body {
.table-recipe-create{
font-size: 2.5vh;
color: white;
}
.button-save-recipe:hover {
transform: scale(1.3);
color: white;
background-color: rgb(6, 25, 16);
}
.button-save-recipe{
width: 20vh;
height: 8vh;
background-color: rgb(16, 58, 39);
color: white;
transition: transform 0.3s;
}
.button-save-medicament:hover {
transform: scale(1.3);
color: white;
}
.button-save-medicament {
color: white;
transition: transform 0.3s;
}