Besciamello #1

Merged
Berack96 merged 8 commits from besciamello into master 2019-01-15 21:35:00 +01:00
6 changed files with 24 additions and 74 deletions
Showing only changes of commit 20bde69070 - Show all commits

View File

@@ -21,6 +21,6 @@ namespace SeniorAssistant.Models
public class SubMenu : IMenuItem public class SubMenu : IMenuItem
{ {
public string Text { get; set; } public string Text { get; set; }
public IEnumerable<MenuItem> Items { get; set; } public IList<MenuItem> Items { get; set; }
} }
} }

View File

@@ -35,7 +35,6 @@ else
@if(isDoc && patient != null) @if(isDoc && patient != null)
{ {
<div> <div>
<p>NOTEEEEEEEEEEEE: l'alunno dorme durante la lezione</p>
<textarea id="note-area" placeholder="Scrivi una nota..">@patient.Notes</textarea> <textarea id="note-area" placeholder="Scrivi una nota..">@patient.Notes</textarea>
<button id="send-note" class="btn">Salva</button> <button id="send-note" class="btn">Salva</button>
<p id="note-error"></p> <p id="note-error"></p>

View File

@@ -46,9 +46,11 @@
</li> </li>
<!-- Control Sidebar Toggle Button --> <!-- Control Sidebar Toggle Button -->
<!--
<li> <li>
<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a> <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
</li> </li>
-->
} }
</ul> </ul>
</div> </div>

View File

@@ -1,12 +1,30 @@
@inject IList<IMenuItem> Menu @inject IList<IMenuItem> Menu
@inject IHttpContextAccessor HttpContextAccessor @inject IHttpContextAccessor HttpContextAccessor
@inject IDataContextFactory<SeniorDataContext> 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<IMenuItem>(Menu); Menu = new List<IMenuItem>(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<MenuItem>() };
foreach (var p in patients)
{
sub.Items.Add(new MenuItem(p.Name, "/user/" + p.Username));
}
Menu.Add(sub);
}
} }
} }
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">

View File

@@ -136,75 +136,6 @@ desired effect
<div> <div>
@{ await Html.RenderPartialAsync("Footer"); } @{ await Html.RenderPartialAsync("Footer"); }
</div> </div>
<!-- Control Sidebar -->
<aside class="control-sidebar control-sidebar-dark">
<!-- Create the tabs -->
<ul class="nav nav-tabs nav-justified control-sidebar-tabs">
<li class="active"><a href="#control-sidebar-home-tab" data-toggle="tab"><i class="fa fa-home"></i></a></li>
<li><a href="#control-sidebar-settings-tab" data-toggle="tab"><i class="fa fa-gears"></i></a></li>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<!-- Home tab content -->
<div class="tab-pane active" id="control-sidebar-home-tab">
<h3 class="control-sidebar-heading">Recent Activity</h3>
<ul class="control-sidebar-menu">
<li>
<a href="javascript:;">
<i class="menu-icon fa fa-birthday-cake bg-red"></i>
<div class="menu-info">
<h4 class="control-sidebar-subheading">Langdon's Birthday</h4>
<p>Will be 23 on April 24th</p>
</div>
</a>
</li>
</ul>
<!-- /.control-sidebar-menu -->
<h3 class="control-sidebar-heading">Tasks Progress</h3>
<ul class="control-sidebar-menu">
<li>
<a href="javascript:;">
<h4 class="control-sidebar-subheading">
Custom Template Design
<span class="pull-right-container">
<span class="label label-danger pull-right">70%</span>
</span>
</h4>
<div class="progress progress-xxs">
<div class="progress-bar progress-bar-danger" style="width: 70%"></div>
</div>
</a>
</li>
</ul>
<!-- /.control-sidebar-menu -->
</div>
<!-- /.tab-pane -->
<!-- Stats tab content -->
<div class="tab-pane" id="control-sidebar-stats-tab">Stats Tab Content</div>
<!-- /.tab-pane -->
<!-- Settings tab content -->
<div class="tab-pane" id="control-sidebar-settings-tab">
<form method="post">
<h3 class="control-sidebar-heading">General Settings</h3>
<div class="form-group">
<label class="control-sidebar-subheading">
Report panel usage
<input type="checkbox" class="pull-right" checked>
</label>
<p>
Some information about this general settings option
</p>
</div>
<!-- /.form-group -->
</form>
</div>
<!-- /.tab-pane -->
</div>
</aside>
<!-- /.control-sidebar -->
<!-- Add the sidebar's background. This div must be placed
immediately after the control sidebar -->
<div class="control-sidebar-bg"></div>
</div> </div>
<!-- ./wrapper --> <!-- ./wrapper -->
<!-- REQUIRED JS SCRIPTS --> <!-- REQUIRED JS SCRIPTS -->

Binary file not shown.