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

Version 3.2.9

Browse Source 
Korrekturen bei ship2ship Koordinaten und try/catch beim Löschen von csv bei der Reportgenerierung
This commit is contained in:
Daniel Schick 2016-10-06 19:21:35 +00:00
parent 376c9492dc
commit ab8fff1d5e
5 changed files with 29 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

@ -689,7 +689,12 @@ namespace bsmd.ExcelReadService
s2sActivity.ShipToShipActivityLocationLoCode = reader.ReadTextNoWhitespace(s2sLocode);
s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = (int?)reader.ReadNumber(s2sLatitude);
// keine "0" (d.h. fehlerhafte Koordinaten) ins ANSW übergeben falls im Sheet nichts ist aber der Reader das aus irgendeinem Grund liest
if (s2sActivity.ShipToShipActivityLocationCoordinatesLatitude.HasValue && s2sActivity.ShipToShipActivityLocationCoordinatesLatitude.Value == 0)
s2sActivity.ShipToShipActivityLocationCoordinatesLatitude = null;
s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = (int?)reader.ReadNumber(s2sLongitude);
if (s2sActivity.ShipToShipActivityLocationCoordinatesLongitude.HasValue && s2sActivity.ShipToShipActivityLocationCoordinatesLongitude.Value == 0)
s2sActivity.ShipToShipActivityLocationCoordinatesLongitude = null;
s2sActivity.ShipToShipActivityDateFrom = reader.ReadDate(s2sFromDate);
s2sActivity.ShipToShipActivityDateTo = reader.ReadDate(s2sToDate);
s2sActivity.ShipToShipActivityType = reader.ReadText(s2sActivityString);

24
nsw/Source/bsmd.ReportGenerator/ReportService.cs
View File

@ -193,8 +193,28 @@ namespace bsmd.ReportGenerator
reportCore.ReportStatus = MessageCore.ReportStatusEnum.NONE;
DBManager.Instance.Save(reportCore);
if (passengerCSV != null) File.Delete(passengerCSV);
if (crewCSV != null) File.Delete(crewCSV);
if (passengerCSV != null)
{
try
{
File.Delete(passengerCSV);
}
catch(Exception ex)
{
_log.WarnFormat("Exception trying to delete passenger csv:{0}", ex.Message);
}
}
if (crewCSV != null)
{
try
{
File.Delete(crewCSV);
}
catch(Exception ex)
{
_log.WarnFormat("Exception trying to delete crew csv:{0}", ex.Message);
}
}
}
#endregion

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

@ -2,6 +2,6 @@
[assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
[assembly: AssemblyProduct("BSMD NSW interface")]
[assembly: AssemblyInformationalVersion("3.2.8")]
[assembly: AssemblyInformationalVersion("3.2.9")]
[assembly: AssemblyCopyright("Copyright © 2014-2016 Informatikbüro Daniel Schick. All rights reserved.")]
[assembly: AssemblyTrademark("")]

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

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