Update copyright year.

Update publication year to 2018.
Upgrade solution to Visual Studio 2017.
2018-09-16 14:07:54 +02:00 · 2018-02-13 09:28:44 +01:00 · 2018-02-13 09:15:17 +01:00 · 2017-09-29 06:14:11 +02:00 · 2017-09-29 06:13:29 +02:00 · 2017-09-29 06:10:47 +02:00
132 changed files with 328 additions and 204 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ doc/
 private/
 *.nupkg
 doxygen_sqlite3.db
+Backup/
+.vs/
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,24 @@
+Version 2.4.2 (2017-09-29)
+------------------------------------------------------------------------
+
+- Geändert: Wenn das Laborsystem Zeitstempel ausgibt, die in derselben Zeile auch noch einen Laborwert enthalten, wird das jetzt korrekt erkannt.
+- Repariert: Stile konnten nicht importiert werden.
+- Verbessert: Benutzer-Interface der Stile-Verwaltung.
+- Verbessert: Der Standard-Ambulanzstil gibt jetzt auch den MSU-Befund mit aus (sofern vorhanden).
+- Verbessert: Für bestimmte Parameter kann die Beschriftung unterdrückt werden (derzeit implementiert im Urin-Hygienebefund, wo "Keim" und "Multiresistenz" nicht mit ausgegeben werden, sondern nur z.B. "E. coli, 3MRGN" bei entsprechender Vorlage "MSU-Keim, MSU-Multiresistenz").
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
+Version 2.4.1 (2017-09-21)
+------------------------------------------------------------------------
+
+- Neu: Parameter für Hygienebefunde hinzugefügt ("MSU-Keim" und "MSU-Multiresistenz").
+- Verbessert: Ambulanzausgabe von Hygienebefunden wird jetzt korrekt erkannt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.4.0 (2017-09-18)
 ------------------------------------------------------------------------

--- a/2
+++ b/2
@@ -23,7 +23,7 @@ versioninfo:
 	mv www/versioninfo.tmp www/versioninfo.txt

 upload:
-	rsync -ruvz --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/
+	rsync -ruvzL --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/

 website:
 	rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/
