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

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

Browse Source
This commit is contained in:
Елена Бакальская 2024-05-29 14:01:34 +04:00
commit aa1e0c4e99
7 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ namespace PolyclinicDatabaseImplement.Models
public int CourseId { get; set; } public int CourseId { get; set; }
[Required] [Required]
public int DiagnoseId { get; set; } public int DiagnoseId { get; set; }
public virtual Course Course { get; set; } = new(); public virtual Course? Course { get; set; }
public virtual Diagnose Diagnose { get; set; } = new(); public virtual Diagnose? Diagnose { get; set; }
} }
} }

2
Polyclinic/PolyclinicDatabaseImplement/Models/Diagnose.cs
View File

@ -17,7 +17,7 @@ namespace PolyclinicDatabaseImplement.Models
public DateTime DateStartDiagnose { get; set; } = DateTime.Now; public DateTime DateStartDiagnose { get; set; } = DateTime.Now;
public DateTime? DateStopDiagnose { get; set; } public DateTime? DateStopDiagnose { get; set; }
public int Id { get; set; } public int Id { get; set; }
public virtual User User { get; set; } = new(); public virtual User? User { get; set; }
public static Diagnose? Create(DiagnoseBindingModel? model) public static Diagnose? Create(DiagnoseBindingModel? model)
{ {

2
Polyclinic/PolyclinicDatabaseImplement/Models/Procedure.cs
View File

@ -19,7 +19,7 @@ namespace PolyclinicDatabaseImplement.Models
[Required] [Required]
public DateTime DateStartProcedure { get; set; } = DateTime.Now; public DateTime DateStartProcedure { get; set; } = DateTime.Now;
public DateTime? DateStopProcedure { get; set; } public DateTime? DateStopProcedure { get; set; }
public virtual User User { get; set; } = new(); public virtual User? User { get; set; }
public string? Comment { get; set; } = string.Empty; public string? Comment { get; set; } = string.Empty;

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

@ -9,7 +9,7 @@ namespace PolyclinicDatabaseImplement.Models
public int ProcedureId { get; set; } public int ProcedureId { get; set; }
[Required] [Required]
public int RecipeId { get; set; } public int RecipeId { get; set; }
public virtual Procedure Procedure { get; set; } = new(); public virtual Procedure? Procedure { get; set; }
public virtual Recipe Recipe { get; set; } = new(); public virtual Recipe? Recipe { get; set; }
} }
} }

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

@ -9,7 +9,7 @@ namespace PolyclinicDatabaseImplement.Models
public int SymptomId { get; set; } public int SymptomId { get; set; }
[Required] [Required]
public int DiagnoseId { get; set; } public int DiagnoseId { get; set; }
public virtual Symptom Symptom { get; set; } = new(); public virtual Symptom? Symptom { get; set; }
public virtual Diagnose Diagnose { get; set; } = new(); public virtual Diagnose? Diagnose { get; set; }
} }
} }

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

@ -9,7 +9,7 @@ namespace PolyclinicDatabaseImplement.Models
public int SymptomId { get; set; } public int SymptomId { get; set; }
[Required] [Required]
public int RecipeId { get; set; } public int RecipeId { get; set; }
public virtual Symptom Symptom { get; set; } = new(); public virtual Symptom? Symptom { get; set; }
public virtual Recipe Recipe { get; set; } = new(); public virtual Recipe? Recipe { get; set; }
} }
} }

21
Polyclinic/PolyclinicWebAppImplementer/Views/Shared/_Layout.cshtml
View File

@ -3,16 +3,16 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@if (ViewData.ContainsKey("Title"))
{
<title> <title>
@if (ViewData.ContainsKey("SelectedSiteMenuItem"))
{
@ViewBag.SelectedSiteMenuItem.Item2
}
else if (ViewData.ContainsKey("Title"))
{
@ViewData["Title"] @ViewData["Title"]
}
</title> </title>
}
else
{
<title>Боликлиника</title>
}
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" /> <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" /> <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
<link rel="stylesheet" href="~/PolyclinicWebView.styles.css" asp-append-version="true" /> <link rel="stylesheet" href="~/PolyclinicWebView.styles.css" asp-append-version="true" />
@ -50,11 +50,14 @@
} }
} }
</ul> </ul>
@if(LoginManager.LogginedUser != null) @if (LoginManager.LogginedUser != null)
{ {
<form method="post" asp-action="Logout" asp-controller="User"> <div class="d-flex align-items-center">
@Html.RouteLink(LoginManager.LogginedUser.FIO, new { controller = "User", action = "Privacy" }, new { @title = "Личный кабинет" })
<form class="ms-3" method="post" asp-action="Logout" asp-controller="User">
<button class="btn btn-secondary" type="submit">Выйти</button> <button class="btn btn-secondary" type="submit">Выйти</button>
</form> </form>
</div>
} }
</div> </div>
</div> </div>