From d62caa048ccbcdb40de70be0a35111e19e977e36 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Thu, 25 Jul 2019 14:52:44 +0200 Subject: [PATCH] code format --- src/Yavsc/Controllers/HomeController.cs | 91 +++++++++++++------------ 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/src/Yavsc/Controllers/HomeController.cs b/src/Yavsc/Controllers/HomeController.cs index c089216a..2c5b163e 100644 --- a/src/Yavsc/Controllers/HomeController.cs +++ b/src/Yavsc/Controllers/HomeController.cs @@ -21,11 +21,11 @@ namespace Yavsc.Controllers [AllowAnonymous] public class HomeController : Controller { - IHostingEnvironment _hosting; + IHostingEnvironment _hosting; - ApplicationDbContext _dbContext; + ApplicationDbContext _dbContext; - readonly IHtmlLocalizer _localizer; + readonly IHtmlLocalizer _localizer; public HomeController(IHtmlLocalizer localizer, IHostingEnvironment hosting, ApplicationDbContext context, UserManager userManager) { @@ -36,42 +36,45 @@ namespace Yavsc.Controllers public async Task Index(string id) { - ViewBag.IsFromSecureProx = (Request.Headers.ContainsKey(Constants.SshHeaderKey))? Request.Headers[Constants.SshHeaderKey]=="on" : false ; - ViewBag.SecureHomeUrl = "https://"+Request.Headers["X-Forwarded-Host"]; + ViewBag.IsFromSecureProx = (Request.Headers.ContainsKey(Constants.SshHeaderKey)) ? Request.Headers[Constants.SshHeaderKey] == "on" : false; + ViewBag.SecureHomeUrl = "https://" + Request.Headers["X-Forwarded-Host"]; ViewBag.SshHeaderKey = Request.Headers[Constants.SshHeaderKey]; var uid = User.GetUserId(); - long [] clicked=null; - if (uid==null) { + long[] clicked = null; + if (uid == null) + { await HttpContext.Session.LoadAsync(); var strclicked = HttpContext.Session.GetString("clicked"); - if (strclicked!=null) clicked = strclicked.Split(':').Select(c=>long.Parse(c)).ToArray(); - if (clicked==null) clicked = new long [0]; + if (strclicked != null) clicked = strclicked.Split(':').Select(c => long.Parse(c)).ToArray(); + if (clicked == null) clicked = new long[0]; } - else clicked = _dbContext.DimissClicked.Where(d=>d.UserId == uid).Select(d=>d.NotificationId).ToArray(); + else clicked = _dbContext.DimissClicked.Where(d => d.UserId == uid).Select(d => d.NotificationId).ToArray(); var notes = _dbContext.Notification.Where( - n=> !clicked.Contains(n.Id) + n => !clicked.Contains(n.Id) ); this.Notify(notes); - ViewData["HaircutCommandCount"] = _dbContext.HairCutQueries.Where( - q=>q.ClientId == uid && q.Status < QueryStatus.Failed + + ViewData["HaircutCommandCount"] = _dbContext.HairCutQueries.Where( + q => q.ClientId == uid && q.Status < QueryStatus.Failed ).Count(); - var toShow = _dbContext.Activities - .Include(a=>a.Forms) - .Include(a=>a.Parent) - .Include(a=>a.Children) - .Where(a=>!a.Hidden) - .Where(a=>a.ParentCode==id) - .OrderByDescending(a=>a.Rate).ToList(); - - foreach (var a in toShow) { - a.Children=a.Children.Where(c => !c.Hidden).ToList(); - } + var toShow = _dbContext.Activities + .Include(a => a.Forms) + .Include(a => a.Parent) + .Include(a => a.Children) + .Where(a => !a.Hidden) + .Where(a => a.ParentCode == id) + .OrderByDescending(a => a.Rate).ToList(); + + foreach (var a in toShow) + { + a.Children = a.Children.Where(c => !c.Hidden).ToList(); + } return View(toShow); } public async Task About() { FileInfo fi = new FileInfo("wwwroot/version"); - return View("About",fi.Exists ? _localizer["Version logicielle: "] + await fi.OpenText().ReadToEndAsync() : _localizer["Aucune information sur la version logicielle n'est publiée."]); + return View("About", fi.Exists ? _localizer["Version logicielle: "] + await fi.OpenText().ReadToEndAsync() : _localizer["Aucune information sur la version logicielle n'est publiée."]); } public IActionResult Privacy() { @@ -89,12 +92,14 @@ namespace Yavsc.Controllers public ActionResult Chat() { - if (User.Identity.IsAuthenticated) { - ViewBag.IsAuthenticated=true; + if (User.Identity.IsAuthenticated) + { + ViewBag.IsAuthenticated = true; string uid = User.GetUserId(); - ViewBag.Contacts = _dbContext.Contact.Where(c=>c.OwnerId == uid) + ViewBag.Contacts = _dbContext.Contact.Where(c => c.OwnerId == uid) ; - } else ViewBag.IsAuthenticated=false; + } + else ViewBag.IsAuthenticated = false; return View(); } @@ -107,24 +112,24 @@ namespace Yavsc.Controllers public IActionResult Status(int id) { ViewBag.StatusCode = id; - return View("~/Views/Shared/Status.cshtml"); + return View("~/Views/Shared/Status.cshtml"); } - public IActionResult Todo() - { + public IActionResult Todo() + { User.GetUserId(); - return View(); - } + return View(); + } - public IActionResult VideoChat() - { - return View(); - } + public IActionResult VideoChat() + { + return View(); + } - public IActionResult Audio() - { - return View(); - } + public IActionResult Audio() + { + return View(); + } - } + } }