Merge branch 'release-2.1.1'

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)
 ========================================================================
 

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);

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);

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);
+        }
     }
 }

www/versioninfo.txt

@@ -1,4 +1,4 @@
-2.1.0
+2.1.1
-http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.0.exe
+http://zaa.nephrowiki.de/downloads/zaaReloaded-2.1.1.exe
-41976c8ac85092c12139884b175d1e8eadc7636b  publish/release/zaaReloaded-2.1.0.exe
+c92e8d47387961f965ca16c52f2ce1f8642df42d  publish/release/zaaReloaded-2.1.1.exe
 

zaaReloaded2/Controller/Comments/ItemComment.cs

@@ -197,9 +197,12 @@ namespace zaaReloaded2.Controller.Comments
         /// </summary>
         protected virtual void OnFillInComment()
         {
+            if (_isFilledIn) return;
+
             EventHandler<ItemCommentEventArgs> 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(@"(?<item>[^""]+)""(?<prefix>[^<]+)?<(?<value>[^>]*)>(?<suffix>[^""]+)?""");
 

zaaReloaded2/Defaults/clinic.zaaReloaded

@@ -3,17 +3,17 @@
 <a1:Settings id="ref-1" xmlns:a1="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
 <Uid xsi:type="a2:Guid" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
-<_a>726346026</_a>
+<_a>1589012381</_a>
-<_b>-9272</_b>
+<_b>-32256</_b>
-<_c>16670</_c>
+<_c>16464</_c>
-<_d>156</_d>
+<_d>150</_d>
-<_e>154</_e>
+<_e>15</_e>
-<_f>68</_f>
+<_f>13</_f>
-<_g>185</_g>
+<_g>38</_g>
-<_h>192</_h>
+<_h>102</_h>
-<_i>11</_i>
+<_i>193</_i>
-<_j>64</_j>
+<_j>167</_j>
-<_k>27</_k>
+<_k>220</_k>
 </Uid>
 <Name id="ref-3">Kopie von Standard für NepA</Name>
 <ReferenceStyle xsi:type="a3:ReferenceStyle" xmlns:a3="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Formatter/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">IfSpecialItem</ReferenceStyle>
@@ -150,7 +150,7 @@
 </a4:Items>
 <a4:Items id="ref-26" xmlns:a4="http://schemas.microsoft.com/clr/nsassem/zaaReloaded2.Controller.Elements/zaaReloaded2%2C%20Version%3D1.0.0.0%2C%20Culture%3Dneutral%2C%20PublicKeyToken%3D6ec8d075a1ab1383">
 <Version>2</Version>
-<Content id="ref-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, CSA (C0) &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;*** BITTE ANGEBEN***&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
+<Content id="ref-50">Medikamente: TAC &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, CSA (C0) &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, SIR &#34;(Ziel-Talspiegel: &#60;&#62; µg/l)&#34;, Vancomycin, Gentamicin, Tobramicin</Content>
 </a4:Items>
 <a2:UnitySerializationHolder id="ref-27" xmlns:a2="http://schemas.microsoft.com/clr/ns/System">
 <Data id="ref-51">zaaReloaded2.Controller.Elements.CustomText</Data>

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(@"<style:(?<style>[^>]+)>");
-        static Range _highlightStart;
 
         #endregion
 

zaaReloaded2/VERSION

@@ -1,2 +1,2 @@
-2.1.0
+2.1.1
-2.1.0.0
+2.1.1.0

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
             {

zaaReloaded2/Views/ItemCommentView.xaml

@@ -42,7 +42,7 @@
         <DockPanel Margin="0 10 0 10">
             <TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
             <TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
-            <TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=LostFocus}"
+            <TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                      MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
                      x:Name="ValueTextBox" Margin="5 0 5 0" />
         </DockPanel>