dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Korrekturen 6.1

Browse Source
This commit is contained in:
Daniel Schick 2021-04-04 17:49:13 +00:00
parent a4d104d23d
commit ebf8a2976f
9 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs
View File

@ -764,7 +764,7 @@ namespace ENI2
NOA_NOD noanod = noanodMessage.Elements[0] as NOA_NOD; NOA_NOD noanod = noanodMessage.Elements[0] as NOA_NOD;
if(sec.LastTenPortFacilitesCalled.Count > 0) if(sec.LastTenPortFacilitesCalled.Count > 0)
{ {
if(!sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode.Equals(noanod.LastPort)) if((sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode == null) || !sec.LastTenPortFacilitesCalled[0].PortFacilityPortLoCode.Equals(noanod.LastPort))
{ {
MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "SEC last port doesn't match NOANOD last port", null, "Last port mismatch", null, "SEC"); MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "SEC last port doesn't match NOANOD last port", null, "Last port mismatch", null, "SEC");
mv.MessageGroupName = Properties.Resources.textOverview; mv.MessageGroupName = Properties.Resources.textOverview;

7
ENI-2/ENI2/ENI2/ENI2.csproj
View File

@ -35,7 +35,7 @@
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>6.1.0.%2a</ApplicationVersion> <ApplicationVersion>6.1.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
@ -69,7 +69,7 @@
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>ENI2_3_TemporaryKey.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>Resources\logo_schwarz.ico</ApplicationIcon> <ApplicationIcon>Resources\logo_schwarz.ico</ApplicationIcon>
@ -90,7 +90,8 @@
<SignManifests>true</SignManifests> <SignManifests>true</SignManifests>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestKeyFile>ENI2_3_TemporaryKey.pfx</ManifestKeyFile> <ManifestKeyFile>
</ManifestKeyFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL"> <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">

10
ENI-2/ENI2/ENI2/MainWindow.xaml.cs
View File

@ -402,6 +402,9 @@ namespace ENI2
closedDialog.Core.DefaultReportingPartyId = this.userEntity.Id; closedDialog.Core.DefaultReportingPartyId = this.userEntity.Id;
DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(closedDialog.Core); DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(closedDialog.Core);
// Meldeklassen für neuen Anlauf erzeugen
bsmd.database.Util.CreateMessagesForCore(closedDialog.Core, null, userEntity);
// watchdog registrieren // watchdog registrieren
this._dbWatchDog.Register(closedDialog.Core); this._dbWatchDog.Register(closedDialog.Core);
@ -423,11 +426,8 @@ namespace ENI2
}; };
this.showIdDict.Add(closedDialog.Core.Id.Value, showIdDialog); this.showIdDict.Add(closedDialog.Core.Id.Value, showIdDialog);
showIdDialog.Show(); showIdDialog.Show();
this.UpdateWaitIdLabel(); this.UpdateWaitIdLabel();
// Meldeklassen für neuen Anlauf erzeugen
bsmd.database.Util.CreateMessagesForCore(closedDialog.Core, null, userEntity);
} }
}; };
visitIdDialog.Show(); visitIdDialog.Show();

2
ENI-2/ENI2/ENI2/SucheControl.xaml.cs
View File

@ -253,7 +253,7 @@ namespace ENI2
DataGrid grid = sender as DataGrid; DataGrid grid = sender as DataGrid;
if (grid?.SelectedItems?.Count == 1) if (grid?.SelectedItems?.Count == 1)
{ {
DataGridRow dgr = grid.ItemContainerGenerator.ContainerFromItem(grid.SelectedItem) as DataGridRow; // DataGridRow dgr = grid.ItemContainerGenerator.ContainerFromItem(grid.SelectedItem) as DataGridRow;
MessageCore selectedCore = grid.SelectedItem as MessageCore; MessageCore selectedCore = grid.SelectedItem as MessageCore;
this.DisplayCore(selectedCore); this.DisplayCore(selectedCore);
} }

BIN
Stundensheet.xlsx
View File

Binary file not shown.

2
nsw/Source/bsmd.database/DBManager.cs
View File

@ -252,7 +252,7 @@ namespace bsmd.database
{ {
MessageCore aMessageCore = new MessageCore(); MessageCore aMessageCore = new MessageCore();
SqlCommand cmd = new SqlCommand(); SqlCommand cmd = new SqlCommand();
if (limit.HasValue && (limit.Value > 0)) if (limit > 0)
aMessageCore.ResultLimit = limit; aMessageCore.ResultLimit = limit;
aMessageCore.PrepareLoadCommand(cmd, Message.LoadFilter.SEARCH_CORE_FILTERS, filters); aMessageCore.PrepareLoadCommand(cmd, Message.LoadFilter.SEARCH_CORE_FILTERS, filters);

2
nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
View File

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyCompany("schick Informatik")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("6.1.0")] [assembly: AssemblyInformationalVersion("6.1.1")]
[assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("6.1.0.*")] [assembly: AssemblyVersion("6.1.1.*")]

4
nsw/Source/bsmd.database/Util.cs
View File

@ -166,7 +166,7 @@ namespace bsmd.database
if (core.IsTransit && (notificationClass == Message.NotificationClass.VISIT)) continue; if (core.IsTransit && (notificationClass == Message.NotificationClass.VISIT)) continue;
if (!core.IsTransit && (notificationClass == Message.NotificationClass.TRANSIT)) continue; if (!core.IsTransit && (notificationClass == Message.NotificationClass.TRANSIT)) continue;
Message message = null; Message message;
if (!messageDict.ContainsKey(notificationClass)) if (!messageDict.ContainsKey(notificationClass))
{ {
@ -185,7 +185,7 @@ namespace bsmd.database
} }
// abgesehen von "Listen" für die Nachrichtenklassen auch untergeordnete Elemente erzeugen, falls nicht vorhanden! // abgesehen von "Listen" für die Nachrichtenklassen auch untergeordnete Elemente erzeugen, falls nicht vorhanden!
DatabaseEntity classElement = null; DatabaseEntity classElement;
if (!Message.IsListClass(notificationClass) && (message.Elements.Count == 0)) if (!Message.IsListClass(notificationClass) && (message.Elements.Count == 0))
{ {
classElement = DBManager.CreateMessage(notificationClass); classElement = DBManager.CreateMessage(notificationClass);