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

Hotfix 6.9.12, zwei Fehler korrigiert

Browse Source
This commit is contained in:
Daniel Schick 2022-01-19 18:19:25 +01:00
parent f22c3d2f80
commit 0fd4b9919a
7 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ENI2/App.config
View File

@ -29,7 +29,7 @@
<value>http://192.168.2.24/LockingService/LockingService.svc</value> <value>http://192.168.2.24/LockingService/LockingService.svc</value>
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value> <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

10
ENI2/ENI2.csproj
View File

@ -18,7 +18,7 @@
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<PublishUrl>eni2.publish\</PublishUrl> <PublishUrl>eni_test\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Web</InstallFrom> <InstallFrom>Web</InstallFrom>
<UpdateEnabled>true</UpdateEnabled> <UpdateEnabled>true</UpdateEnabled>
@ -28,16 +28,16 @@
<UpdatePeriodically>false</UpdatePeriodically> <UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<InstallUrl>http://192.168.2.24/eni2.publish/</InstallUrl> <InstallUrl>http://192.168.2.24/eni_test/</InstallUrl>
<SupportUrl>http://www.textbausteine.net/</SupportUrl> <SupportUrl>http://www.textbausteine.net/</SupportUrl>
<ProductName>ENI</ProductName> <ProductName>ENI Testversion</ProductName>
<PublisherName>Informatikbüro Daniel Schick</PublisherName> <PublisherName>Informatikbüro Daniel Schick</PublisherName>
<SuiteName>NSW</SuiteName> <SuiteName>NSW</SuiteName>
<MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion> <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
<CreateWebPageOnPublish>true</CreateWebPageOnPublish> <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
<WebPage>publish.html</WebPage> <WebPage>publish.html</WebPage>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>6.9.11.0</ApplicationVersion> <ApplicationVersion>6.9.12.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut> <CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
@ -86,7 +86,7 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest> <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestCertificateThumbprint>9B5725EAD90F2E06094631407417EB2554E88941</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>94D98790E3B6C4CC9F4B57C8FD305E3225894DF8</ManifestCertificateThumbprint>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignManifests>true</SignManifests> <SignManifests>true</SignManifests>

2
ENI2/Excel/ExcelBase.cs
View File

@ -16,7 +16,7 @@ namespace ENI2.Excel
internal enum CountryMode { NONE, DE, DK }; internal enum CountryMode { NONE, DE, DK };
protected CountryMode _countryMode = CountryMode.NONE; protected CountryMode _countryMode = CountryMode.DE;
protected Workbooks _excelWorkbooks; protected Workbooks _excelWorkbooks;
protected Workbook _workBook; protected Workbook _workBook;

17
ENI2/Report/ReportManager.cs
View File

@ -49,9 +49,24 @@ namespace ENI2.Report
try try
{ {
string etaDisplay = "";
foreach (Message message in reportMessages)
{
if(message.MessageNotificationClass == Message.NotificationClass.NOA_NOD)
{
if (message.Elements[0] is NOA_NOD noa_nod)
{
if (core.IsTransit && noa_nod.ETAToKielCanal.HasValue)
etaDisplay = noa_nod.ETAToKielCanal.Value.ToLocalTime().ToString();
if (!core.IsTransit && noa_nod.ETAToPortOfCall.HasValue)
etaDisplay = noa_nod.ETAToPortOfCall.Value.ToLocalTime().ToString();
}
}
}
Dictionary<string, string> coverInfos = new Dictionary<string, string>(); Dictionary<string, string> coverInfos = new Dictionary<string, string>();
coverInfos.Add("Ship", DBManager.Instance.GetShipNameFromCore(core)); coverInfos.Add("Ship", DBManager.Instance.GetShipNameFromCore(core));
coverInfos.Add("ETA", core.ETA_NOA_NOD.HasValue ? core.ETA_NOA_NOD.Value.ToLocalTime().ToString() : ""); coverInfos.Add("ETA", etaDisplay);
coverInfos.Add("Port of call", core.Portname); coverInfos.Add("Port of call", core.Portname);
coverInfos.Add("Visit-ID", core.DisplayId); coverInfos.Add("Visit-ID", core.DisplayId);
coverInfos.Add("Class", classes); coverInfos.Add("Class", classes);

BIN
ENI2/Resources/EUREPORT.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 41 KiB

4
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.9.11")] [assembly: AssemblyInformationalVersion("6.9.12")]
[assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2022 schick Informatik")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

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

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