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

3.4.7: weitere kleinere Korrekturen

Browse Source
This commit is contained in:
Daniel Schick 2017-03-23 18:00:07 +00:00
parent 771ba4288e
commit 240dc42f1f
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

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

@ -1294,7 +1294,7 @@ namespace bsmd.ExcelReadService
waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen); waste.WasteAmountGeneratedTillNextPort_MTQ = reader.ReadNumberDefaultZero(amountGen);
waste.WasteDisposedAtLastPort_MTQ = reader.ReadNumberDefaultZero(wasteDis); waste.WasteDisposedAtLastPort_MTQ = reader.ReadNumberDefaultZero(wasteDis);
/*
if ((reader.Mode == ExcelReader.CountryMode.DE) && if ((reader.Mode == ExcelReader.CountryMode.DE) &&
((i == 6) || (i == 8) || (i == 9))) ((i == 6) || (i == 8) || (i == 9)))
{ {
@ -1305,12 +1305,13 @@ namespace bsmd.ExcelReadService
waste.WasteDisposalPort = "ZZUKN"; waste.WasteDisposalPort = "ZZUKN";
waste.WasteAmountGeneratedTillNextPort_MTQ = 0; waste.WasteAmountGeneratedTillNextPort_MTQ = 0;
} }
*/
if(i==15) // falls letzte Zeile leer, entfernen: Christin 22.3.17 if(i==15) // falls letzte Zeile leer, entfernen: Christin 22.3.17
{ {
if ((waste.WasteDescription.IsNullOrEmpty() || waste.WasteDescription == "-") && if ((waste.WasteDescription.IsNullOrEmpty() || waste.WasteDescription == "-") &&
((waste.WasteDisposalAmount_MTQ ?? 0) == 0) && ((waste.WasteDisposalAmount_MTQ ?? 0) == 0) &&
((waste.WasteType ?? 0) == 1300)) (((waste.WasteType ?? 0) == 1300) || !waste.WasteType.HasValue))
was.Waste.Remove(waste); was.Waste.Remove(waste);
} }

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.6")] [assembly: AssemblyInformationalVersion("3.4.7")]
[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.6.*")] [assembly: AssemblyVersion("3.4.7.*")]

BIN
nsw/Waste Type Codes.xlsx Normal file
View File

Binary file not shown.