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

V 3.4.1 Kleines Update für NSW 4.0

Browse Source
This commit is contained in:
Daniel Schick 2017-03-16 18:03:04 +00:00
parent de8b7de10d
commit 6ad237a7f5
7 changed files with 308 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

BIN
nsw/Deutschland/Reference_Sheet_DE.xltx
View File

Binary file not shown.

BIN
nsw/Herberg/angebot_NSW4.020170227.pdf Normal file
View File

Binary file not shown.

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

@ -208,18 +208,21 @@ namespace bsmd.ExcelReadService
internal string ReadNationality(string lookup) internal string ReadNationality(string lookup)
{ {
string val = this.ReadText(lookup); string val = this.ReadText(lookup);
if(val.IsNullOrEmpty()) { if (val.IsNullOrEmpty())
{
this.Conf.ConfirmText(lookup, null, ReadState.FAIL); this.Conf.ConfirmText(lookup, null, ReadState.FAIL);
} }
else
if(val.Length > 2) {
if (val.Length > 2)
{ {
string isoCode = LocodeDB.CountryCodeFromName(val); string isoCode = LocodeDB.CountryCodeFromName(val);
if(isoCode != null) if (isoCode != null)
{ {
this.Conf.ConfirmText(lookup, val, ReadState.OK); this.Conf.ConfirmText(lookup, val, ReadState.OK);
val = isoCode; val = isoCode;
} else }
else
{ {
this.Conf.ConfirmText(lookup, val, ReadState.WARN); this.Conf.ConfirmText(lookup, val, ReadState.WARN);
} }
@ -227,7 +230,7 @@ namespace bsmd.ExcelReadService
if (val.Length == 2) if (val.Length == 2)
this.Conf.ConfirmText(lookup, val, ReadState.OK); this.Conf.ConfirmText(lookup, val, ReadState.OK);
}
return val; return val;
} }

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

@ -1216,7 +1216,7 @@ namespace bsmd.ExcelReadService
if (reader.Mode == ExcelReader.CountryMode.DE) if (reader.Mode == ExcelReader.CountryMode.DE)
{ {
waste.WasteType = i; // remove for V4 // waste.WasteType = i; // remove for V4
// change for V4 // change for V4
reader.Conf.ConfirmText(wastetype, waste.WasteTypeDisplay, ExcelReader.ReadState.OK); reader.Conf.ConfirmText(wastetype, waste.WasteTypeDisplay, ExcelReader.ReadState.OK);
reader.Conf.ConfirmNumber(wasteCode, waste.WasteType, ExcelReader.ReadState.OK); reader.Conf.ConfirmNumber(wasteCode, waste.WasteType, ExcelReader.ReadState.OK);
@ -1277,7 +1277,7 @@ namespace bsmd.ExcelReadService
} }
} }
/*
try try
{ {
// Übergangsphase: Für "DE" werden nur 9 Positionen verwendet // Übergangsphase: Für "DE" werden nur 9 Positionen verwendet
@ -1292,13 +1292,14 @@ namespace bsmd.ExcelReadService
nrSeven.WasteAmountRetained_MTQ = nrEleven.WasteAmountRetained_MTQ; nrSeven.WasteAmountRetained_MTQ = nrEleven.WasteAmountRetained_MTQ;
nrSeven.WasteDisposalPort = nrEleven.WasteDisposalPort; nrSeven.WasteDisposalPort = nrEleven.WasteDisposalPort;
nrSeven.WasteAmountGeneratedTillNextPort_MTQ = nrEleven.WasteAmountGeneratedTillNextPort_MTQ; nrSeven.WasteAmountGeneratedTillNextPort_MTQ = nrEleven.WasteAmountGeneratedTillNextPort_MTQ;
was.Waste.RemoveRange(9, 6); // 9-15 entfernen // was.Waste.RemoveRange(9, 6); // 9-15 entfernen
} }
} }
catch(Exception ex) catch(Exception ex)
{ {
_log.ErrorFormat("Error Waste Workaround DE: {0}", ex.Message); _log.ErrorFormat("Error Waste Workaround DE: {0}", ex.Message);
} }
*/
} }
#endregion #endregion

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

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")] [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")] [assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.4.0")] [assembly: AssemblyInformationalVersion("3.4.1")]
[assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")] [assembly: AssemblyCopyright("Copyright © 2014-2017 Informatikbüro Daniel Schick. All rights reserved.")]
[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("3.4.0.*")] [assembly: AssemblyVersion("3.4.1.*")]