Compare commits

..
15 Commits
Author SHA1 Message Date
daniel 511ed8eed3 Update copyright year. 2018-09-16 14:07:54 +02:00
daniel 8c7065d995 Update publication year to 2018. 2018-02-13 09:28:44 +01:00
daniel 9ff2d56674 Upgrade solution to Visual Studio 2017. 2018-02-13 09:15:17 +01:00
daniel 3daf007b37 Merge branch 'release-2.4.2' into develop 2017-09-29 06:14:11 +02:00
daniel bc041d4288 Prepare release 2.4.2. 2017-09-29 06:13:29 +02:00
daniel 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 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 24dc95f7a8 Upload symlinked files into downloads dir as well. 2017-09-28 11:24:11 +02:00
daniel 1a49eb18e1 Fix settings repository UI.
- Verbessert: Benutzer-Interface der Stile-Verwaltung.
2017-09-22 17:29:59 +02:00
daniel 253a7f24f5 Fix importing of styles.
- Repariert: Stile konnten nicht importiert werden.
2017-09-22 17:03:32 +02:00
daniel 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 13832fa833 Merge branch 'release-2.4.1' into develop 2017-09-21 21:46:48 +02:00
daniel 2b102bb157 Prepare release 2.4.1. 2017-09-21 21:46:13 +02:00
daniel 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 a6b6966c77 Merge branch 'release-2.4.0' into develop 2017-09-18 22:12:17 +02:00
132 changed files with 328 additions and 204 deletions

No files matched your search

