Merge branch 'stage7_user_web_interface_prototype' of https://git.is.ulstu.ru/ns.potapov/PIbd-21_CourseWork_Polyclinic_BeSick into stage7_user_web_interface_prototype

This commit is contained in:
Никита Потапов 2024-05-01 14:15:56 +04:00
commit 751759b832
6 changed files with 107 additions and 61 deletions

View File

@ -9,7 +9,7 @@
<form method="post" class="form-create-medicament d-flex flex-row justify-content-around align-items-center"> <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="medicament-info d-flex flex-column mb-5 mt-5">
<div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center"> <div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
<h3 class="col-3"> <h3 class="col-3">
@ -33,7 +33,7 @@
Выбор процедуры: Выбор процедуры:
</h3> </h3>
<select id="procedureId" name="procedureId" style="width: 45vh"> <select id="procedureId" name="procedureId" style="width: 45vh">
@* <option value="">Выберите процедуру</option> *@ @* <option value="">Выберите процедуру</option> *@
@{ @{
int count = 3; int count = 3;
for (int i = 1; i <= count; i++) for (int i = 1; i <= count; i++)
@ -43,51 +43,24 @@
} }
</select> </select>
</div>
<div class="d-flex flex-row mb-5 justify-content-between align-items-center">
<h3 class="col-3"> <h3 class="col-3">
Выбор симптома: Выбор симптома:
</h3> </h3>
<select id="symptomId" name="symptomId" style="width: 45vh"> <select id="symptomId" name="symptomId" style="width: 45vh">
@* <option value="">Выберите процедуру/ы</option> *@ @* <option value="">Выберите симптом</option> *@
@{ @{
for (int i = 1; i <= count; i++) for (int i = 1; i <= count; i++)
{ {
<option value="@i">процедура "@i"</option> <option value="@i">симптом "@i"</option>
} }
} }
</select> </select>
</div> </div>
</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="d-flex flex-column mb-5 mt-5">
<div class="col-8"></div> <div class="col-8"></div>
<div class="col-4"> <div class="col-4">

View File

@ -7,6 +7,31 @@
<h2 class="display-4">Создание процедуры</h2> <h2 class="display-4">Создание процедуры</h2>
</div> </div>
<div class="d-flex flex-column align-content-center justify-content-around"> <form method="post" class="form-create-procedure d-flex flex-row justify-content-around align-items-center">
</div> <div class="procedure-info 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 m-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 m-3">
Комментарий:
</h3>
<textarea class="col-6" id="comment" name="comment" style="width: 45vh">
</textarea>
</div>
</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-procedure btn" asp-action="Procedures" />
</div>
</div>
</form>

View File

@ -9,7 +9,7 @@
<form method="post" class="form-create-recipe d-flex flex-row justify-content-around align-items-center"> <form method="post" class="form-create-recipe d-flex flex-row justify-content-around align-items-center">
<div class="d-flex flex-column mb-5 mt-5"> <div class="recipe-info d-flex flex-column mb-5 mt-5">
<div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center"> <div class="d-flex flex-row mb-5 flex-row justify-content-between align-items-center">
<h3 class="col-3"> <h3 class="col-3">
@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<div class="d-flex flex-column overflow-auto" style="max-height: 30vh"> <div class="proc-list d-flex flex-column overflow-auto" style="max-height: 45vh">
<table class="table-recipe-create table"> <table class="table-recipe-create table">
<thead> <thead>
<tr> <tr>

View File

@ -61,7 +61,7 @@
При особом неврозе употребляйте каждый день и спина не будет болеть При особом неврозе употребляйте каждый день и спина не будет болеть
</td> </td>
<td> <td>
<a a asp-action="CreateMedicament"> <a asp-action="CreateMedicament">
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg"> <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" /> <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> </svg>

View File

