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

Update: Job Entity -> Enum Support

Browse Source
This commit is contained in:
Gary Sharp
2013-09-05 12:45:23 +10:00
parent 090322126a
commit f3efa56750
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.BI/BI/Extensions/JobFlagExtensions.cs
+2 -2
View File
@@ -41,7 +41,7 @@ namespace Disco.BI.Extensions
CacheAllFlags(); CacheAllFlags();
var currentFlags = j.Flags ?? 0; var currentFlags = (long)(j.Flags ?? 0);
foreach (var jt in j.JobSubTypes) foreach (var jt in j.JobSubTypes)
{ {
@@ -63,7 +63,7 @@ namespace Disco.BI.Extensions
CacheAllFlags(); CacheAllFlags();
var currentFlags = j.Flags ?? 0; var currentFlags = (long)(j.Flags ?? 0);
foreach (var jt in j.JobSubTypes) foreach (var jt in j.JobSubTypes)
{ {
Disco.Data/Disco.Data.csproj
+1 -1
View File
@@ -159,7 +159,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" /> <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
Disco.Models/Repository/Job/Job.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Disco.Models.Repository
public string ClosedTechUserId { get; set; } public string ClosedTechUserId { get; set; }
public DateTime? ClosedDate { get; set; } public DateTime? ClosedDate { get; set; }
public long? Flags { get; set; } public UserManagementFlags? Flags { get; set; }
[Display(Name = "Technician Held Device")] [Display(Name = "Technician Held Device")]
public DateTime? DeviceHeld { get; set; } public DateTime? DeviceHeld { get; set; }
Disco.Web/Areas/API/Controllers/JobController.cs
+5 -5
View File
@@ -499,9 +499,9 @@ namespace Disco.Web.Areas.API.Controllers
} }
else else
{ {
if (!job.Flags.HasValue || job.Flags.Value != flags) if (!job.Flags.HasValue || (long)job.Flags.Value != flags)
{ {
job.Flags = flags; job.Flags = (Disco.Models.Repository.Job.UserManagementFlags)flags;
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
@@ -1391,7 +1391,7 @@ namespace Disco.Web.Areas.API.Controllers
if (job == null) if (job == null)
throw new Exception("Invalid Job Id"); throw new Exception("Invalid Job Id");
long flag = Flag.Value; var flag = Flag.Value;
var validFlags = job.ValidFlags(); var validFlags = job.ValidFlags();
Tuple<string, bool> flagStatus; Tuple<string, bool> flagStatus;
if (validFlags.TryGetValue((flag < 0 ? flag * -1 : flag), out flagStatus)) if (validFlags.TryGetValue((flag < 0 ? flag * -1 : flag), out flagStatus))
@@ -1400,7 +1400,7 @@ namespace Disco.Web.Areas.API.Controllers
{ // Remove Flag { // Remove Flag
if (flagStatus.Item2) if (flagStatus.Item2)
{ {
job.Flags = (job.Flags ?? 0) ^ (flag * -1); job.Flags = (Disco.Models.Repository.Job.UserManagementFlags)((long)(job.Flags ?? 0) ^ (flag * -1));
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
} }
@@ -1408,7 +1408,7 @@ namespace Disco.Web.Areas.API.Controllers
{ // Add Flag { // Add Flag
if (!flagStatus.Item2) if (!flagStatus.Item2)
{ {
job.Flags = (job.Flags ?? 0) | flag; job.Flags = (Disco.Models.Repository.Job.UserManagementFlags)((long)(job.Flags ?? 0) | flag);
} }
// Write Reason // Write Reason
JobLog jobLog = new JobLog() JobLog jobLog = new JobLog()
Disco.Web/Areas/Config/Models/DeviceProfile/IndexModel.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace Disco.Web.Areas.Config.Models.DeviceProfile
ShortName = dp.ShortName, ShortName = dp.ShortName,
Address = dp.DefaultOrganisationAddress, Address = dp.DefaultOrganisationAddress,
Description = dp.Description, Description = dp.Description,
DistributionTypeId = dp.DistributionTypeDb, DistributionTypeId = (int)dp.DistributionType,
DeviceCount = dp.Devices.Count, DeviceCount = dp.Devices.Count,
DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue) DeviceDecommissionedCount = dp.Devices.Count(d => d.DecommissionedDate.HasValue)
}).ToArray().Cast<ConfigDeviceProfileIndexModelItem>().ToList(); }).ToArray().Cast<ConfigDeviceProfileIndexModelItem>().ToList();
Disco.Web/Controllers/JobController.cs
+2 -2
View File
@@ -137,7 +137,7 @@ namespace Disco.Web.Controllers
(j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.IsInsuranceClaim && !j.JobMetaInsurance.ClaimFormSentDate.HasValue)) || (j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.IsInsuranceClaim && !j.JobMetaInsurance.ClaimFormSentDate.HasValue)) ||
(j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue && !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue))) || (j.JobTypeId == JobType.JobTypeIds.HNWar && (j.JobMetaNonWarranty.AccountingChargeRequiredDate.HasValue && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue && !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue))) ||
(j.JobTypeId == JobType.JobTypeIds.HNWar && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue || !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue)) || (j.JobTypeId == JobType.JobTypeIds.HNWar && (!j.JobMetaNonWarranty.AccountingChargeAddedDate.HasValue || !j.JobMetaNonWarranty.AccountingChargePaidDate.HasValue)) ||
(j.JobTypeId == JobType.JobTypeIds.UMgmt && (long)Job.UserManagementFlags.Infringement_BreachFinancialAgreement == (j.Flags & (long)Job.UserManagementFlags.Infringement_BreachFinancialAgreement)) (j.JobTypeId == JobType.JobTypeIds.UMgmt && Job.UserManagementFlags.Infringement_BreachFinancialAgreement == (j.Flags & Job.UserManagementFlags.Infringement_BreachFinancialAgreement))
))); )));
// UI Extensions // UI Extensions
@@ -194,7 +194,7 @@ namespace Disco.Web.Controllers
var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance - Agreement Breach" }; var m = new Models.Job.ListModel() { Title = "Jobs Awaiting Finance - Agreement Breach" };
m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true }; m.JobTable = new Disco.Models.BI.Job.JobTableModel() { ShowStatus = true };
m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null && m.JobTable.Fill(dbContext, BI.JobBI.Searching.BuildJobTableModel(dbContext).Where(j => j.ClosedDate == null &&
(j.JobTypeId == JobType.JobTypeIds.UMgmt && (long)Job.UserManagementFlags.Infringement_BreachFinancialAgreement == (j.Flags & (long)Job.UserManagementFlags.Infringement_BreachFinancialAgreement)) (j.JobTypeId == JobType.JobTypeIds.UMgmt && Job.UserManagementFlags.Infringement_BreachFinancialAgreement == (j.Flags & Job.UserManagementFlags.Infringement_BreachFinancialAgreement))
).OrderBy(j => j.Id)); ).OrderBy(j => j.Id));
// UI Extensions // UI Extensions