From 20bde69070d5e87c946201e19cecf7aac666ceec Mon Sep 17 00:00:00 2001 From: Giacomo Bertolazzi <20015159@studenti.uniupo.it> Date: Tue, 15 Jan 2019 19:54:52 +0100 Subject: [PATCH] Last commit from VS - rewrited menu - removed unused things --- SeniorAssistant/Models/Menu.cs | 2 +- SeniorAssistant/Views/Home/Data.cshtml | 1 - .../Views/Shared/NavbarRightMenu.cshtml | 2 + .../Views/Shared/SidebarMenu.cshtml | 24 +++++- SeniorAssistant/Views/Shared/_Layout.cshtml | 69 ------------------ SeniorAssistant/senior.db | Bin 667648 -> 1105920 bytes 6 files changed, 24 insertions(+), 74 deletions(-) diff --git a/SeniorAssistant/Models/Menu.cs b/SeniorAssistant/Models/Menu.cs index cdd6e86..1d4957d 100644 --- a/SeniorAssistant/Models/Menu.cs +++ b/SeniorAssistant/Models/Menu.cs @@ -21,6 +21,6 @@ namespace SeniorAssistant.Models public class SubMenu : IMenuItem { public string Text { get; set; } - public IEnumerable Items { get; set; } + public IList Items { get; set; } } } diff --git a/SeniorAssistant/Views/Home/Data.cshtml b/SeniorAssistant/Views/Home/Data.cshtml index 1322faa..12a6df6 100644 --- a/SeniorAssistant/Views/Home/Data.cshtml +++ b/SeniorAssistant/Views/Home/Data.cshtml @@ -35,7 +35,6 @@ else @if(isDoc && patient != null) {
-

NOTEEEEEEEEEEEE: l'alunno dorme durante la lezione

diff --git a/SeniorAssistant/Views/Shared/NavbarRightMenu.cshtml b/SeniorAssistant/Views/Shared/NavbarRightMenu.cshtml index 24dea77..64c69e5 100644 --- a/SeniorAssistant/Views/Shared/NavbarRightMenu.cshtml +++ b/SeniorAssistant/Views/Shared/NavbarRightMenu.cshtml @@ -46,9 +46,11 @@ + }
\ No newline at end of file diff --git a/SeniorAssistant/Views/Shared/SidebarMenu.cshtml b/SeniorAssistant/Views/Shared/SidebarMenu.cshtml index 7be360c..8b645e8 100644 --- a/SeniorAssistant/Views/Shared/SidebarMenu.cshtml +++ b/SeniorAssistant/Views/Shared/SidebarMenu.cshtml @@ -1,12 +1,30 @@ @inject IList Menu @inject IHttpContextAccessor HttpContextAccessor +@inject IDataContextFactory dbFactory @{ - string session = HttpContextAccessor.HttpContext.Session.GetString("username"); + var session = HttpContextAccessor.HttpContext.Session; + string username = session.GetString("username"); - if (session != null) { + if (username != null) + { Menu = new List(Menu); - Menu.Insert(1, new MenuItem("Personal Data", "/user/" + session)); + Menu.RemoveAt(1); + Menu.Insert(1, new MenuItem("Dati personali", "/user/" + username)); + if (session.GetString("role").Equals("doctor")) + { + var db = dbFactory.Create(); + var patients = (from p in db.Patients + where p.Doctor.Equals(username) + join u in db.Users on p.Username equals u.Username + select new { Username = p.Username, Name = u.Name + " " + u.LastName }).ToArray(); + var sub = new SubMenu() { Text = "Pazienti", Items = new List() }; + foreach (var p in patients) + { + sub.Items.Add(new MenuItem(p.Name, "/user/" + p.Username)); + } + Menu.Add(sub); + } } }