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

исправила и добавила вывод названия симптома и процедуры во вью модель

Browse Source
This commit is contained in:
Елена Бакальская 2024-05-27 21:53:53 +04:00
parent fa8d5d9d8e
commit 171ca6d819
5 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Polyclinic/PolyclinicContracts/ViewModels/MedicamentViewModel.cs
View File

@ -8,9 +8,19 @@ namespace PolyclinicContracts.ViewModels
public int Id { get; set; } public int Id { get; set; }
public int ProcedureId { get; set; } public int ProcedureId { get; set; }
public int? SymptomId { get; set; } public int? SymptomId { get; set; }
[DisplayName("Название медикамента")] [DisplayName("Название медикамента")]
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;
[DisplayName("Комментарий")] [DisplayName("Комментарий")]
public string Comment { get; set; } = string.Empty; public string Comment { get; set; } = string.Empty;
[DisplayName("Название симптома")]
public string SymptomName { get; set; } = string.Empty;
[DisplayName("Название процедуры")]
public string ProcedureName { get; set; } = string.Empty;
} }
} }

2
Polyclinic/PolyclinicContracts/ViewModels/RecipeViewModel.cs
View File

@ -12,6 +12,8 @@ namespace PolyclinicContracts.ViewModels
[DisplayName("Комментарий")] [DisplayName("Комментарий")]
public string Comment { get; set; } = string.Empty; public string Comment { get; set; } = string.Empty;
[DisplayName("Номер курса")]
public int? CourseId { get; set; } public int? CourseId { get; set; }
public Dictionary<int, IProcedureModel> RecipeProcedures { get; } = new(); public Dictionary<int, IProcedureModel> RecipeProcedures { get; } = new();
} }

4
Polyclinic/PolyclinicDatabaseImplement/Models/Medicament.cs
View File

@ -48,7 +48,9 @@ namespace PolyclinicDatabaseImplement.Models
Name = Name, Name = Name,
Comment = Comment, Comment = Comment,
ProcedureId = ProcedureId, ProcedureId = ProcedureId,
SymptomId = Symptom?.Id ?? null SymptomId = Symptom?.Id ?? null,
SymptomName = Symptom?.Name ?? string.Empty,
ProcedureName = Procedure?.Name ?? string.Empty,
}; };
} }
} }

53
Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml
View File

@ -45,35 +45,32 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<td> @foreach (var item in Model)
1 {
</td> <td>@item.Id</td>
<td> <td>@item.Name</td>
Фенибут <td>@item.SymptomId.</td>
</td> <td>
<td> 3
Сопли до колен </td>
</td> <td>
<td> При особом неврозе употребляйте каждый день и спина не будет болеть
3 </td>
</td> <td>
<td> <a asp-action="CreateMedicament">
При особом неврозе употребляйте каждый день и спина не будет болеть <svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
</td> <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" />
<td> </svg>
<a asp-action="CreateMedicament"> </a>
<svg class="bi-edit-pen" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg"> </td>
<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" /> <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> </svg>
</a> </td>
</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>
</tbody> </tbody>
</table> </table>
} }

2
Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml
View File

@ -32,8 +32,6 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (var item in Model) @foreach (var item in Model)
{ {
<tr> <tr>