jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maintenance unify document generation ui

Browse Source
This commit is contained in:
Gary Sharp
2021-01-13 15:41:51 +11:00
parent 806aadd161
commit f7fdfb0c8a
37 changed files with 1975 additions and 1973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Models/Device/ShowModel.cs
+6 -13
View File
@@ -2,9 +2,8 @@
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.Device;
using Disco.Services.Plugins;
using Disco.Web.Extensions;
using Disco.Web.Models.Shared;
using System.Collections.Generic;
using System.Web.Mvc;
namespace Disco.Web.Models.Device
{
@@ -25,17 +24,11 @@ namespace Disco.Web.Models.Device
public List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
public List<DocumentTemplatePackage> DocumentTemplatePackages { get; set; }
public List<SelectListItem> DocumentTemplatesSelectListItems
public GenerateDocumentControlModel GenerateDocumentControlModel => new GenerateDocumentControlModel()
{
get
{
var list = new List<SelectListItem>();
list.Add(new SelectListItem() { Selected = true, Value = string.Empty, Text = "Generate Document" });
list.AddRange(DocumentTemplates.ToSelectListItems());
list.AddRange(DocumentTemplatePackages.ToSelectListItems());
return list;
}
}
Target = Device,
Templates = DocumentTemplates,
TemplatePackages = DocumentTemplatePackages,
};
}
}
Disco.Web/Models/Job/ShowModel.cs
+8 -15
View File
@@ -2,10 +2,9 @@
using Disco.Models.Services.Job;
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.Job;
using Disco.Web.Extensions;
using Disco.Web.Models.Shared;
using System;
using System.Collections.Generic;
using System.Web.Mvc;
namespace Disco.Web.Models.Job
{
@@ -17,22 +16,16 @@ namespace Disco.Web.Models.Job
public List<Disco.Models.Repository.DocumentTemplate> AvailableDocumentTemplates { get; set; }
public List<DocumentTemplatePackage> AvailableDocumentTemplatePackages { get; set; }
public GenerateDocumentControlModel GenerateDocumentControlModel => new GenerateDocumentControlModel()
{
Target = Job,
Templates = AvailableDocumentTemplates,
TemplatePackages = AvailableDocumentTemplatePackages,
};
public List<Disco.Models.Repository.JobSubType> UpdatableJobSubTypes { get; set; }
public List<Disco.Models.Repository.JobQueue> AvailableQueues { get; set; }
public List<SelectListItem> DocumentTemplatesSelectListItems
{
get
{
var list = new List<SelectListItem>();
list.Add(new SelectListItem() { Selected = true, Value = string.Empty, Text = "Generate Document" });
list.AddRange(AvailableDocumentTemplates.ToSelectListItems());
list.AddRange(AvailableDocumentTemplatePackages.ToSelectListItems());
return list;
}
}
public LocationModes LocationMode { get; set; }
public List<JobLocationReference> LocationOptions { get; set; }
}
Disco.Web/Models/Shared/GenerateDocumentControlModel.cs
+14
View File
@@ -0,0 +1,14 @@
using Disco.Models.Repository;
using Disco.Models.Services.Documents;
using Disco.Services.Plugins.Features.DocumentHandlerProvider;
using System.Collections.Generic;
namespace Disco.Web.Models.Shared
{
public class GenerateDocumentControlModel
{
public IAttachmentTarget Target { get; set; }
public List<DocumentTemplate> Templates { get; set; }
public List<DocumentTemplatePackage> TemplatePackages { get; set; }
}
}
Disco.Web/Models/User/ShowModel.cs
+6 -15
View File
@@ -3,12 +3,9 @@ using Disco.Models.Services.Authorization;
using Disco.Models.Services.Documents;
using Disco.Models.Services.Jobs.JobLists;
using Disco.Models.UI.User;
using Disco.Services.Users.UserFlags;
using Disco.Web.Extensions;
using Disco.Web.Models.Shared;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
namespace Disco.Web.Models.User
{
@@ -18,6 +15,12 @@ namespace Disco.Web.Models.User
public JobTableModel Jobs { get; set; }
public List<DocumentTemplate> DocumentTemplates { get; set; }
public List<DocumentTemplatePackage> DocumentTemplatePackages { get; set; }
public GenerateDocumentControlModel GenerateDocumentControlModel => new GenerateDocumentControlModel()
{
Target = User,
Templates = DocumentTemplates,
TemplatePackages = DocumentTemplatePackages,
};
public List<UserFlag> AvailableUserFlags { get; set; }
@@ -37,18 +40,6 @@ namespace Disco.Web.Models.User
}
}
public List<SelectListItem> DocumentTemplatesSelectListItems
{
get
{
var list = new List<SelectListItem>();
list.Add(new SelectListItem() { Selected = true, Value = string.Empty, Text = "Select a Document to Generate" });
list.AddRange(DocumentTemplates.ToSelectListItems());
list.AddRange(DocumentTemplatePackages.ToSelectListItems());
return list;
}
}
public string PrimaryDeviceSerialNumber
{
get