From e3779a323c2ad1d6ab5dac33399a6c7686706c4c Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Wed, 1 Feb 2017 09:41:08 -0500 Subject: [PATCH] Add priority --- Core/Core.csproj | 8 ++ Core/DAL/DataService.cs | 8 ++ Core/Entities/LeafInput.cs | 81 +++++------ Core/Entities/Priority.cs | 9 ++ ...01701311417095_PendingPriority.Designer.cs | 29 ++++ .../201701311417095_PendingPriority.cs | 18 +++ .../201701311417095_PendingPriority.resx | 126 ++++++++++++++++++ WebCms/App_Data/Models/all.dll.path | 2 +- WebCms/Controllers/QueueController.cs | 35 ++++- WebCms/Controllers/ResultsController.cs | 8 +- WebCms/Models/LeafInputDetails.cs | 3 + .../LeafWebUmbraco - Web Deploy.pubxml | 20 +-- .../PiscalQueue/PiscalQueueManager.cs | 5 +- WebCms/Views/Queue/Index.cshtml | 42 +++--- WebCms/Views/Results/Index.cshtml | 2 +- .../DisplayTemplates/PriorityIcon.cshtml | 12 ++ .../Shared/DisplayTemplates/TimeSpan.cshtml | 13 ++ .../DisplayTemplates/_PriorityForm.cshtml | 24 ++++ WebCms/WebCms.csproj | 3 + 19 files changed, 365 insertions(+), 83 deletions(-) create mode 100644 Core/Entities/Priority.cs create mode 100644 Core/Migrations/201701311417095_PendingPriority.Designer.cs create mode 100644 Core/Migrations/201701311417095_PendingPriority.cs create mode 100644 Core/Migrations/201701311417095_PendingPriority.resx create mode 100644 WebCms/Views/Shared/DisplayTemplates/PriorityIcon.cshtml create mode 100644 WebCms/Views/Shared/DisplayTemplates/TimeSpan.cshtml create mode 100644 WebCms/Views/Shared/DisplayTemplates/_PriorityForm.cshtml diff --git a/Core/Core.csproj b/Core/Core.csproj index 91b3299..c172445 100644 --- a/Core/Core.csproj +++ b/Core/Core.csproj @@ -87,6 +87,7 @@ + @@ -112,6 +113,10 @@ 201605210257006_LeafOutputFileContents.cs + + + 201701311417095_PendingPriority.cs + @@ -172,6 +177,9 @@ 201605210257006_LeafOutputFileContents.cs + + 201701311417095_PendingPriority.cs + diff --git a/Core/DAL/DataService.cs b/Core/DAL/DataService.cs index 6a53e5e..92a8d1f 100644 --- a/Core/DAL/DataService.cs +++ b/Core/DAL/DataService.cs @@ -54,6 +54,14 @@ namespace LeafWeb.Core.DAL return _db.LeafInputs; } + public IQueryable GetLeafInputsOrdered() + { + return _db.LeafInputs + .OrderByDescending(li => li.CurrentStatus == LeafInputStatusType.Pending) + .ThenByDescending(li => li.PendingPriority) + .ThenByDescending(li => li.Id); + } + public LeafInput GetLeafInput(int id) { return _db.LeafInputs.FirstOrDefault(li => li.Id == id); diff --git a/Core/Entities/LeafInput.cs b/Core/Entities/LeafInput.cs index 3d41ad6..dc53d5a 100644 --- a/Core/Entities/LeafInput.cs +++ b/Core/Entities/LeafInput.cs @@ -8,17 +8,53 @@ using System.Linq; namespace LeafWeb.Core.Entities { - public abstract class LeafInputBase + public class LeafInput { + public int Id { get; set; } + + public virtual ICollection InputFiles { get; set; } + public virtual ICollection LeafInputData { get; set; } public virtual ICollection OutputFiles { get; set; } + + [Required(ErrorMessage = "Name required")] + public string Name { get; set; } + + [Required(ErrorMessage = "An email address is required")] + public string Email { get; set; } + + [Required(ErrorMessage = "A unique identifier is required")] + public string Identifier { get; set; } + + [Required(ErrorMessage = "Site Id required")] + public string SiteId { get; set; } + + [Required] + [Column(TypeName = "VARCHAR")] + [StringLength(12)] + [Index("IX_UniqueToken", 1, IsUnique = true)] + public string UniqueToken { get; set; } + + // [Required(ErrorMessage = "PhotosynthesisType required")] + // http://stackoverflow.com/questions/6038541/ef-validation-failing-on-update-when-using-lazy-loaded-required-properties + public virtual PhotosynthesisType PhotosynthesisType { get; set; } + + [DataType(DataType.Date)] + [Required] + public DateTime Added { get; set; } + + public LeafInputStatusType CurrentStatus { get; set; } + + public virtual ICollection StatusHistory { get; set; } + + public Priority PendingPriority { get; set; } + + #region Calculated properties + public LeafOutputFile OutputErrorMessage => OutputFiles?.FirstOrDefault(f => f.IsErrorMessage); public LeafOutputFile OutputWarningMessage => OutputFiles?.FirstOrDefault(f => f.IsWarningMessage); public bool HasOutputFiles => OutputFiles.Any(); public bool HasLeafChart => OutputFiles.Any(f => f.IsLeafChartFile); - public LeafInputStatusType CurrentStatus { get; set; } - public virtual ICollection StatusHistory { get; set; } - public bool IsPending => CurrentStatus == LeafInputStatusType.Pending; public bool IsStarting => CurrentStatus == LeafInputStatusType.Starting; public bool IsRunning => CurrentStatus == LeafInputStatusType.Running; @@ -42,7 +78,6 @@ namespace LeafWeb.Core.Entities public bool IsDeletable => !IsInProgress; public bool IsAtEndState => IsComplete || IsException || IsCancelled; - public DateTime? StartTime { get @@ -71,7 +106,7 @@ namespace LeafWeb.Core.Entities } } - public TimeSpan TotalInProgressTime + public TimeSpan TimeInProgress { get { @@ -90,40 +125,8 @@ namespace LeafWeb.Core.Entities return end.Value - start.Value; } } - } - public class LeafInput : LeafInputBase - { - public int Id { get; set; } - - public virtual ICollection InputFiles { get; set; } - public virtual ICollection LeafInputData { get; set; } - - [Required(ErrorMessage = "Name required")] - public string Name { get; set; } - - [Required(ErrorMessage = "An email address is required")] - public string Email { get; set; } - - [Required(ErrorMessage = "A unique identifier is required")] - public string Identifier { get; set; } - - [Required(ErrorMessage = "Site Id required")] - public string SiteId { get; set; } - - [Required] - [Column(TypeName = "VARCHAR")] - [StringLength(12)] - [Index("IX_UniqueToken", 1, IsUnique = true)] - public string UniqueToken { get; set; } - - // [Required(ErrorMessage = "PhotosynthesisType required")] - // http://stackoverflow.com/questions/6038541/ef-validation-failing-on-update-when-using-lazy-loaded-required-properties - public virtual PhotosynthesisType PhotosynthesisType { get; set; } - - [DataType(DataType.Date)] - [Required] - public DateTime Added { get; set; } + #endregion public override string ToString() { diff --git a/Core/Entities/Priority.cs b/Core/Entities/Priority.cs new file mode 100644 index 0000000..5e4a239 --- /dev/null +++ b/Core/Entities/Priority.cs @@ -0,0 +1,9 @@ +namespace LeafWeb.Core.Entities +{ + public enum Priority + { + Normal = 0, + Low = -1, + High = 1 + } +} \ No newline at end of file diff --git a/Core/Migrations/201701311417095_PendingPriority.Designer.cs b/Core/Migrations/201701311417095_PendingPriority.Designer.cs new file mode 100644 index 0000000..814cc05 --- /dev/null +++ b/Core/Migrations/201701311417095_PendingPriority.Designer.cs @@ -0,0 +1,29 @@ +// +namespace LeafWeb.Core.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.1.3-40302")] + public sealed partial class PendingPriority : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(PendingPriority)); + + string IMigrationMetadata.Id + { + get { return "201701311417095_PendingPriority"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/Core/Migrations/201701311417095_PendingPriority.cs b/Core/Migrations/201701311417095_PendingPriority.cs new file mode 100644 index 0000000..c883e76 --- /dev/null +++ b/Core/Migrations/201701311417095_PendingPriority.cs @@ -0,0 +1,18 @@ +namespace LeafWeb.Core.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class PendingPriority : DbMigration + { + public override void Up() + { + AddColumn("dbo.LeafInput", "PendingPriority", c => c.Int(nullable: false)); + } + + public override void Down() + { + DropColumn("dbo.LeafInput", "PendingPriority"); + } + } +} diff --git a/Core/Migrations/201701311417095_PendingPriority.resx b/Core/Migrations/201701311417095_PendingPriority.resx new file mode 100644 index 0000000..67ab924 --- /dev/null +++ b/Core/Migrations/201701311417095_PendingPriority.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/WebCms/App_Data/Models/all.dll.path b/WebCms/App_Data/Models/all.dll.path index cdffceb..c6b3fd4 100644 --- a/WebCms/App_Data/Models/all.dll.path +++ b/WebCms/App_Data/Models/all.dll.path @@ -1 +1 @@ -C:\Users\poprhythm\AppData\Local\Temp\Temporary ASP.NET Files\vs\f80e29bb\faae20bf\App_Web_all.generated.cs.8f9494c4.tezx-cyz.dll \ No newline at end of file +C:\Users\poprhythm\AppData\Local\Temp\Temporary ASP.NET Files\vs\f80e29bb\faae20bf\App_Web_all.generated.cs.8f9494c4.ewo9-3jr.dll \ No newline at end of file diff --git a/WebCms/Controllers/QueueController.cs b/WebCms/Controllers/QueueController.cs index 8ddb862..5053e9e 100644 --- a/WebCms/Controllers/QueueController.cs +++ b/WebCms/Controllers/QueueController.cs @@ -16,9 +16,7 @@ namespace LeafWeb.WebCms.Controllers { public ActionResult Index() { - var resultItems = - DataService.GetLeafInputs() - .OrderByDescending(f => f.Id); + var resultItems = DataService.GetLeafInputsOrdered(); string serviceDescription; try @@ -43,7 +41,10 @@ namespace LeafWeb.WebCms.Controllers var leafInput = DataService.GetLeafInput(id); if (leafInput == null) + { + SetStatusMessage($"LeafInput '${id}' not found, may have been deleted?"); RedirectToUmbracoPage(LeafWebPageIds.ManageQueue); + } var viewModel = new LeafInputDetails(leafInput); return View(viewModel); @@ -150,7 +151,11 @@ namespace LeafWeb.WebCms.Controllers public ActionResult SendUserDownloadLink(int id) { var leafInput = DataService.GetLeafInput(id); - if (!leafInput.IsComplete) + if (leafInput == null) + { + SetStatusMessage($"LeafInput '${id}' not found, may have been deleted?"); + } + else if (!leafInput.IsComplete) { SetStatusMessage($"LeafInput '{leafInput.Identifier}' is not complete!", StatusType.Error); } @@ -164,6 +169,28 @@ namespace LeafWeb.WebCms.Controllers return RedirectToCurrentUmbracoUrl(); } + [ActionLog] + public ActionResult Priority(int id, Priority priority) + { + var leafInput = DataService.GetLeafInput(id); + if (leafInput == null) + { + SetStatusMessage($"LeafInput '${id}' not found, may have been deleted?"); + } + else if (!leafInput.IsPending) + { + SetStatusMessage($"LeafInput '{leafInput.Identifier}' is no longer pending"); + } + else + { + leafInput.PendingPriority = priority; + DataService.UpdateLeafInput(leafInput); + SetStatusMessage($"LeafInput '{leafInput.Identifier}' priority set to '{leafInput.PendingPriority}'", StatusType.Success); + } + + return RedirectToCurrentUmbracoUrl(); + } + [ActionLog] public ActionResult SendUserChartLink(int id) { diff --git a/WebCms/Controllers/ResultsController.cs b/WebCms/Controllers/ResultsController.cs index fcfb7d4..126fb98 100644 --- a/WebCms/Controllers/ResultsController.cs +++ b/WebCms/Controllers/ResultsController.cs @@ -3,7 +3,6 @@ using System.Linq; using System.Web.Mvc; using LeafWeb.Core.Entities; using LeafWeb.Core.Utility; -using LeafWeb.WebCms.Models; namespace LeafWeb.WebCms.Controllers { @@ -13,12 +12,9 @@ namespace LeafWeb.WebCms.Controllers { var dateThreshold = DateTime.Today.Subtract(TimeSpan.FromDays(90)); var viewModel = - ( - from li in DataService.GetLeafInputs() + from li in DataService.GetLeafInputsOrdered() where li.Added >= dateThreshold - orderby li.Id descending - select li - ); + select li; return View(viewModel); } diff --git a/WebCms/Models/LeafInputDetails.cs b/WebCms/Models/LeafInputDetails.cs index 87efdc7..6876201 100644 --- a/WebCms/Models/LeafInputDetails.cs +++ b/WebCms/Models/LeafInputDetails.cs @@ -47,6 +47,9 @@ namespace LeafWeb.WebCms.Models [Display(Name = "Piscal Warning")] public string OutputWarningMessage { get; set; } + [Display(Name = "Time In Progress")] + public TimeSpan TimeInProgress { get; set; } + [UIHint("LeafInputStatusViewModels")] public List StatusHistory { get; set; } diff --git a/WebCms/Properties/PublishProfiles/LeafWebUmbraco - Web Deploy.pubxml b/WebCms/Properties/PublishProfiles/LeafWebUmbraco - Web Deploy.pubxml index 58f8dbd..4c1e0a3 100644 --- a/WebCms/Properties/PublishProfiles/LeafWebUmbraco - Web Deploy.pubxml +++ b/WebCms/Properties/PublishProfiles/LeafWebUmbraco - Web Deploy.pubxml @@ -14,12 +14,12 @@ by editing this MSBuild file. In order to learn more about this please visit htt True False leafwebumbraco.scm.azurewebsites.net:443 - - - Delete - filePath - Media - + + + Delete + filePath + Media + LeafWebUmbraco True @@ -30,7 +30,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt <_DestinationType>AzureWebSite - + @@ -49,9 +49,9 @@ by editing this MSBuild file. In order to learn more about this please visit htt - - true - + + true + Data Source=tcp:leafweb.database.windows.net,1433;Initial Catalog=leafwebUmbraco;User ID=lwadmin@leafweb;Password=j4f1a2e! diff --git a/WebCms/Services/PiscalQueue/PiscalQueueManager.cs b/WebCms/Services/PiscalQueue/PiscalQueueManager.cs index 259440d..cfdf761 100644 --- a/WebCms/Services/PiscalQueue/PiscalQueueManager.cs +++ b/WebCms/Services/PiscalQueue/PiscalQueueManager.cs @@ -185,9 +185,8 @@ namespace LeafWeb.WebCms.Services.PiscalQueue var pendingInput = DataService - .GetLeafInputs(LeafInputStatusType.Pending) - .OrderBy(l => l.StatusHistory.Min(sh => sh.DateTime)) - .FirstOrDefault(); + .GetLeafInputsOrdered() + .FirstOrDefault(li => li.CurrentStatus == LeafInputStatusType.Pending); if (pendingInput == null) { diff --git a/WebCms/Views/Queue/Index.cshtml b/WebCms/Views/Queue/Index.cshtml index fad3c1d..c149475 100644 --- a/WebCms/Views/Queue/Index.cshtml +++ b/WebCms/Views/Queue/Index.cshtml @@ -1,4 +1,5 @@ -@model QueueViewModel +@using LeafWeb.Core.Entities +@model QueueViewModel @{ var grid = new WebGrid(Model.Items, rowsPerPage: 45); @@ -15,7 +16,7 @@ grid.Column("SiteId", "Site Id"), grid.Column("Name", "Submitted By"), //grid.Column("FileCount", "Input files"), - grid.Column("TotalInProgressTime", "In-Progress Time", item => ((TimeSpan)item.TotalInProgressTime).ToRoundedReadableString()), + grid.Column("TimeInProgress", "Time In Progress", item => TimeInProgress(item.TimeInProgress)), grid.Column("CurrentStatus", "Status", item => Html.Partial("DisplayTemplates/_LeafInputStatus", (string)item.CurrentStatus.ToString())), grid.Column("Total Results: " + Model.Items.Count(), format: item => Btns(item))), htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed" } @@ -33,15 +34,19 @@
  • @DetailsLink(item)
  • @ChartLink(item)
    • + @if (item.IsPending) + { + +
  • Priority
    • +
  • @PriorityForm(item, Priority.High)
    • +
  • @PriorityForm(item, Priority.Normal)
    • +
  • @PriorityForm(item, Priority.Low)
    • + } @if (item.IsCancellable) {
  • @CancelLink(item)
    • } - @* -
  • Priority
    • -
  • @SetPriorityHigh(item, "Set High")
    • -
  • @SetPriorityLow(item, "Set Low")
    • *@
  • Download
  • @DownloadInput(item)
    • @@ -63,19 +68,6 @@ @Html.Partial("DisplayTemplates/_ChartLink", (int)item.Id) } -@helper SetPriorityHigh(dynamic item, string label) -{ - - @label - -} -@helper SetPriorityLow(dynamic item, string label) -{ - - @label - -} - @helper DownloadInput(dynamic item) { @@ -88,6 +80,13 @@ ToUser } +@helper TimeInProgress(TimeSpan timeSpan) +{ +if (timeSpan > TimeSpan.Zero) +{ + @timeSpan.ToRoundedReadableString() +} +} @helper DeleteLink(dynamic item) { @Html.Partial("DisplayTemplates/_DeleteForm", (Tuple)Tuple.Create(item.Id, item.Identifier, item.IsDeletable)) @@ -98,6 +97,11 @@ @Html.Partial("DisplayTemplates/_CancelForm", (Tuple)Tuple.Create(item.Id, item.Identifier)) } +@helper PriorityForm(dynamic item, Priority priority) +{ +@Html.Partial("DisplayTemplates/_PriorityForm", (Tuple)Tuple.Create(item.Id, item.PendingPriority, priority)) +} + @helper DisableItem(bool disabled) { if (disabled) {class="disabled"} diff --git a/WebCms/Views/Results/Index.cshtml b/WebCms/Views/Results/Index.cshtml index a15b83e..b9fb899 100644 --- a/WebCms/Views/Results/Index.cshtml +++ b/WebCms/Views/Results/Index.cshtml @@ -1,4 +1,4 @@ -@model IOrderedQueryable +@model IQueryable @{ var grid = new WebGrid(Model, rowsPerPage: 45); diff --git a/WebCms/Views/Shared/DisplayTemplates/PriorityIcon.cshtml b/WebCms/Views/Shared/DisplayTemplates/PriorityIcon.cshtml new file mode 100644 index 0000000..3b71f53 --- /dev/null +++ b/WebCms/Views/Shared/DisplayTemplates/PriorityIcon.cshtml @@ -0,0 +1,12 @@ +@using LeafWeb.Core.Entities +@model Priority +@{ + switch (Model) + { + case Priority.Normal:break; + case Priority.Low:break; + case Priority.High:break; + default: + throw new ArgumentOutOfRangeException(); + } +} diff --git a/WebCms/Views/Shared/DisplayTemplates/TimeSpan.cshtml b/WebCms/Views/Shared/DisplayTemplates/TimeSpan.cshtml new file mode 100644 index 0000000..c0b6b5d --- /dev/null +++ b/WebCms/Views/Shared/DisplayTemplates/TimeSpan.cshtml @@ -0,0 +1,13 @@ +@model TimeSpan? +@{ + Layout = "~/Views/Shared/DisplayTemplates/_FieldLayout.cshtml"; + var val = + Model.HasValue + ? + ViewData.ModelMetadata.DisplayFormatString != null + ? string.Format(ViewData.ModelMetadata.DisplayFormatString, Model) + : Model.Value.ToReadableString() + : string.Empty; +} + +@(Model == null ? Html.Encode(ViewData.ModelMetadata.NullDisplayText) : Html.Encode(val)) diff --git a/WebCms/Views/Shared/DisplayTemplates/_PriorityForm.cshtml b/WebCms/Views/Shared/DisplayTemplates/_PriorityForm.cshtml new file mode 100644 index 0000000..b2fd36b --- /dev/null +++ b/WebCms/Views/Shared/DisplayTemplates/_PriorityForm.cshtml @@ -0,0 +1,24 @@ +@using LeafWeb.WebCms.Controllers +@model Tuple +@{ + var leafInputId = Model.Item1; + var currentPriority = Model.Item2; + var formPriority = Model.Item3; +} +@if (currentPriority != formPriority) +{ + using (Html.BeginUmbracoForm("Priority", null, new {@class = "clearfix"})) + { + + + + } +} +else +{ + + @Html.Partial("DisplayTemplates/PriorityIcon", formPriority) @formPriority + +} \ No newline at end of file diff --git a/WebCms/WebCms.csproj b/WebCms/WebCms.csproj index 224ff61..2976141 100644 --- a/WebCms/WebCms.csproj +++ b/WebCms/WebCms.csproj @@ -888,6 +888,9 @@ + + + Web.config