diff options
| author | Roy <Roy.mail.net@gmail.com> | 2022-11-04 21:35:07 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2022-11-04 21:35:07 +0200 |
| commit | 8431040bf909ba65d5ce242b5fd2cc91005ba679 (patch) | |
| tree | d6d60f676426d291cbb848b01a1245c1bc7f1348 /Software/Visual_Studio/PPC | |
| parent | 7722d51930bcc1240b0c5e3ad54c9be7da73309d (diff) | |
| download | Tango-8431040bf909ba65d5ce242b5fd2cc91005ba679.tar.gz Tango-8431040bf909ba65d5ce242b5fd2cc91005ba679.zip | |
Statistics Provider & Service Communication.
Diffstat (limited to 'Software/Visual_Studio/PPC')
3 files changed, 6 insertions, 5 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs index 6260c9e5f..621c6d5eb 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs @@ -88,12 +88,10 @@ namespace Tango.PPC.Common.Statistics db_JobRuns = db_JobRuns.Where(x => x.JobName.ToLower().StartsWith(filters.JobName.ToLower())); } - db_JobRuns = db_JobRuns.Where(x => x.JobLength < filters.MinLength && x.JobLength >= filters.MaxLength); + db_JobRuns = db_JobRuns.Where(x => x.JobLength >= filters.MinLength && x.JobLength <= filters.MaxLength); var jobRuns = await db_JobRuns.ToListAsync(); - jobRuns.ForEach(x => x.LiquidQuantityString = null); - var colorSpaces = await db.ColorSpaces.ToListAsync(); var rmls = await db.Rmls.ToListAsync(); var catalogs = await db.ColorCatalogs.ToListAsync(); @@ -123,7 +121,7 @@ namespace Tango.PPC.Common.Statistics foreach (var liquidType in stop.LiquidVolumes) { PresentationLiquidVolume plt = new PresentationLiquidVolume(); - plt.LiquidType = (LiquidTypes)Enum.Parse(typeof(LiquidTypes), liquidType.LiquidTypeName); + plt.LiquidType = (LiquidTypes)Enum.Parse(typeof(LiquidTypes), liquidType.LiquidTypeName.Replace(" ","")); plt.Volume = liquidType.Volume; pbs.LiquidVolumes.Add(plt); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs index 881e5bcef..ab7547dad 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModelLocator.cs @@ -33,6 +33,7 @@ using Tango.PPC.Common.RemoteJob; using Tango.PPC.Common.RemoteJobUpload; using Tango.PPC.Common.RemoteNotifications; using Tango.PPC.Common.SQL; +using Tango.PPC.Common.Statistics; using Tango.PPC.Common.Storage; using Tango.PPC.Common.Synchronization; using Tango.PPC.Common.SystemInfo; @@ -109,6 +110,7 @@ namespace Tango.PPC.UI TangoIOC.Default.Unregister<IBitManager>(); TangoIOC.Default.Unregister<IRemoteNotificationsService>(); TangoIOC.Default.Unregister<IRemoteJobUploadService>(); + TangoIOC.Default.Unregister<IStatisticsService>(); if (App.StartupArgs != null && App.StartupArgs.Contains("-webDebug")) { @@ -156,6 +158,7 @@ namespace Tango.PPC.UI TangoIOC.Default.Register<IBitManager, DefaultBitManager>(); TangoIOC.Default.Register<IRemoteNotificationsService, DefaultRemoteNotificationsService>(); TangoIOC.Default.Register<IRemoteJobUploadService, DefaultRemoteJobUploadService>(); + TangoIOC.Default.Register<IStatisticsService, DefaultStatisticsService>(); TangoIOC.Default.Register<LoadingViewVM>(); TangoIOC.Default.Register<MainViewVM>(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> |