+2
View File
@@ -27,3 +27,5 @@ doc/
private/ private/
*.nupkg *.nupkg
doxygen_sqlite3.db doxygen_sqlite3.db
Backup/
.vs/
+21
View File
@@ -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) Version 2.4.0 (2017-09-18)
------------------------------------------------------------------------ ------------------------------------------------------------------------
+1 -1
View File
@@ -23,7 +23,7 @@ versioninfo:
mv www/versioninfo.tmp www/versioninfo.txt mv www/versioninfo.tmp www/versioninfo.txt
upload: 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: website:
rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/ rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/
+1 -1
View File
@@ -1,7 +1,7 @@
/* CommentPoolTest.cs /* CommentPoolTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ItemCommentTest.cs /* ItemCommentTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* CloneTest.cs /* CloneTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ItemsTest.cs /* ItemsTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* SettingsRepositoryTest.cs /* SettingsRepositoryTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* SettingsTest.cs /* SettingsTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* DocumentWriterClass.cs /* DocumentWriterClass.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+3 -3
View File
@@ -1,7 +1,7 @@
/* FormatterTest.cs /* FormatterTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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(); ZaaImporter importer = new ZaaImporter();
importer.Import( 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(); Document document = new Document();
f.Formatter formatter = new f.Formatter(document); f.Formatter formatter = new f.Formatter(document);
formatter.Laboratory = importer.Laboratory; formatter.Laboratory = importer.Laboratory;
@@ -131,7 +131,7 @@ namespace Tests.Formatter
new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") }); new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") });
formatter.Run(); formatter.Run();
Assert.AreEqual( 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); document.Range().Text);
} }
+1 -1
View File
@@ -1,7 +1,7 @@
/* LaurisItemTest.cs /* LaurisItemTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* LaurisParagraphTest.cs /* LaurisParagraphTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* LaurisTimePointTest.cs /* LaurisTimePointTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ZaaImporterTest.cs /* ZaaImporterTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* UnitTest1.cs /* UnitTest1.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ImporterTest.cs /* ImporterTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* PrescriptionTest.cs /* PrescriptionTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* SelectFirstDayTest.cs /* SelectFirstDayTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* TestHelpers.cs /* TestHelpers.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+7 -1
View File
@@ -1,7 +1,7 @@
/* ParametersTest.cs /* ParametersTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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)")); Assert.IsTrue(Parameters.Default.GetIsBlacklisted("glomerul. Filtrationsr. (MDRD)"));
} }
[Test]
public void GetSuppressLabel()
{
Assert.IsTrue(Parameters.Default.GetSuppressLabel("- Multiresistenz"));
}
} }
} }
+1 -1
View File
@@ -2,7 +2,7 @@
* {{ * {{
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* Class1.cs /* Class1.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ElementPickerViewModelTest.cs /* ElementPickerViewModelTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ItemCommentViewModelTest.cs /* ItemCommentViewModelTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SettingsRepositoryViewModel.cs /* SettingsRepositoryViewModel.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* SettingsViewModelTest.cs /* SettingsViewModelTest.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+2 -2
View File
@@ -1,4 +1,4 @@
2.4.0 2.4.2
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
e84d6b542c14220965c61beb9406a5500fe3d6e9d7ee6137e15bb13d337808d6 deploy/releases/zaaReloaded-2.4.0.exe 2df8d1cd62b2a6b422099e6d59c8f2022ddd2177a649784a7cab8f7c23e734e2 deploy/releases/zaaReloaded-2.4.2.exe
+9 -6
View File
@@ -1,17 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013 # Visual Studio 15
VisualStudioVersion = 12.0.40629.0 VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1 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}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{386B2FA0-E39A-4BC4-930F-0BCF3787DC5E}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.nuget\packages.config = .nuget\packages.config .nuget\packages.config = .nuget\packages.config
EndProjectSection EndProjectSection
EndProject 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 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -30,4 +30,7 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5B5D2F0E-2C7D-4710-85CA-D9F2960DC07A}
EndGlobalSection
EndGlobal EndGlobal
+1 -1
View File
@@ -2,7 +2,7 @@
/* Commands.cs /* Commands.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* CommentPool.cs /* CommentPool.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ParameterComment.cs /* ParameterComment.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ParameterCommentEventArgs.cs /* ParameterCommentEventArgs.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -2,7 +2,7 @@
/* ControlElementBase.cs /* ControlElementBase.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* Text.cs /* Text.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ElementBase.cs /* ElementBase.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* FormatElementBase.cs /* FormatElementBase.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* Items.cs /* Items.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* NextColumn.cs /* NextColumn.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SelectEachDay.cs /* SelectEachDay.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SelectFirstDay.cs /* SelectFirstDay.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SelectFirstDay - Copy.cs /* SelectFirstDay - Copy.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* TwoColumns.cs /* TwoColumns.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+6 -3
View File
@@ -1,7 +1,7 @@
/* Settings.cs /* Settings.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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."); 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(); settings.Uid = Guid.NewGuid();
Logger.Debug("LoadFromFile: new GUID is '{0}", settings.Uid);
return settings; return settings;
} }
@@ -76,14 +78,15 @@ namespace zaaReloaded2.Controller
/// <param name="fileName">File to write to.</param> /// <param name="fileName">File to write to.</param>
public void SaveToFile(string fileName) public void SaveToFile(string fileName)
{ {
Logger.Info("SaveToFile: {0}", fileName); Logger.Info("SaveToFile: Settings name: {0}", Name);
using (StreamWriter writer = new StreamWriter(fileName)) using (StreamWriter writer = new StreamWriter(fileName))
{ {
Serializer serializer = new SerializerBuilder() Serializer serializer = new SerializerBuilder()
//.EnsureRoundtrip() .EnsureRoundtrip()
.Build(); .Build();
serializer.Serialize(writer, this); serializer.Serialize(writer, this);
} }
Logger.Info("SaveToFile: Successfully saved to file '{0}'", fileName);
// SoapFormatter formatter = new SoapFormatter(); // SoapFormatter formatter = new SoapFormatter();
// formatter.Serialize(writer.BaseStream, this); // formatter.Serialize(writer.BaseStream, this);
} }
@@ -1,7 +1,7 @@
/* SettingsRepository.cs /* SettingsRepository.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+3 -1
View File
@@ -48,4 +48,6 @@ Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements
Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR' Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383 - !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)' 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
+5 -2
View File
@@ -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)" a1-Microglobulin SU
"a1-Microglobulin (SU)/die" a1-Microglobulin SU "a1-Microglobulin (SU)/die" a1-Microglobulin SU
"Aerobe Kultur" Keim MSU --- --- --- X
"AFP (ECL, Elecsys, Roche)" AFP S --- X "AFP (ECL, Elecsys, Roche)" AFP S --- X
"aktuelles Bicarbonat" Bic BGA "aktuelles Bicarbonat" Bic BGA
Albumin Alb S Albumin Alb S
@@ -132,6 +134,7 @@ Transferrin Transferrin S
TSH TSH S TSH TSH S
"Übergangsepithelien (U)" Übergangsep. U "Übergangsepithelien (U)" Übergangsep. U
"Unreife Granulozyten" Gran E "Unreife Granulozyten" Gran E
"Untersuchungsmaterial" Material MSU
"Urobilinogen (U)" Urobilinogen U "Urobilinogen (U)" Urobilinogen U
"Vitamin B12" B12 S --- X "Vitamin B12" B12 S --- X
# vim: tw=160 et nowrap fo-=t # vim: tw=160 et nowrap fo-=t
+1 -1
View File
@@ -1,7 +1,7 @@
/* Demo.cs /* Demo.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
Binary file not shown.
@@ -1,7 +1,7 @@
/* ExceptionDetailView.xaml.cs /* ExceptionDetailView.xaml.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ExceptionView.xaml.cs /* ExceptionView.xaml.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ExceptionViewModel.cs /* ExceptionViewModel.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SubmissionCompletedAction.cs /* SubmissionCompletedAction.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SubmissionFailureView.xaml.cs /* SubmissionFailureView.xaml.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SubmissionProcessAction.cs /* SubmissionProcessAction.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SubmissionProcessView.xaml.cs /* SubmissionProcessView.xaml.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* SubmissionSuccessView.xaml.cs /* SubmissionSuccessView.xaml.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* AbnormalStyle.cs /* AbnormalStyle.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* DanielsStyle.cs /* DanielsStyle.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* DocumentWriter.cs /* DocumentWriter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* Formatter.cs /* Formatter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* IItemFormatterDictionary.cs /* IItemFormatterDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ITimePointFormatterDictionary.cs /* ITimePointFormatterDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+17 -4
View File
@@ -1,7 +1,7 @@
/* ItemFormatter.cs /* ItemFormatter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -76,6 +76,11 @@ namespace zaaReloaded2.Formatter
/// </summary> /// </summary>
public bool IsBlacklisted { get { return LabItem.IsBlacklisted; } } 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> /// <summary>
/// Gets or sets the item's comment. /// Gets or sets the item's comment.
/// </summary> /// </summary>
@@ -194,12 +199,20 @@ namespace zaaReloaded2.Formatter
if (comment != String.Empty) comment = " " + comment; 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( String.Format(
"{0} {1}{2}{3}{4}", "{0}{1}{2}{3}{4}",
name, name,
value, value,
unit, unit,
@@ -1,7 +1,7 @@
/* ItemFormatterDictionary.cs /* ItemFormatterDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* NoLaboratoryDataException.cs /* NoLaboratoryDataException.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ReferenceStyle.cs /* ReferenceStyle.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* TimePointFormatter.cs /* TimePointFormatter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* TimePointFormatterDictionary.cs /* TimePointFormatterDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* Helpers.cs /* Helpers.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+10 -10
View File
@@ -2,7 +2,7 @@
/* AutoDetect.cs /* AutoDetect.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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; string text = paragraph.Range.Text;
bool isCinicTimePoint = ClinicTimePoint.IsTimeStampLine(text); bool isCinicTimePoint = ClinicTimePoint.IsTimeStampLine(text);
bool isZaaTimePoint = LaurisTimePoint.IsTimeStampLine(text); bool isZaaTimePoint = LaurisTimePoint.IsTimeStampLine(text);
// If the line is a ZAA time point, but not a clinic timepoint, we can deduct that // // 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 // // 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 // // "(17.09.2015-201810:44:00) Cyclosporin-A vor Gabe: 130 µg/l;" which does not
// occur in the clinic format. // // occur in the clinic format.
if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint) // if ((ImportMode == ImportMode.Undefined) && isZaaTimePoint && !isCinicTimePoint)
{ // {
Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA"); // Logger.Info("IsTimeStampParagraph: Found ZAA time stamp, setting mode to ZAA");
ImportMode = ImportMode.Zaa; // ImportMode = ImportMode.Zaa;
} // }
return isCinicTimePoint || isZaaTimePoint; return isCinicTimePoint || isZaaTimePoint;
} }
@@ -121,7 +121,9 @@ namespace zaaReloaded2.Importer.ClinicImporter
#region Fields #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.Parameters _parameterDictionary;
Thesaurus.Units _unitDictionary; Thesaurus.Units _unitDictionary;
@@ -240,7 +240,7 @@ namespace zaaReloaded2.Importer.ClinicImporter
/// paragraph of a LaurisText. /// paragraph of a LaurisText.
/// </summary> /// </summary>
static readonly Regex _timeStampRegex = new Regex( 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; IList<String> _lines;
Parameters _parameterDictionary; Parameters _parameterDictionary;
Units _unitDictionary; Units _unitDictionary;
+1 -1
View File
@@ -1,7 +1,7 @@
/* IImporter.cs /* IImporter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* LabItem.cs /* LabItem.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); Name = parameterDictionary.GetCanonicalName(OriginalName);
AlwaysPrintLimits = parameterDictionary.GetForceReferenceDisplay(OriginalName); AlwaysPrintLimits = parameterDictionary.GetForceReferenceDisplay(OriginalName);
IsBlacklisted = parameterDictionary.GetIsBlacklisted(OriginalName); IsBlacklisted = parameterDictionary.GetIsBlacklisted(OriginalName);
SuppressLabel = parameterDictionary.GetSuppressLabel(OriginalName);
Material = parameterDictionary.GetMaterial(OriginalName, Material); Material = parameterDictionary.GetMaterial(OriginalName, Material);
PreferredPrecision = parameterDictionary.GetPrecision(OriginalName); PreferredPrecision = parameterDictionary.GetPrecision(OriginalName);
} }
@@ -1,7 +1,7 @@
/* LaurisParagraph.cs /* LaurisParagraph.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* LaurisTimePoint.cs /* LaurisTimePoint.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 // Put the remainder of the line back to the
// 'paragraph' parameter to deal with exceptional // 'paragraph' parameter to deal with exceptional
// lines such as // 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 // We need to add a dummy caption because this is
// the normal format of a paragraph generated from Lauris. // the normal format of a paragraph generated from Lauris.
if (m.Groups["tail"].Success) if (m.Groups["tail"].Success)
@@ -1,7 +1,7 @@
/* ZaaImporter.cs /* ZaaImporter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ItemDictionary.cs /* ItemDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* ITimePointsDictionary.cs /* ITimePointsDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* ItemDictionary.cs /* ItemDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+6 -1
View File
@@ -1,7 +1,7 @@
/* LabItem.cs /* LabItem.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -230,6 +230,11 @@ namespace zaaReloaded2.LabModel
/// </summary> /// </summary>
public bool IsBlacklisted { get; protected set; } public bool IsBlacklisted { get; protected set; }
/// <summary>
/// Gets whether the item's label should be suppressed.
/// </summary>
public bool SuppressLabel { get; protected set; }
#endregion #endregion
#region Constructors #region Constructors
+1 -1
View File
@@ -1,7 +1,7 @@
/* Laboratory.cs /* Laboratory.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+4 -1
View File
@@ -1,7 +1,7 @@
/* Materials.cs /* Materials.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -43,6 +43,9 @@ namespace zaaReloaded2.LabModel
[Description("Sammelurin")] [Description("Sammelurin")]
/// Collected urine /// Collected urine
SU, SU,
[Description("Mittelstrahlurin")]
/// Collected urine
MSU,
} }
/// <summary> /// <summary>
+1 -1
View File
@@ -1,7 +1,7 @@
/* TimePoint.cs /* TimePoint.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
/* TimePointsDictionary.cs /* TimePointsDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* LogFile.cs /* LogFile.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -2,7 +2,7 @@
/* Formatter.cs /* Formatter.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -2,7 +2,7 @@
/* Importer.cs /* Importer.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* Prescription.cs /* Prescription.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -11,7 +11,7 @@ using System.Security;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Daniel Kraus")] [assembly: AssemblyCompany("Daniel Kraus")]
[assembly: AssemblyProduct("zaaReloaded2")] [assembly: AssemblyProduct("zaaReloaded2")]
[assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015")] [assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015-2018")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")] [assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")]
+3 -2
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 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 // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -9,6 +9,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace zaaReloaded2.Properties { namespace zaaReloaded2.Properties {
using System;
/// <summary> /// <summary>
@@ -18,7 +19,7 @@ namespace zaaReloaded2.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
+2 -2
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 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 // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
@@ -12,7 +12,7 @@ namespace zaaReloaded2.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [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 { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+2 -2
View File
@@ -6,7 +6,7 @@
<Value Profile="(Default)">zaaReloaded2</Value> <Value Profile="(Default)">zaaReloaded2</Value>
</Setting> </Setting>
<Setting Name="PubYear" Type="System.String" Scope="Application"> <Setting Name="PubYear" Type="System.String" Scope="Application">
<Value Profile="(Default)">2017</Value> <Value Profile="(Default)">2018</Value>
</Setting> </Setting>
<Setting Name="Authors" Type="System.String" Scope="Application"> <Setting Name="Authors" Type="System.String" Scope="Application">
<Value Profile="(Default)">Daniel Kraus</Value> <Value Profile="(Default)">Daniel Kraus</Value>
@@ -72,4 +72,4 @@
<Value Profile="(Default)">settings.yml</Value> <Value Profile="(Default)">settings.yml</Value>
</Setting> </Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>
+1 -1
View File
@@ -1,7 +1,7 @@
/* Ribbon.cs /* Ribbon.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+2 -2
View File
@@ -4,7 +4,7 @@
Ribbon.xml Ribbon.xml
part of zaaReloaded2 part of zaaReloaded2
Copyright 2015-2017 Daniel Kraus Copyright 2015-2018 Daniel Kraus
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with 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" <button id="zrlFormatLab" label="Formatieren" image="f.png" onAction="Ribbon_Click" size="large"
supertip="Formatiert den ausgewählten Bereich mit dem zuletzt verwendeten Stil." supertip="Formatiert den ausgewählten Bereich mit dem zuletzt verwendeten Stil."
getEnabled="CanFormat" /> 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." /> supertip="Zeigt eine Liste vorhandener Stile an. Stile können bearbeitet, hinzugefügt, gelöscht werden." />
</group> </group>
<group id="zrlGroupDrugs" label="Medikamente"> <group id="zrlGroupDrugs" label="Medikamente">
+1 -1
View File
@@ -1,7 +1,7 @@
/* LineParser.cs /* LineParser.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+14 -1
View File
@@ -1,7 +1,7 @@
/* ParameterDictionary.cs /* ParameterDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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); 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 #endregion
#region Overrides #region Overrides
+1 -1
View File
@@ -1,7 +1,7 @@
/* DictionaryBase.cs /* DictionaryBase.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
+1 -1
View File
@@ -1,7 +1,7 @@
/* UnitDictionary.cs /* UnitDictionary.cs
* part of zaaReloaded2 * part of zaaReloaded2
* *
* Copyright 2015-2017 Daniel Kraus * Copyright 2015-2018 Daniel Kraus
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
Loaded 100 of 132 files, more files were not shown because too many files have changed in this diff. Show more