Statistics Provider & Service Communication.

5 files changed, 12 insertions, 31 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs
index f18f940ce..6b53971d6 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/FSEViewModel.cs
@@ -46,6 +46,7 @@ using Tango.FSE.Common.DemoMode;
 using Tango.FSE.Common.FileAssociation;
 using Tango.FSE.Common.Insights;
 using Tango.FSE.Common.Build;
+using Tango.FSE.Common.Statistics;
 
 namespace Tango.FSE.Common
 {
@@ -256,6 +257,12 @@ namespace Tango.FSE.Common
         public IBuildProvider BuildProvider { get; set; }
 
         /// <summary>
+        /// Gets or sets the statistics data provider.
+        /// </summary>
+        [TangoInject]
+        public IStatisticsProvider StatisticsProvider { get; set; }
+
+        /// <summary>
         /// Gets or sets the FSE service.
         /// </summary>
         [TangoInject]
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs
index 2f72b3b32..66f9f53a3 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs
@@ -3,11 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.PPC.Shared.Statistics;
 
 namespace Tango.FSE.Common.Statistics
 {
     public interface IStatisticsProvider
     {
-        Task<StatisticsModel> GetStatistics();
+        Task<RequiredFiltersData> GetRequiredFiltersData();
+        Task<StatisticsModel> GetStatistics(Filters filters);
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs
deleted file mode 100644
index aa04574b0..000000000
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.FSE.Common.Statistics
-{
-    public class StatisticsFilterData
-    {
-        public List<String> Rmls { get; set; }
-
-        public List<String> Jobs { get; set; }
-
-        public StatisticsFilterData()
-        {
-            Rmls = new List<string>();
-            Jobs = new List<string>();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs
index d23105b30..242bca621 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs
@@ -3,18 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.BL.DTO;
-using Tango.BL.Entities;
+using Tango.PPC.Shared.Statistics;
 
 namespace Tango.FSE.Common.Statistics
 {
     public class StatisticsModel
     {
-        public List<JobRun> JobRuns { get; set; }
-
-        public StatisticsModel()
-        {
-            JobRuns = new List<JobRun>();
-        }
+        public StatisticsResult StatisticsResult { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
index 47fb9a46e..f5e8e48dc 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj
@@ -323,7 +323,6 @@
     <Compile Include="SQL\RemoteSqlCommandMode.cs" />
     <Compile Include="SQL\RemoteSqlCommandResult.cs" />
     <Compile Include="Statistics\IStatisticsProvider.cs" />
-    <Compile Include="Statistics\StatisticsFilterData.cs" />
     <Compile Include="Statistics\StatisticsModel.cs" />
     <Compile Include="Storage\IStorageProvider.cs" />
     <Compile Include="Storage\IStorageResult.cs" />