daniel/zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Make tests pass again (minor glitches).

Browse Source
This commit is contained in:
Daniel Kraus 2015-09-04 17:59:04 +02:00
parent dccb3145db
commit 8c4de2915a
7 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/Controller/Elements/ItemsTest.cs
View File

@ -182,6 +182,7 @@ namespace Tests.Controller.Elements
[Test] [Test]
public void ItemCommentWithoutHandler() public void ItemCommentWithoutHandler()
{ {
CommentPool.Default.Reset();
Laboratory lab = new Laboratory(); Laboratory lab = new Laboratory();
TimePoint tp = new TimePoint(); TimePoint tp = new TimePoint();
tp.TimeStamp = new DateTime(2015, 7, 13, 13, 31, 00); tp.TimeStamp = new DateTime(2015, 7, 13, 13, 31, 00);

4
Tests/Formatter/FormatterTest-all.txt
View File

@ -1,7 +1,5 @@
 Laborwerte vom 04.07.2015 12:31:00:
Laborwerte vom 04.07.2015 12:31:00:
Klinische Chemie: Na 144 mM, K 4,3 mM Klinische Chemie: Na 144 mM, K 4,3 mM
Laborwerte vom 06.07.2015 10:28:00: Laborwerte vom 06.07.2015 10:28:00:
Klinische Chemie: Na 138 mM, K 4,6 mM Klinische Chemie: Na 138 mM, K 4,6 mM

4
Tests/Formatter/FormatterTest-eachday.txt
View File

@ -1,7 +1,5 @@
 Laborwerte vom 04.07.2015:
Laborwerte vom 04.07.2015:
Klinische Chemie: Na 144 mM, K 4,3 mM Klinische Chemie: Na 144 mM, K 4,3 mM
Laborwerte vom 06.07.2015: Laborwerte vom 06.07.2015:
Klinische Chemie: Na 138 mM, K 4,6 mM Klinische Chemie: Na 138 mM, K 4,6 mM

3
Tests/Formatter/FormatterTest-firstday.txt
View File

@ -1,4 +1,3 @@
 Laborwerte vom 04.07.2015:
Laborwerte vom 04.07.2015:
Klinische Chemie: Na 144 mM, K 4,3 mM Klinische Chemie: Na 144 mM, K 4,3 mM

3
Tests/Formatter/FormatterTest-lastday.txt
View File

@ -1,4 +1,3 @@
 Laborwerte vom 06.07.2015:
Laborwerte vom 06.07.2015:
Klinische Chemie: Na 138 mM, K 4,6 mM Klinische Chemie: Na 138 mM, K 4,6 mM

2
publish/zaaReloaded2.iss
View File

@ -3,7 +3,7 @@
; Apache License Version 2.0 ; Apache License Version 2.0
[Setup] [Setup]
; #define DEBUG #define DEBUG
; Read the semantic and the installer file version from the VERSION file ; Read the semantic and the installer file version from the VERSION file
#define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION") #define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION")

19
zaaReloaded2/Formatter/Formatter.cs
View File

@ -142,9 +142,13 @@ namespace zaaReloaded2.Formatter
// Create undo record and styles prior to iterating over the elements // Create undo record and styles prior to iterating over the elements
// because a column switching element might trigger output to the // because a column switching element might trigger output to the
// document. // document.
Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord( bool hasAddin = Globals.ThisAddIn != null;
String.Format("Laborformatierung ({0})", Properties.Settings.Default.AddinName) if (hasAddin)
); {
Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord(
String.Format("Laborformatierung ({0})", Properties.Settings.Default.AddinName)
);
}
CreateStyles(); CreateStyles();
int current = 0; int current = 0;
@ -172,15 +176,6 @@ namespace zaaReloaded2.Formatter
} }
} }
// Write everything to the Word document
bool hasAddin = Globals.ThisAddIn != null;
if (hasAddin)
{
Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord(
String.Format("Laborformatierung ({0})", Properties.Settings.Default.AddinName)
);
}
CreateStyles();
_secondaryBuffer.Flush(); _secondaryBuffer.Flush();
if (hasAddin) if (hasAddin)
{ {