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

refactor: make exporting consistent

Browse Source
This commit is contained in:
Gary Sharp
2025-02-06 19:14:36 +11:00
parent f946f3250c
commit 67f1c2a5d1
69 changed files with 908 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Models/Disco.Models.csproj
+6 -5
View File
@@ -83,8 +83,8 @@
<Compile Include="Services\Interop\DiscoServices\Activation\CallbackModel.cs" />
<Compile Include="Services\Interop\DiscoServices\Activation\ChallengeModel.cs" />
<Compile Include="Services\Interop\DiscoServices\IConnectNotification.cs" />
<Compile Include="Services\Jobs\Exporting\JobExportOptions.cs" />
<Compile Include="Services\Jobs\Exporting\JobExportRecord.cs" />
<Compile Include="Services\Jobs\JobExportOptions.cs" />
<Compile Include="Services\Jobs\JobExportRecord.cs" />
<Compile Include="Services\Jobs\LocationModes.cs" />
<Compile Include="ClientServices\EnrolmentInformation\Certificate.cs" />
<Compile Include="ClientServices\Register.cs" />
@@ -137,10 +137,10 @@
<Compile Include="Repository\User\UserAttachment.cs" />
<Compile Include="Repository\User\UserDetail.cs" />
<Compile Include="Repository\User\AuthorizationRole.cs" />
<Compile Include="Services\Devices\Exporting\DeviceExportRecord.cs" />
<Compile Include="Services\Devices\DeviceExportRecord.cs" />
<Compile Include="Exporting\ExportResult.cs" />
<Compile Include="Services\Devices\Exporting\DeviceExportTypes.cs" />
<Compile Include="Services\Devices\Exporting\DeviceExportOptions.cs" />
<Compile Include="Services\Devices\DeviceExportTypes.cs" />
<Compile Include="Services\Devices\DeviceExportOptions.cs" />
<Compile Include="Services\Devices\Importing\DeviceImportFieldTypes.cs" />
<Compile Include="Services\Devices\Importing\IDeviceImportRecord.cs" />
<Compile Include="Services\Devices\Importing\IDeviceImportContext.cs" />
@@ -159,6 +159,7 @@
<Compile Include="Services\Jobs\JobLists\JobTableStatusQueueItemModel.cs" />
<Compile Include="Services\Jobs\JobQueues\IJobQueueToken.cs" />
<Compile Include="Services\Jobs\Noticeboards\IHeldDeviceItem.cs" />
<Compile Include="Services\Logging\LogExportOptions.cs" />
<Compile Include="Services\Messaging\Email.cs" />
<Compile Include="Services\Messaging\EmailAttachment.cs" />
<Compile Include="Services\Users\Contact\UserContact.cs" />
Disco.Models/Exporting/IExportOptions.cs
+2 -4
View File
@@ -4,9 +4,7 @@ namespace Disco.Models.Services.Exporting
{
public interface IExportOptions
{
ExportFormat Format { get; }
string FilenamePrefix { get; }
string ExcelWorksheetName { get; }
string ExcelTableName { get; }
int Version { get; set; }
ExportFormat Format { get; set; }
}
}
Disco.Models/Services/Devices/Exporting/DeviceExportOptions.cs → Disco.Models/Services/Devices/DeviceExportOptions.cs
+4 -6
View File
@@ -2,17 +2,15 @@
using Disco.Models.Services.Exporting;
using System.ComponentModel.DataAnnotations;
namespace Disco.Models.Services.Devices.Exporting
namespace Disco.Models.Services.Devices
{
public class DeviceExportOptions : IExportOptions
{
public int Version { get; set; } = 1;
public ExportFormat Format { get; set; }
public DeviceExportTypes ExportType { get; set; }
public int? ExportTypeTargetId { get; set; }
public ExportFormat Format { get; set; }
public string FilenamePrefix { get; } = "DiscoDeviceExport";
public string ExcelWorksheetName { get; } = "DeviceExport";
public string ExcelTableName { get; } = "Devices";
// Device
[Display(ShortName = "Device", Name = "Serial Number", Description = "The device serial number")]
Disco.Models/Services/Devices/Exporting/DeviceExportRecord.cs → Disco.Models/Services/Devices/DeviceExportRecord.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using Disco.Models.Repository;
using System;
using System.Collections.Generic;
namespace Disco.Models.Services.Devices.Exporting
namespace Disco.Models.Services.Devices
{
public class DeviceExportRecord : IExportRecord
{
Disco.Models/Services/Devices/Exporting/DeviceExportTypes.cs → Disco.Models/Services/Devices/DeviceExportTypes.cs
+1 -1
View File
@@ -1,4 +1,4 @@
namespace Disco.Models.Services.Devices.Exporting
namespace Disco.Models.Services.Devices
{
public enum DeviceExportTypes
{
Disco.Models/Services/Devices/DeviceFlags/DeviceFlagExportOptions.cs
+1 -3
View File
@@ -7,10 +7,8 @@ namespace Disco.Models.Services.Devices.DeviceFlag
{
public class DeviceFlagExportOptions : IExportOptions
{
public int Version { get; set; } = 1;
public ExportFormat Format { get; set; }
public string FilenamePrefix { get; } = "DiscoDeviceFlagExport";
public string ExcelWorksheetName { get; } = "DeviceFlagExport";
public string ExcelTableName { get; } = "DeviceFlags";
[Required]
public List<int> DeviceFlagIds { get; set; } = new List<int>();
Disco.Models/Services/Jobs/Exporting/JobExportOptions.cs → Disco.Models/Services/Jobs/JobExportOptions.cs
+4 -6
View File
@@ -4,10 +4,13 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace Disco.Models.Services.Jobs.Exporting
namespace Disco.Models.Services.Jobs
{
public class JobExportOptions : IExportOptions
{
public int Version { get; set; } = 1;
public ExportFormat Format { get; set; }
[DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true, ConvertEmptyStringToNull = true, HtmlEncode = false)]
public DateTime FilterStartDate { get; set; }
[DisplayFormat(DataFormatString = "{0:yyyy-MM-dd}", ApplyFormatInEditMode = true, ConvertEmptyStringToNull = true, HtmlEncode = false)]
@@ -17,11 +20,6 @@ namespace Disco.Models.Services.Jobs.Exporting
public List<string> FilterJobSubTypeIds { get; set; }
public int? FilterJobQueueId { get; set; }
public ExportFormat Format { get; set; }
public string FilenamePrefix { get; } = "DiscoJobExport";
public string ExcelWorksheetName { get; } = "JobExport";
public string ExcelTableName { get; } = "Jobs";
// Job
[Display(ShortName = "Job", Name = "Identifier", Description = "The identifier of the job")]
public bool JobId { get; set; }
Disco.Models/Services/Jobs/Exporting/JobExportRecord.cs → Disco.Models/Services/Jobs/JobExportRecord.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using Disco.Models.Repository;
using System;
using System.Collections.Generic;
namespace Disco.Models.Services.Jobs.Exporting
namespace Disco.Models.Services.Jobs
{
public class JobExportRecord : IExportRecord
{
Disco.Models/Services/Logging/LogExportOptions.cs
+19
View File
@@ -0,0 +1,19 @@
using Disco.Models.Exporting;
using Disco.Models.Services.Exporting;
using System;
using System.Collections.Generic;
namespace Disco.Models.Services.Logging
{
public class LogExportOptions : IExportOptions
{
public int Version { get; set; } = 1;
public ExportFormat Format { get; set; }
public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; }
public int? ModuleId { get; set; }
public List<int> EventTypeIds { get; set; }
public int? Take { get; set; }
}
}
Disco.Models/Services/Users/UserFlags/UserFlagExportOptions.cs
+1 -3
View File
@@ -7,10 +7,8 @@ namespace Disco.Models.Services.Users.UserFlags
{
public class UserFlagExportOptions : IExportOptions
{
public int Version { get; set; } = 1;
public ExportFormat Format { get; set; }
public string FilenamePrefix { get; } = "DiscoUserFlagExport";
public string ExcelWorksheetName { get; } = "UserFlagExport";
public string ExcelTableName { get; } = "UserFlags";
[Required]
public List<int> UserFlagIds { get; set; } = new List<int>();
Disco.Models/UI/Config/DeviceFlag/ConfigDeviceFlagExportModel.cs
+3 -2
View File
@@ -1,6 +1,7 @@
using Disco.Models.Services.Devices.DeviceFlag;
using Disco.Models.Services.Exporting;
using Disco.Models.UI;
using System;
using System.Collections.Generic;
namespace Disco.Models.Areas.Config.UI.DeviceFlag
@@ -9,8 +10,8 @@ namespace Disco.Models.Areas.Config.UI.DeviceFlag
{
DeviceFlagExportOptions Options { get; set; }
string ExportSessionId { get; set; }
ExportResult ExportSessionResult { get; set; }
Guid? ExportId { get; set; }
ExportResult ExportResult { get; set; }
List<Repository.DeviceFlag> DeviceFlags { get; set; }
}
Disco.Models/UI/Config/UserFlag/ConfigUserFlagExportModel.cs
+3 -2
View File
@@ -1,6 +1,7 @@
using Disco.Models.Services.Exporting;
using Disco.Models.Services.Users.UserFlags;
using Disco.Models.UI;
using System;
using System.Collections.Generic;
namespace Disco.Models.Areas.Config.UI.UserFlag
@@ -9,8 +10,8 @@ namespace Disco.Models.Areas.Config.UI.UserFlag
{
UserFlagExportOptions Options { get; set; }
string ExportSessionId { get; set; }
ExportResult ExportSessionResult { get; set; }
Guid? ExportId { get; set; }
ExportResult ExportResult { get; set; }
List<Repository.UserFlag> UserFlags { get; set; }
}
Disco.Models/UI/Device/DeviceExportModel.cs
+4 -3
View File
@@ -1,5 +1,6 @@
using Disco.Models.Services.Devices.Exporting;
using Disco.Models.Services.Devices;
using Disco.Models.Services.Exporting;
using System;
using System.Collections.Generic;
namespace Disco.Models.UI.Device
@@ -8,8 +9,8 @@ namespace Disco.Models.UI.Device
{
DeviceExportOptions Options { get; set; }
string ExportSessionId { get; set; }
ExportResult ExportSessionResult { get; set; }
Guid? ExportId { get; set; }
ExportResult ExportResult { get; set; }
IEnumerable<KeyValuePair<int, string>> DeviceBatches { get; set; }
IEnumerable<KeyValuePair<int, string>> DeviceModels { get; set; }
Disco.Models/UI/Job/JobExportModel.cs
+4 -3
View File
@@ -1,6 +1,7 @@
using Disco.Models.Repository;
using Disco.Models.Services.Exporting;
using Disco.Models.Services.Jobs.Exporting;
using Disco.Models.Services.Jobs;
using System;
using System.Collections.Generic;
namespace Disco.Models.UI.Job
@@ -9,8 +10,8 @@ namespace Disco.Models.UI.Job
{
JobExportOptions Options { get; set; }
string ExportSessionId { get; set; }
ExportResult ExportSessionResult { get; set; }
Guid? ExportId { get; set; }
ExportResult ExportResult { get; set; }
List<JobQueue> JobQueues { get; set; }
List<KeyValuePair<string, string>> JobStatuses { get; set; }