diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-09-25 15:20:42 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-09-25 15:20:42 +0300 |
| commit | e6febb2cda232a2c89467690d9e1fbb82423618a (patch) | |
| tree | b2a6c6e2c2d8ce36e5e43b78fbe1672bf7ff7d33 /Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI | |
| parent | f3d5875915904417ac5dddc2e16add4d81b9e393 (diff) | |
| download | Tango-e6febb2cda232a2c89467690d9e1fbb82423618a.tar.gz Tango-e6febb2cda232a2c89467690d9e1fbb82423618a.zip | |
Implemented MultiGraph data series colors from configuration.
Added dispensers & mid-tanks diagnostics monitors.
Diffstat (limited to 'Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI')
4 files changed, 26 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config index 5e14aa35c..feee84b8b 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/App.config @@ -19,6 +19,10 @@ <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" /> + </dependentAssembly> </assemblyBinding> </runtime> </configuration>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index b5442e72b..78a9d0380 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -11,6 +11,7 @@ using Tango.BL; using static Tango.Core.Components.DataBaseDescriptionsHelper; using Tango.Core.Components; using System.ComponentModel.DataAnnotations.Schema; +using Newtonsoft.Json; namespace Tango.PMRGenerator.CLI { @@ -747,7 +748,22 @@ namespace Tango.PMRGenerator.CLI if (db_des != null) { - return db_des.ColumnDescription.ToLines().Take(1).Concat(db_des.ColumnDescription.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine); + RangeDescriptionModel rangeDescription = null; + + try + { + rangeDescription = JsonConvert.DeserializeObject<RangeDescriptionModel>(db_des.ColumnDescription); + } + catch { } + + if (rangeDescription != null && rangeDescription.Description != null) + { + return rangeDescription.Description.ToLines().Take(1).Concat(rangeDescription.Description.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine); + } + else + { + return db_des.ColumnDescription.ToLines().Take(1).Concat(db_des.ColumnDescription.ToLines().Skip(1).Select(x => "//" + x)).Join(Environment.NewLine); + } } return null; diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj index 21e77f3d4..a02aca302 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj @@ -38,6 +38,9 @@ <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <HintPath>..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath> </Reference> + <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> + <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Core" /> @@ -80,7 +83,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/packages.config b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/packages.config index b3daf0d6c..1127d4e32 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/packages.config +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/packages.config @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> <package id="EntityFramework" version="6.2.0" targetFramework="net461" /> + <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" /> </packages>
\ No newline at end of file |