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

feature: job export supports individual user details

Browse Source
This commit is contained in:
Gary Sharp
2025-07-17 13:09:10 +10:00
parent 0905a02aea
commit 3aeb9374a9
7 changed files with 198 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Models/Services/Jobs/JobExportOptions.cs
+99 -99
View File
@@ -21,227 +21,227 @@ namespace Disco.Models.Services.Jobs
public int? FilterJobQueueId { get; set; } public int? FilterJobQueueId { get; set; }
// Job // Job
[Display(ShortName = "Job", Name = "Identifier", Description = "The identifier of the job")] [Display(GroupName = "Job", Name = "Identifier", Description = "The identifier of the job")]
public bool JobId { get; set; } public bool JobId { get; set; }
[Display(ShortName = "Job", Name = "Status", Description = "The status of the job")] [Display(GroupName = "Job", Name = "Status", Description = "The status of the job")]
public bool JobStatus { get; set; } public bool JobStatus { get; set; }
[Display(ShortName = "Job", Name = "Type", Description = "The type of the job")] [Display(GroupName = "Job", Name = "Type", Description = "The type of the job")]
public bool JobType { get; set; } public bool JobType { get; set; }
[Display(ShortName = "Job", Name = "Sub Types", Description = "The sub types of the job")] [Display(GroupName = "Job", Name = "Sub Types", Description = "The sub types of the job")]
public bool JobSubTypes { get; set; } public bool JobSubTypes { get; set; }
[Display(ShortName = "Job", Name = "Opened Date", Description = "The date the job was opened")] [Display(GroupName = "Job", Name = "Opened Date", Description = "The date the job was opened")]
public bool JobOpenedDate { get; set; } public bool JobOpenedDate { get; set; }
[Display(ShortName = "Job", Name = "Opened User", Description = "The user who opened the job")] [Display(GroupName = "Job", Name = "Opened User", Description = "The user who opened the job")]
public bool JobOpenedUser { get; set; } public bool JobOpenedUser { get; set; }
[Display(ShortName = "Job", Name = "Expected Closed Date", Description = "The expected closed date of the job")] [Display(GroupName = "Job", Name = "Expected Closed Date", Description = "The expected closed date of the job")]
public bool JobExpectedClosedDate { get; set; } public bool JobExpectedClosedDate { get; set; }
[Display(ShortName = "Job", Name = "Closed Date", Description = "The date the job was closed")] [Display(GroupName = "Job", Name = "Closed Date", Description = "The date the job was closed")]
public bool JobClosedDate { get; set; } public bool JobClosedDate { get; set; }
[Display(ShortName = "Job", Name = "Closed User", Description = "The user who closed the job")] [Display(GroupName = "Job", Name = "Closed User", Description = "The user who closed the job")]
public bool JobClosedUser { get; set; } public bool JobClosedUser { get; set; }
// Job Details // Job Details
[Display(ShortName = "Job Details", Name = "Held Date", Description = "The date the device was held")] [Display(GroupName = "Job Details", Name = "Held Date", Description = "The date the device was held")]
public bool JobDeviceHeldDate { get; set; } public bool JobDeviceHeldDate { get; set; }
[Display(ShortName = "Job Details", Name = "Held User", Description = "The user who held the device")] [Display(GroupName = "Job Details", Name = "Held User", Description = "The user who held the device")]
public bool JobDeviceHeldUser { get; set; } public bool JobDeviceHeldUser { get; set; }
[Display(ShortName = "Job Details", Name = "Held Location", Description = "The location the device was held")] [Display(GroupName = "Job Details", Name = "Held Location", Description = "The location the device was held")]
public bool JobDeviceHeldLocation { get; set; } public bool JobDeviceHeldLocation { get; set; }
[Display(ShortName = "Job Details", Name = "Ready For Return Date", Description = "The date the device was ready for return")] [Display(GroupName = "Job Details", Name = "Ready For Return Date", Description = "The date the device was ready for return")]
public bool JobDeviceReadyForReturnDate { get; set; } public bool JobDeviceReadyForReturnDate { get; set; }
[Display(ShortName = "Job Details", Name = "Ready For Return User", Description = "The user who made the device ready for return")] [Display(GroupName = "Job Details", Name = "Ready For Return User", Description = "The user who made the device ready for return")]
public bool JobDeviceReadyForReturnUser { get; set; } public bool JobDeviceReadyForReturnUser { get; set; }
[Display(ShortName = "Job Details", Name = "Returned Date", Description = "The date the device was returned")] [Display(GroupName = "Job Details", Name = "Returned Date", Description = "The date the device was returned")]
public bool JobDeviceReturnedDate { get; set; } public bool JobDeviceReturnedDate { get; set; }
[Display(ShortName = "Job Details", Name = "Returned User", Description = "The user who returned the device")] [Display(GroupName = "Job Details", Name = "Returned User", Description = "The user who returned the device")]
public bool JobDeviceReturnedUser { get; set; } public bool JobDeviceReturnedUser { get; set; }
[Display(ShortName = "Job Details", Name = "Waiting For User Action Date", Description = "The date the job was waiting for user action")] [Display(GroupName = "Job Details", Name = "Waiting For User Action Date", Description = "The date the job was waiting for user action")]
public bool JobWaitingForUserActionDate { get; set; } public bool JobWaitingForUserActionDate { get; set; }
// Job Log // Job Log
[Display(ShortName = "Job Log", Name = "Count", Description = "The number of log entries for the job")] [Display(GroupName = "Job Log", Name = "Count", Description = "The number of log entries for the job")]
public bool LogCount { get; set; } public bool LogCount { get; set; }
[Display(ShortName = "Job Log", Name = "First Date", Description = "The date of the first log entry for the job")] [Display(GroupName = "Job Log", Name = "First Date", Description = "The date of the first log entry for the job")]
public bool LogFirstDate { get; set; } public bool LogFirstDate { get; set; }
[Display(ShortName = "Job Log", Name = "First User", Description = "The user who made the first log entry for the job")] [Display(GroupName = "Job Log", Name = "First User", Description = "The user who made the first log entry for the job")]
public bool LogFirstUser { get; set; } public bool LogFirstUser { get; set; }
[Display(ShortName = "Job Log", Name = "First Content", Description = "The content of the first log entry for the job")] [Display(GroupName = "Job Log", Name = "First Content", Description = "The content of the first log entry for the job")]
public bool LogFirstContent { get; set; } public bool LogFirstContent { get; set; }
[Display(ShortName = "Job Log", Name = "Last Date", Description = "The date of the last log entry for the job")] [Display(GroupName = "Job Log", Name = "Last Date", Description = "The date of the last log entry for the job")]
public bool LogLastDate { get; set; } public bool LogLastDate { get; set; }
[Display(ShortName = "Job Log", Name = "Last User", Description = "The user who made the last log entry for the job")] [Display(GroupName = "Job Log", Name = "Last User", Description = "The user who made the last log entry for the job")]
public bool LogLastUser { get; set; } public bool LogLastUser { get; set; }
[Display(ShortName = "Job Log", Name = "Last Content", Description = "The content of the last log entry for the job")] [Display(GroupName = "Job Log", Name = "Last Content", Description = "The content of the last log entry for the job")]
public bool LogLastContent { get; set; } public bool LogLastContent { get; set; }
// Job Attachments // Job Attachments
[Display(ShortName = "Job Attachments", Name = "Count", Description = "The number of attachments for the job")] [Display(GroupName = "Job Attachments", Name = "Count", Description = "The number of attachments for the job")]
public bool AttachmentsCount { get; set; } public bool AttachmentsCount { get; set; }
// Job Queues // Job Queues
[Display(ShortName = "Job Queues", Name = "Count", Description = "The number of times the job has been associated with a queue")] [Display(GroupName = "Job Queues", Name = "Count", Description = "The number of times the job has been associated with a queue")]
public bool JobQueueCount { get; set; } public bool JobQueueCount { get; set; }
[Display(ShortName = "Job Queues", Name = "Active Count", Description = "The number of active queues the job is associated with")] [Display(GroupName = "Job Queues", Name = "Active Count", Description = "The number of active queues the job is associated with")]
public bool JobQueueActiveCount { get; set; } public bool JobQueueActiveCount { get; set; }
[Display(ShortName = "Job Queues", Name = "Active Latest", Description = "The latest queue the job is associated with")] [Display(GroupName = "Job Queues", Name = "Active Latest", Description = "The latest queue the job is associated with")]
public bool JobQueueActiveLatest { get; set; } public bool JobQueueActiveLatest { get; set; }
[Display(ShortName = "Job Queues", Name = "Active Latest Date", Description = "The date the latest queue was added")] [Display(GroupName = "Job Queues", Name = "Active Latest Date", Description = "The date the latest queue was added")]
public bool JobQueueActiveLatestAddedDate { get; set; } public bool JobQueueActiveLatestAddedDate { get; set; }
[Display(ShortName = "Job Queues", Name = "Active Latest User", Description = "The user who added the latest queue")] [Display(GroupName = "Job Queues", Name = "Active Latest User", Description = "The user who added the latest queue")]
public bool JobQueueActiveLatestAddedUser { get; set; } public bool JobQueueActiveLatestAddedUser { get; set; }
// Job Type - Warranty // Job Type - Warranty
[Display(ShortName = "Job Warranty", Name = "External Name", Description = "The name of the external warranty provider")] [Display(GroupName = "Job Warranty", Name = "External Name", Description = "The name of the external warranty provider")]
public bool JobWarrantyExternalName { get; set; } public bool JobWarrantyExternalName { get; set; }
[Display(ShortName = "Job Warranty", Name = "External Logged Date", Description = "The date the warranty was logged with the external provider")] [Display(GroupName = "Job Warranty", Name = "External Logged Date", Description = "The date the warranty was logged with the external provider")]
public bool JobWarrantyExternalLoggedDate { get; set; } public bool JobWarrantyExternalLoggedDate { get; set; }
[Display(ShortName = "Job Warranty", Name = "External Reference", Description = "The reference of the warranty with the external provider")] [Display(GroupName = "Job Warranty", Name = "External Reference", Description = "The reference of the warranty with the external provider")]
public bool JobWarrantyExternalReference { get; set; } public bool JobWarrantyExternalReference { get; set; }
[Display(ShortName = "Job Warranty", Name = "External Completed Date", Description = "The date the warranty was completed with the external provider")] [Display(GroupName = "Job Warranty", Name = "External Completed Date", Description = "The date the warranty was completed with the external provider")]
public bool JobWarrantyExternalCompletedDate { get; set; } public bool JobWarrantyExternalCompletedDate { get; set; }
// Job Type - NonWarranty // Job Type - NonWarranty
[Display(ShortName = "Job Non Warranty", Name = "Accounting Charge Required Date", Description = "The date the accounting charge was required")] [Display(GroupName = "Job Non Warranty", Name = "Accounting Charge Required Date", Description = "The date the accounting charge was required")]
public bool JobNonWarrantyAccountingChargeRequiredDate { get; set; } public bool JobNonWarrantyAccountingChargeRequiredDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Accounting Charge Added Date", Description = "The date the accounting charge was added")] [Display(GroupName = "Job Non Warranty", Name = "Accounting Charge Added Date", Description = "The date the accounting charge was added")]
public bool JobNonWarrantyAccountingChargeAddedDate { get; set; } public bool JobNonWarrantyAccountingChargeAddedDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Accounting Charge Paid Date", Description = "The date the accounting charge was paid")] [Display(GroupName = "Job Non Warranty", Name = "Accounting Charge Paid Date", Description = "The date the accounting charge was paid")]
public bool JobNonWarrantyAccountingChargePaidDate { get; set; } public bool JobNonWarrantyAccountingChargePaidDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Purchase Order Raised Date", Description = "The date the purchase order was raised")] [Display(GroupName = "Job Non Warranty", Name = "Purchase Order Raised Date", Description = "The date the purchase order was raised")]
public bool JobNonWarrantyPurchaseOrderRaisedDate { get; set; } public bool JobNonWarrantyPurchaseOrderRaisedDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Purchase Order Reference", Description = "The reference of the purchase order")] [Display(GroupName = "Job Non Warranty", Name = "Purchase Order Reference", Description = "The reference of the purchase order")]
public bool JobNonWarrantyPurchaseOrderReference { get; set; } public bool JobNonWarrantyPurchaseOrderReference { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Purchase Order Sent Date", Description = "The date the purchase order was sent")] [Display(GroupName = "Job Non Warranty", Name = "Purchase Order Sent Date", Description = "The date the purchase order was sent")]
public bool JobNonWarrantyPurchaseOrderSentDate { get; set; } public bool JobNonWarrantyPurchaseOrderSentDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Invoice Received Date", Description = "The date the invoice was received")] [Display(GroupName = "Job Non Warranty", Name = "Invoice Received Date", Description = "The date the invoice was received")]
public bool JobNonWarrantyInvoiceReceivedDate { get; set; } public bool JobNonWarrantyInvoiceReceivedDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Repairer Name", Description = "The name of the repairer")] [Display(GroupName = "Job Non Warranty", Name = "Repairer Name", Description = "The name of the repairer")]
public bool JobNonWarrantyRepairerName { get; set; } public bool JobNonWarrantyRepairerName { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Repairer Logged Date", Description = "The date the job was logged with the repairer")] [Display(GroupName = "Job Non Warranty", Name = "Repairer Logged Date", Description = "The date the job was logged with the repairer")]
public bool JobNonWarrantyRepairerLoggedDate { get; set; } public bool JobNonWarrantyRepairerLoggedDate { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Repairer Reference", Description = "The repairer reference for the job")] [Display(GroupName = "Job Non Warranty", Name = "Repairer Reference", Description = "The repairer reference for the job")]
public bool JobNonWarrantyRepairerReference { get; set; } public bool JobNonWarrantyRepairerReference { get; set; }
[Display(ShortName = "Job Non Warranty", Name = "Repairer Completed Date", Description = "The date the repairer completed the job")] [Display(GroupName = "Job Non Warranty", Name = "Repairer Completed Date", Description = "The date the repairer completed the job")]
public bool JobNonWarrantyRepairerCompletedDate { get; set; } public bool JobNonWarrantyRepairerCompletedDate { get; set; }
// Job Type - Insurance // Job Type - Insurance
[Display(ShortName = "Job Insurance", Name = "Loss Or Damage Date", Description = "The date of the loss or damage")] [Display(GroupName = "Job Insurance", Name = "Loss Or Damage Date", Description = "The date of the loss or damage")]
public bool JobMetaInsuranceLossOrDamageDate { get; set; } public bool JobMetaInsuranceLossOrDamageDate { get; set; }
[Display(ShortName = "Job Insurance", Name = "Event Location", Description = "The location of the event")] [Display(GroupName = "Job Insurance", Name = "Event Location", Description = "The location of the event")]
public bool JobMetaInsuranceEventLocation { get; set; } public bool JobMetaInsuranceEventLocation { get; set; }
[Display(ShortName = "Job Insurance", Name = "Description", Description = "The description of the event")] [Display(GroupName = "Job Insurance", Name = "Description", Description = "The description of the event")]
public bool JobMetaInsuranceDescription { get; set; } public bool JobMetaInsuranceDescription { get; set; }
[Display(ShortName = "Job Insurance", Name = "Third Party Caused Name", Description = "The name of the third party which caused the event")] [Display(GroupName = "Job Insurance", Name = "Third Party Caused Name", Description = "The name of the third party which caused the event")]
public bool JobMetaInsuranceThirdPartyCausedName { get; set; } public bool JobMetaInsuranceThirdPartyCausedName { get; set; }
[Display(ShortName = "Job Insurance", Name = "Third Party Caused Why", Description = "The reason the third party caused the event")] [Display(GroupName = "Job Insurance", Name = "Third Party Caused Why", Description = "The reason the third party caused the event")]
public bool JobMetaInsuranceThirdPartyCausedWhy { get; set; } public bool JobMetaInsuranceThirdPartyCausedWhy { get; set; }
[Display(ShortName = "Job Insurance", Name = "Witnesses Names Addresses", Description = "The names and addresses of the witnesses")] [Display(GroupName = "Job Insurance", Name = "Witnesses Names Addresses", Description = "The names and addresses of the witnesses")]
public bool JobMetaInsuranceWitnessesNamesAddresses { get; set; } public bool JobMetaInsuranceWitnessesNamesAddresses { get; set; }
[Display(ShortName = "Job Insurance", Name = "Burglary Theft Method Of Entry", Description = "The method of entry for a burglary or theft")] [Display(GroupName = "Job Insurance", Name = "Burglary Theft Method Of Entry", Description = "The method of entry for a burglary or theft")]
public bool JobMetaInsuranceBurglaryTheftMethodOfEntry { get; set; } public bool JobMetaInsuranceBurglaryTheftMethodOfEntry { get; set; }
[Display(ShortName = "Job Insurance", Name = "Property Last Seen Date", Description = "The date the property was last seen")] [Display(GroupName = "Job Insurance", Name = "Property Last Seen Date", Description = "The date the property was last seen")]
public bool JobMetaInsurancePropertyLastSeenDate { get; set; } public bool JobMetaInsurancePropertyLastSeenDate { get; set; }
[Display(ShortName = "Job Insurance", Name = "Police Station Notified", Description = "The police station which was notified")] [Display(GroupName = "Job Insurance", Name = "Police Station Notified", Description = "The police station which was notified")]
public bool JobMetaInsurancePoliceNotifiedStation { get; set; } public bool JobMetaInsurancePoliceNotifiedStation { get; set; }
[Display(ShortName = "Job Insurance", Name = "Police Notified Date", Description = "The date the police were notified")] [Display(GroupName = "Job Insurance", Name = "Police Notified Date", Description = "The date the police were notified")]
public bool JobMetaInsurancePoliceNotifiedDate { get; set; } public bool JobMetaInsurancePoliceNotifiedDate { get; set; }
[Display(ShortName = "Job Insurance", Name = "Police Crime Report Number", Description = "The crime report number provided by the police")] [Display(GroupName = "Job Insurance", Name = "Police Crime Report Number", Description = "The crime report number provided by the police")]
public bool JobMetaInsurancePoliceNotifiedCrimeReportNo { get; set; } public bool JobMetaInsurancePoliceNotifiedCrimeReportNo { get; set; }
[Display(ShortName = "Job Insurance", Name = "Recover Reduce Action", Description = "The action taken to recover or reduce the loss")] [Display(GroupName = "Job Insurance", Name = "Recover Reduce Action", Description = "The action taken to recover or reduce the loss")]
public bool JobMetaInsuranceRecoverReduceAction { get; set; } public bool JobMetaInsuranceRecoverReduceAction { get; set; }
[Display(ShortName = "Job Insurance", Name = "Other Interested Parties", Description = "Other parties interested in the event")] [Display(GroupName = "Job Insurance", Name = "Other Interested Parties", Description = "Other parties interested in the event")]
public bool JobMetaInsuranceOtherInterestedParties { get; set; } public bool JobMetaInsuranceOtherInterestedParties { get; set; }
[Display(ShortName = "Job Insurance", Name = "Date Of Purchase", Description = "The date the item was purchased")] [Display(GroupName = "Job Insurance", Name = "Date Of Purchase", Description = "The date the item was purchased")]
public bool JobMetaInsuranceDateOfPurchase { get; set; } public bool JobMetaInsuranceDateOfPurchase { get; set; }
[Display(ShortName = "Job Insurance", Name = "Claim Form Sent Date", Description = "The date the claim form was sent")] [Display(GroupName = "Job Insurance", Name = "Claim Form Sent Date", Description = "The date the claim form was sent")]
public bool JobMetaInsuranceClaimFormSentDate { get; set; } public bool JobMetaInsuranceClaimFormSentDate { get; set; }
[Display(ShortName = "Job Insurance", Name = "Insurer", Description = "The insurer associated with the claim")] [Display(GroupName = "Job Insurance", Name = "Insurer", Description = "The insurer associated with the claim")]
public bool JobMetaInsuranceInsurer { get; set; } public bool JobMetaInsuranceInsurer { get; set; }
[Display(ShortName = "Job Insurance", Name = "Insurer Reference", Description = "The reference provided by the insurer")] [Display(GroupName = "Job Insurance", Name = "Insurer Reference", Description = "The reference provided by the insurer")]
public bool JobMetaInsuranceInsurerReference { get; set; } public bool JobMetaInsuranceInsurerReference { get; set; }
// Job Type = User Management // Job Type = User Management
[Display(ShortName = "Job User Management", Name = "Flags", Description = "The user management flags associated with the job")] [Display(GroupName = "Job User Management", Name = "Flags", Description = "The user management flags associated with the job")]
public bool JobUserManagementFlags { get; set; } public bool JobUserManagementFlags { get; set; }
// User // User
[Display(ShortName = "User", Name = "Identifier", Description = "The identifier of the user associated with the job")] [Display(GroupName = "User", Name = "Identifier", Description = "The identifier of the user associated with the job")]
public bool UserId { get; set; } public bool UserId { get; set; }
[Display(ShortName = "User", Name = "Display Name", Description = "The display name of the user associated with the job")] [Display(GroupName = "User", Name = "Display Name", Description = "The display name of the user associated with the job")]
public bool UserDisplayName { get; set; } public bool UserDisplayName { get; set; }
[Display(ShortName = "User", Name = "Surname", Description = "The surname of the user associated with the job")] [Display(GroupName = "User", Name = "Surname", Description = "The surname of the user associated with the job")]
public bool UserSurname { get; set; } public bool UserSurname { get; set; }
[Display(ShortName = "User", Name = "Given Name", Description = "The given name of the user associated with the job")] [Display(GroupName = "User", Name = "Given Name", Description = "The given name of the user associated with the job")]
public bool UserGivenName { get; set; } public bool UserGivenName { get; set; }
[Display(ShortName = "User", Name = "Phone Number", Description = "The phone number of the user associated with the job")] [Display(GroupName = "User", Name = "Phone Number", Description = "The phone number of the user associated with the job")]
public bool UserPhoneNumber { get; set; } public bool UserPhoneNumber { get; set; }
[Display(ShortName = "User", Name = "Email Address", Description = "The email address of the user associated with the job")] [Display(GroupName = "User", Name = "Email Address", Description = "The email address of the user associated with the job")]
public bool UserEmailAddress { get; set; } public bool UserEmailAddress { get; set; }
[Display(ShortName = "User", Name = "Custom Details", Description = "The custom details provided by plugins for the user associated with the job")] [Display(GroupName = "User", Name = "Custom Details", Description = "The custom details provided by plugins for the user associated with the job")]
public bool UserDetailCustom { get; set; } public List<string> UserDetailsCustom { get; set; } = new List<string>();
// Device // Device
[Display(ShortName = "Device", Name = "Serial Number", Description = "The device serial number")] [Display(GroupName = "Device", Name = "Serial Number", Description = "The device serial number")]
public bool DeviceSerialNumber { get; set; } public bool DeviceSerialNumber { get; set; }
[Display(ShortName = "Device", Name = "Asset Number", Description = "The device asset number")] [Display(GroupName = "Device", Name = "Asset Number", Description = "The device asset number")]
public bool DeviceAssetNumber { get; set; } public bool DeviceAssetNumber { get; set; }
[Display(ShortName = "Device", Name = "Location", Description = "The device location")] [Display(GroupName = "Device", Name = "Location", Description = "The device location")]
public bool DeviceLocation { get; set; } public bool DeviceLocation { get; set; }
[Display(ShortName = "Device", Name = "Computer Name", Description = "The device computer name")] [Display(GroupName = "Device", Name = "Computer Name", Description = "The device computer name")]
public bool DeviceComputerName { get; set; } public bool DeviceComputerName { get; set; }
[Display(ShortName = "Device", Name = "Last Network Logon", Description = "The last recorded time the device access the network")] [Display(GroupName = "Device", Name = "Last Network Logon", Description = "The last recorded time the device access the network")]
public bool DeviceLastNetworkLogon { get; set; } public bool DeviceLastNetworkLogon { get; set; }
[Display(ShortName = "Device", Name = "Created Date", Description = "The date the device was created in Disco ICT")] [Display(GroupName = "Device", Name = "Created Date", Description = "The date the device was created in Disco ICT")]
public bool DeviceCreatedDate { get; set; } public bool DeviceCreatedDate { get; set; }
[Display(ShortName = "Device", Name = "First Enrolled Date", Description = "The date the device was first enrolled in Disco ICT")] [Display(GroupName = "Device", Name = "First Enrolled Date", Description = "The date the device was first enrolled in Disco ICT")]
public bool DeviceFirstEnrolledDate { get; set; } public bool DeviceFirstEnrolledDate { get; set; }
[Display(ShortName = "Device", Name = "Last Enrolled Date", Description = "The date the device was last enrolled in Disco ICT")] [Display(GroupName = "Device", Name = "Last Enrolled Date", Description = "The date the device was last enrolled in Disco ICT")]
public bool DeviceLastEnrolledDate { get; set; } public bool DeviceLastEnrolledDate { get; set; }
[Display(ShortName = "Device", Name = "Enrolment Trusted", Description = "The device is trusted to complete an unauthenticated enrolment")] [Display(GroupName = "Device", Name = "Enrolment Trusted", Description = "The device is trusted to complete an unauthenticated enrolment")]
public bool DeviceAllowUnauthenticatedEnrol { get; set; } public bool DeviceAllowUnauthenticatedEnrol { get; set; }
[Display(ShortName = "Device", Name = "Decommissioned Date", Description = "The date the device was decommissioned in Disco ICT")] [Display(GroupName = "Device", Name = "Decommissioned Date", Description = "The date the device was decommissioned in Disco ICT")]
public bool DeviceDecommissionedDate { get; set; } public bool DeviceDecommissionedDate { get; set; }
[Display(ShortName = "Device", Name = "Decommissioned Reason", Description = "The reason the device was decommissioned")] [Display(GroupName = "Device", Name = "Decommissioned Reason", Description = "The reason the device was decommissioned")]
public bool DeviceDecommissionedReason { get; set; } public bool DeviceDecommissionedReason { get; set; }
// Model // Model
[Display(ShortName = "Device Model", Name = "Identifier", Description = "The identifier of the device model associated with the job")] [Display(GroupName = "Device Model", Name = "Identifier", Description = "The identifier of the device model associated with the job")]
public bool DeviceModelId { get; set; } public bool DeviceModelId { get; set; }
[Display(ShortName = "Device Model", Name = "Description", Description = "The description of the device model associated with the job")] [Display(GroupName = "Device Model", Name = "Description", Description = "The description of the device model associated with the job")]
public bool DeviceModelDescription { get; set; } public bool DeviceModelDescription { get; set; }
[Display(ShortName = "Device Model", Name = "Manufacturer", Description = "The manufacturer of the device model associated with the job")] [Display(GroupName = "Device Model", Name = "Manufacturer", Description = "The manufacturer of the device model associated with the job")]
public bool DeviceModelManufacturer { get; set; } public bool DeviceModelManufacturer { get; set; }
[Display(ShortName = "Device Model", Name = "Model", Description = "The model of the device model associated with the job")] [Display(GroupName = "Device Model", Name = "Model", Description = "The model of the device model associated with the job")]
public bool DeviceModelModel { get; set; } public bool DeviceModelModel { get; set; }
[Display(ShortName = "Device Model", Name = "Type", Description = "The type of device model associated with the job")] [Display(GroupName = "Device Model", Name = "Type", Description = "The type of device model associated with the job")]
public bool DeviceModelType { get; set; } public bool DeviceModelType { get; set; }
// Batch // Batch
[Display(ShortName = "Device Batch", Name = "Identifier", Description = "The identifier of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Identifier", Description = "The identifier of the device batch associated with the job")]
public bool DeviceBatchId { get; set; } public bool DeviceBatchId { get; set; }
[Display(ShortName = "Device Batch", Name = "Name", Description = "The name of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Name", Description = "The name of the device batch associated with the job")]
public bool DeviceBatchName { get; set; } public bool DeviceBatchName { get; set; }
[Display(ShortName = "Device Batch", Name = "Purchase Date", Description = "The purchase date of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Purchase Date", Description = "The purchase date of the device batch associated with the job")]
public bool DeviceBatchPurchaseDate { get; set; } public bool DeviceBatchPurchaseDate { get; set; }
[Display(ShortName = "Device Batch", Name = "Supplier", Description = "The supplier of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Supplier", Description = "The supplier of the device batch associated with the job")]
public bool DeviceBatchSupplier { get; set; } public bool DeviceBatchSupplier { get; set; }
[Display(ShortName = "Device Batch", Name = "Unit Cost", Description = "The unit cost of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Unit Cost", Description = "The unit cost of the device batch associated with the job")]
public bool DeviceBatchUnitCost { get; set; } public bool DeviceBatchUnitCost { get; set; }
[Display(ShortName = "Device Batch", Name = "Warranty Valid Until Date", Description = "The warranty valid until date of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Warranty Valid Until Date", Description = "The warranty valid until date of the device batch associated with the job")]
public bool DeviceBatchWarrantyValidUntilDate { get; set; } public bool DeviceBatchWarrantyValidUntilDate { get; set; }
[Display(ShortName = "Device Batch", Name = "Insured Date", Description = "The insured date of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Insured Date", Description = "The insured date of the device batch associated with the job")]
public bool DeviceBatchInsuredDate { get; set; } public bool DeviceBatchInsuredDate { get; set; }
[Display(ShortName = "Device Batch", Name = "Insurance Supplier", Description = "The insurance supplier of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Insurance Supplier", Description = "The insurance supplier of the device batch associated with the job")]
public bool DeviceBatchInsuranceSupplier { get; set; } public bool DeviceBatchInsuranceSupplier { get; set; }
[Display(ShortName = "Device Batch", Name = "Insured Until Date", Description = "The insured until date of the device batch associated with the job")] [Display(GroupName = "Device Batch", Name = "Insured Until Date", Description = "The insured until date of the device batch associated with the job")]
public bool DeviceBatchInsuredUntilDate { get; set; } public bool DeviceBatchInsuredUntilDate { get; set; }
// Profile // Profile
[Display(ShortName = "Device Profile", Name = "Identifier", Description = "The identifier of the device profile associated with the job")] [Display(GroupName = "Device Profile", Name = "Identifier", Description = "The identifier of the device profile associated with the job")]
public bool DeviceProfileId { get; set; } public bool DeviceProfileId { get; set; }
[Display(ShortName = "Device Profile", Name = "Name", Description = "The name of the device profile associated with the job")] [Display(GroupName = "Device Profile", Name = "Name", Description = "The name of the device profile associated with the job")]
public bool DeviceProfileName { get; set; } public bool DeviceProfileName { get; set; }
[Display(ShortName = "Device Profile", Name = "Short Name", Description = "The short name of the device profile associated with the job")] [Display(GroupName = "Device Profile", Name = "Short Name", Description = "The short name of the device profile associated with the job")]
public bool DeviceProfileShortName { get; set; } public bool DeviceProfileShortName { get; set; }
public static JobExportOptions DefaultOptions() public static JobExportOptions DefaultOptions()
Disco.Models/UI/Job/JobExportModel.cs
+3
View File
@@ -1,6 +1,7 @@
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Models.Services.Exporting; using Disco.Models.Services.Exporting;
using Disco.Models.Services.Jobs; using Disco.Models.Services.Jobs;
using Disco.Models.UI.Shared;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -16,5 +17,7 @@ namespace Disco.Models.UI.Job
List<JobQueue> JobQueues { get; set; } List<JobQueue> JobQueues { get; set; }
List<KeyValuePair<string, string>> JobStatuses { get; set; } List<KeyValuePair<string, string>> JobStatuses { get; set; }
List<JobType> JobTypes { get; set; } List<JobType> JobTypes { get; set; }
SharedExportFieldsModel<JobExportOptions> Fields { get; set; }
} }
} }
Disco.Services/Jobs/JobExport.cs
+26 -12
View File
@@ -1,6 +1,7 @@
using Disco.Data.Repository; using Disco.Data.Repository;
using Disco.Models.Exporting; using Disco.Models.Exporting;
using Disco.Models.Repository; using Disco.Models.Repository;
using Disco.Models.Services.Devices;
using Disco.Models.Services.Exporting; using Disco.Models.Services.Exporting;
using Disco.Models.Services.Jobs; using Disco.Models.Services.Jobs;
using Disco.Services.Exporting; using Disco.Services.Exporting;
@@ -12,6 +13,7 @@ using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
namespace Disco.Services.Jobs namespace Disco.Services.Jobs
{ {
@@ -205,17 +207,32 @@ namespace Disco.Services.Jobs
r.Job.DeviceReadyForReturn, r.Job.DeviceReadyForReturn,
r.Job.DeviceReturnedDate); r.Job.DeviceReturnedDate);
} }
if (Options.UserDetailCustom && r.User != null)
{
var detailsService = new DetailsProviderService(database);
r.UserCustomDetails = detailsService.GetDetails(r.User);
}
}); });
if (Options.UserDetailsCustom?.Any() ?? false)
AddUserCustomDetails(database, records, status);
return records; return records;
} }
private static void AddUserCustomDetails(DiscoDataContext database, List<JobExportRecord> records, IScheduledTaskStatus status)
{
if (!records.Any(r => r.User != null))
return;
status.UpdateStatus(50, "Extracting custom user detail records");
var detailsService = new DetailsProviderService(database);
var cache = new Dictionary<string, Dictionary<string, string>>(StringComparer.Ordinal);
foreach (var record in records)
{
var userId = record.User?.UserId;
if (string.IsNullOrWhiteSpace(userId))
continue;
if (!cache.TryGetValue(userId, out var details))
details = detailsService.GetDetails(record.User);
record.UserCustomDetails = details;
}
}
public ExportMetadata<JobExportOptions, JobExportRecord> BuildMetadata(DiscoDataContext database, List<JobExportRecord> records, IScheduledTaskStatus status) public ExportMetadata<JobExportOptions, JobExportRecord> BuildMetadata(DiscoDataContext database, List<JobExportRecord> records, IScheduledTaskStatus status)
{ {
var metadata = new ExportMetadata<JobExportOptions, JobExportRecord>(Options); var metadata = new ExportMetadata<JobExportOptions, JobExportRecord>(Options);
@@ -312,13 +329,10 @@ namespace Disco.Services.Jobs
metadata.Add(o => o.UserEmailAddress, r => r.User?.EmailAddress); metadata.Add(o => o.UserEmailAddress, r => r.User?.EmailAddress);
// User Custom Details // User Custom Details
if (Options.UserDetailCustom) if (Options.UserDetailsCustom.Any())
{ {
var keys = records.Where(r => r.UserCustomDetails != null).SelectMany(r => r.UserCustomDetails.Keys).Distinct(StringComparer.OrdinalIgnoreCase).ToList(); foreach (var key in Options.UserDetailsCustom.OrderBy(k => k, StringComparer.OrdinalIgnoreCase))
foreach (var key in keys.OrderBy(k => k, StringComparer.OrdinalIgnoreCase)) metadata.Add($"User Detail {key.TrimEnd('*', '&')}", r => r.UserCustomDetails != null && r.UserCustomDetails.TryGetValue(key, out var value) ? value : null);
{
metadata.Add(key, r => r.UserCustomDetails != null && r.UserCustomDetails.TryGetValue(key, out var value) ? value : null);
}
} }
// Device // Device
Disco.Web/Controllers/JobController.cs
+4
View File
@@ -18,6 +18,7 @@ using Disco.Services.Plugins.Features.UIExtension;
using Disco.Services.Plugins.Features.WarrantyProvider; using Disco.Services.Plugins.Features.WarrantyProvider;
using Disco.Services.Users; using Disco.Services.Users;
using Disco.Services.Web; using Disco.Services.Web;
using Disco.Web.Models.Shared;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -1092,6 +1093,9 @@ namespace Disco.Web.Controllers
JobStatuses = Job.JobStatusIds.StatusDescriptions.ToList(), JobStatuses = Job.JobStatusIds.StatusDescriptions.ToList(),
}; };
m.Fields = ExportFieldsModel.Create(m.Options, JobExportOptions.DefaultOptions());
m.Fields.AddCustomUserDetails(o => o.UserDetailsCustom, m.Fields.FieldGroups.FindIndex(g => g.Name == "User") + 1);
if (Database.DiscoConfiguration.JobPreferences.LastExportDate.GetValueOrDefault() < DateTime.Today.AddDays(-1)) if (Database.DiscoConfiguration.JobPreferences.LastExportDate.GetValueOrDefault() < DateTime.Today.AddDays(-1))
{ {
m.Options.FilterStartDate = new DateTime(DateTime.Today.Year, 1, 1); m.Options.FilterStartDate = new DateTime(DateTime.Today.Year, 1, 1);
Disco.Web/Models/Job/ExportModel.cs
+2
View File
@@ -2,6 +2,7 @@
using Disco.Models.Services.Exporting; using Disco.Models.Services.Exporting;
using Disco.Models.Services.Jobs; using Disco.Models.Services.Jobs;
using Disco.Models.UI.Job; using Disco.Models.UI.Job;
using Disco.Models.UI.Shared;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -18,5 +19,6 @@ namespace Disco.Web.Models.Job
public List<KeyValuePair<string, string>> JobStatuses { get; set; } public List<KeyValuePair<string, string>> JobStatuses { get; set; }
public List<JobType> JobTypes { get; set; } public List<JobType> JobTypes { get; set; }
public SharedExportFieldsModel<JobExportOptions> Fields { get; set; }
} }
} }
Disco.Web/Views/Job/Export.cshtml
+2 -69
View File
@@ -103,54 +103,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div id="Jobs_Export_Fields" class="form" style="width: 570px; margin-top: 15px;"> @Html.Partial(MVC.Shared.Views._ExportFields, Model.Fields.FieldGroups)
<h2>Export Fields <a id="Jobs_Export_Fields_Defaults" href="#">(Defaults)</a></h2>
<table>
@foreach (var optionGroup in optionGroups)
{
var optionFields = optionGroup.ToList();
var itemsPerColumn = (int)Math.Ceiling((double)optionFields.Count / 2);
<tr>
<th style="width: 120px;">
@optionGroup.Key
@if (optionFields.Count > 2)
{
<span style="display: block;" class="select"><a class="selectAll" href="#">ALL</a> | <a class="selectNone" href="#">NONE</a></span>
}
</th>
<td>
<div class="Jobs_Export_Fields_Group">
<table class="none">
<tr>
<td style="width: 50%">
<ul class="none">
@foreach (var optionItem in optionFields.Take(itemsPerColumn))
{
<li title="@optionItem.Description">
<input type="checkbox" id="Options_@optionItem.PropertyName" name="Options.@optionItem.PropertyName" value="true" @(((bool)optionItem.Model) ? "checked " : null) /><label for="Options_@optionItem.PropertyName">@optionItem.DisplayName</label>
</li>
}
</ul>
</td>
<td style="width: 50%">
<ul class="none">
@foreach (var optionItem in optionFields.Skip(itemsPerColumn))
{
<li title="@optionItem.Description">
<input type="checkbox" id="Options_@optionItem.PropertyName" name="Options.@optionItem.PropertyName" value="true" @(((bool)optionItem.Model) ? "checked " : null) /><label for="Options_@optionItem.PropertyName">@optionItem.DisplayName</label>
</li>
}
</ul>
</td>
</tr>
</table>
</div>
</td>
</tr>
}
</table>
</div>
<script> <script>
$(function () { $(function () {
const $FilterStartDate = $('#Options_FilterStartDate'); const $FilterStartDate = $('#Options_FilterStartDate');
@@ -161,7 +114,6 @@
$FilterEndDate.attr('type', 'date'); $FilterEndDate.attr('type', 'date');
var exportDefaultFields = ['JobId', 'JobStatus', 'JobType', 'JobSubTypes', 'JobOpenedDate', 'DeviceSerialNumber', 'DeviceModelDescription', 'DeviceProfileName', 'UserId', 'UserDisplayName']; var exportDefaultFields = ['JobId', 'JobStatus', 'JobType', 'JobSubTypes', 'JobOpenedDate', 'DeviceSerialNumber', 'DeviceModelDescription', 'DeviceProfileName', 'UserId', 'UserDisplayName'];
var $exportFields = $('#Jobs_Export_Fields');
var $form = $FilterStartDate.closest('form'); var $form = $FilterStartDate.closest('form');
function exportTypeChange() { function exportTypeChange() {
@@ -200,28 +152,9 @@
return false; return false;
}); });
$exportFields.on('click', 'a.selectAll,a.selectNone', function (e) {
e.preventDefault();
var $this = $(this);
$this.closest('tr').find('input').prop('checked', $this.is('.selectAll'));
return false;
});
$('#Jobs_Export_Fields_Defaults').click(function (e) {
e.preventDefault();
$exportFields.find('input').prop('checked', false);
$.each(exportDefaultFields, function (index, value) {
$('#Options_' + value).prop('checked', true);
});
return false;
});
$.validator.unobtrusive.parse($form); $.validator.unobtrusive.parse($form);
$form.data("validator").settings.submitHandler = function () { $form.data("validator").settings.submitHandler = function () {
var exportFieldCount = $exportFields.find('input:checked').length; var exportFieldCount = $('#Export_Fields').find('input:checked').length;
if (exportFieldCount > 0) { if (exportFieldCount > 0) {
Disco.Web/Views/Job/Export.generated.cs
+59 -377
View File
@@ -563,334 +563,26 @@ WriteLiteral(" ");
WriteLiteral("\r\n </td>\r\n </tr>\r\n </table>\r\n " + WriteLiteral("\r\n </td>\r\n </tr>\r\n </table>\r\n " +
" </div>\r\n"); " </div>\r\n");
WriteLiteral(" <div");
WriteLiteral(" id=\"Jobs_Export_Fields\""); #line 106 "..\..\Views\Job\Export.cshtml"
WriteLiteral(" class=\"form\"");
WriteLiteral(" style=\"width: 570px; margin-top: 15px;\"");
WriteLiteral(">\r\n <h2>Export Fields <a");
WriteLiteral(" id=\"Jobs_Export_Fields_Defaults\"");
WriteLiteral(" href=\"#\"");
WriteLiteral(">(Defaults)</a></h2>\r\n <table>\r\n");
#line 109 "..\..\Views\Job\Export.cshtml"
#line default #line default
#line hidden #line hidden
#line 109 "..\..\Views\Job\Export.cshtml" #line 106 "..\..\Views\Job\Export.cshtml"
foreach (var optionGroup in optionGroups) Write(Html.Partial(MVC.Shared.Views._ExportFields, Model.Fields.FieldGroups));
{
var optionFields = optionGroup.ToList();
var itemsPerColumn = (int)Math.Ceiling((double)optionFields.Count / 2);
#line default
#line hidden
WriteLiteral(" <tr>\r\n <th");
WriteLiteral(" style=\"width: 120px;\"");
WriteLiteral(">\r\n");
WriteLiteral(" ");
#line 115 "..\..\Views\Job\Export.cshtml"
Write(optionGroup.Key);
#line default
#line hidden
WriteLiteral("\r\n");
#line 116 "..\..\Views\Job\Export.cshtml"
#line default #line default
#line hidden #line hidden
#line 116 "..\..\Views\Job\Export.cshtml" #line 106 "..\..\Views\Job\Export.cshtml"
if (optionFields.Count > 2)
{
#line default #line default
#line hidden #line hidden
WriteLiteral(" <span");
WriteLiteral(" style=\"display: block;\"");
WriteLiteral(" class=\"select\"");
WriteLiteral("><a");
WriteLiteral(" class=\"selectAll\"");
WriteLiteral(" href=\"#\"");
WriteLiteral(">ALL</a> | <a");
WriteLiteral(" class=\"selectNone\"");
WriteLiteral(" href=\"#\"");
WriteLiteral(">NONE</a></span>\r\n");
#line 119 "..\..\Views\Job\Export.cshtml"
}
#line default
#line hidden
WriteLiteral(" </th>\r\n <td>\r\n " +
" <div");
WriteLiteral(" class=\"Jobs_Export_Fields_Group\"");
WriteLiteral(">\r\n <table");
WriteLiteral(" class=\"none\"");
WriteLiteral(">\r\n <tr>\r\n " +
" <td");
WriteLiteral(" style=\"width: 50%\"");
WriteLiteral(">\r\n <ul");
WriteLiteral(" class=\"none\"");
WriteLiteral(">\r\n");
#line 127 "..\..\Views\Job\Export.cshtml"
#line default
#line hidden
#line 127 "..\..\Views\Job\Export.cshtml"
foreach (var optionItem in optionFields.Take(itemsPerColumn))
{
#line default
#line hidden
WriteLiteral(" <li");
WriteAttribute("title", Tuple.Create(" title=\"", 7857), Tuple.Create("\"", 7888)
#line 129 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 7865), Tuple.Create<System.Object, System.Int32>(optionItem.Description
#line default
#line hidden
, 7865), false)
);
WriteLiteral(">\r\n <input");
WriteLiteral(" type=\"checkbox\"");
WriteAttribute("id", Tuple.Create(" id=\"", 7970), Tuple.Create("\"", 8007)
, Tuple.Create(Tuple.Create("", 7975), Tuple.Create("Options_", 7975), true)
#line 130 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 7983), Tuple.Create<System.Object, System.Int32>(optionItem.PropertyName
#line default
#line hidden
, 7983), false)
);
WriteAttribute("name", Tuple.Create(" name=\"", 8008), Tuple.Create("\"", 8047)
, Tuple.Create(Tuple.Create("", 8015), Tuple.Create("Options.", 8015), true)
#line 130 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 8023), Tuple.Create<System.Object, System.Int32>(optionItem.PropertyName
#line default
#line hidden
, 8023), false)
);
WriteLiteral(" value=\"true\"");
WriteLiteral(" ");
#line 130 "..\..\Views\Job\Export.cshtml"
Write(((bool)optionItem.Model) ? "checked " : null);
#line default
#line hidden
WriteLiteral(" /><label");
WriteAttribute("for", Tuple.Create(" for=\"", 8118), Tuple.Create("\"", 8156)
, Tuple.Create(Tuple.Create("", 8124), Tuple.Create("Options_", 8124), true)
#line 130 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 8132), Tuple.Create<System.Object, System.Int32>(optionItem.PropertyName
#line default
#line hidden
, 8132), false)
);
WriteLiteral(">");
#line 130 "..\..\Views\Job\Export.cshtml"
Write(optionItem.DisplayName);
#line default
#line hidden
WriteLiteral("</label>\r\n </li>\r\n");
#line 132 "..\..\Views\Job\Export.cshtml"
}
#line default
#line hidden
WriteLiteral(" </ul>\r\n " +
" </td>\r\n <td");
WriteLiteral(" style=\"width: 50%\"");
WriteLiteral(">\r\n <ul");
WriteLiteral(" class=\"none\"");
WriteLiteral(">\r\n");
#line 137 "..\..\Views\Job\Export.cshtml"
#line default
#line hidden
#line 137 "..\..\Views\Job\Export.cshtml"
foreach (var optionItem in optionFields.Skip(itemsPerColumn))
{
#line default
#line hidden
WriteLiteral(" <li");
WriteAttribute("title", Tuple.Create(" title=\"", 8745), Tuple.Create("\"", 8776)
#line 139 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 8753), Tuple.Create<System.Object, System.Int32>(optionItem.Description
#line default
#line hidden
, 8753), false)
);
WriteLiteral(">\r\n <input");
WriteLiteral(" type=\"checkbox\"");
WriteAttribute("id", Tuple.Create(" id=\"", 8858), Tuple.Create("\"", 8895)
, Tuple.Create(Tuple.Create("", 8863), Tuple.Create("Options_", 8863), true)
#line 140 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 8871), Tuple.Create<System.Object, System.Int32>(optionItem.PropertyName
#line default
#line hidden
, 8871), false)
);
WriteAttribute("name", Tuple.Create(" name=\"", 8896), Tuple.Create("\"", 8935)
, Tuple.Create(Tuple.Create("", 8903), Tuple.Create("Options.", 8903), true)
#line 140 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 8911), Tuple.Create<System.Object, System.Int32>(optionItem.PropertyName
#line default
#line hidden
, 8911), false)
);
WriteLiteral(" value=\"true\"");
WriteLiteral(" ");
#line 140 "..\..\Views\Job\Export.cshtml"
Write(((bool)optionItem.Model) ? "checked " : null);
#line default
#line hidden
WriteLiteral(" /><label");
WriteAttribute("for", Tuple.Create(" for=\"", 9006), Tuple.Create("\"", 9044)
, Tuple.Create(Tuple.Create("", 9012), Tuple.Create("Options_", 9012), true)
#line 140 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 9020), Tuple.Create<System.Object, System.Int32>(optionItem.PropertyName
#line default
#line hidden
, 9020), false)
);
WriteLiteral(">");
#line 140 "..\..\Views\Job\Export.cshtml"
Write(optionItem.DisplayName);
#line default
#line hidden
WriteLiteral("</label>\r\n </li>\r\n");
#line 142 "..\..\Views\Job\Export.cshtml"
}
#line default
#line hidden
WriteLiteral(@" </ul>
</td>
</tr>
</table>
</div>
</td>
</tr>
");
#line 150 "..\..\Views\Job\Export.cshtml"
}
#line default
#line hidden
WriteLiteral(" </table>\r\n </div>\r\n");
WriteLiteral(" <script>\r\n $(function () {\r\n const $FilterStart" + WriteLiteral(" <script>\r\n $(function () {\r\n const $FilterStart" +
"Date = $(\'#Options_FilterStartDate\');\r\n const $FilterEndDate = $(" + "Date = $(\'#Options_FilterStartDate\');\r\n const $FilterEndDate = $(" +
"\'#Options_FilterEndDate\');\r\n const $FilterJobTypeId = $(\'#Options" + "\'#Options_FilterEndDate\');\r\n const $FilterJobTypeId = $(\'#Options" +
@@ -898,58 +590,48 @@ WriteLiteral(" <script>\r\n $(function () {\r\n
" $FilterEndDate.attr(\'type\', \'date\');\r\n\r\n var expor" + " $FilterEndDate.attr(\'type\', \'date\');\r\n\r\n var expor" +
"tDefaultFields = [\'JobId\', \'JobStatus\', \'JobType\', \'JobSubTypes\', \'JobOpenedDate" + "tDefaultFields = [\'JobId\', \'JobStatus\', \'JobType\', \'JobSubTypes\', \'JobOpenedDate" +
"\', \'DeviceSerialNumber\', \'DeviceModelDescription\', \'DeviceProfileName\', \'UserId\'" + "\', \'DeviceSerialNumber\', \'DeviceModelDescription\', \'DeviceProfileName\', \'UserId\'" +
", \'UserDisplayName\'];\r\n var $exportFields = $(\'#Jobs_Export_Field" + ", \'UserDisplayName\'];\r\n var $form = $FilterStartDate.closest(\'for" +
"s\');\r\n var $form = $FilterStartDate.closest(\'form\');\r\n\r\n " + "m\');\r\n\r\n function exportTypeChange() {\r\n $expo" +
" function exportTypeChange() {\r\n $exportTypeTargetConta" + "rtTypeTargetContainers.hide();\r\n $exportTypeTargetContainers." +
"iners.hide();\r\n $exportTypeTargetContainers.find(\'select\').pr" + "find(\'select\').prop(\'disabled\', true);\r\n\r\n switch ($exportTyp" +
"op(\'disabled\', true);\r\n\r\n switch ($exportType.val()) {\r\n " + "e.val()) {\r\n case \'Batch\':\r\n $" +
" case \'Batch\':\r\n $(\'#Devices_Export" + "(\'#Devices_Export_Type_Target_Batch\').show().find(\'select\').prop(\'disabled\', fal" +
"_Type_Target_Batch\').show().find(\'select\').prop(\'disabled\', false);\r\n " + "se);\r\n break;\r\n case \'Profile\'" +
" break;\r\n case \'Profile\':\r\n " + ":\r\n $(\'#Devices_Export_Type_Target_Profile\').show().f" +
" $(\'#Devices_Export_Type_Target_Profile\').show().find(\'select\').pro" + "ind(\'select\').prop(\'disabled\', false);\r\n break;\r\n " +
"p(\'disabled\', false);\r\n break;\r\n " + " case \'Model\':\r\n $(\'#Devices_Expor" +
" case \'Model\':\r\n $(\'#Devices_Export_Type_Target_Mod" + "t_Type_Target_Model\').show().find(\'select\').prop(\'disabled\', false);\r\n " +
"el\').show().find(\'select\').prop(\'disabled\', false);\r\n " + " break;\r\n }\r\n }\r\n " +
" break;\r\n }\r\n }\r\n $FilterJobTyp" + " $FilterJobTypeId\r\n .on(\'change\', function (e) {\r\n " +
"eId\r\n .on(\'change\', function (e) {\r\n $" + " $(\'#Jobs_Export_SubTypes\').hide()\r\n ." +
"(\'#Jobs_Export_SubTypes\').hide()\r\n .find(\'.Jobs_Expor" + "find(\'.Jobs_Export_SubType_Target\').hide()\r\n .find(\'i" +
"t_SubType_Target\').hide()\r\n .find(\'input\').prop(\'disa" + "nput\').prop(\'disabled\', true);\r\n\r\n const type = $(e.curre" +
"bled\', true);\r\n\r\n const type = $(e.currentTarget).val();\r" + "ntTarget).val();\r\n if (type) {\r\n " +
"\n if (type) {\r\n $(\'#Jobs_Expor" + " $(\'#Jobs_Export_SubTypes\').show()\r\n $(\'#Jobs_Expor" +
"t_SubTypes\').show()\r\n $(\'#Jobs_Export_SubTypes_\' + ty" + "t_SubTypes_\' + type).show()\r\n .find(\'input\').prop" +
"pe).show()\r\n .find(\'input\').prop(\'disabled\', fals" + "(\'disabled\', false);\r\n }\r\n }).trigger(" +
"e);\r\n }\r\n }).trigger(\'change\');\r\n " + "\'change\');\r\n $(\'#Jobs_Export_SubTypes\').on(\'click\', \'a.selectAll," +
" $(\'#Jobs_Export_SubTypes\').on(\'click\', \'a.selectAll,a.selectNone\', fu" + "a.selectNone\', function (e) {\r\n e.preventDefault();\r\n " +
"nction (e) {\r\n e.preventDefault();\r\n var $" + " var $this = $(this);\r\n $this.closest(\'div\').find(" +
"this = $(this);\r\n $this.closest(\'div\').find(\'input\').prop(\'ch" + "\'input\').prop(\'checked\', $this.is(\'.selectAll\'));\r\n return fa" +
"ecked\', $this.is(\'.selectAll\'));\r\n return false;\r\n " + "lse;\r\n });\r\n\r\n $.validator.unobtrusive.parse($form" +
" });\r\n\r\n $exportFields.on(\'click\', \'a.selectAll,a.selectNone\'" + ");\r\n $form.data(\"validator\").settings.submitHandler = function ()" +
", function (e) {\r\n e.preventDefault();\r\n v" + " {\r\n var exportFieldCount = $(\'#Export_Fields\').find(\'input:c" +
"ar $this = $(this);\r\n $this.closest(\'tr\').find(\'input\').prop(" + "hecked\').length;\r\n\r\n if (exportFieldCount > 0) {\r\n\r\n " +
"\'checked\', $this.is(\'.selectAll\'));\r\n return false;\r\n " +
" });\r\n\r\n $(\'#Jobs_Export_Fields_Defaults\').click(function " +
"(e) {\r\n e.preventDefault();\r\n\r\n $exportFie" +
"lds.find(\'input\').prop(\'checked\', false);\r\n\r\n $.each(exportDe" +
"faultFields, function (index, value) {\r\n $(\'#Options_\' + " +
"value).prop(\'checked\', true);\r\n });\r\n\r\n re" +
"turn false;\r\n });\r\n\r\n $.validator.unobtrusive.pars" +
"e($form);\r\n $form.data(\"validator\").settings.submitHandler = func" +
"tion () {\r\n var exportFieldCount = $exportFields.find(\'input:" +
"checked\').length;\r\n\r\n if (exportFieldCount > 0) {\r\n\r\n " +
" const $exportingDialog = $(\'#Export_Exporting\').dialog({\r\n " + " const $exportingDialog = $(\'#Export_Exporting\').dialog({\r\n " +
" width: 400,\r\n height: 164,\r\n " + " width: 400,\r\n height: 164,\r\n " +
" resizable: false,\r\n modal: t" + " resizable: false,\r\n modal: tr" +
"rue,\r\n autoOpen: true\r\n });\r\n\r" + "ue,\r\n autoOpen: true\r\n });\r\n\r\n" +
"\n $form[0].submit();\r\n }\r\n " + " $form[0].submit();\r\n }\r\n " +
" else\r\n alert(\'Select at least one field to export" + " else\r\n alert(\'Select at least one field to export." +
".\');\r\n };\r\n\r\n $(\'#Jobs_Export_Button\').click(funct" + "\');\r\n };\r\n\r\n $(\'#Jobs_Export_Button\').click(functi" +
"ion () {\r\n $form.submit();\r\n });\r\n " + "on () {\r\n $form.submit();\r\n });\r\n " +
" $(\'#Jobs_Export_Save_Button\').click(function () {\r\n $form" + " $(\'#Jobs_Export_Save_Button\').click(function () {\r\n $form." +
".attr(\'action\', $form[0].dataset.saveaction);\r\n $form.submit(" + "attr(\'action\', $form[0].dataset.saveaction);\r\n $form.submit()" +
");\r\n });\r\n });\r\n </script>\r\n"); ";\r\n });\r\n });\r\n </script>\r\n");
#line 251 "..\..\Views\Job\Export.cshtml" #line 184 "..\..\Views\Job\Export.cshtml"
} }
@@ -958,7 +640,7 @@ WriteLiteral(" <script>\r\n $(function () {\r\n
WriteLiteral("</div>\r\n"); WriteLiteral("</div>\r\n");
#line 253 "..\..\Views\Job\Export.cshtml" #line 186 "..\..\Views\Job\Export.cshtml"
if (Model.ExportId.HasValue) if (Model.ExportId.HasValue)
{ {
@@ -976,13 +658,13 @@ WriteLiteral(" title=\"Export Jobs\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 256 "..\..\Views\Job\Export.cshtml" #line 189 "..\..\Views\Job\Export.cshtml"
#line default #line default
#line hidden #line hidden
#line 256 "..\..\Views\Job\Export.cshtml" #line 189 "..\..\Views\Job\Export.cshtml"
if (Model.ExportResult.RecordCount == 0) if (Model.ExportResult.RecordCount == 0)
{ {
@@ -992,7 +674,7 @@ WriteLiteral(">\r\n");
WriteLiteral(" <h4>No records matched the filter criteria</h4>\r\n"); WriteLiteral(" <h4>No records matched the filter criteria</h4>\r\n");
#line 259 "..\..\Views\Job\Export.cshtml" #line 192 "..\..\Views\Job\Export.cshtml"
} }
else else
{ {
@@ -1003,7 +685,7 @@ WriteLiteral(" <h4>No records matched the filter criteria</h4>\r\n");
WriteLiteral(" <h4>"); WriteLiteral(" <h4>");
#line 262 "..\..\Views\Job\Export.cshtml" #line 195 "..\..\Views\Job\Export.cshtml"
Write(Model.ExportResult.RecordCount); Write(Model.ExportResult.RecordCount);
@@ -1012,7 +694,7 @@ WriteLiteral(" <h4>");
WriteLiteral(" record"); WriteLiteral(" record");
#line 262 "..\..\Views\Job\Export.cshtml" #line 195 "..\..\Views\Job\Export.cshtml"
Write(Model.ExportResult.RecordCount != 1 ? "s" : null); Write(Model.ExportResult.RecordCount != 1 ? "s" : null);
@@ -1022,14 +704,14 @@ WriteLiteral(" were successfully exported.</h4>\r\n");
WriteLiteral(" <a"); WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 14423), Tuple.Create("\"", 14491) WriteAttribute("href", Tuple.Create(" href=\"", 10612), Tuple.Create("\"", 10680)
#line 263 "..\..\Views\Job\Export.cshtml" #line 196 "..\..\Views\Job\Export.cshtml"
, Tuple.Create(Tuple.Create("", 14430), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.ExportRetrieve(Model.ExportId.Value)) , Tuple.Create(Tuple.Create("", 10619), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.Job.ExportRetrieve(Model.ExportId.Value))
#line default #line default
#line hidden #line hidden
, 14430), false) , 10619), false)
); );
WriteLiteral(" class=\"button\""); WriteLiteral(" class=\"button\"");
@@ -1041,7 +723,7 @@ WriteLiteral(" class=\"fa fa-download fa-lg\"");
WriteLiteral("></i>Download Job Export</a>\r\n"); WriteLiteral("></i>Download Job Export</a>\r\n");
#line 264 "..\..\Views\Job\Export.cshtml" #line 197 "..\..\Views\Job\Export.cshtml"
} }
@@ -1064,7 +746,7 @@ WriteLiteral(@" <script>
"); ");
#line 278 "..\..\Views\Job\Export.cshtml" #line 211 "..\..\Views\Job\Export.cshtml"
} }
@@ -1091,13 +773,13 @@ WriteLiteral(" class=\"actionBar\"");
WriteLiteral(">\r\n"); WriteLiteral(">\r\n");
#line 283 "..\..\Views\Job\Export.cshtml" #line 216 "..\..\Views\Job\Export.cshtml"
#line default #line default
#line hidden #line hidden
#line 283 "..\..\Views\Job\Export.cshtml" #line 216 "..\..\Views\Job\Export.cshtml"
if (Authorization.Has(Claims.Config.ManageSavedExports)) if (Authorization.Has(Claims.Config.ManageSavedExports))
{ {
@@ -1115,7 +797,7 @@ WriteLiteral(" class=\"button\"");
WriteLiteral(">Save Export</button>\r\n"); WriteLiteral(">Save Export</button>\r\n");
#line 286 "..\..\Views\Job\Export.cshtml" #line 219 "..\..\Views\Job\Export.cshtml"
} }
else else
{ {
@@ -1136,7 +818,7 @@ WriteLiteral(" title=\"Requires Manage Saved Exports Permission\"");
WriteLiteral(">Save Export</button>\r\n"); WriteLiteral(">Save Export</button>\r\n");
#line 290 "..\..\Views\Job\Export.cshtml" #line 223 "..\..\Views\Job\Export.cshtml"
} }