ns.potapov/PIbd-21_CourseWork_Polyclinic_BeSick
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

вливаю всё, что было создано на 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
Conversation 0 Commits 180 Files Changed 347 +50 -54
3 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a8021f9b3 - Show all commits

43
Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml
View File

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

4
Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml
View File

@ -9,7 +9,7 @@
<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">
<h3 class="col-3">
@ -45,7 +45,7 @@
</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">
<thead>
<tr>

57
Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css
View File

@ -1,24 +1,24 @@
html {
font-size: 14px;
font-size: 14px;
}
@media (min-width: 768px) {
html {
font-size: 16px;
}
html {
font-size: 16px;
}
}
.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 {
position: relative;
min-height: 100%;
position: relative;
min-height: 100%;
}
body {
margin-bottom: 60px;
margin-bottom: 60px;
}
.bi-edit-pen {
@ -27,9 +27,9 @@ body {
transition: transform 0.3s;
}
.bi-edit-pen:hover{
transform: scale(1.5);
}
.bi-edit-pen:hover {
transform: scale(1.5);
}
.bi-cart-delete {
color: red;
@ -37,12 +37,21 @@ body {
transition: transform 0.3s;
}
.form-create-recipe{
.form-create-recipe {
color: white;
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)
}
@ -54,31 +63,45 @@ body {
transition: transform 0.3s;
}
.table-recipe-create{
.table-recipe-create {
font-size: 2.5vh;
color: white;
}
.proc-list{
border: dashed;
}
.button-save-recipe:hover {
transform: scale(1.3);
color: white;
background-color: rgb(6, 25, 16);
}
.button-save-recipe{
.button-save-recipe {
width: 20vh;
height: 8vh;
background-color: rgb(16, 58, 39);
color: white;
transition: transform 0.3s;
box-shadow: 0px 4px 8px rgba(6, 25, 16, 0.8);
}
.button-save-medicament:hover {
transform: scale(1.3);
color: white;
background-color: rgb(26, 67, 71)
}
.button-save-medicament {
width: 20vh;
height: 8vh;
color: white;
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); /* Ãîðèçîíòàëüíîå ñìåùåíèå, âåðòèêàëüíîå ñìåùåíèå, ðàçìûòèå, öâåò òåíè */
}