From 4479efc1962253d07fedb5a7f130fdb59600c485 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Tue, 1 Dec 2015 17:02:31 +0100 Subject: [PATCH] Fix parsing again. --- Tests/Medication/PrescriptionTest.cs | 1 + publish/zaaReloaded2.iss | 2 +- zaaReloaded2/Medication/Prescription.cs | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Tests/Medication/PrescriptionTest.cs b/Tests/Medication/PrescriptionTest.cs index 80ece2a..a164919 100755 --- a/Tests/Medication/PrescriptionTest.cs +++ b/Tests/Medication/PrescriptionTest.cs @@ -80,6 +80,7 @@ namespace Tests.Medication Assert.AreEqual("0", p.Noon); Assert.AreEqual("2", p.Evening); Assert.AreEqual("(gesteigert)", p.Comment); + Assert.AreEqual("Ramipril 5 mg\t1-0-2 (gesteigert)", p.ToString()); } [Test] diff --git a/publish/zaaReloaded2.iss b/publish/zaaReloaded2.iss index 9988d0d..0188315 100755 --- a/publish/zaaReloaded2.iss +++ b/publish/zaaReloaded2.iss @@ -3,7 +3,7 @@ ; Apache License Version 2.0 [Setup] -; #define DEBUG +#define DEBUG ; Read the semantic and the installer file version from the VERSION file #define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION") diff --git a/zaaReloaded2/Medication/Prescription.cs b/zaaReloaded2/Medication/Prescription.cs index 1fd2e8c..d3f4b9d 100755 --- a/zaaReloaded2/Medication/Prescription.cs +++ b/zaaReloaded2/Medication/Prescription.cs @@ -155,6 +155,10 @@ namespace zaaReloaded2.Medication { s += "-" + Night; } + if (!String.IsNullOrEmpty(Comment)) + { + s += " " + Comment.Trim(); + } return s; }