From c7fa53084c674586ceee773ccbdc6b4c0a2ec7d4 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 9 Dec 2019 16:19:41 +0200 Subject: Implemented full TUP package update !!! --- .../Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 991eb9da6..c6cf624b3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -448,6 +448,10 @@ {8491d07b-c1f6-4b62-a412-41b9fd2d6538} Tango.SharedUI + + {e1e66ed9-597d-45fa-8048-de90a6930484} + Tango.SQLExaminer + {998f8471-dc1b-41b6-9d96-354e1b4e7a32} Tango.TFS @@ -661,7 +665,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\" - + \ No newline at end of file -- cgit v1.3.1 From d5827e26ff5ee1b0532530bce4da3533f71a63dd Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 9 Dec 2019 20:07:12 +0200 Subject: Added LocalDB to machine prerequisit to machine studio installer. Implemented machine studio installer feature selection. Removed roslyn folder from MS release output. Added date to tup file generation. Added LocalDB start before connect service on TupFileBuilder. --- .../Machine Studio Installer.aip | 1412 +++++++++++++------- .../ViewModels/TupViewVM.cs | 2 +- .../Tup/TupFileBuilder.cs | 5 +- .../Tango.MachineStudio.UI.csproj | 3 +- 4 files changed, 914 insertions(+), 508 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index b29828743..bfc3229b5 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + @@ -36,11 +37,13 @@ + + + - @@ -49,26 +52,30 @@ + - + + - + - - + + + - - + + + @@ -76,10 +83,10 @@ - + - - + + @@ -89,34 +96,46 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + + - + + + + + + + + + + - - + + + + @@ -129,8 +148,8 @@ - - + + @@ -157,7 +176,7 @@ - + @@ -179,7 +198,7 @@ - + @@ -205,7 +224,7 @@ - + @@ -219,7 +238,7 @@ - + @@ -228,76 +247,83 @@ - + - - - - - - - - + + + + + + + + - + - - - + + + - + - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + + + + - - + + + - + - - + + - + - + @@ -306,9 +332,9 @@ - + - + @@ -333,429 +359,448 @@ - - - - + + + + - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -772,6 +817,7 @@ + @@ -793,8 +839,13 @@ + + + + + @@ -808,10 +859,23 @@ + + + + + + + + + + + + + - + - + @@ -834,10 +898,15 @@ + + + + + - + @@ -847,6 +916,7 @@ + @@ -855,14 +925,18 @@ + + + + @@ -870,17 +944,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -899,6 +1292,7 @@ + @@ -910,6 +1304,11 @@ + + + + + @@ -927,6 +1326,7 @@ + @@ -934,8 +1334,8 @@ - - + + @@ -947,13 +1347,15 @@ - + + + - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs index 12ed09c75..5d1703dc3 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/TupViewVM.cs @@ -88,7 +88,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels dlg.Title = "Select package location"; dlg.Filter = "Tango Update Package Files|*.tup"; dlg.DefaultExt = ".tup"; - dlg.FileName = LatestVersion == null ? $"{Machine.SerialNumber}_Update.tup" : $"{Machine.SerialNumber}_Update_v{LatestVersion}.tup"; + dlg.FileName = LatestVersion == null ? $"{Machine.SerialNumber}_Update_{DateTime.Now.Date.ToFileName()}.tup" : $"{Machine.SerialNumber}_Update_{DateTime.Now.Date.ToFileName()}_v{LatestVersion}.tup"; if (dlg.ShowDialog().Value) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tup/TupFileBuilder.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tup/TupFileBuilder.cs index 6dd8b82f7..fad6ce949 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tup/TupFileBuilder.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tup/TupFileBuilder.cs @@ -69,9 +69,12 @@ namespace Tango.MachineStudio.Common.Tup { LogManager.Log(ex, "Could not connect using SQLEXPRESS. Trying local DB..."); - CmdCommand command = new CmdCommand("sqllocaldb", "info \"MSSQLLocalDB\""); + CmdCommand command = new CmdCommand("sqllocaldb", "start \"MSSQLLocalDB\""); var result = command.Run().Result; + command = new CmdCommand("sqllocaldb", "info \"MSSQLLocalDB\""); + result = command.Run().Result; + String pattern = "np:.+"; Regex reg = new Regex(pattern); var match = reg.Match(result.StandardOutput); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index c6cf624b3..470cfe4c7 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -654,7 +654,8 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)" copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(TargetDir)" if $(ConfigurationName) == Release del *.xml -if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\" +if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\" +if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\" -- cgit v1.3.1 From ab518a645fed89633aeb67ad107afffe3567499b Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Fri, 13 Dec 2019 14:52:38 +0200 Subject: Added sites and machine studio module template. --- Software/DB/TCC/TCC.mdf | Bin 8388608 -> 8388608 bytes Software/DB/TCC/TCC_log.ldf | Bin 8388608 -> 8388608 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../Tango.MachineStudio.Sites/Images/site.png | Bin 0 -> 22073 bytes .../Properties/AssemblyInfo.cs | 19 +++ .../Properties/Resources.Designer.cs | 62 +++++++++ .../Properties/Resources.resx | 117 ++++++++++++++++ .../Properties/Settings.Designer.cs | 30 ++++ .../Properties/Settings.settings | 7 + .../Tango.MachineStudio.Sites/SitesModule.cs | 62 +++++++++ .../Tango.MachineStudio.Sites.csproj | 147 ++++++++++++++++++++ .../Tango.MachineStudio.Sites/ViewModelLocator.cs | 29 ++++ .../ViewModels/MainViewVM.cs | 18 +++ .../Tango.MachineStudio.Sites/Views/MainView.xaml | 15 ++ .../Views/MainView.xaml.cs | 28 ++++ .../Modules/Tango.MachineStudio.Sites/app.config | 75 ++++++++++ .../Tango.MachineStudio.Sites/packages.config | 8 ++ .../Tango.MachineStudio.UI.csproj | 6 +- .../Project Templates/Machine Studio Module.zip | Bin 0 -> 17805 bytes .../Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs | 8 ++ .../Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs | 14 -- .../Tango.BL/DTO/MachinesRmlDTOBase.cs | 41 ------ .../Tango.BL/DTO/OrganizationsRmlDTO.cs | 14 -- .../Tango.BL/DTO/OrganizationsRmlDTOBase.cs | 41 ------ Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs | 14 ++ Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs | 49 +++++++ Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs | 14 ++ .../Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs | 41 ++++++ .../Tango.BL/Entities/HardwareBlowerBase.cs | 2 + .../Visual_Studio/Tango.BL/Entities/MachineBase.cs | 25 ++++ .../Visual_Studio/Tango.BL/Entities/MachinesRml.cs | 12 -- .../Tango.BL/Entities/MachinesRmlBase.cs | 86 ------------ .../Tango.BL/Entities/OrganizationsRml.cs | 12 -- .../Tango.BL/Entities/OrganizationsRmlBase.cs | 86 ------------ Software/Visual_Studio/Tango.BL/Entities/Site.cs | 12 ++ .../Visual_Studio/Tango.BL/Entities/SiteBase.cs | 137 +++++++++++++++++++ .../Visual_Studio/Tango.BL/Entities/SitesRml.cs | 12 ++ .../Tango.BL/Entities/SitesRmlBase.cs | 86 ++++++++++++ .../Visual_Studio/Tango.BL/ObservablesContext.cs | 32 ++--- .../ObservablesEntitiesAdapterExtension.cs | 152 ++++++++++----------- .../ObservablesStaticCollectionsExtension.cs | 152 ++++++++++----------- Software/Visual_Studio/Tango.BL/Tango.BL.csproj | 16 +-- .../Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs | 1 + .../Tango.DAL.Remote/DB/MACHINES_RMLS.cs | 23 ---- .../Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs | 23 ---- .../Tango.DAL.Remote/DB/RemoteADO.Context.cs | 4 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 138 ++++++++++--------- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 152 ++++++++++----------- Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs | 24 ++++ .../Tango.DAL.Remote/DB/SITES_RMLS.cs | 23 ++++ .../Tango.DAL.Remote/Tango.DAL.Remote.csproj | 12 +- Software/Visual_Studio/Tango.sln | 43 ++++++ 53 files changed, 1445 insertions(+), 679 deletions(-) create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.resx create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.Designer.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml.cs create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config create mode 100644 Software/Visual_Studio/Project Templates/Machine Studio Module.zip delete mode 100644 Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs delete mode 100644 Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs delete mode 100644 Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs create mode 100644 Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs delete mode 100644 Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/Site.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs create mode 100644 Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs delete mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj') diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf index 40ef6dfb9..7acd2ca82 100644 Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf index 46a72f239..d61145d85 100644 Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 45fa2dfde..ddfd3abd8 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 4b53e57cd..58b7b4e60 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png new file mode 100644 index 000000000..2fee5fafa Binary files /dev/null and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..a6eebb5a8 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Windows; + +[assembly: AssemblyTitle("Tango - Machine Studio Sites Module")] +[assembly: AssemblyVersion("1.0.0.1737")] + +[assembly: ComVisible(false)] + +[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) +)] diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs new file mode 100644 index 000000000..ecefa25e7 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// 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.MachineStudio.Sites.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.MachineStudio.Sites.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/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/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/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.Designer.cs new file mode 100644 index 000000000..5fa894ceb --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/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.MachineStudio.Sites.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/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings new file mode 100644 index 000000000..033d7a5e9 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs new file mode 100644 index 000000000..96d3aed49 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs @@ -0,0 +1,62 @@ +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.MachineStudio.Common; +using Tango.MachineStudio.Sites.Views; +using Tango.SharedUI.Helpers; + +namespace Tango.MachineStudio.Sites +{ + [StudioModule(20)] + public class SitesModule : StudioModuleBase + { + public override string Name + { + get + { + return "Sites"; + } + } + + public override string Description + { + get + { + return "Manage organizations sites and their common machine properties."; + } + } + + public override BitmapSource Image + { + get + { + return ResourceHelper.GetImageFromResources("Images/site.png"); + } + } + + public override Type MainViewType + { + get + { + return typeof(MainView); + } + } + + public override Permissions Permission + { + get + { + return Permissions.RunRMLModule; + } + } + + public override void Dispose() + { + + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj new file mode 100644 index 000000000..95f71baa8 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj @@ -0,0 +1,147 @@ + + + + + Debug + AnyCPU + {18A27902-9881-4556-8163-F6DF2236A14D} + library + Tango.MachineStudio.Sites + Tango.MachineStudio.Sites + v4.6.1 + 512 + {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 4 + true + + + true + full + false + ..\..\..\Build\Machine Studio\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\..\Build\Machine Studio\Release\ + TRACE + prompt + 4 + + + + ..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll + + + ..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll + + + ..\..\..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll + + + ..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll + + + ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + + + + ..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll + + + + + + + + + 4.0 + + + + + + + + + + MainView.xaml + + + GlobalVersionInfo.cs + + + + Designer + MSBuild:Compile + + + + + Code + + + True + True + Resources.resx + + + True + Settings.settings + True + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + + {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 + + + {d8f1ad85-526a-4f50-b6dc-d437af63d8d8} + Tango.Settings + + + {8491D07B-C1F6-4B62-A412-41B9FD2D6538} + Tango.SharedUI + + + {74e700b0-1156-4126-be40-ee450d3c3026} + Tango.Transport + + + {cb0b0aa2-bb24-4bca-a720-45e397684e12} + Tango.MachineStudio.Common + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs new file mode 100644 index 000000000..c06ae05e7 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.Core.DI; +using Tango.MachineStudio.Sites.ViewModels; + +namespace Tango.MachineStudio.Sites +{ + public static class ViewModelLocator + { + /// + /// Initializes a new instance of the ViewModelLocator class. + /// + static ViewModelLocator() + { + TangoIOC.Default.Register(); + } + + public static MainViewVM MainViewVM + { + get + { + return TangoIOC.Default.GetInstance(); + } + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs new file mode 100644 index 000000000..d0be162dd --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs @@ -0,0 +1,18 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.MachineStudio.Common; + +namespace Tango.MachineStudio.Sites.ViewModels +{ + public class MainViewVM : StudioViewModel + { + public override void OnApplicationReady() + { + + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml new file mode 100644 index 000000000..80f9ae151 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml @@ -0,0 +1,15 @@ + + + Comming soon... + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml.cs new file mode 100644 index 000000000..75ced5ae2 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/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.MachineStudio.Sites.Views +{ + /// + /// Interaction logic for MainView.xaml + /// + public partial class MainView : UserControl + { + public MainView() + { + InitializeComponent(); + } + } +} diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config new file mode 100644 index 000000000..97a204217 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config new file mode 100644 index 000000000..fd88f4804 --- /dev/null +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj index 470cfe4c7..635d372c2 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj @@ -504,6 +504,10 @@ {d0186ac0-0fcf-4d3b-9619-54812b6e524b} Tango.MachineStudio.RML + + {18a27902-9881-4556-8163-f6df2236a14d} + Tango.MachineStudio.Sites + {8a65ad6a-a9b4-48c0-9301-4b7434b712f8} Tango.MachineStudio.Statistics @@ -666,7 +670,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\" - + \ No newline at end of file diff --git a/Software/Visual_Studio/Project Templates/Machine Studio Module.zip b/Software/Visual_Studio/Project Templates/Machine Studio Module.zip new file mode 100644 index 000000000..b7fb36b94 Binary files /dev/null and b/Software/Visual_Studio/Project Templates/Machine Studio Module.zip differ diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs index e3adf4e0f..fa82ce992 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs @@ -53,6 +53,14 @@ namespace Tango.BL.DTO get; set; } + /// + /// site guid + /// + public String SiteGuid + { + get; set; + } + /// /// machine version guid /// diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs deleted file mode 100644 index 308438b14..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class MachinesRmlDTO : MachinesRmlDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs deleted file mode 100644 index 5ae7d3992..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs +++ /dev/null @@ -1,41 +0,0 @@ - -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class MachinesRmlDTOBase : ObservableEntityDTO - { - - /// - /// machine guid - /// - public String MachineGuid - { - get; set; - } - - /// - /// rml guid - /// - public String RmlGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs deleted file mode 100644 index 796c1812d..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class OrganizationsRmlDTO : OrganizationsRmlDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs deleted file mode 100644 index 339e846af..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs +++ /dev/null @@ -1,41 +0,0 @@ - -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class OrganizationsRmlDTOBase : ObservableEntityDTO - { - - /// - /// organization guid - /// - public String OrganizationGuid - { - get; set; - } - - /// - /// rml guid - /// - public String RmlGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs new file mode 100644 index 000000000..320de2763 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class SiteDTO : SiteDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs new file mode 100644 index 000000000..47d7acc95 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs @@ -0,0 +1,49 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class SiteDTOBase : ObservableEntityDTO + { + + /// + /// organization guid + /// + public String OrganizationGuid + { + get; set; + } + + /// + /// name + /// + public String Name + { + get; set; + } + + /// + /// description + /// + public String Description + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs new file mode 100644 index 000000000..527d710d0 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class SitesRmlDTO : SitesRmlDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs new file mode 100644 index 000000000..1373fedd6 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs @@ -0,0 +1,41 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class SitesRmlDTOBase : ObservableEntityDTO + { + + /// + /// site guid + /// + public String SiteGuid + { + get; set; + } + + /// + /// rml guid + /// + public String RmlGuid + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs index de376da41..bbc55d245 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs @@ -131,6 +131,8 @@ namespace Tango.BL.Entities [Column("VOLTAGE")] [Description("Voltage Description")] + [Range(-10000,1000000)] + public Double Voltage { get diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs index 4f989aeb2..c02b103dd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs @@ -197,6 +197,31 @@ namespace Tango.BL.Entities } } + protected String _siteguid; + + /// + /// Gets or sets the machinebase site guid. + /// + + [Column("SITE_GUID")] + + public String SiteGuid + { + get + { + return _siteguid; + } + + set + { + if (_siteguid != value) + { + _siteguid = value; + + } + } + } + protected String _machineversionguid; /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs deleted file mode 100644 index 6fe2ef16e..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class MachinesRml : MachinesRmlBase - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs deleted file mode 100644 index efb9cd997..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs +++ /dev/null @@ -1,86 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; - -namespace Tango.BL.Entities -{ - [Table("MACHINES_RMLS")] - public abstract class MachinesRmlBase : ObservableEntity - { - - protected String _machineguid; - - /// - /// Gets or sets the machinesrmlbase machine guid. - /// - - [Column("MACHINE_GUID")] - - public String MachineGuid - { - get - { - return _machineguid; - } - - set - { - if (_machineguid != value) - { - _machineguid = value; - - } - } - } - - protected String _rmlguid; - - /// - /// Gets or sets the machinesrmlbase rml guid. - /// - - [Column("RML_GUID")] - - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - if (_rmlguid != value) - { - _rmlguid = value; - - } - } - } - - /// - /// Initializes a new instance of the class. - /// - public MachinesRmlBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs deleted file mode 100644 index 70c8fb66f..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.Entities -{ - public class OrganizationsRml : OrganizationsRmlBase - { - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs deleted file mode 100644 index d1f338428..000000000 --- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs +++ /dev/null @@ -1,86 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Xml.Serialization; -using Newtonsoft.Json; -using System.Linq; -using Tango.DAL.Remote.DB; -using Tango.Core; -using System.ComponentModel; - -namespace Tango.BL.Entities -{ - [Table("ORGANIZATIONS_RMLS")] - public abstract class OrganizationsRmlBase : ObservableEntity - { - - protected String _organizationguid; - - /// - /// Gets or sets the organizationsrmlbase organization guid. - /// - - [Column("ORGANIZATION_GUID")] - - public String OrganizationGuid - { - get - { - return _organizationguid; - } - - set - { - if (_organizationguid != value) - { - _organizationguid = value; - - } - } - } - - protected String _rmlguid; - - /// - /// Gets or sets the organizationsrmlbase rml guid. - /// - - [Column("RML_GUID")] - - public String RmlGuid - { - get - { - return _rmlguid; - } - - set - { - if (_rmlguid != value) - { - _rmlguid = value; - - } - } - } - - /// - /// Initializes a new instance of the class. - /// - public OrganizationsRmlBase() : base() - { - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/Entities/Site.cs b/Software/Visual_Studio/Tango.BL/Entities/Site.cs new file mode 100644 index 000000000..d88a00567 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/Site.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class Site : SiteBase + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs new file mode 100644 index 000000000..4294b2daf --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs @@ -0,0 +1,137 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; + +namespace Tango.BL.Entities +{ + [Table("SITES")] + public abstract class SiteBase : ObservableEntity + { + + public event EventHandler NameChanged; + + public event EventHandler DescriptionChanged; + + protected String _organizationguid; + + /// + /// Gets or sets the sitebase organization guid. + /// + + [Column("ORGANIZATION_GUID")] + + public String OrganizationGuid + { + get + { + return _organizationguid; + } + + set + { + if (_organizationguid != value) + { + _organizationguid = value; + + } + } + } + + protected String _name; + + /// + /// Gets or sets the sitebase name. + /// + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected String _description; + + /// + /// Gets or sets the sitebase description. + /// + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + if (_description != value) + { + _description = value; + + OnDescriptionChanged(value); + + } + } + } + + /// + /// Called when the Name has changed. + /// + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// + /// Called when the Description has changed. + /// + protected virtual void OnDescriptionChanged(String description) + { + DescriptionChanged?.Invoke(this, description); + RaisePropertyChanged(nameof(Description)); + } + + /// + /// Initializes a new instance of the class. + /// + public SiteBase() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs new file mode 100644 index 000000000..1d6dafe8b --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.Entities +{ + public class SitesRml : SitesRmlBase + { + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs new file mode 100644 index 000000000..0538069b4 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs @@ -0,0 +1,86 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; + +namespace Tango.BL.Entities +{ + [Table("SITES_RMLS")] + public abstract class SitesRmlBase : ObservableEntity + { + + protected String _siteguid; + + /// + /// Gets or sets the sitesrmlbase site guid. + /// + + [Column("SITE_GUID")] + + public String SiteGuid + { + get + { + return _siteguid; + } + + set + { + if (_siteguid != value) + { + _siteguid = value; + + } + } + } + + protected String _rmlguid; + + /// + /// Gets or sets the sitesrmlbase rml guid. + /// + + [Column("RML_GUID")] + + public String RmlGuid + { + get + { + return _rmlguid; + } + + set + { + if (_rmlguid != value) + { + _rmlguid = value; + + } + } + } + + /// + /// Initializes a new instance of the class. + /// + public SitesRmlBase() : base() + { + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 25c3b5682..d47f6514b 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -414,14 +414,6 @@ namespace Tango.BL get; set; } - /// - /// Gets or sets the MachinesRmls. - /// - public DbSet MachinesRmls - { - get; set; - } - /// /// Gets or sets the MediaConditions. /// @@ -462,14 +454,6 @@ namespace Tango.BL get; set; } - /// - /// Gets or sets the OrganizationsRmls. - /// - public DbSet OrganizationsRmls - { - get; set; - } - /// /// Gets or sets the Permissions. /// @@ -526,6 +510,22 @@ namespace Tango.BL get; set; } + /// + /// Gets or sets the Sites. + /// + public DbSet Sites + { + get; set; + } + + /// + /// Gets or sets the SitesRmls. + /// + public DbSet SitesRmls + { + get; set; + } + /// /// Gets or sets the SpoolTypes. /// diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index cb259995b..139c90158 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -1781,42 +1781,6 @@ namespace Tango.BL } - private ObservableCollection _machinesrmls; - /// - /// Gets or sets the MachinesRmls. - /// - public ObservableCollection MachinesRmls - { - get - { - return _machinesrmls; - } - - set - { - _machinesrmls = value; RaisePropertyChanged(nameof(MachinesRmls)); - } - - } - - private ICollectionView _machinesrmlsViewSource; - /// - /// Gets or sets the MachinesRmls View Source. - /// - public ICollectionView MachinesRmlsViewSource - { - get - { - return _machinesrmlsViewSource; - } - - set - { - _machinesrmlsViewSource = value; RaisePropertyChanged(nameof(MachinesRmlsViewSource)); - } - - } - private ObservableCollection _mediaconditions; /// /// Gets or sets the MediaConditions. @@ -1997,42 +1961,6 @@ namespace Tango.BL } - private ObservableCollection _organizationsrmls; - /// - /// Gets or sets the OrganizationsRmls. - /// - public ObservableCollection OrganizationsRmls - { - get - { - return _organizationsrmls; - } - - set - { - _organizationsrmls = value; RaisePropertyChanged(nameof(OrganizationsRmls)); - } - - } - - private ICollectionView _organizationsrmlsViewSource; - /// - /// Gets or sets the OrganizationsRmls View Source. - /// - public ICollectionView OrganizationsRmlsViewSource - { - get - { - return _organizationsrmlsViewSource; - } - - set - { - _organizationsrmlsViewSource = value; RaisePropertyChanged(nameof(OrganizationsRmlsViewSource)); - } - - } - private ObservableCollection _permissions; /// /// Gets or sets the Permissions. @@ -2285,6 +2213,78 @@ namespace Tango.BL } + private ObservableCollection _sites; + /// + /// Gets or sets the Sites. + /// + public ObservableCollection Sites + { + get + { + return _sites; + } + + set + { + _sites = value; RaisePropertyChanged(nameof(Sites)); + } + + } + + private ICollectionView _sitesViewSource; + /// + /// Gets or sets the Sites View Source. + /// + public ICollectionView SitesViewSource + { + get + { + return _sitesViewSource; + } + + set + { + _sitesViewSource = value; RaisePropertyChanged(nameof(SitesViewSource)); + } + + } + + private ObservableCollection _sitesrmls; + /// + /// Gets or sets the SitesRmls. + /// + public ObservableCollection SitesRmls + { + get + { + return _sitesrmls; + } + + set + { + _sitesrmls = value; RaisePropertyChanged(nameof(SitesRmls)); + } + + } + + private ICollectionView _sitesrmlsViewSource; + /// + /// Gets or sets the SitesRmls View Source. + /// + public ICollectionView SitesRmlsViewSource + { + get + { + return _sitesrmlsViewSource; + } + + set + { + _sitesrmlsViewSource = value; RaisePropertyChanged(nameof(SitesRmlsViewSource)); + } + + } + private ObservableCollection _spooltypes; /// /// Gets or sets the SpoolTypes. @@ -2893,8 +2893,6 @@ namespace Tango.BL MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - MachinesRmlsViewSource = CreateCollectionView(MachinesRmls); - MediaConditionsViewSource = CreateCollectionView(MediaConditions); MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); @@ -2905,8 +2903,6 @@ namespace Tango.BL OrganizationsViewSource = CreateCollectionView(Organizations); - OrganizationsRmlsViewSource = CreateCollectionView(OrganizationsRmls); - PermissionsViewSource = CreateCollectionView(Permissions); ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables); @@ -2921,6 +2917,10 @@ namespace Tango.BL SegmentsViewSource = CreateCollectionView(Segments); + SitesViewSource = CreateCollectionView(Sites); + + SitesRmlsViewSource = CreateCollectionView(SitesRmls); + SpoolTypesViewSource = CreateCollectionView(SpoolTypes); SpoolsViewSource = CreateCollectionView(Spools); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index 3b24aa506..e509d0e3c 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -1781,42 +1781,6 @@ namespace Tango.BL } - private ObservableCollection _machinesrmls; - /// - /// Gets or sets the MachinesRmls. - /// - public ObservableCollection MachinesRmls - { - get - { - return _machinesrmls; - } - - set - { - _machinesrmls = value; RaisePropertyChanged(nameof(MachinesRmls)); - } - - } - - private ICollectionView _machinesrmlsViewSource; - /// - /// Gets or sets the MachinesRmls View Source. - /// - public ICollectionView MachinesRmlsViewSource - { - get - { - return _machinesrmlsViewSource; - } - - set - { - _machinesrmlsViewSource = value; RaisePropertyChanged(nameof(MachinesRmlsViewSource)); - } - - } - private ObservableCollection _mediaconditions; /// /// Gets or sets the MediaConditions. @@ -1997,42 +1961,6 @@ namespace Tango.BL } - private ObservableCollection _organizationsrmls; - /// - /// Gets or sets the OrganizationsRmls. - /// - public ObservableCollection OrganizationsRmls - { - get - { - return _organizationsrmls; - } - - set - { - _organizationsrmls = value; RaisePropertyChanged(nameof(OrganizationsRmls)); - } - - } - - private ICollectionView _organizationsrmlsViewSource; - /// - /// Gets or sets the OrganizationsRmls View Source. - /// - public ICollectionView OrganizationsRmlsViewSource - { - get - { - return _organizationsrmlsViewSource; - } - - set - { - _organizationsrmlsViewSource = value; RaisePropertyChanged(nameof(OrganizationsRmlsViewSource)); - } - - } - private ObservableCollection _permissions; /// /// Gets or sets the Permissions. @@ -2285,6 +2213,78 @@ namespace Tango.BL } + private ObservableCollection _sites; + /// + /// Gets or sets the Sites. + /// + public ObservableCollection Sites + { + get + { + return _sites; + } + + set + { + _sites = value; RaisePropertyChanged(nameof(Sites)); + } + + } + + private ICollectionView _sitesViewSource; + /// + /// Gets or sets the Sites View Source. + /// + public ICollectionView SitesViewSource + { + get + { + return _sitesViewSource; + } + + set + { + _sitesViewSource = value; RaisePropertyChanged(nameof(SitesViewSource)); + } + + } + + private ObservableCollection _sitesrmls; + /// + /// Gets or sets the SitesRmls. + /// + public ObservableCollection SitesRmls + { + get + { + return _sitesrmls; + } + + set + { + _sitesrmls = value; RaisePropertyChanged(nameof(SitesRmls)); + } + + } + + private ICollectionView _sitesrmlsViewSource; + /// + /// Gets or sets the SitesRmls View Source. + /// + public ICollectionView SitesRmlsViewSource + { + get + { + return _sitesrmlsViewSource; + } + + set + { + _sitesrmlsViewSource = value; RaisePropertyChanged(nameof(SitesRmlsViewSource)); + } + + } + private ObservableCollection _spooltypes; /// /// Gets or sets the SpoolTypes. @@ -2893,8 +2893,6 @@ namespace Tango.BL MachinesEventsViewSource = CreateCollectionView(MachinesEvents); - MachinesRmlsViewSource = CreateCollectionView(MachinesRmls); - MediaConditionsViewSource = CreateCollectionView(MediaConditions); MediaMaterialsViewSource = CreateCollectionView(MediaMaterials); @@ -2905,8 +2903,6 @@ namespace Tango.BL OrganizationsViewSource = CreateCollectionView(Organizations); - OrganizationsRmlsViewSource = CreateCollectionView(OrganizationsRmls); - PermissionsViewSource = CreateCollectionView(Permissions); ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables); @@ -2921,6 +2917,10 @@ namespace Tango.BL SegmentsViewSource = CreateCollectionView(Segments); + SitesViewSource = CreateCollectionView(Sites); + + SitesRmlsViewSource = CreateCollectionView(SitesRmls); + SpoolTypesViewSource = CreateCollectionView(SpoolTypes); SpoolsViewSource = CreateCollectionView(Spools); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index c3c1b9ab9..d75cdc0c1 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -206,8 +206,6 @@ - - @@ -222,8 +220,6 @@ - - @@ -238,6 +234,10 @@ + + + + @@ -323,8 +323,6 @@ - - @@ -332,8 +330,6 @@ - - @@ -341,6 +337,10 @@ + + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs index 9e83e7e4d..0508fc99e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs @@ -30,6 +30,7 @@ namespace Tango.DAL.Remote.DB public string NAME { get; set; } public System.DateTime PRODUCTION_DATE { get; set; } public string ORGANIZATION_GUID { get; set; } + public string SITE_GUID { get; set; } public string MACHINE_VERSION_GUID { get; set; } public string CONFIGURATION_GUID { get; set; } public string DEFAULT_RML_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs deleted file mode 100644 index 64cdfe830..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class MACHINES_RMLS - { - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public string MACHINE_GUID { get; set; } - public string RML_GUID { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs deleted file mode 100644 index 1db95419e..000000000 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated from a template. -// -// Manual changes to this file may cause unexpected behavior in your application. -// Manual changes to this file will be overwritten if the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Tango.DAL.Remote.DB -{ - using System; - using System.Collections.Generic; - - public partial class ORGANIZATIONS_RMLS - { - public int ID { get; set; } - public string GUID { get; set; } - public System.DateTime LAST_UPDATED { get; set; } - public string ORGANIZATION_GUID { get; set; } - public string RML_GUID { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index fc248bbfe..9f81121ca 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -74,13 +74,11 @@ namespace Tango.DAL.Remote.DB public virtual DbSet MACHINE_VERSIONS { get; set; } public virtual DbSet MACHINES { get; set; } public virtual DbSet MACHINES_EVENTS { get; set; } - public virtual DbSet MACHINES_RMLS { get; set; } public virtual DbSet MEDIA_CONDITIONS { get; set; } public virtual DbSet MEDIA_MATERIALS { get; set; } public virtual DbSet MEDIA_PURPOSES { get; set; } public virtual DbSet MID_TANK_TYPES { get; set; } public virtual DbSet ORGANIZATIONS { get; set; } - public virtual DbSet ORGANIZATIONS_RMLS { get; set; } public virtual DbSet PERMISSIONS { get; set; } public virtual DbSet PROCESS_PARAMETERS_TABLES { get; set; } public virtual DbSet PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } @@ -88,6 +86,8 @@ namespace Tango.DAL.Remote.DB public virtual DbSet ROLES { get; set; } public virtual DbSet ROLES_PERMISSIONS { get; set; } public virtual DbSet SEGMENTS { get; set; } + public virtual DbSet SITES { get; set; } + public virtual DbSet SITES_RMLS { get; set; } public virtual DbSet SPOOL_TYPES { get; set; } public virtual DbSet SPOOLS { get; set; } public virtual DbSet sysdiagrams { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index 44dffd473..2c003669e 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -708,6 +708,7 @@ + @@ -749,16 +750,6 @@ - - - - - - - - - - @@ -811,16 +802,6 @@ - - - - - - - - - - @@ -941,6 +922,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -2237,13 +2239,11 @@ - - @@ -2251,6 +2251,8 @@ + + @@ -2645,13 +2647,11 @@ - - @@ -2659,6 +2659,8 @@ + + @@ -3808,6 +3810,7 @@ + @@ -3862,16 +3865,6 @@ - - - - - - - - - - @@ -3933,16 +3926,6 @@ - - - - - - - - - - @@ -4086,6 +4069,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -6124,6 +6128,7 @@ + @@ -6150,17 +6155,6 @@ - - - - - - - - - - - @@ -6218,17 +6212,6 @@ - - - - - - - - - - - @@ -6356,6 +6339,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index a30733407..e7b00e86f 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,82 +5,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs new file mode 100644 index 000000000..10dcaef11 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class SITE + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string ORGANIZATION_GUID { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs new file mode 100644 index 000000000..ea22adbf8 --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class SITES_RMLS + { + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public string SITE_GUID { get; set; } + public string RML_GUID { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index cda3f47c2..4150c2771 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -204,9 +204,6 @@ RemoteADO.tt - - RemoteADO.tt - RemoteADO.tt @@ -228,9 +225,6 @@ RemoteADO.tt - - RemoteADO.tt - RemoteADO.tt @@ -267,6 +261,12 @@ RemoteADO.tt + + RemoteADO.tt + + + RemoteADO.tt + RemoteADO.tt diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 9d0bc3083..bfdbb9c8a 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -331,6 +331,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Browser", "PPC\Mo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Packages.CefInstaller", "PPC\Packages\Tango.PPC.Packages.CefInstaller\Tango.PPC.Packages.CefInstaller.csproj", "{DF64460A-6617-4338-872A-DC43FD994C48}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.Sites", "MachineStudio\Modules\Tango.MachineStudio.Sites\Tango.MachineStudio.Sites.csproj", "{18A27902-9881-4556-8163-F6DF2236A14D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution AppVeyor|Any CPU = AppVeyor|Any CPU @@ -5903,6 +5905,46 @@ Global {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x64.Build.0 = Release|Any CPU {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x86.ActiveCfg = Release|Any CPU {DF64460A-6617-4338-872A-DC43FD994C48}.Release|x86.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|Any CPU.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM64.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x64.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x64.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x86.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x86.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM64.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x64.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x64.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x86.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x86.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x64.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x86.Build.0 = Debug|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|Any CPU.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM64.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM64.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|x64.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|x64.Build.0 = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|x86.ActiveCfg = Release|Any CPU + {18A27902-9881-4556-8163-F6DF2236A14D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -6013,6 +6055,7 @@ Global {F3746F2B-E4AE-498B-9D42-74F95D992460} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60} {F02EAA84-AD59-465B-99A2-4422C13BFB72} = {0048447D-1D94-4E60-9DAD-7349C777CB4E} {DF64460A-6617-4338-872A-DC43FD994C48} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA} + {18A27902-9881-4556-8163-F6DF2236A14D} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} -- cgit v1.3.1