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

5.0.17 Komische Korrektur mit ETAPortOfCall (bei Falscheingaben)

Browse Source
This commit is contained in:
Daniel Schick 2018-09-03 16:03:58 +00:00
parent 26a668a4d9
commit e3fea3560f
8 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ENI-2/ENI2/ENI2/App.config
View File

@ -26,12 +26,12 @@
<value>1000</value> <value>1000</value>
</setting> </setting>
<setting name="LockingServerAddress" serializeAs="String"> <setting name="LockingServerAddress" serializeAs="String">
<value>http://192.168.2.4/LockingService/LockingService.svc</value> <!--value>http://192.168.2.4/LockingService/LockingService.svc</value-->
<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value--> <value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
</setting> </setting>
<setting name="ConnectionString" serializeAs="String"> <setting name="ConnectionString" serializeAs="String">
<value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value> <!--value>Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value-->
<!--value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value--> <value>Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False</value>
</setting> </setting>
</ENI2.Properties.Settings> </ENI2.Properties.Settings>
</applicationSettings> </applicationSettings>

BIN
Stundensheet.xlsx
View File

Binary file not shown.

4
nsw/Source/bsmd.ExcelReadService/ExcelReader.cs
View File

@ -438,9 +438,9 @@ namespace bsmd.ExcelReadService
if (val is DateTime) if (val is DateTime)
{ {
this.Conf.ConfirmDate(lookup, val, noHighlight ? ReadState.NONE : ReadState.OK); this.Conf.ConfirmDate(lookup, val, noHighlight ? ReadState.NONE : ReadState.OK);
return val; date = val;
} }
if (val is double) else if (val is double)
{ {
try try
{ {

8
nsw/Source/bsmd.ExcelReadService/Util.cs
View File

@ -1158,15 +1158,15 @@ namespace bsmd.ExcelReadService
{ {
if (eta.HasValue) if (eta.HasValue)
noa_nod.ETAToKielCanal = eta; noa_nod.ETAToKielCanal = eta;
else //else
noa_nod.ETAToKielCanal = messageCore.ETAKielCanal; // noa_nod.ETAToKielCanal = messageCore.ETAKielCanal;
} }
else else
{ {
if (eta.HasValue) if (eta.HasValue)
noa_nod.ETAToPortOfCall = eta; noa_nod.ETAToPortOfCall = eta;
else //else
noa_nod.ETAToPortOfCall = messageCore.ETA; // noa_nod.ETAToPortOfCall = messageCore.ETA;
// Zeit muss zurückkonvertiert werden, da toUniversalTime() kodiert // Zeit muss zurückkonvertiert werden, da toUniversalTime() kodiert
if(noa_nod.ETAToPortOfCall.HasValue) if(noa_nod.ETAToPortOfCall.HasValue)

1
nsw/Source/bsmd.ExcelReadService/bsmd.ExcelReadService.csproj
View File

@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>..\..\..\..\mtc\puls200.frame\frame.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>

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("5.0.15")] [assembly: AssemblyInformationalVersion("5.0.17")]
[assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")] [assembly: AssemblyCopyright("Copyright © 2014-2018 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("5.0.15.*")] [assembly: AssemblyVersion("5.0.17.*")]

1
nsw/Source/bsmd.email/bsmd.email.csproj
View File

@ -23,6 +23,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<UseVSHostingProcess>false</UseVSHostingProcess> <UseVSHostingProcess>false</UseVSHostingProcess>
<CodeAnalysisRuleSet>..\..\..\..\mtc\puls200.frame\frame.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>