Fixed issue with RML in Machine Studio DB Module.

Implemented TouchTextBox.
Made some modifications to ViewModel validation.

1 files changed, 16 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs b/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs
index 3b974d172..7d215cd06 100644
--- a/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/ViewModel.cs
@@ -9,6 +9,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows.Controls;
 using Tango.Core;
 using Tango.Core.DI;
 
@@ -75,8 +76,6 @@ namespace Tango.SharedUI
         /// <returns></returns>
         protected bool Validate()
         {
-            OnValidating();
-
             HasErrors = false;
             _currentErrors.Clear();
 
@@ -87,24 +86,37 @@ namespace Tango.SharedUI
 
             ValidationErrors.Clear();
 
+            OnValidating();
+
             foreach (var prop in this.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
             {
                 foreach (var validation in prop.GetCustomAttributes<ValidationAttribute>())
                 {
                     if (!validation.IsValid(prop.GetValue(this)))
                     {
-                        HasErrors = true;
                         _currentErrors.Add(new KeyValuePair<string, string>(prop.Name, validation.ErrorMessage));
                         ValidationErrors.Add(validation.ErrorMessage);
-                        RaiseError(prop.Name);
                     }
                 }
+
+                HasErrors = _currentErrors.Count > 0;
+                RaiseError(prop.Name);
             }
 
             return !HasErrors;
         }
 
         /// <summary>
+        /// Inserts the specified property error (Use inside OnValidating).
+        /// </summary>
+        /// <param name="propName">Name of the property.</param>
+        /// <param name="error">The error.</param>
+        protected void InsertError(String propName, String error)
+        {
+            _currentErrors.Add(new KeyValuePair<string, string>(propName, error));
+        }
+
+        /// <summary>
         /// Called before validating.
         /// </summary>
         protected virtual void OnValidating()