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

Korrekturen nach Tests mit Sheet von Gerd Sietas

Browse Source
This commit is contained in:
Daniel Schick 2016-12-14 07:09:11 +00:00
parent a5ed1b7763
commit d8b23ba720
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Stundensheet.xlsx
View File

Binary file not shown.

3
nsw/Source/SQL/Update_3.1.3_To_3.5.sql
View File

@ -53,7 +53,8 @@ CREATE TABLE [dbo].[STO] (
[Quantity] [INT] NULL, [Quantity] [INT] NULL,
[QuantityUnit] [NVARCHAR] (16) NULL, [QuantityUnit] [NVARCHAR] (16) NULL,
[LocationOnBoard] [NVARCHAR] (64) NULL, [LocationOnBoard] [NVARCHAR] (64) NULL,
[OfficialUse] [NVARCHAR] (16) NULL [OfficialUse] [NVARCHAR] (16) NULL,
[Identifier] [NVARCHAR] (50) NULL
); );
GO GO

13
nsw/Source/bsmd.database/DBManager.cs
View File

@ -480,12 +480,15 @@ namespace bsmd.database
{ {
msgClass.PrepareLoadCommand(cmd, Message.LoadFilter.MESSAGEHEADER, message.Id); msgClass.PrepareLoadCommand(cmd, Message.LoadFilter.MESSAGEHEADER, message.Id);
SqlDataReader reader = this.PerformCommand(cmd); SqlDataReader reader = this.PerformCommand(cmd);
List<DatabaseEntity> statList = msgClass.LoadList(reader); if (reader != null)
foreach (DatabaseEntity derivedMessage in statList)
{ {
message.Elements.Add(derivedMessage); List<DatabaseEntity> statList = msgClass.LoadList(reader);
derivedMessage.MessageHeader = message; foreach (DatabaseEntity derivedMessage in statList)
this.LoadDependingLists(derivedMessage); {
message.Elements.Add(derivedMessage);
derivedMessage.MessageHeader = message;
this.LoadDependingLists(derivedMessage);
}
} }
} }
else else

2
nsw/Source/bsmd.database/STO.cs
View File

@ -84,7 +84,7 @@ namespace bsmd.database
public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria) public override void PrepareLoadCommand(IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
{ {
string query = string.Format("SELECT Id, Name, Quantity, QuantityUnit, LocationOnBoard, OfficialUse, Identifier FROM {0}", string query = string.Format("SELECT Id, Name, Quantity, QuantityUnit, LocationOnBoard, OfficialUse, Identifier FROM {0} ",
this.Tablename); this.Tablename);
switch (filter) switch (filter)

5
nsw/Source/bsmd.email/BSMDPopClient.cs
View File

@ -82,6 +82,11 @@ namespace bsmd.email
attachmentLocalFile = Path.Combine(Properties.Settings.Default.ArchiveFolder, part.FileName); attachmentLocalFile = Path.Combine(Properties.Settings.Default.ArchiveFolder, part.FileName);
part.Save(new FileInfo(attachmentLocalFile)); part.Save(new FileInfo(attachmentLocalFile));
} }
else if (part.FileName.EndsWith(".xlsx", StringComparison.InvariantCultureIgnoreCase))
{
attachmentLocalFile = Path.Combine(Properties.Settings.Default.ArchiveFolder, part.FileName);
part.Save(new FileInfo(attachmentLocalFile));
}
} }
this.currentMail++; // advance message pointer this.currentMail++; // advance message pointer