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

Update: Update Job Identifiers

Browse Source
This commit is contained in:
Gary Sharp
2014-08-19 10:53:59 +10:00
parent f26474fa4d
commit 0de162fce3
4 changed files with 128 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Models/Disco.Models.csproj
+5 -1
View File
@@ -34,6 +34,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
@@ -176,12 +179,13 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2014/6/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
<UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2014/6/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
Disco.Models/Services/Interop/DiscoServices/UpdateRequestV2.cs
+43 -17
View File
@@ -1,4 +1,5 @@
using System;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
namespace Disco.Models.Services.Interop.DiscoServices
@@ -21,18 +22,31 @@ namespace Disco.Models.Services.Interop.DiscoServices
public List<StatisticString> InstalledPlugins { get; set; }
public List<StatisticIntPair> Stat_JobIdentifiers { get; set; }
public List<StatisticJob> Stat_Jobs { get; set; }
public class StatisticIntPair
{
[JsonProperty("B")]
public int Begin;
[JsonProperty("E")]
public int End;
}
public class StatisticInt
{
public string K;
public int V;
[JsonProperty("K")]
public string Key;
[JsonProperty("V")]
public int Value;
}
public class StatisticString
{
public string K;
public string V;
[JsonProperty("K")]
public string Key;
[JsonProperty("V")]
public string Value;
}
public class StatisticJob
@@ -40,62 +54,74 @@ namespace Disco.Models.Services.Interop.DiscoServices
/// <summary>
/// Job Identifier
/// </summary>
public int I { get; set; }
[JsonProperty("I")]
public int Identifier { get; set; }
/// <summary>
/// Opened Date
/// </summary>
public DateTime OD { get; set; }
[JsonProperty("OD")]
public DateTime OpenedDate { get; set; }
/// <summary>
/// Closed Date
/// </summary>
public DateTime? CD { get; set; }
[JsonProperty("CD", NullValueHandling = NullValueHandling.Ignore)]
public DateTime? ClosedDate { get; set; }
/// <summary>
/// Job Type
/// </summary>
public string T { get; set; }
[JsonProperty("T")]
public string Type { get; set; }
/// <summary>
/// Job Sub Types (Semicolon Separated)
/// </summary>
public string ST { get; set; }
[JsonProperty("ST")]
public string SubTypes { get; set; }
/// <summary>
/// Deployment-Unique Device Serial Identifier (Device Serial Number anonymized via hashing salted with Deployment Secret)
/// </summary>
public string D { get; set; }
[JsonProperty("D", NullValueHandling = NullValueHandling.Ignore)]
public string DeviceIdentifier { get; set; }
/// <summary>
/// Deployment-Unique Job User Identifier (Job User Id anonymized via hashing salted with Deployment Secret)
/// </summary>
public string U { get; set; }
[JsonProperty("U", NullValueHandling = NullValueHandling.Ignore)]
public string UserIdentifier { get; set; }
/// <summary>
/// Deployment-Unique Job Technician Identifier (Job Technician Id anonymized via hashing salted with Deployment Secret)
/// </summary>
public string TI { get; set; }
[JsonProperty("TI")]
public string TechnicianIdentifier { get; set; }
/// <summary>
/// Device Model
/// </summary>
public string DM { get; set; }
[JsonProperty("DM", NullValueHandling = NullValueHandling.Ignore)]
public string DeviceModel { get; set; }
/// <summary>
/// External Repairer
/// </summary>
public string R { get; set; }
[JsonProperty("R", NullValueHandling = NullValueHandling.Ignore)]
public string Repairer { get; set; }
/// <summary>
/// External Repairer Logged
/// </summary>
public DateTime? RL { get; set; }
[JsonProperty("RL", NullValueHandling = NullValueHandling.Ignore)]
public DateTime? RepairerLogged { get; set; }
/// <summary>
/// External Repairer Completed
/// </summary>
public DateTime? RC { get; set; }
[JsonProperty("RC", NullValueHandling = NullValueHandling.Ignore)]
public DateTime? RepairerCompleted { get; set; }
}
}
}
Disco.Models/packages.config
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
</packages>