From 300df897dec250e603db88a0a13c5a08ec932d09 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 7 Sep 2015 19:41:48 +0200 Subject: [PATCH 1/4] Do not output to console in SerializationTest. --- Tests/SerializationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/SerializationTest.cs b/Tests/SerializationTest.cs index f6f0821..f91cadb 100755 --- a/Tests/SerializationTest.cs +++ b/Tests/SerializationTest.cs @@ -50,7 +50,7 @@ namespace Tests.Controller serializer.Serialize(stream, element); stream.Position = 0; StreamReader sr = new StreamReader(stream); - Console.WriteLine(sr.ReadToEnd()); + // Console.WriteLine(sr.ReadToEnd()); stream.Position = 0; SelectFirstDay deserialized = serializer.Deserialize(stream) as SelectFirstDay; Assert.IsNotNull(deserialized); From 3ce046a2388740648eb5473a243b9d0dde87a76b Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 7 Sep 2015 19:42:04 +0200 Subject: [PATCH 2/4] Remove extraneous field from DocumentWriter. --- zaaReloaded2/Formatter/DocumentWriter.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/zaaReloaded2/Formatter/DocumentWriter.cs b/zaaReloaded2/Formatter/DocumentWriter.cs index d1b38bf..460ca9f 100755 --- a/zaaReloaded2/Formatter/DocumentWriter.cs +++ b/zaaReloaded2/Formatter/DocumentWriter.cs @@ -250,7 +250,6 @@ namespace zaaReloaded2.Formatter // The splitting pattern must not contain subgroups! static readonly Regex _markupRegex = new Regex(@"(<[^ >]+>)"); static readonly Regex _styleRegex = new Regex(@"[^>]+)>"); - static Range _highlightStart; #endregion From 2f60c2c5d17fa7023b08a6e9bc2f21f5f93c773b Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 7 Sep 2015 21:17:27 +0200 Subject: [PATCH 3/4] Fix filling in comments. - VERBESSERT: Fehler bei der Kommentaraufforderung wurden behoben. --- Tests/Controller/Comments/CommentPoolTest.cs | 1 + Tests/ViewModels/ItemCommentViewModelTest.cs | 34 +++++++++++++++++++ .../Controller/Comments/ItemComment.cs | 4 +++ .../ViewModels/ItemCommentViewModel.cs | 4 +-- zaaReloaded2/Views/ItemCommentView.xaml | 2 +- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/Tests/Controller/Comments/CommentPoolTest.cs b/Tests/Controller/Comments/CommentPoolTest.cs index e29fd52..452c49d 100755 --- a/Tests/Controller/Comments/CommentPoolTest.cs +++ b/Tests/Controller/Comments/CommentPoolTest.cs @@ -30,6 +30,7 @@ namespace Tests.Controller.Comments [Test] public void CreateCommentIfDoesNotExist() { + CommentPool.Default.Reset(); int n = CommentPool.Default.Count; ItemComment i = CommentPool.Default.GetCommentFor("item \"<>\""); Assert.AreEqual(n + 1, CommentPool.Default.Count); diff --git a/Tests/ViewModels/ItemCommentViewModelTest.cs b/Tests/ViewModels/ItemCommentViewModelTest.cs index 5d3b3bd..75710ba 100755 --- a/Tests/ViewModels/ItemCommentViewModelTest.cs +++ b/Tests/ViewModels/ItemCommentViewModelTest.cs @@ -38,5 +38,39 @@ namespace Tests.ViewModels Assert.AreEqual(comment.Suffix, vm.Suffix); Assert.AreEqual(comment.Value, vm.Value); } + + [Test] + public void EnterComment() + { + ItemComment comment = new ItemComment("TAC", "(Ziel-Talspiegel: ", "", "µg/l)"); + ItemCommentViewModel vm = new ItemCommentViewModel(comment); + vm.Value = "8-10"; + bool eventRaised = false; + vm.RequestCloseView += (sender, args) => + { + eventRaised = true; + }; + vm.SaveCommand.Execute(null); + Assert.IsTrue(eventRaised, "Event was not raised."); + Assert.IsFalse(comment.IsCancelled, "Comment.IsCancelled should be false"); + Assert.AreEqual("8-10", comment.Value); + } + + [Test] + public void CancelComment() + { + ItemComment comment = new ItemComment("TAC", "(Ziel-Talspiegel: ", "default", "µg/l)"); + ItemCommentViewModel vm = new ItemCommentViewModel(comment); + vm.Value = "blabla"; + bool eventRaised = false; + vm.RequestCloseView += (sender, args) => + { + eventRaised = true; + }; + vm.CloseViewCommand.Execute(null); + Assert.IsTrue(eventRaised, "Event was not raised."); + Assert.IsTrue(comment.IsCancelled, "Comment.IsCancelled should be true"); + Assert.AreEqual("default", comment.Value); + } } } diff --git a/zaaReloaded2/Controller/Comments/ItemComment.cs b/zaaReloaded2/Controller/Comments/ItemComment.cs index 1b17dd8..744ad29 100755 --- a/zaaReloaded2/Controller/Comments/ItemComment.cs +++ b/zaaReloaded2/Controller/Comments/ItemComment.cs @@ -197,9 +197,12 @@ namespace zaaReloaded2.Controller.Comments /// protected virtual void OnFillInComment() { + if (_isFilledIn) return; + EventHandler h = FillInComment; if (h != null) { + _isFilledIn = true; h(this, new ItemCommentEventArgs(this)); } } @@ -208,6 +211,7 @@ namespace zaaReloaded2.Controller.Comments #region Fields + bool _isFilledIn; static readonly Regex _definition = new Regex(@"(?[^""]+)""(?[^<]+)?<(?[^>]*)>(?[^""]+)?"""); diff --git a/zaaReloaded2/ViewModels/ItemCommentViewModel.cs b/zaaReloaded2/ViewModels/ItemCommentViewModel.cs index 8615c1e..ab6d39e 100755 --- a/zaaReloaded2/ViewModels/ItemCommentViewModel.cs +++ b/zaaReloaded2/ViewModels/ItemCommentViewModel.cs @@ -41,7 +41,7 @@ namespace zaaReloaded2.ViewModels { get { - return _itemComment.Value; + return _value; } set { @@ -56,7 +56,7 @@ namespace zaaReloaded2.ViewModels #region Commands - DelegatingCommand SaveCommand + public DelegatingCommand SaveCommand { get { diff --git a/zaaReloaded2/Views/ItemCommentView.xaml b/zaaReloaded2/Views/ItemCommentView.xaml index e3681bc..3b40a28 100755 --- a/zaaReloaded2/Views/ItemCommentView.xaml +++ b/zaaReloaded2/Views/ItemCommentView.xaml @@ -42,7 +42,7 @@ - From 6fe2a41932c21219f9a281595adb040acce877b7 Mon Sep 17 00:00:00 2001 From: Daniel Kraus Date: Mon, 7 Sep 2015 21:57:05 +0200 Subject: [PATCH 4/4] Prepare release 2.1.1. --- HISTORY.md | 8 ++++++++ www/versioninfo.txt | 6 +++--- zaaReloaded2/Defaults/clinic.zaaReloaded | 24 ++++++++++++------------ zaaReloaded2/VERSION | 4 ++-- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index d8eec87..9a38157 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,11 @@ +Version 2.1.1 (2015-09-07) +======================================================================== + +- VERBESSERT: Fehler bei der Kommentaraufforderung wurden behoben. + +* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + + Version 2.1.0 (2015-09-06) ======================================================================== diff --git a/www/versioninfo.txt b/www/versioninfo.txt index 2993766..a8c140b 100644 --- a/www/versioninfo.txt +++ b/www/versioninfo.txt @@ -1,4 +1,4 @@ -2.1.0 -http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.0.exe -41976c8ac85092c12139884b175d1e8eadc7636b publish/release/zaaReloaded-2.1.0.exe +2.1.1 +http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.1.exe +c92e8d47387961f965ca16c52f2ce1f8642df42d publish/release/zaaReloaded-2.1.1.exe diff --git a/zaaReloaded2/Defaults/clinic.zaaReloaded b/zaaReloaded2/Defaults/clinic.zaaReloaded index fb02ed6..3c40ff4 100755 --- a/zaaReloaded2/Defaults/clinic.zaaReloaded +++ b/zaaReloaded2/Defaults/clinic.zaaReloaded @@ -3,17 +3,17 @@ 2 -<_a>726346026 -<_b>-9272 -<_c>16670 -<_d>156 -<_e>154 -<_f>68 -<_g>185 -<_h>192 -<_i>11 -<_j>64 -<_k>27 +<_a>1589012381 +<_b>-32256 +<_c>16464 +<_d>150 +<_e>15 +<_f>13 +<_g>38 +<_h>102 +<_i>193 +<_j>167 +<_k>220 Kopie von Standard für NepA IfSpecialItem @@ -150,7 +150,7 @@ 2 -Medikamente: TAC "(Ziel-Talspiegel: <*** BITTE ANGEBEN***> µg/l)", CSA (C0) "(Ziel-Talspiegel: <*** BITTE ANGEBEN***> µg/l)", SIR "(Ziel-Talspiegel: <*** BITTE ANGEBEN***> µg/l)", Vancomycin, Gentamicin, Tobramicin +Medikamente: TAC "(Ziel-Talspiegel: <> µg/l)", CSA (C0) "(Ziel-Talspiegel: <> µg/l)", SIR "(Ziel-Talspiegel: <> µg/l)", Vancomycin, Gentamicin, Tobramicin zaaReloaded2.Controller.Elements.CustomText diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION index 407c581..06c850b 100755 --- a/zaaReloaded2/VERSION +++ b/zaaReloaded2/VERSION @@ -1,2 +1,2 @@ -2.1.0 -2.1.0.0 +2.1.1 +2.1.1.0