Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e955dc7a1 | |||
| 8b1525efbb | |||
| a38d0d76d4 | |||
| eb524689b2 | |||
| 85b0356971 | |||
| 2755655e8f | |||
| a5b4daae7a | |||
| 3267bd9d5a | |||
| 753219c1eb | |||
| b1cd1f1a05 | |||
| 20c0b8a76e | |||
| c104568e5b | |||
| 2a3ff8c63e | |||
| d01bdabf35 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -27,6 +27,3 @@ doc/
|
||||
private/
|
||||
*.nupkg
|
||||
doxygen_sqlite3.db
|
||||
Backup/
|
||||
.vs/
|
||||
publish/
|
||||
|
||||
12
HISTORY.md
12
HISTORY.md
@ -1,15 +1,3 @@
|
||||
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)
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
2
Makefile
2
Makefile
@ -23,7 +23,7 @@ versioninfo:
|
||||
mv www/versioninfo.tmp www/versioninfo.txt
|
||||
|
||||
upload:
|
||||
rsync -ruvzL --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/
|
||||
rsync -ruvz --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/
|
||||
|
||||
website:
|
||||
rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* CommentPoolTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemCommentTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* CloneTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemsTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SettingsRepositoryTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SettingsTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* DocumentWriterClass.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* FormatterTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -123,7 +123,7 @@ namespace Tests.Formatter
|
||||
{
|
||||
ZaaImporter importer = new ZaaImporter();
|
||||
importer.Import(
|
||||
"(17.09.2015-201810:44:00) Cyclosporin-A vor Gabe: 130 µg/l; CK gesamt: 123 [<= 170] U/l; Cholesterin: 211");
|
||||
"(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l; CK gesamt: 123 [<= 170] U/l; Cholesterin: 211");
|
||||
Document document = new Document();
|
||||
f.Formatter formatter = new f.Formatter(document);
|
||||
formatter.Laboratory = importer.Laboratory;
|
||||
@ -131,7 +131,7 @@ namespace Tests.Formatter
|
||||
new List<ElementBase>() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") });
|
||||
formatter.Run();
|
||||
Assert.AreEqual(
|
||||
"Laborwerte vom 17.09.2015-201810:44:00:\rCsA (C0) 130 µg/l\r\r",
|
||||
"Laborwerte vom 17.09.2015-201710:44:00:\rCsA (C0) 130 µg/l\r\r",
|
||||
document.Range().Text);
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LaurisItemTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LaurisParagraphTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LaurisTimePointTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ZaaImporterTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* UnitTest1.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ImporterTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* PrescriptionTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SelectFirstDayTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* TestHelpers.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
@ -17,9 +16,6 @@
|
||||
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
|
||||
<IsCodedUITest>False</IsCodedUITest>
|
||||
<TestProjectType>UnitTest</TestProjectType>
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@ -29,7 +25,6 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@ -38,46 +33,47 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>zaaReloaded2.pfx</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Bovender">
|
||||
<HintPath>..\..\bovender\Bovender\bin\Debug\Bovender.dll</HintPath>
|
||||
<Reference Include="Bovender, Version=0.17.0.0, Culture=neutral, PublicKeyToken=df1c15557d8b6df8, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Bovender.0.17.0.0\lib\net40\Bovender.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Microsoft.Office.Interop.Word, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</Reference>
|
||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.4.5.11\lib\net40-client\NLog.dll</HintPath>
|
||||
<HintPath>..\packages\NLog.4.4.12\lib\net40\NLog.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NUnit.3.11.0\lib\net40\nunit.framework.dll</HintPath>
|
||||
<Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Core">
|
||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.Transactions" />
|
||||
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Expression.Blend.Sdk.1.0.2\lib\net40-client\System.Windows.Interactivity.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xaml" />
|
||||
<Reference Include="System.XML" />
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="YamlDotNet, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\YamlDotNet.Signed.4.1.0\lib\net35\YamlDotNet.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<Choose>
|
||||
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
|
||||
@ -176,12 +172,6 @@
|
||||
</Choose>
|
||||
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
|
||||
</Target>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ParametersTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -52,11 +52,5 @@ namespace Tests.Thesaurus
|
||||
{
|
||||
Assert.IsTrue(Parameters.Default.GetIsBlacklisted("glomerul. Filtrationsr. (MDRD)"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetSuppressLabel()
|
||||
{
|
||||
Assert.IsTrue(Parameters.Default.GetSuppressLabel("- Multiresistenz"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* {{
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Class1.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ElementPickerViewModelTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemCommentViewModelTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SettingsRepositoryViewModel.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SettingsViewModelTest.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
app.config
|
||||
part of zaaReloaded2
|
||||
@ -21,9 +21,9 @@
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
|
||||
<assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
|
||||
</configuration>
|
||||
@ -1,6 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Bovender" version="0.17.0.0" targetFramework="net40" />
|
||||
<package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net40" />
|
||||
<package id="NLog" version="4.5.11" targetFramework="net40" />
|
||||
<package id="NUnit" version="3.11.0" targetFramework="net40" />
|
||||
<package id="NLog" version="4.4.12" targetFramework="net40" />
|
||||
<package id="NUnit" version="3.8.1" targetFramework="net40" />
|
||||
<package id="YamlDotNet.Signed" version="4.2.1" targetFramework="net40" />
|
||||
</packages>
|
||||
@ -1,4 +1,4 @@
|
||||
2.4.2
|
||||
2.4.1
|
||||
https://doktorkraus.de/zaareloaded/downloads/zaaReloaded-$VERSION.exe
|
||||
2df8d1cd62b2a6b422099e6d59c8f2022ddd2177a649784a7cab8f7c23e734e2 deploy/releases/zaaReloaded-2.4.2.exe
|
||||
b98ec2c5ad39dc4d54c97599f32634f8a41636eb0b0d8bf10c6d1c520e260e8b deploy/releases/zaaReloaded-2.4.1.exe
|
||||
|
||||
|
||||
@ -1,12 +1,17 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27130.2027
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.40629.0
|
||||
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
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -25,7 +30,4 @@ Global
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {5B5D2F0E-2C7D-4710-85CA-D9F2960DC07A}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/* Commands.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* CommentPool.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ParameterComment.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ParameterCommentEventArgs.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/* ControlElementBase.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -35,21 +35,7 @@ namespace zaaReloaded2.Controller.Elements
|
||||
/// Gets a list of child elements, all of which must be derived
|
||||
/// from FormatElementBase.
|
||||
/// </summary>
|
||||
public IList<FormatElementBase> Children
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_children == null)
|
||||
{
|
||||
_children = new List<FormatElementBase>();
|
||||
}
|
||||
return _children;
|
||||
}
|
||||
internal set
|
||||
{
|
||||
_children = value;
|
||||
}
|
||||
}
|
||||
public IList<FormatElementBase> Children { get; internal set; }
|
||||
|
||||
/// <summary>
|
||||
/// Informs whether this control element can have child elements.
|
||||
@ -60,16 +46,17 @@ namespace zaaReloaded2.Controller.Elements
|
||||
|
||||
#region Constructors
|
||||
|
||||
public ControlElementBase() : base() { }
|
||||
public ControlElementBase()
|
||||
: this(new List<FormatElementBase>())
|
||||
{ }
|
||||
|
||||
public ControlElementBase(IList<FormatElementBase> children)
|
||||
: this()
|
||||
{
|
||||
Children = children;
|
||||
}
|
||||
|
||||
public ControlElementBase(FormatElementBase child)
|
||||
: this(new List<FormatElementBase>() { child })
|
||||
public ControlElementBase(FormatElementBase children)
|
||||
: this(new List<FormatElementBase>() { children })
|
||||
{ }
|
||||
|
||||
#endregion
|
||||
@ -124,11 +111,5 @@ namespace zaaReloaded2.Controller.Elements
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Fields
|
||||
|
||||
IList<FormatElementBase> _children;
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Text.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ElementBase.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* FormatElementBase.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -16,8 +16,8 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace zaaReloaded2.Controller.Elements
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Items.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* NextColumn.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SelectEachDay.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SelectFirstDay.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SelectFirstDay - Copy.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* TwoColumns.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Settings.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -18,12 +18,13 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using zaaReloaded2;
|
||||
using System.Text;
|
||||
using zaaReloaded2.Formatter;
|
||||
using zaaReloaded2.Controller.Elements;
|
||||
using System.IO;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Runtime.Serialization;
|
||||
using System.Runtime.Serialization.Formatters.Soap;
|
||||
using YamlDotNet.Serialization;
|
||||
|
||||
namespace zaaReloaded2.Controller
|
||||
@ -34,24 +35,6 @@ namespace zaaReloaded2.Controller
|
||||
[Serializable]
|
||||
public class Settings : ICloneable, ISerializable
|
||||
{
|
||||
#region Auxiliary factories for YamlDotNet
|
||||
|
||||
public static ISerializer BuildSerializer()
|
||||
{
|
||||
SerializerBuilder builder = new SerializerBuilder()
|
||||
.WithCommonTagMappings()
|
||||
.EnsureRoundtrip();
|
||||
return builder.Build();
|
||||
}
|
||||
|
||||
public static IDeserializer BuildDeserializer()
|
||||
{
|
||||
DeserializerBuilder builder = new DeserializerBuilder().WithCommonTagMappings();
|
||||
return builder.Build();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Persistence
|
||||
|
||||
/// <summary>
|
||||
@ -65,7 +48,7 @@ namespace zaaReloaded2.Controller
|
||||
{
|
||||
Logger.Info("LoadFromFile: {0}", fileName);
|
||||
StreamReader reader = new StreamReader(fileName);
|
||||
IDeserializer deserializer = BuildDeserializer();
|
||||
Deserializer deserializer = new DeserializerBuilder().Build();
|
||||
Settings settings;
|
||||
try
|
||||
{
|
||||
@ -83,9 +66,7 @@ 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;
|
||||
}
|
||||
|
||||
@ -95,13 +76,14 @@ namespace zaaReloaded2.Controller
|
||||
/// <param name="fileName">File to write to.</param>
|
||||
public void SaveToFile(string fileName)
|
||||
{
|
||||
Logger.Info("SaveToFile: Settings name: {0}", Name);
|
||||
Logger.Info("SaveToFile: {0}", fileName);
|
||||
using (StreamWriter writer = new StreamWriter(fileName))
|
||||
{
|
||||
ISerializer serializer = BuildSerializer();
|
||||
Serializer serializer = new SerializerBuilder()
|
||||
//.EnsureRoundtrip()
|
||||
.Build();
|
||||
serializer.Serialize(writer, this);
|
||||
}
|
||||
Logger.Info("SaveToFile: Successfully saved to file '{0}'", fileName);
|
||||
// SoapFormatter formatter = new SoapFormatter();
|
||||
// formatter.Serialize(writer.BaseStream, this);
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SettingsRepository.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -62,12 +62,10 @@ namespace zaaReloaded2.Controller
|
||||
SettingsRepository repo = UserSettings.Default.SettingsRepository;
|
||||
if (repo == null)
|
||||
{
|
||||
Logger.Warn("Load: No repository in user settings; creating a new one.");
|
||||
return new SettingsRepository();
|
||||
}
|
||||
else
|
||||
{
|
||||
Logger.Warn("Load: Loaded repository from user settings.");
|
||||
repo.LoadDefaults();
|
||||
return repo;
|
||||
}
|
||||
@ -185,8 +183,8 @@ namespace zaaReloaded2.Controller
|
||||
private void LoadDefaults()
|
||||
{
|
||||
Assembly myAssembly = this.GetType().Assembly;
|
||||
var deserializer = Settings.BuildDeserializer();
|
||||
Logger.Info("LoadDefaults: Loading ward default");
|
||||
// SoapFormatter deserializer = new SoapFormatter();
|
||||
var deserializer = new YamlDotNet.Serialization.DeserializerBuilder().Build();
|
||||
using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.ward.zaaReloaded2"))
|
||||
{
|
||||
StreamReader reader = new StreamReader(stream);
|
||||
@ -195,7 +193,6 @@ namespace zaaReloaded2.Controller
|
||||
settings.Uid = Guid.Parse(DEFAULT_SETTINGS_1_UID);
|
||||
ReplaceOrAdd(settings);
|
||||
}
|
||||
Logger.Info("LoadDefaults: Loading clinic default");
|
||||
using (Stream stream = myAssembly.GetManifestResourceStream("zaaReloaded2.Defaults.clinic.zaaReloaded2"))
|
||||
{
|
||||
StreamReader reader = new StreamReader(stream);
|
||||
@ -241,13 +238,5 @@ namespace zaaReloaded2.Controller
|
||||
const string DEFAULT_SETTINGS_2_UID = "783C63B5-A964-4368-B2D0-D4595DCCB952";
|
||||
|
||||
#endregion
|
||||
|
||||
#region Class logger
|
||||
|
||||
private static NLog.Logger Logger { get { return _logger.Value; } }
|
||||
|
||||
private static readonly Lazy<NLog.Logger> _logger = new Lazy<NLog.Logger>(() => NLog.LogManager.GetCurrentClassLogger());
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,53 +1,51 @@
|
||||
!Settings
|
||||
!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Name: Kopie von Standard für NepA
|
||||
ReferenceStyle: IfSpecialItem
|
||||
Elements: !ElementsList
|
||||
- !SelectEachDay
|
||||
Children: !FormatElementsList
|
||||
- !Items
|
||||
Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
|
||||
- !zaaReloaded2.Controller.Elements.SelectEachDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Kardiale Marker: CK, CK-MB, hsTnT, NT-proBNP'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt, U-Schwangerschaftstest'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE, CDT'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hormone: iPTH, TSH, fT3, fT4, Aldosteron, Renin, ARQ'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Vitamine: B12, Folsäure'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'BGA: pH, Std.-Bic., BE'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Tumormarker: PSA, AFP'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
|
||||
- !CustomText
|
||||
- !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)'
|
||||
- !Items
|
||||
Content: 'MSU: MSU-Keim, MSU-Multiresistenz'
|
||||
Uid: 581d378c-8f7a-4a1c-8490-36e257770a09
|
||||
Uid: 99b44ee9-2858-4651-84ad-eb7980832352
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST" "NO-LABEL"
|
||||
# =========== ================== ======== ============== ======================= =========== ==========
|
||||
"- Multiresistenz" Multiresistenz MSU --- --- --- X
|
||||
# LAURIS-NAME "KANONISCHER NAME" MATERIAL DEZIMALSTELLEN "IMMER REFERENZBEREICH" "BLACKLIST"
|
||||
# =========== ================== ======== ============== ======================= ===========
|
||||
"- Multiresistenz" Multiresistenz MSU
|
||||
"a1-Microglobulin (SU)" a1-Microglobulin SU
|
||||
"a1-Microglobulin (SU)/die" a1-Microglobulin SU
|
||||
"Aerobe Kultur" Keim MSU --- --- --- X
|
||||
"Aerobe Kultur" Keim MSU
|
||||
"AFP (ECL, Elecsys, Roche)" AFP S --- X
|
||||
"aktuelles Bicarbonat" Bic BGA
|
||||
Albumin Alb S
|
||||
|
||||
@ -1,101 +1,101 @@
|
||||
!Settings
|
||||
!zaaReloaded2.Controller.Settings,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Name: Kopie von Standard für Station
|
||||
ReferenceStyle: IfSpecialItem
|
||||
Elements: !ElementsList
|
||||
- !TwoColumns
|
||||
Children: !FormatElementsList
|
||||
- !SelectFirstDay
|
||||
Children: !FormatElementsList
|
||||
- !Items
|
||||
Elements: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.ElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
|
||||
- !zaaReloaded2.Controller.Elements.TwoColumns,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 []
|
||||
- !zaaReloaded2.Controller.Elements.SelectFirstDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hormone: iPTH, TSH, fT3, fT4'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Vitamine: B12, Folsäure'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'BGA: pH, Std.-Bic., BE'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Tumormarker: PSA'
|
||||
- !NextColumn
|
||||
Children: !FormatElementsList
|
||||
- !SelectLastDay
|
||||
Children: !FormatElementsList
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.NextColumn,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089 []
|
||||
- !zaaReloaded2.Controller.Elements.SelectLastDay,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Children: !System.Collections.Generic.List%601[[zaaReloaded2.Controller.Elements.FormatElementBase,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383]],%20mscorlib,%20Version=4.0.0.0,%20Culture=neutral,%20PublicKeyToken=b77a5c561934e089
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Klinische Chemie: Na, K, Cl, Mg, Ca, P, CaxP, Alb, Prot, Haptoglobin, LDH, Glukose, Harnsäure'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Entzündung/Immunsystem: CRP, Pct, C3c, C4, Anti-DNAse B, ASL'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Kardiale Marker: CK, CKMB, hsTnT, NT-proBNP'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Niere: Krea, Hst, eGFR (CKD-EPI), Cystatin C'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Sammelurin: SU-Prot, SU-Alb, SU-CrCl, SU-HstCl, SU-GFR, SU-Na, SU-Zeit, SU-Volumen'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Spot-Urin: U-TPCR, U-ACR, U-Alb, U-Ery, U-Leu, U-Bakt'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Leber: GOT, GGT, GPT, AP, Bilirubin, CHE'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Blutfette: TG, Chol, LDL, HDL, Lp(a)'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hämatologie: Hb, Hkt, Reti, Leu, Thr, MCV, HbA1c, Retikulozyten, Fragmentozyten'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Diff.-BB: Neu, Lym, Mon, Baso, Eos'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Gerinnung: Quick, INR, PTT, Fibrinogen, ATIII, Anti-Xa'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Serum-Elektrophorese: Albumin-Fraktion, a1-Globulin, a2-Globulin, b-Globulin, g-Globulin'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hormone: iPTH, TSH, fT3, fT4'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Vitamine: B12, Folsäure'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Eisenhaushalt: Eisen, Ferritin, Transferrin, Tf.-Sätt.'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'BGA: pH, Std.-Bic., BE'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Hepatitis-Serologie: Anti-HBs, Anti-HBc'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CsA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Nephrolog. Sediment: pH, Proteinurie, Ery /µl, Leu /µl, Plattenep. /µl, Bakt., Schleimfäden'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Virologie (EDTA-Blut): CMV-PCR, BKV-PCR'
|
||||
- !CustomText
|
||||
- !zaaReloaded2.Controller.Elements.CustomText,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Autoantikörper: ANCA (IF), MPO-ANCA (ELISA), PR3-ANCA (ELISA), ANA (IF), AnDNA (ELISA), AnDNA (RIA)'
|
||||
- !Items
|
||||
- !zaaReloaded2.Controller.Elements.Items,%20zaaReloaded2,%20Version=1.0.0.0,%20Culture=neutral,%20PublicKeyToken=6ec8d075a1ab1383
|
||||
Content: 'Tumormarker: PSA'
|
||||
Uid: 216d9bbb-94d8-47e5-b13b-59e0edd24d91
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Demo.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ExceptionDetailView.xaml.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ExceptionView.xaml.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ExceptionViewModel.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SubmissionCompletedAction.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SubmissionFailureView.xaml.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SubmissionProcessAction.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SubmissionProcessView.xaml.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* SubmissionSuccessView.xaml.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* AbnormalStyle.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* DanielsStyle.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* DocumentWriter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Formatter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* IItemFormatterDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ITimePointFormatterDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemFormatter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -76,11 +76,6 @@ 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>
|
||||
@ -199,20 +194,12 @@ namespace zaaReloaded2.Formatter
|
||||
if (comment != String.Empty) comment = " " + comment;
|
||||
}
|
||||
|
||||
string name;
|
||||
if (LabItem.SuppressLabel)
|
||||
{
|
||||
name = String.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
name = (IncludeMaterial ? LabItem.QualifiedName : LabItem.Name) + " ";
|
||||
}
|
||||
string name = IncludeMaterial ? LabItem.QualifiedName : LabItem.Name;
|
||||
|
||||
|
||||
string output =
|
||||
String.Format(
|
||||
"{0}{1}{2}{3}{4}",
|
||||
"{0} {1}{2}{3}{4}",
|
||||
name,
|
||||
value,
|
||||
unit,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemFormatterDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* NoLaboratoryDataException.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ReferenceStyle.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* TimePointFormatter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* TimePointFormatterDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Helpers.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/* AutoDetect.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -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-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;
|
||||
// }
|
||||
// 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;
|
||||
}
|
||||
return isCinicTimePoint || isZaaTimePoint;
|
||||
}
|
||||
|
||||
|
||||
@ -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)?\)");
|
||||
@"^(Labor:?)?\s*\(?\s*(?<datetime>\d\d\.\d\d\.\d\d\d\d\s+\d\d:\d\d)(:00)?\)\s*$");
|
||||
IList<String> _lines;
|
||||
Parameters _parameterDictionary;
|
||||
Units _unitDictionary;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* IImporter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LabItem.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -76,7 +76,6 @@ 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);
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LaurisParagraph.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LaurisTimePoint.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -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-201810:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
|
||||
// "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l;"
|
||||
// We need to add a dummy caption because this is
|
||||
// the normal format of a paragraph generated from Lauris.
|
||||
if (m.Groups["tail"].Success)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ZaaImporter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ITimePointsDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ItemDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LabItem.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -230,11 +230,6 @@ 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
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Laboratory.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Materials.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* TimePoint.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* TimePointsDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LogFile.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/* Formatter.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
/* Importer.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* Prescription.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -11,11 +11,10 @@ using System.Security;
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("Daniel Kraus")]
|
||||
[assembly: AssemblyProduct("zaaReloaded2")]
|
||||
[assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015-2018")]
|
||||
[assembly: AssemblyCopyright("Copyright © Daniel Kraus 2015")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
//[assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")]
|
||||
[assembly: InternalsVisibleTo("Tests")]
|
||||
[assembly: InternalsVisibleTo("Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010061ecc0718277dee13e7dae2dad33787a981c9883ba80a659bebbdbec76563e201a7a3a6a5852e01bb5eb328d24d5889244b4626da9af9f93db663565441a3120e3985789e6f2a39289f4eed063725b84152cbef472d9dd2f7495f51dad6c91f4dc6fb7c72cb6bd9381335ac9878ec0a6369e880f35b8eca3063e16468d7704eb")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
|
||||
5
zaaReloaded2/Properties/Resources.Designer.cs
generated
5
zaaReloaded2/Properties/Resources.Designer.cs
generated
@ -1,7 +1,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
// Runtime Version:4.0.30319.18444
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
@ -9,7 +9,6 @@
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace zaaReloaded2.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
/// <summary>
|
||||
@ -19,7 +18,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", "15.0.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
internal class Resources {
|
||||
|
||||
24
zaaReloaded2/Properties/Settings.Designer.cs
generated
24
zaaReloaded2/Properties/Settings.Designer.cs
generated
@ -1,7 +1,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:4.0.30319.42000
|
||||
// Runtime Version:4.0.30319.18444
|
||||
//
|
||||
// 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", "15.9.0.0")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
@ -32,6 +32,15 @@ namespace zaaReloaded2.Properties {
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("2017")]
|
||||
public string PubYear {
|
||||
get {
|
||||
return ((string)(this["PubYear"]));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("Daniel Kraus")]
|
||||
@ -178,7 +187,7 @@ namespace zaaReloaded2.Properties {
|
||||
|
||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("https://git.bovender.de/daniel/zaaReloaded2")]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("https://git.bovender.de")]
|
||||
public string Repository {
|
||||
get {
|
||||
return ((string)(this["Repository"]));
|
||||
@ -220,14 +229,5 @@ namespace zaaReloaded2.Properties {
|
||||
return ((string)(this["UserSettingsFile"]));
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Configuration.ApplicationScopedSettingAttribute()]
|
||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||
[global::System.Configuration.DefaultSettingValueAttribute("2018")]
|
||||
public string PubYear {
|
||||
get {
|
||||
return ((string)(this["PubYear"]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,6 +5,9 @@
|
||||
<Setting Name="AddinName" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">zaaReloaded2</Value>
|
||||
</Setting>
|
||||
<Setting Name="PubYear" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">2017</Value>
|
||||
</Setting>
|
||||
<Setting Name="Authors" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">Daniel Kraus</Value>
|
||||
</Setting>
|
||||
@ -54,7 +57,7 @@
|
||||
<Value Profile="(Default)">BITTE_ERGÄNZEN</Value>
|
||||
</Setting>
|
||||
<Setting Name="Repository" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">https://git.bovender.de/daniel/zaaReloaded2</Value>
|
||||
<Value Profile="(Default)">https://git.bovender.de</Value>
|
||||
</Setting>
|
||||
<Setting Name="DrugsParagraph" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">zaaReloaded2-Medikamente</Value>
|
||||
@ -68,8 +71,5 @@
|
||||
<Setting Name="UserSettingsFile" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">settings.yml</Value>
|
||||
</Setting>
|
||||
<Setting Name="PubYear" Type="System.String" Scope="Application">
|
||||
<Value Profile="(Default)">2018</Value>
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
||||
@ -1,7 +1,7 @@
|
||||
/* Ribbon.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
Ribbon.xml
|
||||
part of zaaReloaded2
|
||||
|
||||
Copyright 2015-2018 Daniel Kraus
|
||||
Copyright 2015-2017 Daniel Kraus
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@ -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="Stile verwalten" image="fff.png" onAction="Ribbon_Click" size="large"
|
||||
<button id="zrlSettings" label="Stilauswahl" 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">
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* LineParser.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* ParameterDictionary.cs
|
||||
* part of zaaReloaded2
|
||||
*
|
||||
* Copyright 2015-2018 Daniel Kraus
|
||||
* Copyright 2015-2017 Daniel Kraus
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -126,19 +126,6 @@ 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
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user