diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 860d073a..df1878a4 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -26,12 +26,12 @@ 1000 - - http://heupferd/bsmd.LockingService/LockingService.svc + http://192.168.2.24/LockingService/LockingService.svc + - - 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 + Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false + diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index cdb7db96..dd0c6c9a 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -64,6 +64,9 @@ namespace ENI2 // Bedingung: // wenn in einer Meldeklasse zwar Daten vorhanden sind, eingespielt durch Excel import oder // Handeingabe, diese aber NICHT gesendet wurden. + // TODO: Hier wird noch ein Flag benötigt, dass die erfolgte Anzeige des Warndialogs speichert + + /* foreach (Message aMessage in _messages) { if ((aMessage.InternalStatus == Message.BSMDStatus.UPDATED) || @@ -71,7 +74,7 @@ namespace ENI2 (aMessage.InternalStatus == Message.BSMDStatus.EXCEL)) return true; } - + */ return false; } } diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index 5399e6f7..36568a76 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -35,7 +35,7 @@ true publish.html 1 - 5.5.0.%2a + 5.6.0.%2a false true true diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 856fce24..b5dcfdbd 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/SQL/fk_indexes.sql b/nsw/Source/SQL/fk_indexes.sql index 66d8ad60..c0cc6e1e 100644 --- a/nsw/Source/SQL/fk_indexes.sql +++ b/nsw/Source/SQL/fk_indexes.sql @@ -38,3 +38,8 @@ CREATE INDEX [IX_FK_PortOfCallLast30Days_MDH] ON PortOfCallLast30Days(MDH_Id) CREATE INDEX [IX_FK_SInfectedArea_MDH] ON InfectedArea(MDH_Id) CREATE INDEX [IX_FK_PortOfCallLast30DaysCrewJoinedShip_PortOfCallLast30Days] ON PortOfCallLast30DaysCrewJoinedShip(PortOfCallLast30DaysId) CREATE INDEX [IX_FK_WasteDisposalServiceProvider_WAS] ON WasteDisposalServiceProvider(WASId) + +CREATE NONCLUSTERED INDEX [IX_FK_VALUE_IMPORTHEADERID] +ON [dbo].[ImportValue] ([ImportHeaderId]) +INCLUDE ([NotificationClass],[Name],[Value],[Identifier],[Status]) +GO diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 10acfe63..cfda07ce 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("5.5.0")] +[assembly: AssemblyInformationalVersion("5.6.0")] [assembly: AssemblyCopyright("Copyright © 2014-2019 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 0b68ded0..78df9b08 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("5.5.0.*")] +[assembly: AssemblyVersion("5.6.0.*")]