diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index e173ff53..d3e54f8b 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -26,12 +26,12 @@ 1000 - http://192.168.2.24/LockingService/LockingService.svc - + + http://heupferd/bsmd.LockingService/LockingService.svc - Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false - + + Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index 8b99e75a..625e08ce 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -35,7 +35,7 @@ true publish.html 0 - 6.5.4.0 + 6.6.0.0 false true true diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 15d1bd8e..4d245145 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs index 132ef5e0..96f6b710 100644 --- a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs +++ b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs @@ -1675,7 +1675,7 @@ namespace bsmd.ReportGenerator hRow.Cells[3].AddParagraph("Hazards"); hRow.Cells[4].AddParagraph("Fl I"); hRow.Cells[5].AddParagraph("Flp (C°)"); - hRow.Cells[6].AddParagraph("Quantity"); + hRow.Cells[6].AddParagraph("Quant.(kgs)"); hRow.Cells[7].AddParagraph("Stow"); hRow.Cells[8].AddParagraph("PoL"); hRow.Cells[9].AddParagraph("PoD"); @@ -1740,7 +1740,7 @@ namespace bsmd.ReportGenerator hRow.Cells[1].AddParagraph("UN No"); hRow.Cells[2].AddParagraph("IMO Class"); hRow.Cells[3].AddParagraph("Product name"); - hRow.Cells[4].AddParagraph("Quantity"); + hRow.Cells[4].AddParagraph("Quant.(kgs)"); hRow.Cells[5].AddParagraph("Stow. pos"); hRow.Cells[6].AddParagraph("PoL"); hRow.Cells[7].AddParagraph("PoD"); @@ -1805,7 +1805,7 @@ namespace bsmd.ReportGenerator hRow.Cells[3].AddParagraph("MHB"); hRow.Cells[4].AddParagraph("UN No"); hRow.Cells[5].AddParagraph("IMO Class"); - hRow.Cells[6].AddParagraph("Quantity"); + hRow.Cells[6].AddParagraph("Quant.(kgs)"); hRow.Cells[7].AddParagraph("Stow. pos"); hRow.Cells[8].AddParagraph("PoL"); hRow.Cells[9].AddParagraph("PoD"); @@ -1868,7 +1868,7 @@ namespace bsmd.ReportGenerator hRow.Cells[1].AddParagraph("Name"); hRow.Cells[2].AddParagraph("Fl I"); hRow.Cells[3].AddParagraph("Flp (C°)"); - hRow.Cells[4].AddParagraph("Quantity"); + hRow.Cells[4].AddParagraph("Quant.(kgs)"); hRow.Cells[5].AddParagraph("Stow. pos"); hRow.Cells[6].AddParagraph("PoL"); hRow.Cells[7].AddParagraph("PoD"); diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 12c6fc82..7e64b4ae 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("6.5.0")] +[assembly: AssemblyInformationalVersion("6.6.0")] [assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 04b02627..d2165406 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("6.5.0.*")] +[assembly: AssemblyVersion("6.6.0.*")] diff --git a/nsw/Source/bsmd.database/versions.md b/nsw/Source/bsmd.database/versions.md index a71c9c1b..d4329824 100644 --- a/nsw/Source/bsmd.database/versions.md +++ b/nsw/Source/bsmd.database/versions.md @@ -5,8 +5,11 @@ ___ # Planung -ENI 6.5.0: Korrektur SEC / AGNT Vorlagen -ReportGenerator 6.5 (wartet auf Freigabe) +ENI 6.6.0: + +ReportGenerator 6.6.0: kleinere Korrekturen + + # Aktuell installiert bei BSMD