@ -60,10 +60,11 @@
ммммммм ммммммм
</td> </td>
<td> <td>
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg"> <a asp-action="CreateProcedure">
<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 class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
</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>
<td> <td>
<svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg class="bi-cart-delete" viewBox="0 0 154 164" fill="none" xmlns="http://www.w3.org/2000/svg">

View File

@ -1,24 +1,24 @@
html { html {
font-size: 14px; font-size: 14px;
} }
@media (min-width: 768px) { @media (min-width: 768px) {
html { html {
font-size: 16px; font-size: 16px;
} }
} }
.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { .btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
} }
html { html {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
} }
body { body {
margin-bottom: 60px; margin-bottom: 60px;
} }
.bi-edit-pen { .bi-edit-pen {
@ -27,9 +27,9 @@ body {
transition: transform 0.3s; transition: transform 0.3s;
} }
.bi-edit-pen:hover{ .bi-edit-pen:hover {
transform: scale(1.5); transform: scale(1.5);
} }
.bi-cart-delete { .bi-cart-delete {
color: red; color: red;
@ -37,12 +37,21 @@ body {
transition: transform 0.3s; transition: transform 0.3s;
} }
.form-create-recipe{ .form-create-recipe {
color: white; color: white;
background-color: rgb(66, 132, 112) background-color: rgb(66, 132, 112)
}S }
.create-recipe{ .form-create-medicament {
color: white;
background-color: rgb(65, 154, 162)
}
.recipe-info {
text-shadow: 0px 4px 8px rgba(6, 25, 16, 0.8);
}
.create-recipe {
background-color: rgb(145, 195, 128) background-color: rgb(145, 195, 128)
} }
@ -54,31 +63,69 @@ body {
transition: transform 0.3s; transition: transform 0.3s;
} }
.table-recipe-create{ .table-recipe-create {
font-size: 2.5vh; font-size: 2.5vh;
color: white; color: white;
} }
.proc-list {
border: dashed;
}
.button-save-recipe:hover { .button-save-recipe:hover {
transform: scale(1.3); transform: scale(1.3);
color: white; color: white;
background-color: rgb(6, 25, 16); background-color: rgb(6, 25, 16);
} }
.button-save-recipe{ .form-create-procedure{
color: white;
background-color: rgb(149, 100, 197)
}
.button-save-procedure {
width: 20vh;
height: 8vh;
background-color: rgb(70, 42, 98);
color: white;
transition: transform 0.3s;
box-shadow: 0px 4px 8px rgba(49, 29, 7);
}
.procedure-info {
text-shadow: 0px 4px 8px rgba(49, 29, 7);
}
.button-save-procedure:hover {
transform: scale(1.3);
color: white;
background-color: rgb(49, 29, 70);
}
.button-save-recipe {
width: 20vh; width: 20vh;
height: 8vh; height: 8vh;
background-color: rgb(16, 58, 39); background-color: rgb(16, 58, 39);
color: white; color: white;
transition: transform 0.3s; transition: transform 0.3s;
box-shadow: 0px 4px 8px rgba(6, 25, 16, 0.8);
} }
.button-save-medicament:hover { .button-save-medicament:hover {
transform: scale(1.3); transform: scale(1.3);
color: white; color: white;
background-color: rgb(26, 67, 71)
} }
.button-save-medicament { .button-save-medicament {
width: 20vh;
height: 8vh;
color: white; color: white;
transition: transform 0.3s; transition: transform 0.3s;
} background-color: rgb(40, 92, 97);
box-shadow: 0px 4px 8px rgba(26, 67, 71, 1); /* Ãîðèçîíòàëüíîå ñìåùåíèå, âåðòèêàëüíîå ñìåùåíèå, ðàçìûòèå, öâåò òåíè */
}
.medicament-info {
text-shadow: 0px 4px 8px rgba(26, 67, 71, 1); /* Ãîðèçîíòàëüíîå ñìåùåíèå, âåðòèêàëüíîå ñìåùåíèå, ðàçìûòèå, öâåò òåíè */
}