--- a/Tests/Controller/Comments/CommentPoolTest.cs
+++ b/Tests/Controller/Comments/CommentPoolTest.cs
@@ -1,7 +1,7 @@
 /* CommentPoolTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/Comments/ItemCommentTest.cs
+++ b/Tests/Controller/Comments/ItemCommentTest.cs
@@ -1,7 +1,7 @@
 /* ItemCommentTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/Elements/CloneTest.cs
+++ b/Tests/Controller/Elements/CloneTest.cs
@@ -1,7 +1,7 @@
 /* CloneTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/Elements/ItemsTest.cs
+++ b/Tests/Controller/Elements/ItemsTest.cs
@@ -1,7 +1,7 @@
 /* ItemsTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/SettingsRepositoryTest.cs
+++ b/Tests/Controller/SettingsRepositoryTest.cs
@@ -1,7 +1,7 @@
 /* SettingsRepositoryTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Controller/SettingsTest.cs
+++ b/Tests/Controller/SettingsTest.cs
@@ -1,7 +1,7 @@
 /* SettingsTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Formatter/DocumentWriterTest.cs
+++ b/Tests/Formatter/DocumentWriterTest.cs
@@ -1,7 +1,7 @@
 /* DocumentWriterClass.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Formatter/FormatterTest.cs
+++ b/Tests/Formatter/FormatterTest.cs
@@ -1,7 +1,7 @@
 /* FormatterTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 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-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;  CK gesamt: 123 [<= 170] U/l;  Cholesterin: 211");
+                "(17.09.2015-201810: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-201710:44:00:\rCsA (C0) 130 µg/l\r\r",
+                "Laborwerte vom 17.09.2015-201810:44:00:\rCsA (C0) 130 µg/l\r\r",
                document.Range().Text);
        }

--- a/Tests/Importer/ZaaImporter/LaurisItemTest.cs
+++ b/Tests/Importer/ZaaImporter/LaurisItemTest.cs
@@ -1,7 +1,7 @@
 /* LaurisItemTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs
+++ b/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs
@@ -1,7 +1,7 @@
 /* LaurisParagraphTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Importer/ZaaImporter/TimePointTest.cs
+++ b/Tests/Importer/ZaaImporter/TimePointTest.cs
@@ -1,7 +1,7 @@
 /* LaurisTimePointTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Importer/ZaaImporter/ZaaImporterTest.cs
+++ b/Tests/Importer/ZaaImporter/ZaaImporterTest.cs
@@ -1,7 +1,7 @@
 /* ZaaImporterTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/LineParserTest.cs
+++ b/Tests/LineParserTest.cs
@@ -1,7 +1,7 @@
 /* UnitTest1.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Medication/ImporterTest.cs
+++ b/Tests/Medication/ImporterTest.cs
@@ -1,7 +1,7 @@
 /* ImporterTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Medication/PrescriptionTest.cs
+++ b/Tests/Medication/PrescriptionTest.cs
@@ -1,7 +1,7 @@
 /* PrescriptionTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/SerializationTest.cs
+++ b/Tests/SerializationTest.cs
@@ -1,7 +1,7 @@
 /* SelectFirstDayTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/TestHelpers.cs
+++ b/Tests/TestHelpers.cs
@@ -1,7 +1,7 @@
 /* TestHelpers.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Thesaurus/ParametersTest.cs
+++ b/Tests/Thesaurus/ParametersTest.cs
@@ -1,7 +1,7 @@
 /* ParametersTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -52,5 +52,11 @@ namespace Tests.Thesaurus
        {
            Assert.IsTrue(Parameters.Default.GetIsBlacklisted("glomerul. Filtrationsr. (MDRD)"));
        }
+
+        [Test]
+        public void GetSuppressLabel()
+        {
+            Assert.IsTrue(Parameters.Default.GetSuppressLabel("- Multiresistenz"));
+        }
    }
 }
--- a/Tests/Thesaurus/TestThesaurus.cs
+++ b/Tests/Thesaurus/TestThesaurus.cs
@@ -2,7 +2,7 @@
 * {{
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/Thesaurus/ThesaurusTest.cs
+++ b/Tests/Thesaurus/ThesaurusTest.cs
@@ -1,7 +1,7 @@
 /* Class1.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/ElementPickerViewModelTest.cs
+++ b/Tests/ViewModels/ElementPickerViewModelTest.cs
@@ -1,7 +1,7 @@
 /* ElementPickerViewModelTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/ItemCommentViewModelTest.cs
+++ b/Tests/ViewModels/ItemCommentViewModelTest.cs
@@ -1,7 +1,7 @@
 /* ItemCommentViewModelTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/SettingsRepositoryViewModelTest.cs
+++ b/Tests/ViewModels/SettingsRepositoryViewModelTest.cs
@@ -1,7 +1,7 @@
 /* SettingsRepositoryViewModel.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Tests/ViewModels/SettingsViewModelTest.cs
+++ b/Tests/ViewModels/SettingsViewModelTest.cs
@@ -1,7 +1,7 @@
 /* SettingsViewModelTest.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@@ -1,4 +1,4 @@
-2.4.0
+2.4.2
 https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
-e84d6b542c14220965c61beb9406a5500fe3d6e9d7ee6137e15bb13d337808d6  deploy/releases/zaaReloaded-2.4.0.exe
+2df8d1cd62b2a6b422099e6d59c8f2022ddd2177a649784a7cab8f7c23e734e2  deploy/releases/zaaReloaded-2.4.2.exe

--- a/zaaReloaded2.sln
+++ b/zaaReloaded2.sln
@@ -1,17 +1,17 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zaaReloaded2", "zaaReloaded2\zaaReloaded2.csproj", "{0478F1B0-17F2-4151-8F93-1CB6EB9732C5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{529544E3-3C26-4688-B39D-04DA30F05E20}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{386B2FA0-E39A-4BC4-930F-0BCF3787DC5E}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zaaReloaded2", "zaaReloaded2\zaaReloaded2.csproj", "{0478F1B0-17F2-4151-8F93-1CB6EB9732C5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{529544E3-3C26-4688-B39D-04DA30F05E20}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,4 +30,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5B5D2F0E-2C7D-4710-85CA-D9F2960DC07A}
+	EndGlobalSection
 EndGlobal
--- a/zaaReloaded2/Commands.cs
+++ b/zaaReloaded2/Commands.cs
@@ -2,7 +2,7 @@
 /* Commands.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Comments/CommentPool.cs
+++ b/zaaReloaded2/Controller/Comments/CommentPool.cs
@@ -1,7 +1,7 @@
 /* CommentPool.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Comments/ItemComment.cs
+++ b/zaaReloaded2/Controller/Comments/ItemComment.cs
@@ -1,7 +1,7 @@
 /* ParameterComment.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Comments/ItemCommentEventArgs.cs
+++ b/zaaReloaded2/Controller/Comments/ItemCommentEventArgs.cs
@@ -1,7 +1,7 @@
 /* ParameterCommentEventArgs.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/ControlElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/ControlElementBase.cs
@@ -2,7 +2,7 @@
 /* ControlElementBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/CustomText.cs
+++ b/zaaReloaded2/Controller/Elements/CustomText.cs
@@ -1,7 +1,7 @@
 /* Text.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/ElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/ElementBase.cs
@@ -1,7 +1,7 @@
 /* ElementBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/FormatElementBase.cs
+++ b/zaaReloaded2/Controller/Elements/FormatElementBase.cs
@@ -1,7 +1,7 @@
 /* FormatElementBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/Items.cs
+++ b/zaaReloaded2/Controller/Elements/Items.cs
@@ -1,7 +1,7 @@
 /* Items.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/NextColumn.cs
+++ b/zaaReloaded2/Controller/Elements/NextColumn.cs
@@ -1,7 +1,7 @@
 /* NextColumn.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/SelectEachDay.cs
+++ b/zaaReloaded2/Controller/Elements/SelectEachDay.cs
@@ -1,7 +1,7 @@
 /* SelectEachDay.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/SelectFirstDay.cs
+++ b/zaaReloaded2/Controller/Elements/SelectFirstDay.cs
@@ -1,7 +1,7 @@
 /* SelectFirstDay.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/SelectLastDay.cs
+++ b/zaaReloaded2/Controller/Elements/SelectLastDay.cs
@@ -1,7 +1,7 @@
 /* SelectFirstDay - Copy.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Elements/TwoColumns.cs
+++ b/zaaReloaded2/Controller/Elements/TwoColumns.cs
@@ -1,7 +1,7 @@
 /* TwoColumns.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Controller/Settings.cs
+++ b/zaaReloaded2/Controller/Settings.cs
@@ -1,7 +1,7 @@
 /* Settings.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -66,7 +66,9 @@ namespace zaaReloaded2.Controller
            {
                throw new InvalidDataException("Datei enthält keine Stil-Daten oder ist beschädigt.");
            }
+            Logger.Info("LoadFromFile: Successfully loaded '{0}", settings.Name);
            settings.Uid = Guid.NewGuid();
+            Logger.Debug("LoadFromFile: new GUID is '{0}", settings.Uid);
            return settings;
        }

@@ -76,14 +78,15 @@ namespace zaaReloaded2.Controller
        /// <param name="fileName">File to write to.</param>
        public void SaveToFile(string fileName)
        {
-            Logger.Info("SaveToFile: {0}", fileName);
+            Logger.Info("SaveToFile: Settings name: {0}", Name);
            using (StreamWriter writer = new StreamWriter(fileName))
            {
                Serializer serializer = new SerializerBuilder()
-                    //.EnsureRoundtrip()
+                    .EnsureRoundtrip()
                    .Build();
                serializer.Serialize(writer, this);
            }
+            Logger.Info("SaveToFile: Successfully saved to file '{0}'", fileName);
            // SoapFormatter formatter = new SoapFormatter();
            // formatter.Serialize(writer.BaseStream, this);
        }
--- a/zaaReloaded2/Controller/SettingsRepository.cs
+++ b/zaaReloaded2/Controller/SettingsRepository.cs
@@ -1,7 +1,7 @@
 /* SettingsRepository.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Defaults/clinic.zaaReloaded2
+++ b/zaaReloaded2/Defaults/clinic.zaaReloaded2
@@ -48,4 +48,6 @@ Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements
    Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
  - !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
    Content: 'Autoantikörper: ANCA (IF) 1: (Ref. < 1:40), MPO-ANCA (ELISA) IU/ml (Ref. < 9), PR3-ANCA (ELISA) IU/ml (Ref. < 3,5), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
-Uid: 99b44ee9-2858-4651-84ad-eb7980832352
+  - !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
+    Content: 'MSU: MSU-Keim, MSU-Multiresistenz'
+Uid: 581d378c-8f7a-4a1c-8490-36e257770a09
--- a/zaaReloaded2/Defaults/parameters.txt
+++ b/zaaReloaded2/Defaults/parameters.txt
@@ -1,7 +1,9 @@
-# LAURIS-NAME                      "KANONISCHER NAME"   MATERIAL   DEZIMALSTELLEN   "IMMER REFERENZBEREICH"   "BLACKLIST"
-# ===========                      ==================   ========   ==============   =======================   ===========
+# LAURIS-NAME                      "KANONISCHER NAME"   MATERIAL   DEZIMALSTELLEN   "IMMER REFERENZBEREICH"   "BLACKLIST"  "NO-LABEL"
+# ===========                      ==================   ========   ==============   =======================   ===========  ==========
+"- Multiresistenz"                 Multiresistenz       MSU        ---              ---                       ---          X
 "a1-Microglobulin (SU)"            a1-Microglobulin     SU
 "a1-Microglobulin (SU)/die"        a1-Microglobulin     SU
+"Aerobe Kultur"                    Keim                 MSU        ---              ---                       ---          X
 "AFP  (ECL, Elecsys, Roche)"       AFP                  S          ---              X
 "aktuelles Bicarbonat"             Bic                  BGA
 Albumin                            Alb                  S
@@ -132,6 +134,7 @@ Transferrin                        Transferrin          S
 TSH                                TSH                  S
 "Übergangsepithelien (U)"          Übergangsep.         U
 "Unreife Granulozyten"             Gran                 E
+"Untersuchungsmaterial"            Material             MSU
 "Urobilinogen (U)"                 Urobilinogen         U
 "Vitamin B12"                      B12                  S          ---              X
 # vim: tw=160 et nowrap fo-=t
--- a/zaaReloaded2/Demo/Demo.cs
+++ b/zaaReloaded2/Demo/Demo.cs
@@ -1,7 +1,7 @@
 /* Demo.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Demo/Demo.docx
+++ b/zaaReloaded2/Demo/Demo.docx
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs
@@ -1,7 +1,7 @@
 /* ExceptionDetailView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs
@@ -1,7 +1,7 @@
 /* ExceptionView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs
+++ b/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs
@@ -1,7 +1,7 @@
 /* ExceptionViewModel.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs
@@ -1,7 +1,7 @@
 /* SubmissionCompletedAction.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs
@@ -1,7 +1,7 @@
 /* SubmissionFailureView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs
@@ -1,7 +1,7 @@
 /* SubmissionProcessAction.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs
@@ -1,7 +1,7 @@
 /* SubmissionProcessView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs
@@ -1,7 +1,7 @@
 /* SubmissionSuccessView.xaml.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/AbnormalStyle.cs
+++ b/zaaReloaded2/Formatter/AbnormalStyle.cs
@@ -1,7 +1,7 @@
 /* AbnormalStyle.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/DanielsStyle.cs
+++ b/zaaReloaded2/Formatter/DanielsStyle.cs
@@ -1,7 +1,7 @@
 /* DanielsStyle.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/DocumentWriter.cs
+++ b/zaaReloaded2/Formatter/DocumentWriter.cs
@@ -1,7 +1,7 @@
 /* DocumentWriter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/Formatter.cs
+++ b/zaaReloaded2/Formatter/Formatter.cs
@@ -1,7 +1,7 @@
 /* Formatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/IItemFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/IItemFormatterDictionary.cs
@@ -1,7 +1,7 @@
 /* IItemFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/ITimePointFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/ITimePointFormatterDictionary.cs
@@ -1,7 +1,7 @@
 /* ITimePointFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/ItemFormatter.cs
+++ b/zaaReloaded2/Formatter/ItemFormatter.cs
@@ -1,7 +1,7 @@
 /* ItemFormatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -76,6 +76,11 @@ namespace zaaReloaded2.Formatter
        /// </summary>
        public bool IsBlacklisted { get { return LabItem.IsBlacklisted;  } }

+        /// <summary>
+        /// Gets whether the Item is marked to suppress its label in the thesaurus.
+        /// </summary>
+        public bool SuppressLabel { get { return LabItem.SuppressLabel; } }
+
        /// <summary>
        /// Gets or sets the item's comment.
        /// </summary>
@@ -194,12 +199,20 @@ namespace zaaReloaded2.Formatter
                if (comment != String.Empty) comment = " " + comment;
            }

-            string name = IncludeMaterial ? LabItem.QualifiedName : LabItem.Name;
+            string name;
+            if (LabItem.SuppressLabel)
+	        {
+                name = String.Empty;
+	        }
+            else
+            {
+                name = (IncludeMaterial ? LabItem.QualifiedName : LabItem.Name) + " ";
+            }


-            string output =
+            string output = 
                String.Format(
-                    "{0} {1}{2}{3}{4}",
+                    "{0}{1}{2}{3}{4}",
                    name,
                    value,
                    unit,
--- a/zaaReloaded2/Formatter/ItemFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/ItemFormatterDictionary.cs
@@ -1,7 +1,7 @@
 /* ItemFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/NoLaboratoryDataException.cs
+++ b/zaaReloaded2/Formatter/NoLaboratoryDataException.cs
@@ -1,7 +1,7 @@
 /* NoLaboratoryDataException.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/ReferenceStyle.cs
+++ b/zaaReloaded2/Formatter/ReferenceStyle.cs
@@ -1,7 +1,7 @@
 /* ReferenceStyle.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/TimePointFormatter.cs
+++ b/zaaReloaded2/Formatter/TimePointFormatter.cs
@@ -1,7 +1,7 @@
 /* TimePointFormatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Formatter/TimePointFormatterDictionary.cs
+++ b/zaaReloaded2/Formatter/TimePointFormatterDictionary.cs
@@ -1,7 +1,7 @@
 /* TimePointFormatterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Helpers.cs
+++ b/zaaReloaded2/Helpers.cs
@@ -1,7 +1,7 @@
 /* Helpers.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Importer/AutoDetector.cs
+++ b/zaaReloaded2/Importer/AutoDetector.cs
@@ -2,7 +2,7 @@
 /* AutoDetect.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -175,15 +175,15 @@ namespace zaaReloaded2.Importer
            string text = paragraph.Range.Text;
            bool isCinicTimePoint = ClinicTimePoint.IsTimeStampLine(text);
            bool isZaaTimePoint = LaurisTimePoint.IsTimeStampLine(text);
-            // If the line is a ZAA time point, but not a clinic timepoint, we can deduct that
-            // the lab mode *must* be ZAA, because it will be a line in the form
-            // "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not
-            // occur in the clinic format.
-            if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint)
-            {
-                Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA");
-                ImportMode = ImportMode.Zaa;
-            }
+            // // If the line is a ZAA time point, but not a clinic timepoint, we can deduct that
+            // // the lab mode *must* be ZAA, because it will be a line in the form
+            // // "(17.09.2015-201810:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not
+            // // occur in the clinic format.
+            // if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint)
+            // {
+            //     Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA");
+            //     ImportMode = ImportMode.Zaa;
+            // }
            return isCinicTimePoint || isZaaTimePoint;
        }

--- a/zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs
+++ b/zaaReloaded2/Importer/ClinicImporter/ClinicLine.cs
@@ -121,7 +121,9 @@ namespace zaaReloaded2.Importer.ClinicImporter

        #region Fields

-        static readonly Regex _expectedFormat = new Regex(@"\t(?<item>[^:]+:(\t([^\t]+)?){3})");
+        // Microbiology report has different format, gets special treatment
+        // static readonly Regex _expectedFormat = new Regex(@"^\t(?<item>[^:]+:(\t([^\t]+)?){3})|\t(?<item>(- Multiresistenz|Aerobe Kultur|Befundstatus Auftrag|Negatives Kulturergebnis|Untersuchungsmaterial:|Wachstum):(\t([^\t]+)))");
+        static readonly Regex _expectedFormat = new Regex(@"^\t(?<item>[^:]+:{1,2}(\t([^\t]+)?){1,3})");
        Thesaurus.Parameters _parameterDictionary;
        Thesaurus.Units _unitDictionary;

--- a/zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs
+++ b/zaaReloaded2/Importer/ClinicImporter/ClinicTimePoint.cs
@@ -240,7 +240,7 @@ namespace zaaReloaded2.Importer.ClinicImporter
        /// paragraph of a LaurisText.
        /// </summary>
        static readonly Regex _timeStampRegex = new Regex(
-            @"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00)?\)\s*$");
+            @"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00)?\)");
        IList<String> _lines;
        Parameters _parameterDictionary;
        Units _unitDictionary;
--- a/zaaReloaded2/Importer/IImporter.cs
+++ b/zaaReloaded2/Importer/IImporter.cs
@@ -1,7 +1,7 @@
 /* IImporter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/LaurisItem.cs
@@ -1,7 +1,7 @@
 /* LabItem.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ namespace zaaReloaded2.Importer.ZaaImporter
                Name = parameterDictionary.GetCanonicalName(OriginalName);
                AlwaysPrintLimits = parameterDictionary.GetForceReferenceDisplay(OriginalName);
                IsBlacklisted = parameterDictionary.GetIsBlacklisted(OriginalName);
+                SuppressLabel = parameterDictionary.GetSuppressLabel(OriginalName);
                Material = parameterDictionary.GetMaterial(OriginalName, Material);
                PreferredPrecision = parameterDictionary.GetPrecision(OriginalName);
            }
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisParagraph.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/LaurisParagraph.cs
@@ -1,7 +1,7 @@
 /* LaurisParagraph.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Importer/ZaaImporter/LaurisTimePoint.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/LaurisTimePoint.cs
@@ -1,7 +1,7 @@
 /* LaurisTimePoint.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -214,7 +214,7 @@ 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-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
+                // "(17.09.2015-201810: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)
--- a/zaaReloaded2/Importer/ZaaImporter/ZaaImporter.cs
+++ b/zaaReloaded2/Importer/ZaaImporter/ZaaImporter.cs
@@ -1,7 +1,7 @@
 /* ZaaImporter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/IItemDictionary.cs
+++ b/zaaReloaded2/LabModel/IItemDictionary.cs
@@ -1,7 +1,7 @@
 /* ItemDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/ITimePointsDictionary.cs
+++ b/zaaReloaded2/LabModel/ITimePointsDictionary.cs
@@ -1,7 +1,7 @@
 /* ITimePointsDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/ItemDictionary.cs
+++ b/zaaReloaded2/LabModel/ItemDictionary.cs
@@ -1,7 +1,7 @@
 /* ItemDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/LabItem.cs
+++ b/zaaReloaded2/LabModel/LabItem.cs
@@ -1,7 +1,7 @@
 /* LabItem.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -230,6 +230,11 @@ namespace zaaReloaded2.LabModel
        /// </summary>
        public bool IsBlacklisted { get; protected set; }

+        /// <summary>
+        /// Gets whether the item's label should be suppressed.
+        /// </summary>
+        public bool SuppressLabel { get; protected set; }
+
        #endregion

        #region Constructors
--- a/zaaReloaded2/LabModel/Laboratory.cs
+++ b/zaaReloaded2/LabModel/Laboratory.cs
@@ -1,7 +1,7 @@
 /* Laboratory.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/Material.cs
+++ b/zaaReloaded2/LabModel/Material.cs
@@ -1,7 +1,7 @@
 /* Materials.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -43,6 +43,9 @@ namespace zaaReloaded2.LabModel
        [Description("Sammelurin")]
        /// Collected urine
        SU,
+        [Description("Mittelstrahlurin")]
+        /// Collected urine
+        MSU,
    }

    /// <summary>
--- a/zaaReloaded2/LabModel/TimePoint.cs
+++ b/zaaReloaded2/LabModel/TimePoint.cs
@@ -1,7 +1,7 @@
 /* TimePoint.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LabModel/TimePointsDictionary.cs
+++ b/zaaReloaded2/LabModel/TimePointsDictionary.cs
@@ -1,7 +1,7 @@
 /* TimePointsDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/LogFile.cs
+++ b/zaaReloaded2/LogFile.cs
@@ -1,7 +1,7 @@
 /* LogFile.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Medication/Formatter.cs
+++ b/zaaReloaded2/Medication/Formatter.cs
@@ -2,7 +2,7 @@
 /* Formatter.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Medication/Importer.cs
+++ b/zaaReloaded2/Medication/Importer.cs
@@ -2,7 +2,7 @@
 /* Importer.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Medication/Prescription.cs
+++ b/zaaReloaded2/Medication/Prescription.cs
@@ -1,7 +1,7 @@
 /* Prescription.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Properties/AssemblyInfo.cs
+++ b/zaaReloaded2/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@ using System.Security;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Daniel Kraus")]
 [assembly: AssemblyProduct("zaaReloaded2")]
-[assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015")]
+[assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015-2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")]
--- a/zaaReloaded2/Properties/Resources.Designer.cs
+++ b/zaaReloaded2/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,6 +9,7 @@
 //------------------------------------------------------------------------------

 namespace zaaReloaded2.Properties {
+    using System;
    
    
    /// <summary>
@@ -18,7 +19,7 @@ namespace zaaReloaded2.Properties {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/zaaReloaded2/Properties/Settings.Designer.cs
+++ b/zaaReloaded2/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace zaaReloaded2.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/zaaReloaded2/Properties/Settings.settings
+++ b/zaaReloaded2/Properties/Settings.settings
@@ -6,7 +6,7 @@
      <Value Profile="(Default)">zaaReloaded2</Value>
    </Setting>
    <Setting Name="PubYear" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">2017</Value>
+      <Value Profile="(Default)">2018</Value>
    </Setting>
    <Setting Name="Authors" Type="System.String" Scope="Application">
      <Value Profile="(Default)">Daniel Kraus</Value>
@@ -72,4 +72,4 @@
      <Value Profile="(Default)">settings.yml</Value>
    </Setting>
  </Settings>
-</SettingsFile>
+</SettingsFile>
--- a/zaaReloaded2/Ribbon.cs
+++ b/zaaReloaded2/Ribbon.cs
@@ -1,7 +1,7 @@
 /* Ribbon.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Ribbon.xml
+++ b/zaaReloaded2/Ribbon.xml
@@ -4,7 +4,7 @@
 	Ribbon.xml
 	part of zaaReloaded2
 	
-	Copyright 2015-2017 Daniel Kraus
+	Copyright 2015-2018 Daniel Kraus
 	
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 					<button id="zrlFormatLab" label="Formatieren" image="f.png" onAction="Ribbon_Click" size="large"
 					  supertip="Formatiert den ausgewählten Bereich mit dem zuletzt verwendeten Stil."
 					  getEnabled="CanFormat" />
-					<button id="zrlSettings" label="Stilauswahl" image="fff.png" onAction="Ribbon_Click" size="large"
+					<button id="zrlSettings" label="Stile verwalten" image="fff.png" onAction="Ribbon_Click" size="large"
 					  supertip="Zeigt eine Liste vorhandener Stile an. Stile können bearbeitet, hinzugefügt, gelöscht werden." />
 				</group>
 				<group id="zrlGroupDrugs" label="Medikamente">
--- a/zaaReloaded2/Thesaurus/LineParser.cs
+++ b/zaaReloaded2/Thesaurus/LineParser.cs
@@ -1,7 +1,7 @@
 /* LineParser.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Thesaurus/Parameters.cs
+++ b/zaaReloaded2/Thesaurus/Parameters.cs
@@ -1,7 +1,7 @@
 /* ParameterDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -126,6 +126,19 @@ namespace zaaReloaded2.Thesaurus
        {
            return LookUpValue(laurisName, 5, false);
        }
+
+        /// <summary>
+        /// Checks whether an item's label should be suppressed or not.
+        /// </summary>
+        /// <param name="laurisName">Laboratory item to lok up;
+        /// this must be an original Lauris string.</param>
+        /// <returns>True if the item should *not* be labelled,
+        /// false if not. Default is false (i.e., labels are .</returns>
+        public bool GetSuppressLabel(string laurisName)
+        {
+            return LookUpValue(laurisName, 6, false);
+        }
+
        #endregion

        #region Overrides
--- a/zaaReloaded2/Thesaurus/ThesaurusBase.cs
+++ b/zaaReloaded2/Thesaurus/ThesaurusBase.cs
@@ -1,7 +1,7 @@
 /* DictionaryBase.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/zaaReloaded2/Thesaurus/Units.cs
+++ b/zaaReloaded2/Thesaurus/Units.cs
@@ -1,7 +1,7 @@
 /* UnitDictionary.cs
 * part of zaaReloaded2
 * 
- * Copyright 2015-2017 Daniel Kraus
+ * Copyright 2015-2018 Daniel Kraus
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Kraus	511ed8eed3	Update copyright year.	2018-09-16 14:07:54 +02:00
Daniel Kraus	8c7065d995	Update publication year to 2018.	2018-02-13 09:28:44 +01:00
Daniel Kraus	9ff2d56674	Upgrade solution to Visual Studio 2017.	2018-02-13 09:15:17 +01:00
Daniel Kraus	3daf007b37	Merge branch 'release-2.4.2' into develop	2017-09-29 06:14:11 +02:00
Daniel Kraus	bc041d4288	Prepare release 2.4.2.	2017-09-29 06:13:29 +02:00
Daniel Kraus	de9d6b3095	Upate default clinic style to include MSU. - Verbessert: Der Standard-Ambulanzstil gibt jetzt auch den MSU-Befund mit aus (sofern vorhanden).	2017-09-29 06:10:47 +02:00
Daniel Kraus	b7cda4c9a7	Accept clinic-system time stamps with lab data. - Geändert: Wenn das Laborsystem Zeitstempel ausgibt, die in derselben Zeile auch noch einen Laborwert enthalten, wird das jetzt korrekt erkannt.	2017-09-29 06:07:36 +02:00
Daniel Kraus	24dc95f7a8	Upload symlinked files into downloads dir as well.	2017-09-28 11:24:11 +02:00
Daniel Kraus	1a49eb18e1	Fix settings repository UI. - Verbessert: Benutzer-Interface der Stile-Verwaltung.	2017-09-22 17:29:59 +02:00
Daniel Kraus	253a7f24f5	Fix importing of styles. - Repariert: Stile konnten nicht importiert werden.	2017-09-22 17:03:32 +02:00
Daniel Kraus	4c3198afce	Add ability to suppress an item's label. - Verbessert: Für bestimmte Parameter kann die Beschriftung unterdrückt werden (derzeit implementiert im Urin-Hygienebefund, wo "Keim" und "Multiresistenz" nicht mit ausgegeben werden, sondern nur z.B. "E. coli, 3MRGN" bei entsprechender Vorlage "MSU-Keim, MSU-Multiresistenz").	2017-09-22 11:48:40 +02:00
Daniel Kraus	13832fa833	Merge branch 'release-2.4.1' into develop	2017-09-21 21:46:48 +02:00
Daniel Kraus	2b102bb157	Prepare release 2.4.1.	2017-09-21 21:46:13 +02:00
Daniel Kraus	a2346aedf4	Fix lab detection for urine microbiology. - Verbessert: Ambulanzausgabe von Hygienebefunden wird jetzt korrekt erkannt. - Neu: Parameter für Hygienebefunde hinzugefügt ("MSU-Keim" und "MSU-Multiresistenz").	2017-09-21 21:42:52 +02:00
Daniel Kraus	a6b6966c77	Merge branch 'release-2.4.0' into develop	2017-09-18 22:12:17 +02:00