Merge branch 'release-2.2.6'

- Repariert: Stilauswahl wurde immer ganz im Vordergrund dargestellt und verdeckte damit mitunter andere Hinweise.

.gitignore

@@ -16,6 +16,7 @@ publish/release/
 x64/
 win32/
 [Rr]elease/
+[Rr]eleases/
 [Dd]debug/
 Dist/
 build/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "www/PHPMailer"]
 	path = www/PHPMailer
 	url = git@github.com:PHPMailer/PHPMailer.git
+[submodule "deploy/VstoAddinInstaller"]
+	path = deploy/VstoAddinInstaller
+	url = git@github.com:bovender/VstoAddinInstaller.git

HISTORY.md

@@ -1,5 +1,74 @@
+Version 2.2.6 (2017-02-23)
+------------------------------------------------------------------------
+
+- Repariert: Stilauswahl wurde immer ganz im Vordergrund dargestellt und verdeckte damit mitunter andere Hinweise.
+- Verbessert: Diverse technische Verbesserungen.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.5 (2016-10-03)
+------------------------------------------------------------------------
+
+- Repariert: Word bleibt nicht mehr hängen, wenn man versucht, ein Dokument zu speichern.
+- Verbessert: Multiple Verbesserungen im Programmcode.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.4 (2016-04-05)
+------------------------------------------------------------------------
+
+- VERBESSERT: Kleine Optimierungen beim Installationsprogramm.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.3 (2016-03-30)
+------------------------------------------------------------------------
+
+- REPARIERT: Installationsskript hat Add-in nicht aktiviert.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.2 (2016-03-29)
+------------------------------------------------------------------------
+
+- VERBESSERT: Installationsprogramm erkennt jetzt, wenn Word bereits läuft, und bietet an, es zu schließen
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.1 (2015-12-03)
+------------------------------------------------------------------------
+
+- VERBESSERT: 'Alternative' Verordnungen wurden nicht erkannt, wenn in der selben Zeile nicht auch eine 'kanonische' Verordnung stand.
+- VERBESSERT: Fehlermeldung "Ein Name darf nicht mit dem Zeichen ' ' beginnen" wurde abgestellt (Fehlernr. 6a36e38b).
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.2.0 (2015-12-03)
+------------------------------------------------------------------------
+
+- NEU: Funktion zum Formatieren der Medikationsliste.
+- VERBESSERT: Kohlehydratdefizientes Transferrin hinzugefügt (als 'CDT') und Ambulanzstil angepaßt.
+- VERBESSERT: Referenzbereiche zu Immunologie-Vorlage im Ambulanzstil hinzugefügt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.1.13 (2015-11-12)
+------------------------------------------------------------------------
+
+- VERBESSERT: Parameter für Aldosteron, Renin und Schwangerschaftstest einprogrammiert.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.1.12 (2015-11-04)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Lp(a) zu den bekannten Parametern hinzugefügt.
 
@@ -7,7 +76,7 @@ Version 2.1.12 (2015-11-04)
 
 
 Version 2.1.11 (2015-10-28)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Ambulanzstil überarbeitet, CK-MB wird jetzt mit ausgegeben.
 - VERBESSERT: Benutzereinstellungen werden nicht mehr jedes Mal zurückgesetzt.
@@ -16,7 +85,7 @@ Version 2.1.11 (2015-10-28)
 
 
 Version 2.1.10 (2015-10-24)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: PSA wird jetzt richtig erkannt.
 
@@ -24,7 +93,7 @@ Version 2.1.10 (2015-10-24)
 
 
 Version 2.1.9 (2015-10-18)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Integritätsprüfung für Updates wurde für besseren Algorithmus (SHA-256) vorbereitet.
 
@@ -32,7 +101,7 @@ Version 2.1.9 (2015-10-18)
 
 
 Version 2.1.8 (2015-10-11)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Alpha-Fetoprotein (AFP) zu den bekannten Parametern hinzugefügt.
 - VERBESSERT: Einstellungen werden nach Office-Update nicht vergessen.
@@ -41,7 +110,7 @@ Version 2.1.8 (2015-10-11)
 
 
 Version 2.1.7 (2015-10-02)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Statt Sekretariatsmodus stand zweimal Ärztemodus im Begrüßungsbildschirm.
 
@@ -49,7 +118,7 @@ Version 2.1.7 (2015-10-02)
 
 
 Version 2.1.6. (2015-09-27)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Eingebaute Stile überarbeitet.
 - VERBESSERT: Troponin T wurde nicht richtig verarbeitet.
@@ -58,7 +127,7 @@ Version 2.1.6. (2015-09-27)
 
 
 Version 2.1.5. (2015-09-24)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: NT-proBNP wird jetzt korrekt ausgegeben.
 
@@ -66,7 +135,7 @@ Version 2.1.5. (2015-09-24)
 
 
 Version 2.1.4 (2015-09-23)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Unkonventionell ausgegebene Laborwerte (v.a. Cyclosporin-A vor Gabe) wurden nicht richtig erkannt.
 
@@ -74,7 +143,7 @@ Version 2.1.4 (2015-09-23)
 
 
 Version 2.1.3. (2015-09-18)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: CsA-Talspiegel tauchte nicht in der Ausgabe auf.
 - VERBESSERT: Extreme Werte (mit "<" oder ">") wurden nicht sehr schön formatiert.
@@ -83,7 +152,7 @@ Version 2.1.3. (2015-09-18)
 
 
 Version 2.1.2 (2015-09-11)
-========================================================================
+------------------------------------------------------------------------
 
 - GEÄNDERT: Sammelurin-Proteinurie als Prot abgekürzt.
 - VERBESSERT: Ambulanzstil überarbeitet.
@@ -93,7 +162,7 @@ Version 2.1.2 (2015-09-11)
 
 
 Version 2.1.1 (2015-09-07)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Fehler bei der Kommentaraufforderung wurden behoben.
 
@@ -101,7 +170,7 @@ Version 2.1.1 (2015-09-07)
 
 
 Version 2.1.0 (2015-09-06)
-========================================================================
+------------------------------------------------------------------------
 
 - NEU: Optionale Kommentare zu Laborwerten.
 - NEU: Sekretariatsmodus (siehe 'Einstellungen'), um die Nachfrage nach Zusatz-Kommentaren zu unterdrücken.
@@ -113,7 +182,7 @@ Version 2.1.0 (2015-09-06)
 
 
 Version 2.0.1 (2015-09-02)
-========================================================================
+------------------------------------------------------------------------
 
 - FEHLERBEHEBUNG: Kein Absturz mehr, wenn zwei Spalten formatiert werden.
 - VERBESSERT: Kein Absturz mehr, wenn das Demo-Dokument innerhalb der ZAA geöffnet wird (Exception ID 65a5c34e).
@@ -124,7 +193,7 @@ Version 2.0.1 (2015-09-02)
 
 
 Version 2.0.0-beta.5 (2015-08-25)
-========================================================================
+------------------------------------------------------------------------
 
 - NEU: Auszeichnung pathologischer Werte kann eingestellt werden.
 - NEU: Für bestimmte Laborwerte ist die bevorzugte Nachkommastellenzahl hinterlegt (z.B. Kreatinin mit nur einer Nachkommastelle).
@@ -135,7 +204,7 @@ Version 2.0.0-beta.5 (2015-08-25)
 
 
 Version 2.0.0-beta.4. (2015-08-23)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERUNG: Aliasse für fT3 und fT4.
 - VERBESSERUNG: Ambulanz-Stil überarbeitet.
@@ -144,7 +213,7 @@ Version 2.0.0-beta.4. (2015-08-23)
 
 
 Version 2.0.0-beta.3. (2015-08-20)
-========================================================================
+------------------------------------------------------------------------
 
 - VERBESSERT: Bei Updates werden neue eingebaute Stile jetzt immer berücksichtigt.
 - VERBESSERT: Formatierung erscheint nur noch als 1 Undo-Schritt.
@@ -156,7 +225,7 @@ Version 2.0.0-beta.3. (2015-08-20)
 
 
 Version 2.0.0-beta.2 (2015-08-16)
-========================================================================
+------------------------------------------------------------------------
 
 - FIX: Kleinere Bugfixes.
 - GEÄNDERT: Diff.-BB-Werte im Stations-Stil in Hämatologie-Zeile integriert.
@@ -172,7 +241,7 @@ Version 2.0.0-beta.2 (2015-08-16)
 
 
 Version 2.0.0-beta.1 (2015-08-13)
-========================================================================
+------------------------------------------------------------------------
 
 - FIX: Datenimport funktioniert jetzt auch mit Word-Text und nicht nur in den Tests.
 - FIX: Mehrere Thesaurus-Fehler behoben.
@@ -189,7 +258,7 @@ Version 2.0.0-beta.1 (2015-08-13)
 
 
 Version 2.0.0-alpha.5. (2015-08-04)
-========================================================================
+------------------------------------------------------------------------
 
 - FIX: Daniels Spezial löscht nicht mehr die Unterschriften.
 - NEU: Eingebautes Demo-Dokument zum Ausprobieren.
@@ -199,7 +268,7 @@ Version 2.0.0-alpha.5. (2015-08-04)
 
 
 Version 2.0.0-alpha.3 (2015-07-31)
-========================================================================
+------------------------------------------------------------------------
 
 - FIX: Beim Start wird jetzt nach Updates gesucht.
 
@@ -207,7 +276,7 @@ Version 2.0.0-alpha.3 (2015-07-31)
 
 
 Version 2.0.0-alpha.2 (2015-07-28)
-========================================================================
+------------------------------------------------------------------------
 
 - NEU: Fehlerbehandlung und Fehlerberichte.
 
@@ -215,7 +284,7 @@ Version 2.0.0-alpha.2 (2015-07-28)
 
 
 Version 2.0.0-alpha.1 (2015-07-27)
-========================================================================
+------------------------------------------------------------------------
 
 - NEW: First release of version 2 series.
 
@@ -223,7 +292,7 @@ Version 2.0.0-alpha.1 (2015-07-27)
 
 
 Version 2.0.0 (2015-08-30)
-========================================================================
+------------------------------------------------------------------------
 
 - FEHLERBEHEBUNG: Kein Absturz mehr, wenn zwei Spalten formatiert werden.
 - VERBESSERT: Kein Crash mehr, falls sich ein Komma in den Lauris-Block einschleicht.

Makefile

@@ -0,0 +1,29 @@
+SHELL=/bin/bash
+.PHONY=all help upload website versioninfo
+
+help:
+	# Available targets:
+	# website     - update website on server
+	# versioninfo - create versioninfo file for the current release
+	# upload      - upload release files to server
+	# all         - all of the above
+
+all: versioninfo upload website
+	#
+	# Check repository status!
+	# 
+
+versioninfo:
+	head -n 1 zaaReloaded2/VERSION | tr -d '\r' > www/versioninfo.tmp
+	chmod 644 www/versioninfo.tmp
+	echo 'https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$$VERSION.exe' >> www/versioninfo.tmp
+	sha256sum deploy/releases/zaaReloaded-$$(head -n 1 zaaReloaded2/VERSION | tr -d '\r').exe >> www/versioninfo.tmp
+	echo '' >> www/versioninfo.tmp
+	todos www/versioninfo.tmp
+	mv www/versioninfo.tmp www/versioninfo.txt
+
+upload:
+	rsync -ruvz --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/
+
+website:
+	rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/

README.md

@@ -29,7 +29,7 @@ zaaReloaded2 ist in C# mit VSTO geschrieben, unter Zuhilfenahme von
 Visual Studio Professional 2013. Der Quellcode liegt in einem öffentlich
 zugänglichen Git-Repository:
 
