diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj index 3c3bd17..44ac370 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/IngeniBridge.GenerateFullInventory.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 IngeniBridge.GenerateFullInventory 1.0.0 JTO Tec @@ -14,22 +14,25 @@ - - - - - - + + + + + + - - NETCORE;NETSTANDARD;NETSTANDARD2_0 - - - - + + + PreserveNewest + + + + + + \ No newline at end of file diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Program.cs b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Program.cs index 3b42d58..7d3b19b 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Program.cs +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Program.cs @@ -20,6 +20,7 @@ class Program private static readonly ILog log = LogManager.GetLogger ( System.Reflection.MethodBase.GetCurrentMethod ().DeclaringType ); static int Main ( string [] args ) { + ExcelPackage.LicenseContext = LicenseContext.NonCommercial; int exitCode = 0; XmlConfigurator.Configure ( LogManager.GetRepository ( Assembly.GetEntryAssembly () ), new FileInfo ( "log4net.config" ) ); CommandLineOptions options = null; @@ -53,7 +54,7 @@ static int Main ( string [] args ) log.Info ( "DataModel Version Minor => " + accessor.Version.Minor.ToString () ); log.Info ( "DataModel Version Build => " + accessor.Version.Build.ToString () ); TreeChecker tc = new TreeChecker ( accessor ); - Console.WriteLine ( "Vérification de l'arbre..." ); + log.Info ( "Vérification de l'arbre..." ); tc.CheckTree ( true, message => log.Error ( message ) ); FileInfo fi = new FileInfo ( options.InventoryFile ); if ( fi.Exists ) fi.Delete (); diff --git a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Properties/launchSettings.json b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Properties/launchSettings.json index bbd6ff2..50c040c 100644 --- a/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Properties/launchSettings.json +++ b/IngeniBridge.Programs/IngeniBridge.GenerateFullInventory/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "IngeniBridge.GenerateFullInventory": { "commandName": "Project", - "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\MasterAssetMyCompany_2020_01_03.ibdb --InventoryFile=InventoryFileIB.xlsx" + "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=\"..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\DatabaseInit\\MasterAssetMyCompany_2022_01_27.ibdb\" --InventoryFile=InventoryFileIB.xlsx" } } } \ No newline at end of file diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj index e1d64e5..2131775 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/IngeniBridge.IBDatabaseParser.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 IngeniBridge.IBDatabaseParser 1.0.0 JTO Tec @@ -14,11 +14,11 @@ - - - - - + + + + + @@ -28,13 +28,9 @@ - - NETCORE;NETSTANDARD;NETSTANDARD2_0 - - - - + + \ No newline at end of file diff --git a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Properties/launchSettings.json b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Properties/launchSettings.json index e33cf23..0932c0a 100644 --- a/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Properties/launchSettings.json +++ b/IngeniBridge.Programs/IngeniBridge.IBDatabaseParser/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "IngeniBridge.IBDatabaseParser": { "commandName": "Project", - "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\MasterAssetMyCompany_2020_01_03.ibdb" + "commandLineArgs": "--StorageAccessorAssembly=\"IngeniBridge.StorageAccessor.InMemory.dll\" --IBDatabase=..\\..\\..\\..\\..\\IngeniBridge.Sample.MyCompany\\DatabaseInit\\MasterAssetMyCompany_2022_01_27.ibdb" } } } \ No newline at end of file diff --git a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompanyNew_2020_05_03.ibdb_Database.xlsx b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompanyNew_2020_05_03.ibdb_Database.xlsx deleted file mode 100644 index 1c7f37e..0000000 Binary files a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompanyNew_2020_05_03.ibdb_Database.xlsx and /dev/null differ diff --git a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb new file mode 100644 index 0000000..e69de29 diff --git a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb_Database.xlsx b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb_Database.xlsx new file mode 100644 index 0000000..27b6fb8 Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_26.ibdb_Database.xlsx differ diff --git a/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_27.ibdb b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_27.ibdb new file mode 100644 index 0000000..1d3e15d Binary files /dev/null and b/IngeniBridge.Sample.MyCompany/DatabaseInit/MasterAssetMyCompany_2022_01_27.ibdb differ diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany.sln b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany.sln index 5e582ba..d8f767e 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany.sln +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31410.357 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCompanyDataModel", "MyCompanyDataModel\MyCompanyDataModel.csproj", "{43213853-C6F5-4CC4-B1C5-3FEAD2355024}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IngeniBridge.Samples.MyCompany", "IngeniBridge.Samples.MyCompany\IngeniBridge.Samples.MyCompany.csproj", "{8410C11D-DDED-46BA-B855-1813A1CF98A4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {43213853-C6F5-4CC4-B1C5-3FEAD2355024}.Debug|Any CPU.Build.0 = Debug|Any CPU {43213853-C6F5-4CC4-B1C5-3FEAD2355024}.Release|Any CPU.ActiveCfg = Release|Any CPU {43213853-C6F5-4CC4-B1C5-3FEAD2355024}.Release|Any CPU.Build.0 = Release|Any CPU + {8410C11D-DDED-46BA-B855-1813A1CF98A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8410C11D-DDED-46BA-B855-1813A1CF98A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8410C11D-DDED-46BA-B855-1813A1CF98A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8410C11D-DDED-46BA-B855-1813A1CF98A4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj index e5f9361..5b71d47 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/IngeniBridge.Samples.MyCompany.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 IngeniBridge.Samples.MyCompany 1.0.0 JTO Tec @@ -19,11 +19,11 @@ - - - - - + + + + + @@ -36,11 +36,8 @@ - - NETCORE;NETSTANDARD;NETSTANDARD2_0 - - + - + diff --git a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs index 610b61c..d0bf36c 100644 --- a/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs +++ b/IngeniBridge.Sample.MyCompany/IngeniBridge.Samples.MyCompany/Program.cs @@ -39,24 +39,24 @@ static int Main ( string [ ] args ) Assembly accessorasm = Assembly.LoadFile ( path + "\\IngeniBridge.StorageAccessor.InMemory.dll" ); Core.Storage.StorageAccessor accessor = Core.Storage.StorageAccessor.InstantiateFromAssembly ( accessorasm ); AssetExtension.StorageAccessor = accessor; - string fimastername = FileDater.SetFileNameDateTime ( "..\\..\\..\\..\\MasterAssetMyCompany.ibdb" ); + string fimastername = FileDater.SetFileNameDateTime ("..\\..\\..\\..\\DatabaseInit\\MasterAssetMyCompany.ibdb"); accessor.InitializeNewDB ( Assembly.GetAssembly ( typeof ( MyCompanyAsset ) ), fimastername ); #endregion #region Init root asset MyCompanyRootAsset root = new MyCompanyRootAsset () { Code = "Root Asset", Label = "The root of my company's assests and measures" }; accessor.SetRootAsset ( root ); #endregion - #region nomenclatures - accessor.AddNomenclatureEntry ( new City () { Code = "PAR", Label = "Paris" } ); - accessor.AddNomenclatureEntry ( new City () { Code = "LIV", Label = "Livry-Gargan" } ); - accessor.AddNomenclatureEntry ( new City () { Code = "LER", Label = "Le Raincy" } ); - accessor.AddNomenclatureEntry ( new TypeOfMeasure () { Code = "TMP", Label = "Temperature", Unit = "°C" } ); - accessor.AddNomenclatureEntry ( new TypeOfMeasure () { Code = "PRESS", Label = "Pressure", Unit = "bar" } ); - accessor.AddNomenclatureEntry ( new TypeOfMeasure () { Code = "ELEC", Label = "Electricity", Unit = "kw/h" } ); - accessor.AddNomenclatureEntry ( new TypeOfMeasure () { Code = "WT", Label = "Water throuput", Unit = "m3/h" } ); - accessor.AddNomenclatureEntry ( new TypeOfMeasure () { Code = "CL", Label = "Clorine", Unit = "mg/l" } ); - accessor.AddNomenclatureEntry ( new Sector () { Code = "W", Label = "West" } ); - accessor.AddNomenclatureEntry ( new Sector () { Code = "S", Label = "South" } ); + #region tables + accessor.AddTableEntry ( new City () { Code = "PAR", Label = "Paris" } ); + accessor.AddTableEntry ( new City () { Code = "LIV", Label = "Livry-Gargan" } ); + accessor.AddTableEntry ( new City () { Code = "LER", Label = "Le Raincy" } ); + accessor.AddTableEntry ( new TypeOfMeasure () { Code = "TMP", Label = "Temperature", Unit = "°C" } ); + accessor.AddTableEntry ( new TypeOfMeasure () { Code = "PRESS", Label = "Pressure", Unit = "bar" } ); + accessor.AddTableEntry ( new TypeOfMeasure () { Code = "ELEC", Label = "Electricity", Unit = "kw/h" } ); + accessor.AddTableEntry ( new TypeOfMeasure () { Code = "WT", Label = "Water throuput", Unit = "m3/h" } ); + accessor.AddTableEntry ( new TypeOfMeasure () { Code = "CL", Label = "Clorine", Unit = "mg/l" } ); + accessor.AddTableEntry ( new Sector () { Code = "W", Label = "West" } ); + accessor.AddTableEntry ( new Sector () { Code = "S", Label = "South" } ); #endregion #region Influence zones // Here you see how to access an Excel file using the EPPlus package @@ -74,13 +74,13 @@ static int Main ( string [ ] args ) xlConsolidate.Dispose (); #endregion #region assets - ProductionSite siteParis = new ProductionSite () { Code = "Site of Paris", Label = "Site of Paris, production of water", City = accessor.RetrieveNomenclatureEntry ( "PAR" ), Sector = accessor.RetrieveNomenclatureEntry ( "W" ) }; + ProductionSite siteParis = new ProductionSite () { Code = "Site of Paris", Label = "Site of Paris, production of water", City = accessor.RetrieveTableEntry ( "PAR" ), Sector = accessor.RetrieveTableEntry ( "W" ) }; siteParis.Zone = accessor.RetrieveChildEntity ( root, "InfluenceZones", "Z1" ); root.AddChildAsset ( siteParis ); - ProductionSite siteLivry = new ProductionSite () { Code = "Site of Livry", Label = "Site of Livry-Gargan, quality of water", City = accessor.RetrieveNomenclatureEntry ( "LIV" ), Sector = accessor.RetrieveNomenclatureEntry ( "S" ) }; + ProductionSite siteLivry = new ProductionSite () { Code = "Site of Livry", Label = "Site of Livry-Gargan, quality of water", City = accessor.RetrieveTableEntry ( "LIV" ), Sector = accessor.RetrieveTableEntry ( "S" ) }; siteLivry.Zone = accessor.RetrieveChildEntity ( root, "InfluenceZones", "Z2" ); root.AddChildAsset ( siteLivry ); - ProductionSite siteLeRaincy = new ProductionSite () { Code = "Site of Le Raincy", Label = "Site of Le Raincy, Itercommunication", City = accessor.RetrieveNomenclatureEntry ( "LER" ), Sector = accessor.RetrieveNomenclatureEntry ( "S" ) }; + ProductionSite siteLeRaincy = new ProductionSite () { Code = "Site of Le Raincy", Label = "Site of Le Raincy, Itercommunication", City = accessor.RetrieveTableEntry ( "LER" ), Sector = accessor.RetrieveTableEntry ( "S" ) }; siteLeRaincy.Zone = accessor.RetrieveChildEntity ( root, "InfluenceZones", "Z2" ); root.AddChildAsset ( siteLeRaincy ); GroupOfPumps grouppumps = new GroupOfPumps () { Code = "GP 001" }; @@ -99,27 +99,27 @@ static int Main ( string [ ] args ) siteLeRaincy.AddChildAsset ( ws1 ); #endregion #region measures - AcquiredMeasure am1 = new AcquiredMeasure () { Code = "M 001", TimeSeriesExternalReference = "EXTREF 001", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "WT" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am1 = new AcquiredMeasure () { Code = "M 001", TimeSeriesExternalReference = "EXTREF 001", TypeOfMeasure = accessor.RetrieveTableEntry ( "WT" ), ConsolidationType = ConsolidationType.None }; grouppumps.AddTimeSeries ( am1 ); - AcquiredMeasure am2 = new AcquiredMeasure () { Code = "M 002", TimeSeriesExternalReference = "EXTREF 002", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am2 = new AcquiredMeasure () { Code = "M 002", TimeSeriesExternalReference = "EXTREF 002", TypeOfMeasure = accessor.RetrieveTableEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; wp1.AddTimeSeries ( am2 ); - AcquiredMeasure am3 = new AcquiredMeasure () { Code = "M 003", TimeSeriesExternalReference = "EXTREF 003", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am3 = new AcquiredMeasure () { Code = "M 003", TimeSeriesExternalReference = "EXTREF 003", TypeOfMeasure = accessor.RetrieveTableEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; wp2.AddTimeSeries ( am3 ); - AcquiredMeasure am4 = new AcquiredMeasure () { Code = "M 004", TimeSeriesExternalReference = "EXTREF 004", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "PRESS" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am4 = new AcquiredMeasure () { Code = "M 004", TimeSeriesExternalReference = "EXTREF 004", TypeOfMeasure = accessor.RetrieveTableEntry ( "PRESS" ), ConsolidationType = ConsolidationType.None }; iot1.AddTimeSeries ( am4 ); - ComputedMeasure am5 = new ComputedMeasure () { Code = "M 005", TimeSeriesExternalReference = "EXTREF 005", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "ELEC" ), ConsolidationType = ConsolidationType.Average }; + ComputedMeasure am5 = new ComputedMeasure () { Code = "M 005", TimeSeriesExternalReference = "EXTREF 005", TypeOfMeasure = accessor.RetrieveTableEntry ( "ELEC" ), ConsolidationType = ConsolidationType.Average }; siteParis.AddTimeSeries ( am5 ); - AcquiredMeasure am6 = new AcquiredMeasure () { Code = "M 006", TimeSeriesExternalReference = "EXTREF 006", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "CL" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am6 = new AcquiredMeasure () { Code = "M 006", TimeSeriesExternalReference = "EXTREF 006", TypeOfMeasure = accessor.RetrieveTableEntry ( "CL" ), ConsolidationType = ConsolidationType.None }; iot2.AddTimeSeries ( am6 ); - AcquiredMeasure am7 = new AcquiredMeasure () { Code = "M 007", TimeSeriesExternalReference = "EXTREF 007", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "PRESS" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am7 = new AcquiredMeasure () { Code = "M 007", TimeSeriesExternalReference = "EXTREF 007", TypeOfMeasure = accessor.RetrieveTableEntry ( "PRESS" ), ConsolidationType = ConsolidationType.None }; cl1.AddTimeSeries ( am7 ); - AcquiredMeasure am8 = new AcquiredMeasure () { Code = "M 008", TimeSeriesExternalReference = "EXTREF 008", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am8 = new AcquiredMeasure () { Code = "M 008", TimeSeriesExternalReference = "EXTREF 008", TypeOfMeasure = accessor.RetrieveTableEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; cl1.AddTimeSeries ( am8 ); - AcquiredMeasure am9 = new AcquiredMeasure () { Code = "M 009", TimeSeriesExternalReference = "EXTREF 010", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "CL" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am9 = new AcquiredMeasure () { Code = "M 009", TimeSeriesExternalReference = "EXTREF 010", TypeOfMeasure = accessor.RetrieveTableEntry ( "CL" ), ConsolidationType = ConsolidationType.None }; cl1.AddTimeSeries ( am9 ); - AcquiredMeasure am10 = new AcquiredMeasure () { Code = "M 010", TimeSeriesExternalReference = "EXTREF 009", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am10 = new AcquiredMeasure () { Code = "M 010", TimeSeriesExternalReference = "EXTREF 009", TypeOfMeasure = accessor.RetrieveTableEntry ( "ELEC" ), ConsolidationType = ConsolidationType.None }; cl1.AddTimeSeries ( am10 ); - AcquiredMeasure am11 = new AcquiredMeasure () { Code = "M 011", TimeSeriesExternalReference = "EXTREF 011", TypeOfMeasure = accessor.RetrieveNomenclatureEntry ( "PRESS" ), ConsolidationType = ConsolidationType.None }; + AcquiredMeasure am11 = new AcquiredMeasure () { Code = "M 011", TimeSeriesExternalReference = "EXTREF 011", TypeOfMeasure = accessor.RetrieveTableEntry ( "PRESS" ), ConsolidationType = ConsolidationType.None }; ws1.AddTimeSeries ( am11 ); #endregion #region check and generate IB database (generic script) @@ -133,7 +133,7 @@ static int Main ( string [ ] args ) ( nbTotalAssets, nbTotalDatas ) = accessor.GetStatistics (); log.Info ( "nb total assets => " + nbTotalAssets.ToString () ); log.Info ( "nb total datas => " + nbTotalDatas.ToString () ); - accessor.CloseDB (); + accessor.CloseDB(); #endregion } catch ( Exception e ) diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/AssetDataModel.cd b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/AssetDataModel.cd index 6566de0..995236f 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/AssetDataModel.cd +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/AssetDataModel.cd @@ -127,7 +127,7 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs @@ -162,7 +162,7 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs index 8ba0bab..c244907 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/DatavizIndexHelper.cs @@ -31,7 +31,7 @@ public string IndexNode ( StorageAccessor accessor, string PathInTree, IngeniBri ret.Append ( Entity.Label + " - " ); accessor.ContentHelper.ParseAttributes ( Entity, ( AttributeMetaDescription attribute, object val ) => { - if ( val.GetType ().IsSubclassOf ( typeof ( Nomenclature ) ) || val.GetType ().IsSubclassOf ( typeof ( Asset ) ) ) ret.Append ( accessor.ContentHelper.RetrieveLabelValue ( ( Nomenclature ) val ) + " - " ); + if ( val.GetType ().IsSubclassOf ( typeof ( Table ) ) || val.GetType ().IsSubclassOf ( typeof ( Asset ) ) ) ret.Append ( accessor.ContentHelper.RetrieveLabelValue ( ( Table ) val ) + " - " ); else if ( attribute.IsEnum == true ) ret.Append ( val.ToString () + " - " ); return ( true ); }, true, true ); diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd index 112ac16..0841473 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/FullDataModel.cd @@ -98,7 +98,7 @@ AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs @@ -140,7 +140,7 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj index bbe662e..450f1c7 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/MyCompanyDataModel.csproj @@ -3,7 +3,7 @@ netstandard2.0 MyCompanyDataModel - 2.0.0.3 + 2.1.0.1 JTO Tec Copyright © Acceliance 2016 false @@ -12,12 +12,8 @@ - + - - NETCORE;NETSTANDARD;NETSTANDARD2_0 - - diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cd b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cd index 47703f6..5f90766 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cd +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cd @@ -4,10 +4,10 @@ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs - + @@ -18,14 +18,14 @@ AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cs b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cs index b2d961a..09bd041 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cs +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/Nomenclatures.cs @@ -7,14 +7,14 @@ namespace MyCompanyDataModel { - public class TypeOfMeasure : Nomenclature + public class TypeOfMeasure : Table { public string Unit { get; set; } } - public class Sector : Nomenclature + public class Sector : Table { } - public class City : Nomenclature + public class City : Table { } diff --git a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/TimeSeriesDataModel.cd b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/TimeSeriesDataModel.cd index 1178299..6b39268 100644 --- a/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/TimeSeriesDataModel.cd +++ b/IngeniBridge.Sample.MyCompany/MyCompanyDataModel/TimeSeriesDataModel.cd @@ -22,7 +22,7 @@ AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA= - Nomenclatures.cs + Tables.cs diff --git a/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.deploy.cmd b/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.deploy.cmd index 090de0b..49b3bed 100644 --- a/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.deploy.cmd +++ b/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.deploy.cmd @@ -10,7 +10,7 @@ setlocal @rem --------------------------------------------------------------------------------- @rem Please Make sure you have Web Deploy install in your machine. @rem Alternatively, you can explicit set the MsDeployPath to the location it is on your machine -@rem set MSDeployPath="C:\Program Files (x86)\IIS\Microsoft Web Deploy V3\" +@rem set MSDeployPath="C:\Program Files\IIS\Microsoft Web Deploy V3\" @rem --------------------------------------------------------------------------------- @rem --------------------------------------------------------------------------------- diff --git a/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.zip b/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.zip index c2dff58..0d4cf91 100644 Binary files a/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.zip and b/IngeniBridge.Server/WebDeploy/IngeniBridge.Server.v.1.0.6.zip differ diff --git a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj index 69cd46c..11b4503 100644 --- a/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj +++ b/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer/IngeniBridge.TestServer.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 IngeniBridge.TestServer 1.0.0 JTO Tec @@ -13,10 +13,10 @@ - - - - + + + + @@ -30,12 +30,8 @@ - - NETCORE;NETSTANDARD;NETSTANDARD2_0 - - - +