From bcfaaf57b60a63acacf0651f5a69b45304abc132 Mon Sep 17 00:00:00 2001 From: Roy Date: Thu, 3 Nov 2022 09:16:24 +0200 Subject: FSE Statistics module starter. --- .../FSE/Modules/Tango.FSE.Statistics/App.xaml | 16 ++ .../Tango.FSE.Statistics/Images/statistics.png | Bin 0 -> 2664 bytes .../Properties/AssemblyInfo.cs | 55 +++++++ .../Properties/Resources.Designer.cs | 71 ++++++++ .../Tango.FSE.Statistics/Properties/Resources.resx | 117 ++++++++++++++ .../Properties/Settings.Designer.cs | 30 ++++ .../Properties/Settings.settings | 7 + .../Tango.FSE.Statistics/StatisticsModule.cs | 26 +++ .../Tango.FSE.Statistics.csproj | 180 +++++++++++++++++++++ .../Tango.FSE.Statistics/ViewModelLocator.cs | 26 +++ .../Tango.FSE.Statistics/ViewModels/MainViewVM.cs | 32 ++++ .../Tango.FSE.Statistics/Views/MainView.xaml | 14 ++ .../Tango.FSE.Statistics/Views/MainView.xaml.cs | 28 ++++ .../FSE/Modules/Tango.FSE.Statistics/app.config | 85 ++++++++++ .../Modules/Tango.FSE.Statistics/packages.config | 10 ++ .../ViewModels/MainViewVM.cs | 2 +- .../Services/MachineConfigurationService.cs | 4 +- .../Statistics/IStatisticsProvider.cs | 13 ++ .../Statistics/StatisticsFilterData.cs | 21 +++ .../Tango.FSE.Common/Statistics/StatisticsModel.cs | 20 +++ .../FSE/Tango.FSE.Common/Tango.FSE.Common.csproj | 3 + .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj | 4 + .../Statistics/DefaultStatisticsService.cs | 103 ++++++++++++ .../Statistics/IStatisticsService.cs | 13 ++ .../PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 4 +- .../PPC/Tango.PPC.Shared/Statistics/Filters.cs | 26 +++ .../Statistics/GetStatisticsRequest.cs | 18 +++ .../GetStatisticsRequiredFiltersRequest.cs | 13 ++ .../GetStatisticsRequiredFiltersResponse.cs | 18 +++ .../Statistics/GetStatisticsResponse.cs | 18 +++ .../Statistics/JobRunComposition.cs | 20 +++ .../Statistics/RequiredFiltersData.cs | 21 +++ .../Statistics/StatisticsResult.cs | 19 +++ .../PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj | 8 + Software/Visual_Studio/Tango.BL/Entities/JobRun.cs | 18 +-- Software/Visual_Studio/Tango.sln | 35 +++- 36 files changed, 1079 insertions(+), 19 deletions(-) create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/App.xaml create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/statistics.png create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.Designer.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.resx create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.Designer.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.settings create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/StatisticsModule.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModelLocator.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml.cs create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/app.config create mode 100644 Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/packages.config create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/IStatisticsService.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/Filters.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersRequest.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersResponse.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsResponse.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/JobRunComposition.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/RequiredFiltersData.cs create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/StatisticsResult.cs (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/App.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/App.xaml new file mode 100644 index 000000000..384ab9cca --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/App.xaml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/statistics.png b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/statistics.png new file mode 100644 index 000000000..bf818a6f1 Binary files /dev/null and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Images/statistics.png differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/AssemblyInfo.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..61d2c5bb6 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/AssemblyInfo.cs @@ -0,0 +1,55 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Tango.FSE.Statistics")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Tango.FSE.Statistics")] +[assembly: AssemblyCopyright("Copyright © 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US english +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] + + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] + + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.Designer.cs new file mode 100644 index 000000000..8a60559df --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.Designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.FSE.Statistics.Properties +{ + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager + { + get + { + if ((resourceMan == null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.FSE.Statistics.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.resx b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.Designer.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.Designer.cs new file mode 100644 index 000000000..b2e12cbff --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.Designer.cs @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.FSE.Statistics.Properties +{ + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase + { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default + { + get + { + return defaultInstance; + } + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.settings b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/StatisticsModule.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/StatisticsModule.cs new file mode 100644 index 000000000..919cfe466 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/StatisticsModule.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Media.Imaging; +using Tango.BL.Enumerations; +using Tango.FSE.Common; +using Tango.FSE.Statistics.Views; + +namespace Tango.FSE.Statistics +{ + [FSEModule(index: 1)] + public class StatisticsModule : FSEModuleBase + { + public override string Name { get; } = "Statistics"; + public override string Description { get; } = "Statistics module"; + public override Type MainViewType { get; } = typeof(MainView); + public override Permissions Permission { get; } = Permissions.FSE_RunFSE; + + public override void Dispose() + { + + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj new file mode 100644 index 000000000..8562c73ca --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj @@ -0,0 +1,180 @@ + + + + + Debug + AnyCPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788} + library + Tango.FSE.Statistics + Tango.FSE.Statistics + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + + + true + full + false + ..\..\..\Build\FSE\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\..\Build\FSE\Release\ + TRACE + prompt + 4 + + + + ..\..\..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll + + + ..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll + + + ..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll + + + ..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + + ..\..\..\packages\MahApps.Metro.1.6.5\lib\net46\MahApps.Metro.dll + + + ..\..\..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll + + + ..\..\..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll + + + ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + + + + + ..\..\..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + + + + + + + + + MainView.xaml + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + {bb2abb74-ba58-4812-83aa-ec8171f42df4} + Tango.AutoComplete + + + {f441feee-322a-4943-b566-110e12fd3b72} + Tango.BL + + + {a34ee0f0-649d-41c8-8489-b6f1cc6924ee} + Tango.Core + + + {4206ac58-3b57-4699-8835-90bf6db01a61} + Tango.Integration + + + {bc932dbd-7cdb-488c-99e4-f02cf441f55e} + Tango.Logging + + + {e4927038-348d-4295-aaf4-861c58cb3943} + Tango.PMR + + + {d8f1ad85-526a-4f50-b6dc-d437af63d8d8} + Tango.Settings + + + {8491d07b-c1f6-4b62-a412-41b9fd2d6538} + Tango.SharedUI + + + {74e700b0-1156-4126-be40-ee450d3c3026} + Tango.Transport + + + {834c81c3-09b5-45d7-be12-e7d1e6655a7c} + Tango.FSE.BL + + + {bc37cccb-7392-4f78-8d1c-e9629e6e046e} + Tango.FSE.Common + + + + + MSBuild:Compile + Designer + + + Designer + MSBuild:Compile + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModelLocator.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModelLocator.cs new file mode 100644 index 000000000..4afef5a01 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModelLocator.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.DI; +using Tango.FSE.Statistics.ViewModels; + +namespace Tango.FSE.Statistics +{ + public static class ViewModelLocator + { + static ViewModelLocator() + { + TangoIOC.Default.Register(); + } + + public static MainViewVM MainViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs new file mode 100644 index 000000000..bfcc9cbd2 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.FSE.Common; +using Tango.FSE.Common.Navigation; +using Tango.SharedUI.Helpers; + +namespace Tango.FSE.Statistics.ViewModels +{ + public class MainViewVM : FSEViewModel + { + public override void OnApplicationStarted() + { + InvokeUI(() => + { + NavigationManager.MenuItems.Add(new NavigationMenuItem(() => + { + NavigationManager.NavigateTo(); + }) + { + Name = "Statistics", + Index = 11, + Description = "Query for statistical data of a machine.", + Image = ResourceHelper.GetImageFromResources("Images/statistics.png"), + }); + }); + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml new file mode 100644 index 000000000..24afcc9c0 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml @@ -0,0 +1,14 @@ + + + Statistics View + + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml.cs new file mode 100644 index 000000000..db93b84fc --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.FSE.Statistics.Views +{ + /// + /// Interaction logic for MainView.xaml + /// + public partial class MainView : UserControl + { + public MainView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/app.config b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/app.config new file mode 100644 index 000000000..36bc04f85 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/app.config @@ -0,0 +1,85 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/packages.config b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/packages.config new file mode 100644 index 000000000..dd8c723e4 --- /dev/null +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs index 17a361932..842db47be 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/MainViewVM.cs @@ -27,7 +27,7 @@ namespace Tango.FSE.UsersAndRoles.ViewModels }) { Name = "Users & Roles", - Index = 11, + Index = 12, Description = "Manage users and their permissions on your organization.", Image = ResourceHelper.GetImageFromResources("Images/users_and_roles.png"), }); diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs index 3b33719d0..46b3a5beb 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs @@ -71,10 +71,10 @@ namespace Tango.FSE.BL.Services //Tags composition.Tags = db.TangoVersions.Select(x => x.Tag).Where(x => x != null).Distinct().ToList(); - composition.Tags.Insert(0, String.Empty); + composition.Tags.Insert(0, string.Empty); //Counters - var jobRuns = db.JobRuns.Where(x => x.MachineGuid == machineGuid).Select(x => new { x.StartDate, x.EndDate, x.EndPosition }).ToList(); + var jobRuns = db.JobRuns.Where(x => x.MachineGuid == machineGuid).Select(x => new { StartDate=x.StartDate, x.EndDate, x.EndPosition }).ToList(); composition.TotalDyeTime = TimeSpan.FromHours(jobRuns.Select(x => x.EndDate - x.StartDate).Sum(x => x.TotalHours)).ToStringUnlimitedHours(); int meters = (int)jobRuns.Select(x => x.EndPosition).Sum(); composition.TotalDyeMeters = $"{meters.ToString("N0")} meters"; diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs new file mode 100644 index 000000000..2f72b3b32 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/IStatisticsProvider.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.FSE.Common.Statistics +{ + public interface IStatisticsProvider + { + Task GetStatistics(); + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs new file mode 100644 index 000000000..aa04574b0 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsFilterData.cs @@ -0,0 +1,21 @@ +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 Rmls { get; set; } + + public List Jobs { get; set; } + + public StatisticsFilterData() + { + Rmls = new List(); + Jobs = new List(); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs new file mode 100644 index 000000000..d23105b30 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Statistics/StatisticsModel.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.DTO; +using Tango.BL.Entities; + +namespace Tango.FSE.Common.Statistics +{ + public class StatisticsModel + { + public List JobRuns { get; set; } + + public StatisticsModel() + { + JobRuns = new List(); + } + } +} 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 3e389289e..47fb9a46e 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 @@ -322,6 +322,9 @@ + + + diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj index ce2aa999f..4147629ab 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj @@ -793,6 +793,10 @@ {1754f846-4763-4000-807f-c7bfaa145db2} Tango.FSE.Procedures + + {7a30b35f-94dc-4a9c-b9d2-cb5caa735788} + Tango.FSE.Statistics + {0c0b24cb-79af-4253-aac3-b2badf034675} Tango.FSE.Upgrade diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs new file mode 100644 index 000000000..a603410d0 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/DefaultStatisticsService.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using System.Data.Entity; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL; +using Tango.Core; +using Tango.Core.DI; +using Tango.Integration.ExternalBridge; +using Tango.PPC.Common.ExternalBridge; +using Tango.PPC.Shared.Statistics; + +namespace Tango.PPC.Common.Statistics +{ + [TangoCreateWhenRegistered] + public class DefaultStatisticsService : ExtendedObject, IStatisticsService, IExternalBridgeRequestHandler + { + public bool Enabled { get; set; } = true; + + public DefaultStatisticsService(IPPCExternalBridgeService externalBridge) + { + try + { + externalBridge.RegisterRequestHandler(this); + } + catch (Exception ex) + { + LogManager.Log(ex, "Error initializing the statistics service."); + Enabled = false; + } + } + + [ExternalBridgeRequestHandlerMethod(typeof(GetStatisticsRequiredFiltersRequest), RequestHandlerLoggingMode.LogRequestName)] + public async Task OnGetStatisticsRequiredFiltersRequest(GetStatisticsRequiredFiltersRequest request, String token, ExternalBridgeReceiver receiver) + { + this.ThrowIfDisabled(); + + var response = new GetStatisticsRequiredFiltersResponse(); + + using (ObservablesContext db = ObservablesContext.CreateDefault()) + { + var jobNames = await db.JobRuns.Select(x => x.JobName).ToListAsync(); + var threadNames = await db.Rmls.Select(x => x.DisplayName).ToListAsync(); + response.FiltersData.Jobs = jobNames; + response.FiltersData.Rmls = threadNames; + } + + await receiver.SendGenericResponse(response, token); + } + + [ExternalBridgeRequestHandlerMethod(typeof(GetStatisticsRequest), RequestHandlerLoggingMode.LogRequestName)] + public async Task OnGetStatisticsRequest(GetStatisticsRequest request, String token, ExternalBridgeReceiver receiver) + { + this.ThrowIfDisabled(); + + var response = new GetStatisticsResponse(); + + using (ObservablesContext db = ObservablesContext.CreateDefault()) + { + var filters = request.Filters; + + var db_JobRuns = db.JobRuns.Where(x => (x.StartDate <= filters.EndDateUTC && x.StartDate >= filters.StartDateUTC)); + + int[] jobRunStatusArr = filters.EndStatuses.Distinct().ToArray(); + if (jobRunStatusArr.Length > 0) + { + db_JobRuns = db_JobRuns.Where(x => jobRunStatusArr.Contains(x.Status)); + } + + if (!filters.IncludeHeadCleaning) + { + db_JobRuns = db_JobRuns.Where(x => !x.IsHeadCleaning); + } + + List rmlGuids = filters.Threads; + + if (filters.Threads.Count > 0) + { + db_JobRuns = db_JobRuns.Where(x => rmlGuids.Contains(x.RmlGuid)); + } + + if (filters.JobName.IsNotNullOrEmpty()) + { + 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); + + var runs_db = await db_JobRuns.ToListAsync(); + + runs_db.ForEach(x => x.LiquidQuantityString = null); + } + + await receiver.SendGenericResponse(response, token); + } + + public void OnReceiverDisconnected(ExternalBridgeReceiver receiver) + { + + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/IStatisticsService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/IStatisticsService.cs new file mode 100644 index 000000000..553264d42 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Statistics/IStatisticsService.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Common.Statistics +{ + public interface IStatisticsService : IPPCService + { + + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index 0adce35a0..d0476647b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -198,6 +198,8 @@ + + @@ -587,7 +589,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/Filters.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/Filters.cs new file mode 100644 index 000000000..0438c699a --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/Filters.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Statistics +{ + public class Filters + { + public DateTime StartDateUTC { get; set; } + public DateTime EndDateUTC { get; set; } + public List Threads { get; set; } + public String JobName { get; set; } + public int MinLength { get; set; } + public int MaxLength { get; set; } + public List EndStatuses { get; set; } + public bool IncludeHeadCleaning { get; set; } + + public Filters() + { + Threads = new List(); + EndStatuses = new List(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequest.cs new file mode 100644 index 000000000..cacd8db2f --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequest.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Statistics +{ + public class GetStatisticsRequest + { + public Filters Filters { get; set; } + + public GetStatisticsRequest() + { + Filters = new Filters(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersRequest.cs new file mode 100644 index 000000000..fb10cfbfc --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersRequest.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Statistics +{ + public class GetStatisticsRequiredFiltersRequest + { + + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersResponse.cs new file mode 100644 index 000000000..44611f68e --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsRequiredFiltersResponse.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Statistics +{ + public class GetStatisticsRequiredFiltersResponse + { + public RequiredFiltersData FiltersData { get; set; } + + public GetStatisticsRequiredFiltersResponse() + { + FiltersData = new RequiredFiltersData(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsResponse.cs new file mode 100644 index 000000000..a46f15b63 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/GetStatisticsResponse.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Statistics +{ + public class GetStatisticsResponse + { + public StatisticsResult Result { get; set; } + + public GetStatisticsResponse() + { + Result = new StatisticsResult(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/JobRunComposition.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/JobRunComposition.cs new file mode 100644 index 000000000..643f5a63c --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/JobRunComposition.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.DTO; + +namespace Tango.PPC.Shared.Statistics +{ + public class JobRunComposition + { + public JobRunDTO JobRun { get; set; } + public List Events { get; set; } + + public JobRunComposition() + { + Events = new List(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/RequiredFiltersData.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/RequiredFiltersData.cs new file mode 100644 index 000000000..6b934fa49 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/RequiredFiltersData.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.PPC.Shared.Statistics +{ + public class RequiredFiltersData + { + public List Rmls { get; set; } + + public List Jobs { get; set; } + + public RequiredFiltersData() + { + Rmls = new List(); + Jobs = new List(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/StatisticsResult.cs b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/StatisticsResult.cs new file mode 100644 index 000000000..8cee4c545 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Statistics/StatisticsResult.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.DTO; + +namespace Tango.PPC.Shared.Statistics +{ + public class StatisticsResult + { + public List JobRuns { get; set; } + + public StatisticsResult() + { + JobRuns = new List(); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj index 73f142f67..4f06312c6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Shared/Tango.PPC.Shared.csproj @@ -121,6 +121,14 @@ + + + + + + + + diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs index 1750b835d..2ab10f14d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs @@ -143,24 +143,24 @@ namespace Tango.BL.Entities } } - + public TimeSpan TotalDyeingTime { get - { - if( this.ActualStartDate == null || this.EndDate == default(DateTime) || this.EndDate < this.ActualStartDate) - return TimeSpan.Zero; + { + if (this.ActualStartDate == null || this.EndDate == default(DateTime) || this.EndDate < this.ActualStartDate) + return TimeSpan.Zero; return EndDate - (DateTime)ActualStartDate; } - + } - /// - /// Initializes a new instance of the class. - /// - public JobRun() : base() + /// + /// Initializes a new instance of the class. + /// + public JobRun() : base() { } diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 03bcbcb97..9c0920e8b 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -483,6 +483,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.BulkEmailModifier.CLI EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tango.ColorLib_v6", "ColorLib\Tango.ColorLib_v6\Tango.ColorLib_v6.vcxproj", "{D74E49AA-4C6B-4427-BEFF-D7CE2690D059}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FSE.Statistics", "FSE\Modules\Tango.FSE.Statistics\Tango.FSE.Statistics.csproj", "{7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -4610,6 +4612,26 @@ Global {D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|x64.Build.0 = Release|x64 {D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|x86.ActiveCfg = Release|Win32 {D74E49AA-4C6B-4427-BEFF-D7CE2690D059}.Release|x86.Build.0 = Release|Win32 + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|ARM.Build.0 = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|ARM64.Build.0 = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|x64.ActiveCfg = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|x64.Build.0 = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|x86.ActiveCfg = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Debug|x86.Build.0 = Debug|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|Any CPU.Build.0 = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|ARM.ActiveCfg = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|ARM.Build.0 = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|ARM64.ActiveCfg = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|ARM64.Build.0 = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|x64.ActiveCfg = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|x64.Build.0 = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|x86.ActiveCfg = Release|Any CPU + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4782,14 +4804,15 @@ Global {0F87D32E-B65F-4AE8-862C-29F4CCC38240} = {7181F9DE-0760-46B7-AD8F-BDBCAEDEF1B7} {DA4FCA0B-E0EA-431F-B0CC-AA9B0A4C73C2} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760} {D74E49AA-4C6B-4427-BEFF-D7CE2690D059} = {7181F9DE-0760-46B7-AD8F-BDBCAEDEF1B7} + {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_UseGlobalSettings = False - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs - BuildVersion_StartDate = 2000/1/1 - BuildVersion_UpdateFileVersion = False - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_UpdateFileVersion = False + BuildVersion_StartDate = 2000/1/1 + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_UseGlobalSettings = False EndGlobalSection EndGlobal -- cgit v1.3.1