-<http://git.bovender.de>
+<https://git.bovender.de>
 
 Clonen:
 
@@ -212,7 +212,7 @@ dem [MVVM][]-Muster implementiert. Dabei wurde auf das Hilfs-Framework
 ## Updates
 
 Das Add-in sucht täglich nach einem Update; dabei wird die Datei
-<http://zaa.nephrowiki.de/versioninfo.txt> heruntergeladen. Updates
+<https://doktorkraus.de/zaareloaded/versioninfo.txt> heruntergeladen. Updates
 werden automatisch im Hintergrund geladen und beim Schließen von Word
 (bzw. der Zentralen Arztbriefablage) installiert und stehen dann beim
 nächsten Starten der Anwendung zur Verfügung.

Tests/Controller/Comments/CommentPoolTest.cs

@@ -1,7 +1,7 @@
 /* CommentPoolTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Controller/Comments/ItemCommentTest.cs

@@ -1,7 +1,7 @@
 /* ItemCommentTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Controller/Elements/CloneTest.cs

@@ -1,7 +1,7 @@
 /* CloneTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Controller/Elements/ItemsTest.cs

@@ -1,7 +1,7 @@
 /* ItemsTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ namespace Tests.Controller.Elements
         public void TearDown()
         {
             ((_Document)_document).Close(WdSaveOptions.wdDoNotSaveChanges);
+            Bovender.ComHelpers.ReleaseComObject(_document);
         }
 
         [Test]

Tests/Controller/SettingsRepositoryTest.cs

@@ -1,7 +1,7 @@
 /* SettingsRepositoryTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,14 +32,14 @@ namespace Tests.Controller
         [SetUp]
         public void SetUp()
         {
-            _savedSettings = zaaReloaded2.Properties.Settings.Default.SettingsRepository;
+            _savedSettings = zaaReloaded2.UserSettings.Default.SettingsRepository;
         }
 
         [TearDown]
         public void TearDown()
         {
-            zaaReloaded2.Properties.Settings.Default.SettingsRepository = _savedSettings;
+            zaaReloaded2.UserSettings.Default.SettingsRepository = _savedSettings;
-            zaaReloaded2.Properties.Settings.Default.Save();
+            zaaReloaded2.UserSettings.Default.Save();
         }
 
         [Test]

Tests/Controller/SettingsTest.cs

@@ -1,7 +1,7 @@
 /* SettingsTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Formatter/DocumentWriterTest.cs

@@ -1,7 +1,7 @@
 /* DocumentWriterClass.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Formatter/FormatterTest.cs

@@ -1,7 +1,7 @@
 /* FormatterTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,7 +123,7 @@ namespace Tests.Formatter
         {
             ZaaImporter importer = new ZaaImporter();
             importer.Import(
-                "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;  CK gesamt: 123 [<= 170] U/l;  Cholesterin: 211");
+                "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;  CK gesamt: 123 [<= 170] U/l;  Cholesterin: 211");
             Document document = new Document();
             f.Formatter formatter = new f.Formatter(document);
             formatter.Laboratory = importer.Laboratory;
@@ -131,7 +131,7 @@ namespace Tests.Formatter
                 new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") });
             formatter.Run();
             Assert.AreEqual(
-                "Laborwerte vom 17.09.2015 10:44:00:\rCsA (C0) 130 µg/l\r\r",
+                "Laborwerte vom 17.09.2015-201710:44:00:\rCsA (C0) 130 µg/l\r\r",
                 document.Range().Text);
         }
 

Tests/Importer/ZaaImporter/LaurisItemTest.cs

@@ -1,7 +1,7 @@
 /* LaurisItemTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -153,7 +153,7 @@ namespace Tests.Importer.ZaaImporter
 
         [TestCase("Albumin (SU)/die: 149.9 [<= 30] mg/d; ", Material.SU)]
         [TestCase("Gesamt-Eiweiss/Creatinin (PU): 281 [<= 70] mg/g Crea;", Material.U)]
-        [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.B)]
+        [TestCase("Cystatin C (N Latex): 2.37 [0.57 - 0.96] mg/l; ", Material.S)]
         public void ParseLaurisMaterial(string laurisString, Material expectedMaterial)
         {
             LaurisItem i = new LaurisItem(laurisString);

Tests/Importer/ZaaImporter/LaurisParagraphTest.cs

@@ -1,7 +1,7 @@
 /* LaurisParagraphTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Importer/ZaaImporter/TimePointTest.cs

@@ -1,7 +1,7 @@
 /* LaurisTimePointTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Importer/ZaaImporter/ZaaImporterTest.cs

@@ -1,7 +1,7 @@
 /* ZaaImporterTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/LineParserTest.cs

@@ -1,7 +1,7 @@
 /* UnitTest1.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Medication/ImporterTest.cs

@@ -0,0 +1,45 @@
+/* ImporterTest.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015-2017 Daniel Kraus
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+
+namespace Tests.Medication
+{
+    [TestFixture]
+    class ImporterTest
+    {
+        [Test]
+        public void ImportDrugsTwoColumns()
+        {
+            string s =
+                "Aktuelle Medikation:\r" +
+                "Advagraf 1 mg	2-0-0 				CellCept 500 mg	1-0-1\r" +
+                "CellCept 250 mg	1-0-1				Decortin 10 mg		1-0-0\r" +
+                "Beloc-Zok mite	1-0-1				Ramipril 5 mg		0-0-1 (neu)\r" +
+                "Pantozol 40 mg	0-0-1				Decostriol 0,5 µg	2-0-0\r" +
+                "Euthyrox 200 µg	1-1-1 (gesteigert)			Ossofortin forte		1-0-1\r" +
+                "Vfend 200 mg	2-0-2				CPS-Pulver		0-1-0\r" +
+                "Cyklokapron 500 mg	1-1-1				Tamsulosin 0,4 mg	1-0-0           "; 
+            zaaReloaded2.Medication.Importer i = new zaaReloaded2.Medication.Importer(s);
+            Assert.AreEqual(14, i.Prescriptions.Count);
+        }
+    }
+}

Tests/Medication/PrescriptionTest.cs

@@ -0,0 +1,128 @@
+/* PrescriptionTest.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015-2017 Daniel Kraus
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using zaaReloaded2.Medication;
+
+namespace Tests.Medication
+{
+    [TestFixture]
+    class PrescriptionTest
+    {
+        [Test]
+        [TestCase("Ramipril 5 mg 1-2-3", "Ramipril 5 mg", "1", "2", "3")]
+        [TestCase("Ramipril 5 mg 1 -2 - 3", "Ramipril 5 mg", "1", "2", "3")]
+        [TestCase("Ramipril 5 mg 1 - 2 - 3", "Ramipril 5 mg", "1", "2", "3")]
+        [TestCase("Ramipril  5 mg  1 - 2 - 3", "Ramipril 5 mg", "1", "2", "3")]
+        [TestCase("Ramipril 5 mg 1 1/2-2-3", "Ramipril 5 mg", "1 1/2", "2", "3")]
+        [TestCase("Ramipril 5 mg 1 1/2 - 2 - 3", "Ramipril 5 mg", "1 1/2", "2", "3")]
+        [TestCase("Ramipril 5 mg ½-⅓-¼", "Ramipril 5 mg", "½", "⅓", "¼")]
+        public void ParseLine(string line, string drug, string morning,
+            string noon, string evening)
+        {
+            Prescription p = Prescription.FromLine(line);
+            Assert.AreEqual(drug, p.Drug, "Drug should be " + drug);
+            Assert.AreEqual(morning, p.Morning, "Morning should be " + morning);
+            Assert.AreEqual(noon, p.Noon, "Noon should be " + noon);
+            Assert.AreEqual(evening, p.Evening, "Evening should be " + evening);
+        }
+
+        [Test]
+        public void MultiplePrescriptions()
+        {
+            IEnumerable<Prescription> list = Prescription.ManyFromLine(
+                "Ramipril 5 mg 1-0-0  \t Prograf 1 mg 1-0-1");
+            Assert.AreEqual(2, list.Count());
+            Assert.AreEqual("Ramipril 5 mg\t1-0-0", list.First().ToString());
+            Assert.AreEqual("Prograf 1 mg\t1-0-1", list.Last().ToString());
+        }
+
+        [Test]
+        [TestCase("Ramipril 5 mg", "1", "0", "0", "0", "Ramipril 5 mg\t1-0-0-0")]
+        [TestCase("Ramipril 5 mg", "1", "0", "0", "", "Ramipril 5 mg\t1-0-0")]
+        [TestCase("Ramipril 5 mg", "1", "0", "", "", "Ramipril 5 mg\t1-0")]
+        [TestCase("Ramipril 5 mg", "1", "", "", "", "Ramipril 5 mg\t1")]
+        [TestCase("Ramipril 5 mg", "1", "", "0", "0", "Ramipril 5 mg\t1-0-0-0")]
+        [TestCase("Ramipril 5 mg", "1", "0", "", "0", "Ramipril 5 mg\t1-0-0-0")]
+        [TestCase("Ramipril 5 mg", "1", "", "", "0", "Ramipril 5 mg\t1-0-0-0")]
+        [TestCase("Ramipril 5 mg", "", "", "", "", "Ramipril 5 mg\t")]
+        public void PrescriptionToString(string drug, string morning, string noon,
+            string evening, string night, string formatted)
+        {
+            Prescription p = new Prescription(drug, morning, noon, evening, night);
+            Assert.AreEqual(formatted, p.ToString());
+        }
+
+        [Test]
+        public void PrescriptionWithComment()
+        {
+            Prescription p = Prescription.FromLine("Ramipril 5 mg 1-0-2 (gesteigert)");
+            Assert.AreEqual("Ramipril 5 mg", p.Drug);
+            Assert.AreEqual("1", p.Morning);
+            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]
+        public void PrescriptionsLineWithComment()
+        {
+            IList<Prescription> list = Prescription.ManyFromLine(
+                "Ramipril 5 mg 1-0-2 (gesteigert) \t Concor 2,5 mg 3-2-1-0 neu");
+            Assert.AreEqual(2, list.Count);
+            Assert.AreEqual("Ramipril 5 mg", list[0].Drug);
+            Assert.AreEqual("1", list[0].Morning);
+            Assert.AreEqual("0", list[0].Noon);
+            Assert.AreEqual("2", list[0].Evening);
+            Assert.AreEqual("", list[0].Night);
+            Assert.AreEqual("(gesteigert)", list[0].Comment);
+            Assert.AreEqual("Concor 2,5 mg", list[1].Drug);
+            Assert.AreEqual("3", list[1].Morning);
+            Assert.AreEqual("2", list[1].Noon);
+            Assert.AreEqual("1", list[1].Evening);
+            Assert.AreEqual("0", list[1].Night);
+            Assert.AreEqual("neu", list[1].Comment);
+        }
+
+        [Test]
+        public void PrescriptionWithoutTypicalDosing()
+        {
+            Prescription p = Prescription.FromLine("Eusaprim forte\t alle zwei Tage");
+            Assert.AreEqual("Eusaprim forte", p.Drug);
+            Assert.AreEqual("alle zwei Tage", p.Comment);
+            Assert.AreEqual("Eusaprim forte\talle zwei Tage", p.ToString(), "ToString");
+        }
+
+        [Test]
+        [TestCase("CellCept 500 mg", true)]
+        [TestCase("Cell CEpt 500 mg", true)]
+        [TestCase("Myfortic", true)]
+        [TestCase("Mycophenolatmofetil 500 mg", true)]
+        [TestCase("Cellophan 5 g", false)]
+        [TestCase("MMF 500 mg", true)]
+        public void MmfProperty(string drug, bool isMmf)
+        {
+            Prescription p = new Prescription(drug);
+            Assert.AreEqual(isMmf, p.IsMmf);
+        }
+    }
+}

Tests/SerializationTest.cs

@@ -1,7 +1,7 @@
 /* SelectFirstDayTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/TestHelpers.cs

@@ -1,7 +1,7 @@
 /* TestHelpers.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Tests.csproj

@@ -41,16 +41,20 @@
     <AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bovender, Version=0.5.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
+    <Reference Include="Bovender, Version=0.16.2.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bovender.0.5.0.0\lib\net40\Bovender.dll</HintPath>
+      <HintPath>..\packages\Bovender.0.16.2.0\lib\net40\Bovender.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\NLog.4.3.7\lib\net40\NLog.dll</HintPath>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.4.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -66,6 +70,10 @@
     <Reference Include="System.Xaml" />
     <Reference Include="System.XML" />
     <Reference Include="WindowsBase" />
+    <Reference Include="YamlDotNet, Version=3.9.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.Signed.3.9.0\lib\net35\YamlDotNet.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -83,6 +91,8 @@
     <Compile Include="Controller\Comments\CommentPoolTest.cs" />
     <Compile Include="Controller\Comments\ItemCommentTest.cs" />
     <Compile Include="Controller\Elements\CloneTest.cs" />
+    <Compile Include="Medication\ImporterTest.cs" />
+    <Compile Include="Medication\PrescriptionTest.cs" />
     <Compile Include="SerializationTest.cs" />
     <Compile Include="Controller\SettingsRepositoryTest.cs" />
     <Compile Include="Controller\SettingsTest.cs" />
@@ -105,6 +115,7 @@
     <Compile Include="ViewModels\SettingsViewModelTest.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="Tests.licenseheader" />
     <None Include="zaaReloaded2.pfx" />

Tests/Thesaurus/ParametersTest.cs

@@ -1,7 +1,7 @@
 /* ParametersTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Thesaurus/TestThesaurus.cs

@@ -2,7 +2,7 @@
  * {{
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/Thesaurus/ThesaurusTest.cs

@@ -1,7 +1,7 @@
 /* Class1.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/ViewModels/ElementPickerViewModelTest.cs

@@ -1,7 +1,7 @@
 /* ElementPickerViewModelTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/ViewModels/ItemCommentViewModelTest.cs

@@ -1,7 +1,7 @@
 /* ItemCommentViewModelTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/ViewModels/SettingsRepositoryViewModelTest.cs

@@ -1,7 +1,7 @@
 /* SettingsRepositoryViewModel.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/ViewModels/SettingsViewModelTest.cs

@@ -1,7 +1,7 @@
 /* SettingsViewModelTest.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Tests/app.config

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	app.config
+	part of zaaReloaded2
+	
+	Copyright 2016 Daniel Kraus
+	
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	    http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.9.0.0" newVersion="3.9.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

Tests/packages.config

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bovender" version="0.5.0.0" targetFramework="net40" />
+  <package id="Bovender" version="0.16.2.0" targetFramework="net40" />
   <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="NLog" version="4.3.7" targetFramework="net40" />
+  <package id="NUnit" version="3.4.1" targetFramework="net40" />
+  <package id="YamlDotNet.Signed" version="3.9.0" targetFramework="net40" />
 </packages>

deploy/make-installer.iss

@@ -0,0 +1,32 @@
+#expr Exec("C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com", \
+           "x:\Code\zaaReloaded2\zaaReloaded2\zaaReloaded2.csproj /Build Release")
+
+#define VERSIONFILE "..\zaaReloaded2\VERSION"
+#define PUB_YEARS "2015-2017"
+#define TARGET_HOST "word"
+#define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}"
+#define ADDIN_NAME "zaaReloaded"
+#define COMPANY "Daniel Kraus (bovender)"
+#define DESCRIPTION "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert."
+#define HOMEPAGE "https://doktorkraus.de/zaareloaded"
+#define REGKEY "zaaReloaded2"
+
+#define SOURCEDIR "..\zaaReloaded2\bin\Release\"
+#define VSTOFILE "zaaReloaded2.vsto"
+
+; OUTPUTDIR is the directory where the installer will be saved.
+#define OUTPUTDIR "releases\"
+
+#define LOGFILE "ZAARELOADED2-INSTALL-LOG.TXT"
+
+#define SETUPFILESDIR "setup-files\"
+#define LICENSE_FILE "license.rtf"
+#define INSTALLER_ICO "icon.ico"
+#define INSTALLER_IMAGE_LARGE "installbanner.bmp"
+#define INSTALLER_IMAGE_SMALL "installbanner-small.bmp"
+
+; If the VstoAddinInstaller files are in a different subdirectory
+; than 'VstoAddinInstaller', change the path below.
+#include "VstoAddinInstaller\vsto-installer.iss"
+
+; vim: ts=2 sts=2 sw=2 et

publish/zaaReloaded2.iss

@@ -1,760 +0,0 @@
-; Inno Setup script for zaaReloaded2
-; (c) 2015 Daniel Kraus
-; Apache License Version 2.0
-
-[Setup]
-; #define DEBUG
-
-; Read the semantic and the installer file version from the VERSION file
-#define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION")
-#define SEMVER FileRead(FILE_HANDLE)
-#define VER FileRead(FILE_HANDLE)
-#expr FileClose(FILE_HANDLE)
-
-#define YEAR "2015"
-#define DEV "Daniel Kraus"
-#define LOGFILE "INST-LOG.TXT"
-#define REGKEY "Software\Microsoft\Office\Word\Addins\zaaReloaded2"
-#define APPNAME "zaaReloaded"
-#define SLOGAN "Word-Addin, das Lauris-Laborwerte in der Zentralen Arztbriefablage formatiert"
-#define UNINSTALLDIR "{app}\setup"
-#define ADDINNAME "zaaReloaded2"
-#define DOTNETSHA1 "58da3d74db353aad03588cbb5cea8234166d8b99"
-#define VSTORSHA1 "ad1dcc5325cb31754105c8c783995649e2208571"
-
-#ifndef DEBUG
-  #define SOURCEDIR "Release"
-	#define VSTORURL "http://download.microsoft.com/download/2/E/9/2E9D2603-6D1F-4B12-BD37-DB1410B23597/vstor_redist.exe"
-	#define DOTNETURL "http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe"
-	; Build the solution with Release configuration
-	#expr Exec("C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com", \
-				"x:\Code\zaaReloaded2\zaaReloaded2\zaaReloaded2.csproj /Build Release")
-#else
-  #define SOURCEDIR "Debug"
-	#define VSTORURL "http://vhost/vstor_redist.exe"
-	#define DOTNETURL "http://vhost/dotNetFx40_Full_x86_x64.exe"
-#endif
-
-; Specific AppID - NEVER CHANGE THIS!
-AppId={{8520B887-3AB1-422B-AB6B-A265D14FE4E5}
-                      
-; Compiler info
-OutputDir=release
-#ifndef DEBUG
-	OutputBaseFilename=zaaReloaded-{#SEMVER}
-#else
-	OutputBaseFilename=zaaReloaded-debug
-#endif
-Compression=lzma
-InternalCompressLevel=max
-SolidCompression=true
-LicenseFile=setup-files\license.rtf
-
-; Application name, version, etc.
-AppName={#APPNAME}
-AppVersion={#SEMVER}
-AppPublisher={#DEV}
-AppCopyright=2008-{#YEAR} {#DEV}
-AppComments={#SLOGAN}
-VersionInfoDescription={#SLOGAN}
-VersionInfoVersion={#VER}
-VersionInfoProductVersion={#VER}
-VersionInfoTextVersion={#SEMVER}
-VersionInfoProductTextVersion={#SEMVER}
-AppContact={#DEV}
-AppPublisherURL=http://zaa.nephrowiki.de
-AppSupportURL=http://zaa.nephrowiki.de
-AppUpdatesURL=http://zaa.nephrowiki.de
-
-; Setup wizard
-SetupIconFile=setup-files\icon.ico
-WizardImageFile=setup-files\installbanner.bmp
-WizardSmallImageFile=setup-files\installbanner-small.bmp
-ArchitecturesAllowed=x86 x64
-ArchitecturesInstallIn64BitMode=x64
-DisableProgramGroupPage=true
-DisableDirPage=false
-DisableReadyPage=false
-LanguageDetectionMethod=locale
-TimeStampsInUTC=false
-PrivilegesRequired=lowest
-WizardImageStretch=false
-WizardImageBackColor=clWhite
-; ChangesAssociations=true
-AppendDefaultDirName=false
-DefaultDirName={code:SuggestInstallDir}
-CreateAppDir=true
-CloseApplicationsFilter=*.*
-DefaultDialogFontName=Segoe UI
-
-; Uninstall
-;UninstallDisplayIcon={#UNINSTALLDIR}\xltoolbox.ico
-UninstallFilesDir={#UNINSTALLDIR}
-	
-; Inno Downloader Plugin is required for this
-; Note that this include directive MUST be located at the end of the [setup]
-; section.
-#include <idp.iss>
-
-[Languages]
-Name: en; MessagesFile: compiler:Default.isl; 
-Name: de; MessagesFile: compiler:Languages\German.isl; 
-; Name: Brasileiro; MessagesFile: compiler:Languages\BrazilianPortuguese.isl;
-; Name: Portugues; MessagesFile: compiler:Languages\Portuguese.isl;
-#include "c:\Program Files (x86)\Inno Download Plugin\Unicode\idplang\german.iss"
-
-[Files]
-Source: "..\zaaReloaded2\bin\{#SOURCEDIR}\*"; DestDir: "{app}"; Flags: ignoreversion createallsubdirs recursesubdirs
-; Source: "setup-files\xltoolbox.ico"; DestDir: "{#UNINSTALLDIR}"
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Registry]
-; Keys for single-user install (HKCU)
-Check: not IsMultiUserInstall; ValueName: Description; ValueData: {#SLOGAN}; ValueType: string; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: not IsMultiUserInstall; ValueName: FriendlyName; ValueData: {#APPNAME}; ValueType: string; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: not IsMultiUserInstall; ValueName: LoadBehavior; ValueData: 3; ValueType: dword; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: not IsMultiUserInstall; ValueName: Warmup; ValueData: 1; ValueType: dword; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: not IsMultiUserInstall; ValueName: Manifest; ValueData: file:///{code:ConvertSlash|{app}}/{#ADDINNAME}.vsto|vstolocal; ValueType: string; Root: HKCU; Subkey: {#REGKEY}; Flags: uninsdeletekey
-
-; Same keys again, this time for multi-user install (HKLM)
-Check: IsMultiUserInstall; ValueName: Description; ValueData: {#SLOGAN}; ValueType: string; Root: HKLM; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: IsMultiUserInstall; ValueName: FriendlyName; ValueData: {#APPNAME}; ValueType: string; Root: HKLM; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: IsMultiUserInstall; ValueName: LoadBehavior; ValueData: 3; ValueType: dword; Root: HKLM; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: IsMultiUserInstall; ValueName: Warmup; ValueData: 1; ValueType: dword; Root: HKLM; Subkey: {#REGKEY}; Flags: uninsdeletekey
-Check: IsMultiUserInstall; ValueName: Manifest; ValueData: file:///{code:ConvertSlash|{app}}/{#ADDINNAME}.vsto|vstolocal; ValueType: string; Root: HKLM; Subkey: {#REGKEY}; Flags: uninsdeletekey
-
-[Run]
-; Filename: http://xltoolbox.sourceforge.net/welcome.html; Flags: shellexec nowait; Check: ShowWelcomePageInBrowser
-
-[UninstallRun]
-; Filename: http://xltoolbox.sourceforge.net/uninstall.html; Flags: shellexec nowait
-
-[CustomMessages]
-; General messages [EN]
-en.SingleOrMulti=Single-user or system-wide install
-en.SingleOrMultiSubcaption=Install for the current user only or for all users
-en.SingleOrMultiDesc=Please indicate the scope of this installation:
-en.SingleOrMultiSingle=Single user (only for me)
-en.SingleOrMultiAll=All users (system-wide)
-en.Word2007Required=zaaReloaded requires Word 2007 or later.
-
-; CannotInstallPage [EN]
-en.CannotInstallCaption=Administrator privileges required
-en.CannotInstallDesc=You do not have the necessary rights to install additional required runtime files.
-en.CannotInstallMsg=Additional runtime files from Microsoft are required to run this add-in. You may continue the installation, but the add-in won't start unless the required runtime files are installed by an administrator. Note: On Windows Vista and newer, right-click the installer file and choose 'Run as administrator'.
-en.CannotInstallCont=Continue anyway, although it won't work without the required runtime files
-en.CannotInstallAbort=Abort the installation (come back when the admin has installed the files)
-
-; DownloadInfoPage [EN]
-en.RequiredCaption=Additional runtime files required
-en.RequiredDesc=Additional runtime files for the .NET framework from Microsoft are required in order to run the add-in.
-en.RequiredMsg=%d file(s) totalling about %s MiB need to be downloaded from the Microsoft servers. Click 'Next' to start downloading.
-
-; InstallInfoPage [EN]
-en.InstallCaption=Runtime files downloaded
-en.InstallDesc=The required runtime files are ready to install.
-en.InstallMsg=Click 'Next' to beginn the installation.
-
-en.StillNotInstalled=The required additional runtime files are still not installed. Setup cannot continue. You may try again, or abort the add-in installation.
-en.DownloadNotValidated=A downloaded file has unexpected content. It may have not been downloaded correctly, or someone might have hampered with it. You may click 'Back' and then 'Next' to download it again.
-
-; General messages [DE]
-de.SingleOrMulti=Einzelner oder alle Benutzer
-de.SingleOrMultiSubcaption=Geben Sie an, f<>r wen die Installation sein soll
-de.SingleOrMultiDesc=Bitte geben Sie an, ob das Addin nur f<>r Sie oder f<>r alle Benutzer installiert werden soll.
-de.SingleOrMultiSingle=Ein Benutzer (nur f<>r mich)
-de.SingleOrMultiAll=Alle Benutzer (systemweit)
-de.Word2007Required=Dieses Addin erfordert mindestens Word 2007.
-
-; "Download required" messages (.NET and VSTOR runtimes) [DE]
-de.CannotInstallCaption=Administratorrechte ben<65>tigt
-de.CannotInstallDesc=Sie haben nicht die erforderlichen Benutzerrechte, um weitere ben<65>tigte Laufzeitdateien zu installieren.
-de.CannotInstallMsg=Sie k<>nnen mit der Installation fortfahren, aber das Addin wird nicht starten, solange die VSTO-Laufzeitdateien nicht von einem Admin installiert wurden. Tipp: Wenn Sie Windows Vista oder neuer verwenden, klicken Sie mit der rechten Maustaste auf die Installationsdatei und w<>hlen "Als Administrator ausf<73>hren".
-de.CannotInstallCont=Trotzdem installieren, obwohl es nicht funktionieren wird
-de.CannotInstallAbort=Installation abbrechen
-
-; DownloadInfoPage [EN]
-de.RequiredCaption=Weitere Laufzeitdateien erforderlich
-de.RequiredDesc=Weitere Laufzeitdateien f<>r das .NET-Framework von Microsoft werden ben<65>tigt, um das Addin verwenden zu k<>nnen.
-de.RequiredMsg=%d Datei(en) mit ca. %s MiB mu<6D>/m<>ssen von den Microsoft-Servern heruntergeladen werden. Klicken Sie 'Weiter', um den Download zu beginnen.
-
-; InstallInfoPage [EN]
-de.InstallCaption=Weitere .NET-Laufzeitdateien heruntergeladen
-de.InstallDesc=Die zus<75>tzlichen ben<65>tigten Dateien von Microsoft k<>nnen jetzt installiert werden.
-de.InstallMsg=Klicken Sie 'Weiter', um mit der Installation zu beginnen.
-
-de.StillNotInstalled=Die zus<75>tzlichen ben<65>tigten Dateien wurden leider nicht korrekt installiert, so da<64> die Installation nicht fortgesetzt werden kann.
-de.DownloadNotValidated=Es wurde unerwarteter Inhalt in einer heruntergeladenen Datei gefunden. Die Installation kann so nicht fortgesetzt werden. Sie k<>nnen aber 'Zur<75>ck' und dann 'Weiter' klicken, um den Download neu zu beginnen.
-
-[Code]
-const
-	maxWord = 24; //< highest Word version number to check for.
-	
-var
-	PageDevelopmentInfo: TInputOptionWizardPage;
-	PageSingleOrMultiUser: TInputOptionWizardPage;
-	PageCannotInstall: TInputOptionWizardPage;
-	PageDownloadInfo: TOutputMsgWizardPage;
-	PageInstallInfo: TOutputMsgWizardPage;
-	prerequisitesChecked: boolean;
-	prerequisitesMet: boolean;
-
-/// Returns the path for the Wow6432Node registry tree if the current operating
-/// system is 64-bit, i.e., simulates WOW64 redirection.
-function GetWowNode(): string;
-begin
-	if IsWin64 then
-	begin
-		result := 'Wow6432Node\';
-	end
-	else
-	begin
-		result := '';
-	end;
-end;
-	
-/// Checks if a given Word version is installed
-function IsWordVersionInstalled(version: integer): boolean;
-var key: string;
-var lookup1, lookup2: boolean;
-begin
-	key := 'Microsoft\Office\' + IntToStr(version) + '.0\Word\InstallRoot';
-	lookup1 := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\' + GetWowNode + key);
-	
-	// If checking for version >= 14.0 ("2010"), which was the first version
-	// that was produced in both 32-bit and 64-bit, on a 64-bit system we
-	// also need to check a path without  'Wow6434Node'.
-	if IsWin64 and (version >= 14) then
-	begin
-		lookup2 := RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\' + key);
-	end;
-	
-	result := lookup1 or lookup2;
-end;
-
-/// Checks if only Word 2007 is installed
-function IsOnlyWord2007Installed(): boolean;
-var
-	i: integer;
-begin
-	result := IsWordVersionInstalled(12);
-	
-	// Iterate through all
-	for i := 14 to maxWord do
-	begin
-		if IsWordVersionInstalled(i) then
-		begin
-			result := false;
-			break;
-		end;
-	end;
-end;
-
-/// Checks if hotfix KB976477 is installed. This hotfix
-/// is required to make Word 2007 recognize add-ins in
-/// the HKLM hive as well.
-function IsHotfixInstalled(): boolean;
-begin
-  result := RegKeyExists(HKEY_LOCAL_MACHINE,
-		'SOFTWARE\Microsoft\Windows\Current Version\Uninstall\KB976477');
-end;
-
-/// Retrieves the build number of an installed Office version
-/// in OutBuild. Returns true if the requested Office version
-/// is installed and false if it is not installed.
-function GetOfficeBuild(OfficeVersion: integer; var OutBuild: integer): boolean;
-var
-	key: string;
-	value: string;
-	build: string;
-begin
-	key := 'SOFTWARE\' + GetWowNode + 'Microsoft\Office\' +
-					IntToStr(OfficeVersion) + '.0\Common\ProductVersion';
-	if RegQueryStringValue(HKEY_LOCAL_MACHINE, key, 'LastProduct', value) then
-	begin
-		// Office build numbers always have 4 digits, at least as of Feb. 2015;
-		// from a string '14.0.1234.5000' simply copy 4 characters from the 5th
-		// position to get the build number. TODO: Make this future-proof.
-		build := Copy(value, 6, 4);
-		Log('Found ProductVersion "' + value + '" for queried Office version '
-			+ IntToStr(OfficeVersion) + ', extracted build number ' + build);
-		OutBuild := StrToInt(build);
-		result := true;
-	end
-	else
-		Log('Did not find LastProduct key for Office version ' +
-				IntToStr(OfficeVersion) + '.0.');
-end;
-
-/// Asserts if Office 2007 is installed. Does not check whether other Office
-/// versions are concurrently installed.
-function IsOffice2007Installed(): boolean;
-begin
-	result := IsWordVersionInstalled(12);
-	if result then Log('Detected Office 2007.');
-end;
-
-/// Asserts if Office 2010 without service pack is installed.
-/// For build number, see http://support.microsoft.com/kb/2121559/en-us
-function IsOffice2010NoSpInstalled(): boolean;
-var
-	build: integer;
-begin
-	if GetOfficeBuild(14, build) then
-	begin
-		result := build = 4763; // 4763 is the original Office 2007 build
-		if result then
-			Log('Detected Office 2010 without service pack (v. 14.0, build 4763)')
-		else
-			Log('Detected Office 2010, apparently with some service pack (build ' +
-					IntToStr(build) + ').');
-	end;
-end;
-
-/// Checks if the VSTO runtime is installed. This is relevant if only
-/// Word 2007 is installed. Since Office 2010, the CLR is
-/// automatically included.
-/// The presence of the VSTO runtime is indicated by the presence one of
-/// four possible registry keys.
-/// See: http://xltoolbox.sf.net/blog/2015/01/net-vsto-add-ins-getting-prerequisites-right
-/// HKLM\SOFTWARE\Microsoft\VSTO Runtime Setup\v4R (32-bit)
-/// HKLM\SOFTWARE\Wow6432Node\Microsoft\VSTO Runtime Setup\v4R (64-bit)
-function IsVstorInstalled(): boolean;
-var
-	software, vstorPath: string;
-begin
-	software := 'SOFTWARE\';
-	vstorPath := 'Microsoft\VSTO Runtime Setup\v4R';
-	result := RegKeyExists(HKEY_LOCAL_MACHINE, software + GetWowNode + vstorPath);
-end;
-
-/// Checks if the .NET 4.0 (or 4.5) runtime is installed.
-/// See https://msdn.microsoft.com/en-us/library/hh925568
-function IsNetInstalled(): boolean;
-begin
-	result := RegKeyExists(HKEY_LOCAL_MACHINE, 
-		'SOFTWARE\' + GetWowNode + 'Microsoft\NET Framework Setup\NDP\v4');
-end;
-
-/// Asserts if the VSTO runtime for .NET 4.0 redistributable needs to be
-/// downloaded and installed.
-/// If Office 2010 SP 1 or newer is installed on the system, the VSTOR runtime
-/// will be automagically configured as long as the .NET 4.0 runtime is present.
-/// Office 2007 and Office 2010 without service pack need the VSTO runtime
-/// redistributable. For details, see:
-/// http://xltoolbox.sf.net/blog/2015/01/net-vsto-add-ins-getting-prerequisites-right
-function NeedToInstallVstor(): boolean;
-begin
-	result := false; // Default for Office 2010 SP1 or newer
-	if IsOffice2007Installed or IsOffice2010NoSpInstalled then
-		result := not IsVstorInstalled;
-end;
-
-/// Checks if all required prerequisites are met, i.e. if the necessary
-/// runtimes are installed on the system
-function PrerequisitesAreMet(): boolean;
-begin
-	// Cache check result to avoid multiple registry lookups and log messages
-	if not prerequisitesChecked then
-	begin
-		prerequisitesMet := IsNetInstalled and not NeedToInstallVstor;
-		prerequisitesChecked := true;
-	end;
-	result := prerequisitesMet;
-end;
-
-/// Checks if a file exists and has a valid Sha1 sum.
-function IsFileValid(file: string; expectedSha1: string): boolean;
-var
-	actualSha1: string;
-begin
-	try
-		if FileExists(file) then
-		begin
-			actualSha1 := GetSHA1OfFile(file);
-		end;
-	finally
-		result := actualSha1 = expectedSha1;
-	end;
-end;
-
-/// Returns the path to the downloaded VSTO runtime installer.
-function GetVstorInstallerPath(): string;
-begin
-	result := ExpandConstant('{%temp}\vstor_redist_40.exe');
-end;
-
-/// Returns the path to the downloaded .NET runtime installer.
-function GetNetInstallerPath(): string;
-begin
-	result := ExpandConstant('{%temp}\dotNetFx40_Full_x86_x64.exe');
-end;
-
-/// Checks if the VSTO runtime redistributable setup file has already been
-/// downloaded by comparing SHA1 checksums.
-function IsVstorDownloaded(): boolean;
-begin
-	result := IsFileValid(GetVstorInstallerPath, '{#VSTORSHA1}');
-end;
-
-/// Checks if the .NET runtime setup file has already been
-/// downloaded by comparing SHA1 checksums.
-function IsNetDownloaded(): boolean;
-begin
-	result := IsFileValid(GetNetInstallerPath, '{#DOTNETSHA1}');
-end;
-
-/// Determines if the VSTO runtime needs to be downloaded.
-/// This is not the case it the runtime is already installed,
-/// or if there is a file with a valid Sha1 sum.
-function NeedToDownloadVstor: boolean;
-begin
-	result := NeedToInstallVstor and not IsVstorDownloaded;
-end;
-
-/// Determines if the VSTO runtime needs to be downloaded.
-/// This is not the case it the runtime is already installed,
-/// or if there is a file with a valid Sha1 sum.
-function NeedToDownloadNet: boolean;
-begin
-	result := not IsNetInstalled and not IsNetDownloaded;
-end;
-
-/// Determines whether or not a system-wide installation
-/// is possible. This depends on whether the current user
-/// is an administrator, and whether the hotfix KB976477
-/// is present on the system if Word 2007 is the only version
-/// of Word that is present (without that hotfix, Word
-/// 2007 does not load add-ins that are registered in the
-/// HKLM hive).
-function CanInstallSystemWide(): boolean;
-begin
-	if IsAdminLoggedOn then
-	begin
-		if IsOnlyWord2007Installed then
-		begin
-			result := IsHotfixInstalled;
-		end
-		else
-		begin
-			result := true;
-		end;
-	end
-	else
-	begin
-		result := false;
-	end;
-end;
-
-procedure CreateSingleOrAllUserPage();
-begin
-	PageSingleOrMultiUser := CreateInputOptionPage(wpLicense,
-		CustomMessage('SingleOrMulti'), CustomMessage('SingleOrMultiSubcaption'),
-		CustomMessage('SingleOrMultiDesc'), True, False);
-	PageSingleOrMultiUser.Add(CustomMessage('SingleOrMultiSingle'));
-	PageSingleOrMultiUser.Add(CustomMessage('SingleOrMultiAll'));
-	if CanInstallSystemWide then
-	begin
-		PageSingleOrMultiUser.Values[1] := True;
-	end
-	else
-	begin
-		PageSingleOrMultiUser.Values[0] := True;
-	end;
-end;
-
-procedure CreateCannotInstallPage();
-begin
-	PageCannotInstall := CreateInputOptionPage(wpWelcome,
-		CustomMessage('CannotInstallCaption'),
-		CustomMessage('CannotInstallDesc'),
-		CustomMessage('CannotInstallMsg'), True, False);
-	PageCannotInstall.Add(CustomMessage('CannotInstallCont'));
-	PageCannotInstall.Add(CustomMessage('CannotInstallAbort'));
-	PageCannotInstall.Values[1] := True;
-end;
-
-procedure CreateDownloadInfoPage();
-var
-	bytes: Int64;
-	mib: Single;
-	size: String;
-begin
-	if idpGetFilesSize(bytes) then
-	begin
-		mib := bytes / 1048576;
-		size := Format('%.1f', [ mib ]);
-	end
-	else
-	begin
-		size := '[?]'
-	end;
-	PageDownloadInfo := CreateOutputMsgPage(PageSingleOrMultiUser.Id,
-		CustomMessage('RequiredCaption'),
-		CustomMessage('RequiredDesc'),
-		Format(CustomMessage('RequiredMsg'), [idpFilesCount, size]));
-end;
-
-procedure CreateInstallInfoPage();
-begin
-	PageInstallInfo := CreateOutputMsgPage(PageDownloadInfo.Id,
-		CustomMessage('InstallCaption'),
-		CustomMessage('InstallDesc'),
-		CustomMessage('InstallMsg'));
-end;
-
-
-function InitializeSetup(): boolean;
-var
-	minWordInstalled: boolean;
-	i: integer;
-begin
-	// Determine if Word 2007 or newer is installed (absolute requirement
-	// for this VSTO add-in). Word 2007 ist version 12.0.
-	for i := 12 to maxWord do
-	begin
-		minWordInstalled := minWordInstalled or IsWordVersionInstalled(i);
-	end;
-
-	if not minWordInstalled then
-	begin
-		result := False;
-		Log('Informing user that Word 2007 or newer is required.');
-		MsgBox(CustomMessage('Word2007Required'), mbInformation, MB_OK);
-	end
-	else
-	begin
-		result := True;
-	end
-end;
-	
-procedure InitializeWizard();
-begin
-	// CreateDevelopmentInfoPage;
-	CreateSingleOrAllUserPage;
-	if not PrerequisitesAreMet then
-	begin
-		Log('Not all prerequisites are met...');
-		CreateCannotInstallPage;
-		if NeedToDownloadNet then
-		begin
-			Log('Mark {#DOTNETURL} for download.');
-			idpAddFileSize('{#DOTNETURL}', GetNetInstallerPath, 50449456);
-		end;
-		if NeedToDownloadVstor then
-		begin
-			Log('Mark {#VSTORURL} for download.');
-			idpAddFileSize('{#VSTORURL}', GetVstorInstallerPath, 40123576);
-		end;
-		CreateDownloadInfoPage;
-		CreateInstallInfoPage;
-		idpDownloadAfter(PageDownloadInfo.Id);
-	end;
-end;
-
-function ExecuteNetSetup(): boolean;
-var
-	exitCode: integer;
-begin
-	result := true;
-	if not IsNetInstalled then
-	begin
-		if IsNetDownloaded then
-		begin
-			Log('Valid .NET runtime download found, installing.');
-			Exec(GetNetInstallerPath, '/norestart',
-				'', SW_SHOW, ewWaitUntilTerminated, exitCode);
-			BringToFrontAndRestore;
-			if not IsNetInstalled then
-			begin
-				MsgBox(CustomMessage('StillNotInstalled'), mbInformation, MB_OK);
-				result := False;
-			end;
-		end
-		else
-		begin
-			Log('No or invalid .NET runtime download found, will not install.');
-			MsgBox(CustomMessage('DownloadNotValidated'), mbInformation, MB_OK);
-			result := False;
-		end;
-	end; // not IsNetInstalled
-end;
-
-function ExecuteVstorSetup(): boolean;
-var
-	exitCode: integer;
-begin
-	result := true;
-	if NeedToInstallVstor then
-	begin
-		if IsVstorDownloaded then
-		begin
-			Log('Valid VSTO runtime download found, installing.');
-			Exec(GetVstorInstallerPath, '/norestart', '', SW_SHOW,
-				ewWaitUntilTerminated, exitCode);
-			BringToFrontAndRestore;
-			if not IsVstorInstalled then
-			begin
-				MsgBox(CustomMessage('StillNotInstalled'), mbInformation, MB_OK);
-				result := False;
-			end;
-		end
-		else
-		begin
-			Log('No or invalid VSTO runtime download found, will not install.');
-			MsgBox(CustomMessage('DownloadNotValidated'), mbInformation, MB_OK);
-			result := False;
-		end;
-	end; // not IsVstorInstalled
-end;
-
-function NextButtonClick(CurPageID: Integer): Boolean;
-begin
-	result := True;
-	{
-	if not WizardSilent then
-	begin
-		if CurPageID = PageDevelopmentInfo.Id then
-		begin
-			if PageDevelopmentInfo.Values[0] = False then
-			begin
-				Log('Requesting user to acknowledge use of a developmental version.');
-				MsgBox(CustomMessage('DevVerMsgBox'), mbInformation, MB_OK);
-				result := False;
-			end;
-		end;
-	end;
-	}
-	
-	if not PrerequisitesAreMet then
-	begin
-		// Abort the installation if any of the runtimes are missing, the user
-		// is not an administrator, and requested to abort the installation.
-		if CurPageID = PageCannotInstall.ID then
-		begin
-			if PageCannotInstall.Values[1] = true then
-			begin
-				WizardForm.Close;
-				result := False;
-			end
-			else
-			begin
-				Log('Non-admin user continues although not all required runtimes are installed.');
-			end;
-		end;
-
-		if CurPageID = PageInstallInfo.ID then
-		begin
-		  // Return true if installation succeeds (or no installation required)
-			result := ExecuteNetSetup and ExecuteVstorSetup;
-		end; 
-	end; // not PrerequisitesAreMet
-end;
-
-/// Skips the folder selection, single/multi user, and ready pages for
-/// normal users without power privileges.
-/// This function also takes care of dynamically determining what wizard
-/// pages to install, depending on the current system setup and whether
-/// the current user is an administrator.
-function ShouldSkipPage(PageID: Integer): Boolean;
-begin
-	result := False;
-	
-	if not PrerequisitesAreMet then
-	begin
-		// The PageDownloadCannotInstall will only have been initialized if
-		// PrerequisitesAreMet returned false.
-		if PageID = PageCannotInstall.ID then
-		begin
-			// Skip the warning if the user is an admin.
-			result := IsAdminLoggedOn 
-			if not result then
-			begin
-				Log('Warning user that required runtimes cannot be installed due to missing privileges');
-			end;
-		end;
-		
-		if PageID = PageDownloadInfo.ID then
-		begin
-			// Skip page informing about downloads if no files need to be downloaded.
-			result := idpFilesCount = 0;
-		end;
-	
-		if PageID = IDPForm.Page.ID then
-		begin
-			// Skip downloader plugin if there are no files to download.
-			result := idpFilesCount = 0;
-			if not result then
-			begin
-				Log('Beginning download of ' + IntToStr(idpFilesCount) + ' file(s).');
-			end;
-		end;
-	end; // not PrerequisitesAreMet
-	
-	if PageID = PageSingleOrMultiUser.ID then
-	begin
-		if IsOnlyWord2007Installed then
-		begin
-			Log('Only Word 2007 appears to be installed on this system.');
-			if IsHotfixInstalled then
-			begin
-				Log('Hotfix KB976477 found; can install for all users.');
-			end
-			else
-			begin
-				Log('Hotfix KB976477 not found; cannot install for all users.');
-			end;
-		end
-		else
-		begin
-			Log('Word 2010 or newer found on this system.');
-		end;
-		if CanInstallSystemWide then
-		begin
-			Log('Offer installation for all users.');
-			result := False;
-		end
-		else
-		begin
-			Log('Offer single-user installation only.');
-			result := True;
-		end;
-	end;
-	
-	if (PageID = wpSelectDir) or (PageID = wpReady) then
-	begin
-		// Do not show the pages to select the target directory, and the ready 
-		// page if the user is not an admin.
-		result := not IsAdminLoggedOn;
-	end
-end;
-
-/// Helper function that evaluates the custom PageSingleOrMultiUser page.
-function IsMultiUserInstall(): Boolean;
-begin
-	result := PageSingleOrMultiUser.Values[1];
-end;
-
-/// Suggest an initial target directory depending on whether
-/// the installer is run with admin privileges.
-function SuggestInstallDir(Param: string): string;
-var
-	dir: string;
-begin
-	if CanInstallSystemWide then
-	begin
-		dir := ExpandConstant('{pf}');
-	end
-	else
-	begin
-		dir := ExpandConstant('{userappdata}');
-	end;
-	result := AddBackslash(dir) + 'zaaReloaded';
-end;
-
-/// Converts backslashes to forward slashes.
-function ConvertSlash(Value: string): string;
-begin
-	StringChangeEx(Value, '\', '/', True);
-	Result := Value;
-end;

www/index.html

@@ -368,7 +368,7 @@
 
     <footer class="footer">
       <p>
-        &copy; 2015 <a href="http://www.bovender.de">Daniel Kraus</a>
+        &copy; 2015-2017 <a href="https://www.bovender.de">Daniel Kraus</a>
         <span class="pull-right">
           Handarbeit mit
           <a href="http://www.vim.org">

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.1.12
+2.2.6
-http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
+https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
-b6e80b12e7325a9e0fcc0ad75bd1deaf5f6fe966  publish/release/zaaReloaded-2.1.12.exe
+b6cc9ef2730cf86debeb4b0a5192e18eaa0ae555a330e2853772e0ebf317331f  deploy/releases/zaaReloaded-2.2.6.exe
 

zaaReloaded2/Commands.cs

@@ -2,7 +2,7 @@
 /* Commands.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ namespace zaaReloaded2
             if (CanFormat())
             {
                 SettingsRepository repository = SettingsRepository.Load();
-                Guid lastSettingsUid = Properties.Settings.Default.LastSettings;
+                Guid lastSettingsUid = UserSettings.Default.LastSettings;
                 Settings lastSettings = repository.FindByGuid(lastSettingsUid);
                 if (lastSettings != null)
                 {
@@ -72,8 +72,7 @@ namespace zaaReloaded2
                 SettingsViewModel settingsVM = args.Content.ViewModel as SettingsViewModel;
                 Settings settings = settingsVM.RevealModelObject() as Settings;
                 DoFormat(settings);
-                Properties.Settings.Default.LastSettings = settings.Uid;
+                UserSettings.Default.LastSettings = settings.Uid;
-                Properties.Settings.Default.Save();
             };
             vm.InjectInto<SettingsRepositoryView>().ShowDialog();
         }
@@ -108,7 +107,7 @@ namespace zaaReloaded2
                         + "wenn Word in der Zentralen Arztbriefablage ausgeführt wird.\r"
                         + "Bitte Word als eigenständige Anwendung starten und dann "
                         + "noch einmal versuchen.";
-                    a.OkButtonLabel = "Schließen";
+                    a.OkButtonText = "Schließen";
                     a.Invoke();
                 }
                 else
@@ -127,8 +126,8 @@ namespace zaaReloaded2
 
         public static void ShowPreferences()
         {
-            ViewModels.PreferencesViewModel.Default.InjectInto<Views.PreferencesView>()
+            ViewModels.PreferencesViewModel vm = new PreferencesViewModel();
-                .ShowDialog();
+            vm.InjectInto<Views.PreferencesView>().ShowDialog();
         }
 
         public static void ApplyDanielsStyle()
@@ -138,6 +137,58 @@ namespace zaaReloaded2
                 Globals.ThisAddIn.Application.Selection);
         }
 
+        public static void FormatDrugs(int columns)
+        {
+            if (columns < 1 || columns > 2)
+            {
+                throw new ArgumentOutOfRangeException("Can only format 1 or 2 columns, not " + columns);
+            }
+
+            // If no "real" selection exists, attempt to auto-detect the drugs section.
+            // (NB Technically, there is never _no_ selection in a document.)
+            Word.Window activeWindow = Globals.ThisAddIn.Application.ActiveWindow;
+            Word.Selection sel = activeWindow.Selection;
+            Word.Paragraphs paragraphs = sel.Paragraphs;
+            Word.Document document = activeWindow.Document;
+            if (!(paragraphs.Count > 1
+                || (sel.Text.Length > 1 && sel.Text.EndsWith("\r"))))
+            {
+                Logger.Info("FormatDrugs: Attempting to auto-detect");
+                if (!Medication.Importer.AutoDetect(document))
+                {
+                    Logger.Info("FormatDrugs: Failed to auto-detect");
+                    NotificationAction a = new NotificationAction();
+                    a.Caption = "Formatieren nicht möglich";
+                    a.Message = "Das Dokument scheint keine Medikationsliste zu enthalten.";
+                    a.OkButtonText = "Schließen";
+                    a.Invoke();
+                    return;
+                }
+            }
+
+            Logger.Info("FormatDrugs: Importing");
+            Medication.Importer importer = new Medication.Importer(sel.Text);
+            Medication.Formatter formatter = new Medication.Formatter(importer.Prescriptions);
+
+            Logger.Info("FormatDrugs: Formatting");
+            switch (columns)
+            {
+                case 1:
+                    formatter.FormatOneColumn(document);
+                    break;
+                case 2:
+                    formatter.FormatTwoColumns(document);
+                    break;
+                default:
+                    break;
+            }
+            Logger.Info("FormatDrugs: Cleaning up");
+            Bovender.ComHelpers.ReleaseComObject(document);
+            Bovender.ComHelpers.ReleaseComObject(paragraphs);
+            Bovender.ComHelpers.ReleaseComObject(sel);
+            Bovender.ComHelpers.ReleaseComObject(activeWindow);
+        }
+
         #endregion
 
         #region Private methods
@@ -146,57 +197,84 @@ namespace zaaReloaded2
         {
             // If no "real" selection exists, attempt to auto-detect the lab data.
             // (NB Technically, there is never _no_ selection in a document.)
-            Word.Window activeWindow = Globals.ThisAddIn.Application.ActiveWindow;
+            Word.Application word = Globals.ThisAddIn.Application;
-            Word.Selection sel = activeWindow.Selection;
+            Word.Document activeDocument = word.ActiveDocument;
-            if (!(sel.Paragraphs.Count > 1
+            Word.Window activeWindow = word.ActiveWindow;
-                || (sel.Text.Length > 1 && sel.Text.EndsWith("\r"))))
+            Word.Selection selection = activeWindow.Selection;
+            Word.Paragraphs paragraphs = selection.Paragraphs;
+            if (!(paragraphs.Count > 1
+                || (selection.Text.Length > 1 && selection.Text.EndsWith("\r"))))
             {
-                if (!AutoDetect.Detect(activeWindow.Document))
+                Logger.Info("DoFormat: Attempting to auto-detect");
+                Word.Document doc = activeWindow.Document;
+                if (!AutoDetect.Detect(doc))
                 {
+                    Logger.Info("DoFormat: Automatic detection failed");
                     NotificationAction a = new NotificationAction();
                     a.Caption = "Formatieren nicht möglich";
                     a.Message = "Das Dokument scheint keine Lauris-Labordaten zu enthalten.";
-                    a.OkButtonLabel = "Schließen";
+                    a.OkButtonText = "Schließen";
                     a.Invoke();
                     return;
                 }
+                // Don't release the COM object here
+                // Bovender.ComHelpers.ReleaseComObject(doc);
             }
 
+            Logger.Info("DoFormat: Importing");
             ZaaImporter importer = new ZaaImporter();
-            importer.Import(Globals.ThisAddIn.Application.ActiveWindow.Selection.Text);
+            importer.Import(selection.Text);
-            Formatter.Formatter formatter = new Formatter.Formatter(
+            Formatter.Formatter formatter = new Formatter.Formatter(activeDocument);
-                Globals.ThisAddIn.Application.ActiveDocument);
+
             formatter.Settings = settings;
             formatter.Laboratory = importer.Laboratory;
             CommentPool.Default.Reset();
             CommentPool.Default.FillInComment += CommentPool_FillInComment;
             try
             {
+                Logger.Info("DoFormat: Formatting");
                 formatter.Run();
             }
-            catch (NoLaboratoryDataException)
+            catch (NoLaboratoryDataException e)
             {
+                Logger.Warn("DoFormat: No lab data?!");
+                Logger.Warn(e);
                 NotificationAction a = new NotificationAction();
                 a.Caption = "Formatieren nicht möglich";
                 a.Message = "Die aktuelle Markierung scheint keine Labordaten zu enthalten.";
-                a.OkButtonLabel = "Schließen";
+                a.OkButtonText = "Schließen";
                 a.Invoke();
             }
+            Bovender.ComHelpers.ReleaseComObject(paragraphs);
+            Bovender.ComHelpers.ReleaseComObject(selection);
+            Bovender.ComHelpers.ReleaseComObject(activeWindow);
+            Bovender.ComHelpers.ReleaseComObject(activeDocument);
+            Logger.Info("DoFormat: Finished");
         }
 
         private static void CommentPool_FillInComment(object sender, ItemCommentEventArgs e)
         {
-            if (Preferences.Default.SuppressItemCommentInteraction)
+            if (UserSettings.Default.SuppressItemCommentInteraction)
             {
+                Logger.Info("CommentPool_FillInComment: Comment interaction is suppressed by user settings");
                 e.Comment.IsCancelled = true;
             }
             else
             {
+                Logger.Info("CommentPool_FillInComment: Requesting user interaction");
                 ItemCommentViewModel vm = new ItemCommentViewModel(e.Comment);
                 vm.InjectInto<ItemCommentView>().ShowDialog();
             }
         }
 
         #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
     }
 }

zaaReloaded2/Controller/Comments/CommentPool.cs

@@ -1,7 +1,7 @@
 /* CommentPool.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Comments/ItemComment.cs

@@ -1,7 +1,7 @@
 /* ParameterComment.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Comments/ItemCommentEventArgs.cs

@@ -1,7 +1,7 @@
 /* ParameterCommentEventArgs.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/ControlElementBase.cs

@@ -2,7 +2,7 @@
 /* ControlElementBase.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/CustomText.cs

@@ -1,7 +1,7 @@
 /* Text.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/ElementBase.cs

@@ -1,7 +1,7 @@
 /* ElementBase.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/FormatElementBase.cs

@@ -1,7 +1,7 @@
 /* FormatElementBase.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/Items.cs

@@ -1,7 +1,7 @@
 /* Items.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/NextColumn.cs

@@ -1,7 +1,7 @@
 /* NextColumn.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/SelectEachDay.cs

@@ -1,7 +1,7 @@
 /* SelectEachDay.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/SelectFirstDay.cs

@@ -1,7 +1,7 @@
 /* SelectFirstDay.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/SelectLastDay.cs

@@ -1,7 +1,7 @@
 /* SelectFirstDay - Copy.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Elements/TwoColumns.cs

@@ -1,7 +1,7 @@
 /* TwoColumns.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/Settings.cs

@@ -1,7 +1,7 @@
 /* Settings.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Controller/SettingsRepository.cs

@@ -1,7 +1,7 @@
 /* SettingsRepository.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,7 @@ namespace zaaReloaded2.Controller
         /// </remarks>
         public static SettingsRepository Load()
         {
-            string s = Properties.Settings.Default.SettingsRepository;
+            string s = UserSettings.Default.SettingsRepository;
             if (String.IsNullOrEmpty(s))
             {
                 return new SettingsRepository();
@@ -67,7 +67,7 @@ namespace zaaReloaded2.Controller
             else
             {
                 MemoryStream stream = new MemoryStream();
-                string encoded = Properties.Settings.Default.SettingsRepository;
+                string encoded = UserSettings.Default.SettingsRepository;
                 byte[] bytes = Convert.FromBase64String(encoded);
                 stream.Write(bytes, 0, bytes.Length);
                 stream.Position = 0;
@@ -94,8 +94,7 @@ namespace zaaReloaded2.Controller
             serializer.Serialize(stream, this);
             stream.Position = 0;
             string encoded = Convert.ToBase64String(stream.ToArray());
-            Properties.Settings.Default.SettingsRepository =  encoded;
+            UserSettings.Default.SettingsRepository =  encoded;
-            Properties.Settings.Default.Save();
         }
 
         #endregion

zaaReloaded2/Defaults/clinic.zaaReloaded

@@ -3,17 +3,17 @@
 <a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
 <Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>975892959</_a>
+<_a>-903942278</_a>
-<_b>1621</_b>
+<_b>-22298</_b>
-<_c>18089</_c>
+<_c>17811</_c>
-<_d>190</_d>
+<_d>139</_d>
-<_e>209</_e>
+<_e>190</_e>
-<_f>136</_f>
+<_f>233</_f>
-<_g>9</_g>
+<_g>83</_g>
-<_h>91</_h>
+<_h>158</_h>
-<_i>189</_i>
+<_i>73</_i>
-<_j>67</_j>
+<_j>21</_j>
-<_k>208</_k>
+<_k>115</_k>
 </Uid>
 <Name id="ref-3">Kopie von Standard für NepA</Name>
 <ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
@@ -102,11 +102,11 @@
 </a4:Items>
 <a4:Items id="ref-14" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt</Content>
+<Content id="ref-38">Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest</Content>
 </a4:Items>
 <a4:Items id="ref-15" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-39">Leber: GOT, GGT, GPT, AP, Bilirubin, CHE</Content>
+<Content id="ref-39">Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT</Content>
 </a4:Items>
 <a4:Items id="ref-16" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
@@ -130,7 +130,7 @@
 </a4:Items>
 <a4:Items id="ref-21" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-45">Hormone: iPTH, TSH, fT3, fT4</Content>
+<Content id="ref-45">Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ</Content>
 </a4:Items>
 <a4:Items id="ref-22" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
@@ -171,7 +171,7 @@
 </a4:CustomText>
 <a4:CustomText id="ref-31" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-55">Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
+<Content id="ref-55">Autoantikörper: ANCA (IF) 1: (Ref. &#60; 1:40), MPO-ANCA (ELISA) IU/ml (Ref. &#60; 9), PR3-ANCA (ELISA) IU/ml (Ref. &#60; 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)</Content>
 </a4:CustomText>
 </SOAP-ENV:Body>
 </SOAP-ENV:Envelope>

zaaReloaded2/Defaults/parameters.txt

@@ -10,6 +10,8 @@ Albumin                            Alb                  S
 "Albumin (SU)/die"                 Alb                  SU
 "Albumin - Fraktion"               Albumin-Fraktion     S          ---              X
 "Albumin/Creatinin (PU)"           ACR                  U          0
+Aldosteron                         Aldosteron           S          ---              X
+Aldosteron-Renin-Quotient          ARQ                  S          ---              X
 "Alk. Phosphatase"                 AP                   S          0
 "Alpha1-Globulin - Fraktion"       a1-Globulin          S          ---              X
 "Alpha2-Globulin - Fraktion"       a2-Globulin          S          ---              X
@@ -79,6 +81,7 @@ Kalium                             K                    S
 "Kalium (SU)"                      K                    U
 "Kalium (SU)/die"                  K                    SU
 "Ketonkörper (U)"                  KK                   U
+"kohlenhyd. def. Transferrin"      CDT                  S          1                X
 "Komplementfaktor C3c"             C3c                  S          ---              X
 "Komplementfaktor C4"              C4                   S          ---              X
 "Lactat Dehydrogenase"             LDH                  S
@@ -110,10 +113,12 @@ pH                                 pH                   BGA
 "PTH intakt"                       iPTH                 S
 PTT                                PTT                  Z
 "Ratio int. norm."                 INR                  Z
+Plasma-Renin-Konzentration         Renin                S          ---              X
 Retikulozyten                      Retikulozyten        E          ---              X
 "Sammelmenge (U)"                  Volumen              SU
 "Sammelzeit (U)"                   Zeit                 SU
 "Sauerstoffsättigung (art.)"       SO2                  BGA
+"Schwangerschaftstest (U)"         Schwangerschaftstest U
 Sirolimus                          SIR                  S
 "spezifisches Gewicht (U)"         "spez. Gew."         U
 "Standard Bicarbonat"              "Std.-Bic."          BGA

zaaReloaded2/Demo/Demo.cs

@@ -1,7 +1,7 @@
 /* Demo.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs

@@ -1,7 +1,7 @@
 /* ExceptionDetailView.xaml.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs

@@ -1,7 +1,7 @@
 /* ExceptionView.xaml.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs

@@ -1,7 +1,7 @@
 /* ExceptionViewModel.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ namespace zaaReloaded2.ExceptionHandler
         {
             get
             {
-                return zaaReloaded2.Updater.Version.CurrentVersion().ToString();
+                return zaaReloaded2.Updater.Version.Current.ToString();
             }
         }
 
@@ -86,6 +86,11 @@ namespace zaaReloaded2.ExceptionHandler
             return @"x:\Code\zaaReloaded2\zaaReloaded2\";
         }
 
+        protected override Bovender.UserSettings.UserSettingsBase UserSettings
+        {
+            get { return zaaReloaded2.UserSettings.Default; }
+        }
+
         #endregion
     }
 }

zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs

@@ -1,7 +1,7 @@
 /* SubmissionCompletedAction.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs

@@ -1,7 +1,7 @@
 /* SubmissionFailureView.xaml.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs

@@ -1,7 +1,7 @@
 /* SubmissionProcessAction.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs

@@ -1,7 +1,7 @@
 /* SubmissionProcessView.xaml.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs

@@ -1,7 +1,7 @@
 /* SubmissionSuccessView.xaml.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/AbnormalStyle.cs

@@ -1,7 +1,7 @@
 /* AbnormalStyle.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/DanielsStyle.cs

@@ -1,7 +1,7 @@
 /* DanielsStyle.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/DocumentWriter.cs

@@ -1,7 +1,7 @@
 /* DocumentWriter.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -171,6 +171,14 @@ namespace zaaReloaded2.Formatter
             _buffer.AppendLine(text);
         }
 
+        /// <summary>
+        /// Appends a newline to the buffer.
+        /// </summary>
+        public void WriteLine()
+        {
+            _buffer.AppendLine();
+        }
+
         /// <summary>
         /// Inserts text at the start of the buffer.
         /// </summary>

zaaReloaded2/Formatter/Formatter.cs

@@ -1,7 +1,7 @@
 /* Formatter.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,13 +142,7 @@ namespace zaaReloaded2.Formatter
             // Create undo record and styles prior to iterating over the elements
             // because a column switching element might trigger output to the
             // document.
-            bool hasAddin = Globals.ThisAddIn != null;
+            Helpers.StartUndo("Laborformatierung");
-            if (hasAddin)
-            {
-                Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord(
-                    String.Format("Laborformatierung ({0})", Properties.Settings.Default.AddinName)
-                    );
-            }
             CreateStyles();
 
             int current = 0;
@@ -177,10 +171,7 @@ namespace zaaReloaded2.Formatter
             }
 
             _secondaryBuffer.Flush();
-            if (hasAddin)
+            Helpers.EndUndo();
-            {
-                Globals.ThisAddIn.Application.UndoRecord.EndCustomRecord();
-            }
         }
 
         /// <summary>
@@ -281,15 +272,18 @@ namespace zaaReloaded2.Formatter
         {
             if (Document != null)
             {
+                Logger.Info("CreateStyles");
                 Style style;
                 // Don't see a better way to check for the existence of a particular
                 // paragraph style than by using a try...catch construction.
                 try
                 {
                     style = Document.Styles[Properties.Settings.Default.StyleParagraph];
+                    Logger.Info("CreateStyles: Found paragraph style in document");
                 }
                 catch
                 {
+                    Logger.Info("CreateStyles: Need to create paragraph style");
                     // Add default paragraph style for laboratory
                     style = Document.Styles.Add(Properties.Settings.Default.StyleParagraph);
                     style.Font.Size = 10; // pt
@@ -302,13 +296,16 @@ namespace zaaReloaded2.Formatter
                     style.ParagraphFormat.FirstLineIndent = -36; // pt
                     style.ParagraphFormat.Alignment = WdParagraphAlignment.wdAlignParagraphJustify;
                 }
+                Bovender.ComHelpers.ReleaseComObject(style);
 
                 try
                 {
                     style = Document.Styles[Properties.Settings.Default.StyleHeader];
+                    Logger.Info("CreateStyles: Found header style in document");
                 }
                 catch
                 {
+                    Logger.Info("CreateStyles: Need to create header style");
                     // Add header paragraph style for laboratory
                     style = Document.Styles.Add(Properties.Settings.Default.StyleHeader);
                     style.Font.Size = 10; // pt
@@ -322,6 +319,7 @@ namespace zaaReloaded2.Formatter
                     style.ParagraphFormat.Alignment = WdParagraphAlignment.wdAlignParagraphJustify;
                     style.set_NextParagraphStyle(Document.Styles[Properties.Settings.Default.StyleParagraph]);
                 }
+                Bovender.ComHelpers.ReleaseComObject(style);
 
                 /*
                 try
@@ -431,5 +429,13 @@ namespace zaaReloaded2.Formatter
         Table _table;
 
         #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
     }
 }

zaaReloaded2/Formatter/IItemFormatterDictionary.cs

@@ -1,7 +1,7 @@
 /* IItemFormatterDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/ITimePointFormatterDictionary.cs

@@ -1,7 +1,7 @@
 /* ITimePointFormatterDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/ItemFormatter.cs

@@ -1,7 +1,7 @@
 /* ItemFormatter.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/ItemFormatterDictionary.cs

@@ -1,7 +1,7 @@
 /* ItemFormatterDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/NoLaboratoryDataException.cs

@@ -1,7 +1,7 @@
 /* NoLaboratoryDataException.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/ReferenceStyle.cs

@@ -1,7 +1,7 @@
 /* ReferenceStyle.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/TimePointFormatter.cs

@@ -1,7 +1,7 @@
 /* TimePointFormatter.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Formatter/TimePointFormatterDictionary.cs

@@ -1,7 +1,7 @@
 /* TimePointFormatterDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Helpers.cs

@@ -0,0 +1,69 @@
+/* Helpers.cs
+ * part of zaaReloaded2
+ * 
+ * Copyright 2015-2017 Daniel Kraus
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+
+namespace zaaReloaded2
+{
+    /// <summary>
+    /// Common helper methods.
+    /// </summary>
+    public static class Helpers
+    {
+        /// <summary>
+        /// Splits a text into paragraphs.
+        /// </summary>
+        /// <param name="paragraph">Text to split.</param>
+        /// <returns>Array of paragraphs in the text.</returns>
+        /// <remarks>
+        /// This implementation relies on the fact that the order of
+        /// splitting strings in C#'s String.Split() method is
+        /// important; see http://stackoverflow.com/a/8664639/270712
+        /// </remarks>
+        public static string[] SplitParagraphs(string text)
+        {
+            return text.Split(
+                new string[] { "\r\n", "\n\r", "\r", "\n" },
+                StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        /// <summary>
+        /// Starts a custom undo record.
+        /// </summary>
+        /// <param name="message"></param>
+        public static void StartUndo(string message)
+        {
+            if (Globals.ThisAddIn != null)
+            {
+                Globals.ThisAddIn.Application.UndoRecord.StartCustomRecord(
+                    String.Format("{0} ({1})", message, Properties.Settings.Default.AddinName)
+                    );
+            }
+        }
+
+        /// <summary>
+        /// Ends an undo record.
+        /// </summary>
+        public static void EndUndo()
+        {
+            if (Globals.ThisAddIn != null)
+            {
+                Globals.ThisAddIn.Application.UndoRecord.EndCustomRecord();
+            }
+        }
+    }
+}

zaaReloaded2/Importer/IImporter.cs

@@ -1,7 +1,7 @@
 /* IImporter.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Importer/ZaaImporter/AutoDetect.cs

@@ -2,7 +2,7 @@
 /* AutoDetect.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs

@@ -1,7 +1,7 @@
 /* LabItem.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,14 +103,17 @@ namespace zaaReloaded2.Importer.ZaaImporter
             // "HBs-Antigen: neg. ;"
             // "Erythrozyten (U): + [negativ]"
             Match match;
+            Logger.Debug("ParseLauris: {0}", LaurisText);
             if (_numericalRegex.IsMatch(LaurisText))
             {
+                Logger.Debug("ParseLauris: Numerical match");
                 match = _numericalRegex.Match(LaurisText);
                 ParseLimits(match);
                 Value = match.Groups["value"].Value.Trim().Replace(',', '.');
             }
             else
             {
+                Logger.Debug("ParseLauris: Not a numerical match");
                 match = _categoricalRegex.Match(LaurisText);
                 Normal = match.Groups["normal"].Value.Trim();
                 Value = match.Groups["value"].Value.Trim();
@@ -120,6 +123,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
                 OriginalName = match.Groups["name"].Value.Trim();
                 Name = OriginalName;
                 Unit = match.Groups["unit"].Value.Trim();
+                Logger.Debug("ParseLauris: Match: {0}, {1}", Name, Unit);
+            }
+            else
+            {
+                Logger.Debug("ParseLauris: No match: \"{0}\"", LaurisText);
             }
         }
 
@@ -132,9 +140,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
         {
             if (match.Groups["limits"].Success)
             {
+                Logger.Debug("ParseLimits: Has limits: {0}", match.Groups["limits"].Value);
                 Match limitMatch = _limitRegex.Match(match.Groups["limits"].Value);
                 if (limitMatch.Groups["limit1"].Success && limitMatch.Groups["limit2"].Success)
                 {
+                    Logger.Debug("ParseLimits: Upper and lower limit detected");
                     // Use InvariantCulture because Lauris always outputs dots as decimal separator
                     // Only in rare cases, a comma sneaks in...
                     LowerLimit = Double.Parse(limitMatch.Groups["limit1"].Value.Replace(',', '.'),
@@ -144,6 +154,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
                 }
                 else
                 {
+                    Logger.Debug("ParseLimits: Single limit detected");
                     switch (limitMatch.Groups["operator"].Value.Trim())
                     {
                         case "<=":
@@ -159,9 +170,9 @@ namespace zaaReloaded2.Importer.ZaaImporter
                             // Fixes exception ID 65ca8575.
                             break;
                         default:
-                            throw new InvalidOperationException(
+                            string unknown = match.Groups["limits"].Value;
-                                String.Format("Unknown operator in {0}",
+                            Logger.Fatal("ParseLimits: Unknown operator \"{0}\"", unknown);
-                                    match.Groups["limits"].Value));
+                            throw new InvalidOperationException(String.Format("Unknown operator in {0}",unknown));
                     }
                 }
             }
@@ -210,5 +221,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
         static readonly Regex _materialRegex = new Regex(@"\((?<material>(SU|PU))\)");
 
         #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
     }
 }

zaaReloaded2/Importer/ZaaImporter/LaurisParagraph.cs

@@ -1,7 +1,7 @@
 /* LaurisParagraph.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using zaaReloaded2.Thesaurus;
 using zaaReloaded2.LabModel;
+using Bovender.Extensions;
 
 namespace zaaReloaded2.Importer.ZaaImporter
 {
@@ -109,9 +110,11 @@ namespace zaaReloaded2.Importer.ZaaImporter
         /// </summary>
         void Parse()
         {
+            Logger.Info("Parse: \"{0}\"", OriginalParagraph.TruncateWithEllipsis(40));
             Match m = _expectedFormat.Match(OriginalParagraph);
             if (m.Success)
             {
+                Logger.Info("Parse: Matches Lauris paragraph format");
                 Items = new ItemDictionary();
                 if (m.Groups["caption"].Success)
                 {
@@ -127,6 +130,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
             }
             else
             {
+                Logger.Info("Parse: Does not match Lauris paragraph format");
                 IsLaurisParagraph = false;
             }
         }
@@ -140,5 +144,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
         Thesaurus.Units _unitDictionary;
 
         #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
     }
 }

zaaReloaded2/Importer/ZaaImporter/LaurisTimePoint.cs

@@ -1,7 +1,7 @@
 /* LaurisTimePoint.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -199,6 +199,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
             Match m = _timeStampRegex.Match(paragraph);
             if (m.Success)
             {
+                Logger.Info("ParseParagraph: Matches time stamp");
                 DateTime dt;
                 if (DateTime.TryParseExact(
                     m.Groups["datetime"].Value,
@@ -213,27 +214,30 @@ namespace zaaReloaded2.Importer.ZaaImporter
                 // Put the remainder of the line back to the
                 // 'paragraph' parameter to deal with exceptional
                 // lines such as 
-                // "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
+                // "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
                 // We need to add a dummy caption because this is
                 // the normal format of a paragraph generated from Lauris.
                 if (m.Groups["tail"].Success)
                 {
+                    Logger.Info("ParseParagraph: Time stamp has a tail -- putting it back with a dummy caption");
                     paragraph = "DUMMY CAPTION: " + m.Groups["tail"].Value;
                 }
                 else
                 {
-                    paragraph = String.Empty;
+                    paragraph = null;
                 }
             }
 
             if (!String.IsNullOrEmpty(paragraph))
             {
+                Logger.Info("ParseParagraph: Not a time stamp");
                 LaurisParagraph lp = new LaurisParagraph(
                         paragraph,
                         _parameterDictionary,
                         _unitDictionary);
                 if (lp.IsLaurisParagraph)
                 {
+                    Logger.Debug("ParseParagraph: Merging Lauris paragraph");
                     Items.Merge(lp.Items);
                 }
             }
@@ -259,5 +263,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
         Units _unitDictionary;
 
         #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
     }
 }

zaaReloaded2/Importer/ZaaImporter/ZaaImporter.cs

@@ -1,7 +1,7 @@
 /* ZaaImporter.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,20 +67,19 @@ namespace zaaReloaded2.Importer.ZaaImporter
         /// <param name="text">ZAA-formatted Lauris output to import.</param>
         public void Import(string text)
         {
-            // Split the text into parargraphs. This implementation relies on the fact
+            Logger.Info("Import: \"{0}\"", text.TruncateWithEllipsis(120));
-            // that the order or splitting strings in C#'s String.Split() method is
+            string[] paragraphs = Helpers.SplitParagraphs(text);
-            // important; see http://stackoverflow.com/a/8664639/270712
+            Logger.Info("Import: {0} paragraph(s)", paragraphs.Length);
-            string[] paragraphs = text.Split(
-                new string[] { "\r\n", "\n\r", "\r", "\n" },
-                StringSplitOptions.RemoveEmptyEntries);
             LaurisTimePoint timePoint = null;
 
             foreach (string paragraph in paragraphs)
             {
+                Logger.Info("Import: \"{0}\"", paragraph.TruncateWithEllipsis(40));
                 // If the current paragraph looks like a Lauris time stamp,
                 // create a new time point.
                 if (LaurisTimePoint.IsTimeStampLine(paragraph))
                 {
+                    Logger.Info("Import: Time stamp detected", paragraph);
                     timePoint = new LaurisTimePoint(paragraph, _parameters, _units);
                     // Add the time point to the laboratory only if none
                     // with the same time stamp exists yet.
@@ -99,6 +98,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
                 // if no time point exists yet, create one.
                 else if (LaurisParagraph.ResemblesLaurisParagraph(paragraph))
                 {
+                    Logger.Info("Import: Lauris paragraph detected");
                     if (timePoint == null)
                     {
                         timePoint = new LaurisTimePoint(_parameters, _units);
@@ -106,6 +106,10 @@ namespace zaaReloaded2.Importer.ZaaImporter
                     }
                     timePoint.AddParagraph(paragraph);
                 }
+                else
+                {
+                    Logger.Debug("Import: Neither time stamp, nor Lauris paragraph");
+                }
             }
         }
 
@@ -128,5 +132,13 @@ namespace zaaReloaded2.Importer.ZaaImporter
         Units _units;
 
         #endregion
+
+        #region Class logger
+
+        private static NLog.Logger Logger { get { return _logger.Value; } }
+
+        private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
+
+        #endregion
     }
 }

zaaReloaded2/LabModel/IItemDictionary.cs

@@ -1,7 +1,7 @@
 /* ItemDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/LabModel/ITimePointsDictionary.cs

@@ -1,7 +1,7 @@
 /* ITimePointsDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/LabModel/ItemDictionary.cs

@@ -1,7 +1,7 @@
 /* ItemDictionary.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/LabModel/LabItem.cs

@@ -1,7 +1,7 @@
 /* LabItem.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -206,12 +206,13 @@ namespace zaaReloaded2.LabModel
         {
             get
             {
-                if (Material == LabModel.Material.B)
+                switch (Material)
                 {
+                    case Material.S:
+                    case Material.E:
+                    case Material.B:
                         return Name;
-                }
+                    default:
-                else
-                {
                         return String.Format("{0}-{1}", Material.ToString(), Name);
                 }
             }

zaaReloaded2/LabModel/Laboratory.cs

@@ -1,7 +1,7 @@
 /* Laboratory.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

zaaReloaded2/LabModel/Material.cs

@@ -1,7 +1,7 @@
 /* Materials.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +28,12 @@ namespace zaaReloaded2.LabModel
     /// </summary>
     public enum Material
     {
+        [Description("Serum")]
+        /// Serum (default -- first declared)
+        S,
+        [Description("EDTA-Blut")]
+        /// EDTA blood
+        E,
         [Description("Blut")]
         /// Blood
         B,

zaaReloaded2/LabModel/TimePoint.cs

@@ -1,7 +1,7 @@
 /* TimePoint.cs
  * part of zaaReloaded2
  * 
- * Copyright 2015 Daniel Kraus
+ * Copyright 2015-2017 Daniel Kraus
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.