diff --git a/Makefile b/Makefile index 5417fda..180cf48 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ SHELL=/bin/bash -.PHONY=all help release upload website versioninfo +.PHONY=all help upload website versioninfo help: # Available targets: # website - update website on server # versioninfo - create versioninfo file for the current release # upload - upload release files to server - # release - all of the above + # all - all of the above all: versioninfo upload website # @@ -23,7 +23,7 @@ versioninfo: mv www/versioninfo.tmp www/versioninfo.txt upload: - rsync -ruvz --progress deploy/releases/* doktorkraus.de:/var/www/html/zaareloaded/downloads/ + rsync -ruvz --progress deploy/releases/* bovender.de:/var/www/html/zaareloaded/downloads/ website: - rsync -ruvz www/ doktorkraus.de:/var/www/html/zaareloaded/ + rsync -ruvz www/ bovender.de:/var/www/html/zaareloaded/ diff --git a/README.md b/README.md index 8924919..a7b8550 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ zaaReloaded2 ist in C# mit VSTO geschrieben, unter Zuhilfenahme von Visual Studio Professional 2013. Der Quellcode liegt in einem öffentlich zugänglichen Git-Repository: - + Clonen: @@ -212,7 +212,7 @@ dem [MVVM][]-Muster implementiert. Dabei wurde auf das Hilfs-Framework ## Updates Das Add-in sucht täglich nach einem Update; dabei wird die Datei - heruntergeladen. Updates + heruntergeladen. Updates werden automatisch im Hintergrund geladen und beim Schließen von Word (bzw. der Zentralen Arztbriefablage) installiert und stehen dann beim nächsten Starten der Anwendung zur Verfügung. diff --git a/Tests/Controller/Comments/CommentPoolTest.cs b/Tests/Controller/Comments/CommentPoolTest.cs index 452c49d..f41e18a 100755 --- a/Tests/Controller/Comments/CommentPoolTest.cs +++ b/Tests/Controller/Comments/CommentPoolTest.cs @@ -1,7 +1,7 @@ /* CommentPoolTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Controller/Comments/ItemCommentTest.cs b/Tests/Controller/Comments/ItemCommentTest.cs index bb1aaa2..ceaab58 100755 --- a/Tests/Controller/Comments/ItemCommentTest.cs +++ b/Tests/Controller/Comments/ItemCommentTest.cs @@ -1,7 +1,7 @@ /* ItemCommentTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Controller/Elements/CloneTest.cs b/Tests/Controller/Elements/CloneTest.cs index a6602e3..7509843 100755 --- a/Tests/Controller/Elements/CloneTest.cs +++ b/Tests/Controller/Elements/CloneTest.cs @@ -1,7 +1,7 @@ /* CloneTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Controller/Elements/ItemsTest.cs b/Tests/Controller/Elements/ItemsTest.cs index aaed72f..63bc582 100755 --- a/Tests/Controller/Elements/ItemsTest.cs +++ b/Tests/Controller/Elements/ItemsTest.cs @@ -1,7 +1,7 @@ /* ItemsTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Controller/SettingsRepositoryTest.cs b/Tests/Controller/SettingsRepositoryTest.cs index 80a02c4..6e70650 100755 --- a/Tests/Controller/SettingsRepositoryTest.cs +++ b/Tests/Controller/SettingsRepositoryTest.cs @@ -1,7 +1,7 @@ /* SettingsRepositoryTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Controller/SettingsTest.cs b/Tests/Controller/SettingsTest.cs index 04e3be3..efe0818 100755 --- a/Tests/Controller/SettingsTest.cs +++ b/Tests/Controller/SettingsTest.cs @@ -1,7 +1,7 @@ /* SettingsTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Formatter/DocumentWriterTest.cs b/Tests/Formatter/DocumentWriterTest.cs index bb74e46..b9e4ede 100755 --- a/Tests/Formatter/DocumentWriterTest.cs +++ b/Tests/Formatter/DocumentWriterTest.cs @@ -1,7 +1,7 @@ /* DocumentWriterClass.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Formatter/FormatterTest.cs b/Tests/Formatter/FormatterTest.cs index 0df3924..fb2c53b 100755 --- a/Tests/Formatter/FormatterTest.cs +++ b/Tests/Formatter/FormatterTest.cs @@ -1,7 +1,7 @@ /* FormatterTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,7 +123,7 @@ namespace Tests.Formatter { ZaaImporter importer = new ZaaImporter(); importer.Import( - "(17.09.2015 10:44:00) Cyclosporin-A vor Gabe: 130 µg/l; CK gesamt: 123 [<= 170] U/l; Cholesterin: 211"); + "(17.09.2015-201710:44:00) Cyclosporin-A vor Gabe: 130 µg/l; CK gesamt: 123 [<= 170] U/l; Cholesterin: 211"); Document document = new Document(); f.Formatter formatter = new f.Formatter(document); formatter.Laboratory = importer.Laboratory; @@ -131,7 +131,7 @@ namespace Tests.Formatter new List() { new Items("CsA (C0) \"(Ziel-Talspiegel: <> µg/l)\"") }); formatter.Run(); Assert.AreEqual( - "Laborwerte vom 17.09.2015 10:44:00:\rCsA (C0) 130 µg/l\r\r", + "Laborwerte vom 17.09.2015-201710:44:00:\rCsA (C0) 130 µg/l\r\r", document.Range().Text); } diff --git a/Tests/Importer/ZaaImporter/LaurisItemTest.cs b/Tests/Importer/ZaaImporter/LaurisItemTest.cs index 3caee25..03b679e 100755 --- a/Tests/Importer/ZaaImporter/LaurisItemTest.cs +++ b/Tests/Importer/ZaaImporter/LaurisItemTest.cs @@ -1,7 +1,7 @@ /* LaurisItemTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs b/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs index e08b037..f108049 100755 --- a/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs +++ b/Tests/Importer/ZaaImporter/LaurisParagraphTest.cs @@ -1,7 +1,7 @@ /* LaurisParagraphTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Importer/ZaaImporter/TimePointTest.cs b/Tests/Importer/ZaaImporter/TimePointTest.cs index 81e33d7..5c12381 100755 --- a/Tests/Importer/ZaaImporter/TimePointTest.cs +++ b/Tests/Importer/ZaaImporter/TimePointTest.cs @@ -1,7 +1,7 @@ /* LaurisTimePointTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Importer/ZaaImporter/ZaaImporterTest.cs b/Tests/Importer/ZaaImporter/ZaaImporterTest.cs index 58433cc..8425359 100755 --- a/Tests/Importer/ZaaImporter/ZaaImporterTest.cs +++ b/Tests/Importer/ZaaImporter/ZaaImporterTest.cs @@ -1,7 +1,7 @@ /* ZaaImporterTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/LineParserTest.cs b/Tests/LineParserTest.cs index 3838f79..912d922 100755 --- a/Tests/LineParserTest.cs +++ b/Tests/LineParserTest.cs @@ -1,7 +1,7 @@ /* UnitTest1.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Medication/ImporterTest.cs b/Tests/Medication/ImporterTest.cs index 2a69659..a11dbaa 100755 --- a/Tests/Medication/ImporterTest.cs +++ b/Tests/Medication/ImporterTest.cs @@ -1,7 +1,7 @@ /* ImporterTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Medication/PrescriptionTest.cs b/Tests/Medication/PrescriptionTest.cs index e84fd85..df882f7 100755 --- a/Tests/Medication/PrescriptionTest.cs +++ b/Tests/Medication/PrescriptionTest.cs @@ -1,7 +1,7 @@ /* PrescriptionTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/SerializationTest.cs b/Tests/SerializationTest.cs index f91cadb..9444c04 100755 --- a/Tests/SerializationTest.cs +++ b/Tests/SerializationTest.cs @@ -1,7 +1,7 @@ /* SelectFirstDayTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/TestHelpers.cs b/Tests/TestHelpers.cs index b8d1587..a95db83 100755 --- a/Tests/TestHelpers.cs +++ b/Tests/TestHelpers.cs @@ -1,7 +1,7 @@ /* TestHelpers.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Thesaurus/ParametersTest.cs b/Tests/Thesaurus/ParametersTest.cs index 7bc01f8..10a823f 100755 --- a/Tests/Thesaurus/ParametersTest.cs +++ b/Tests/Thesaurus/ParametersTest.cs @@ -1,7 +1,7 @@ /* ParametersTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Thesaurus/TestThesaurus.cs b/Tests/Thesaurus/TestThesaurus.cs index ab96490..3a63d31 100755 --- a/Tests/Thesaurus/TestThesaurus.cs +++ b/Tests/Thesaurus/TestThesaurus.cs @@ -2,7 +2,7 @@ * {{ * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/Thesaurus/ThesaurusTest.cs b/Tests/Thesaurus/ThesaurusTest.cs index 2c31f82..1279a67 100755 --- a/Tests/Thesaurus/ThesaurusTest.cs +++ b/Tests/Thesaurus/ThesaurusTest.cs @@ -1,7 +1,7 @@ /* Class1.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/ViewModels/ElementPickerViewModelTest.cs b/Tests/ViewModels/ElementPickerViewModelTest.cs index 6240d0b..62234c1 100755 --- a/Tests/ViewModels/ElementPickerViewModelTest.cs +++ b/Tests/ViewModels/ElementPickerViewModelTest.cs @@ -1,7 +1,7 @@ /* ElementPickerViewModelTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/ViewModels/ItemCommentViewModelTest.cs b/Tests/ViewModels/ItemCommentViewModelTest.cs index 75710ba..ebf2013 100755 --- a/Tests/ViewModels/ItemCommentViewModelTest.cs +++ b/Tests/ViewModels/ItemCommentViewModelTest.cs @@ -1,7 +1,7 @@ /* ItemCommentViewModelTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/ViewModels/SettingsRepositoryViewModelTest.cs b/Tests/ViewModels/SettingsRepositoryViewModelTest.cs index afa5ddc..516ac4c 100755 --- a/Tests/ViewModels/SettingsRepositoryViewModelTest.cs +++ b/Tests/ViewModels/SettingsRepositoryViewModelTest.cs @@ -1,7 +1,7 @@ /* SettingsRepositoryViewModel.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/Tests/ViewModels/SettingsViewModelTest.cs b/Tests/ViewModels/SettingsViewModelTest.cs index dec16f7..1a64cf4 100755 --- a/Tests/ViewModels/SettingsViewModelTest.cs +++ b/Tests/ViewModels/SettingsViewModelTest.cs @@ -1,7 +1,7 @@ /* SettingsViewModelTest.cs * part of zaaReloaded2 * - * Copyright 2015 Daniel Kraus + * Copyright 2015-2017 Daniel Kraus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/deploy/make-installer.iss b/deploy/make-installer.iss index ff3816b..ec11a6d 100755 --- a/deploy/make-installer.iss +++ b/deploy/make-installer.iss @@ -2,7 +2,7 @@ "x:\Code\zaaReloaded2\zaaReloaded2\zaaReloaded2.csproj /Build Release") #define VERSIONFILE "..\zaaReloaded2\VERSION" -#define PUB_YEARS "2015-2016" +#define PUB_YEARS "2015-2017" #define TARGET_HOST "word" #define APP_GUID "{{8520B887-3AB1-422B-AB6B-A265D14FE4E5}" #define ADDIN_NAME "zaaReloaded" diff --git a/www/index.html b/www/index.html index 8ae31b9..a62eb2b 100644 --- a/www/index.html +++ b/www/index.html @@ -368,7 +368,7 @@