MERGE

11 files changed, 229 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs
new file mode 100644
index 000000000..6f44d51f0
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ContactsViewVM.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+using SimpleValidator.Extensions;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class ContactsViewVM : DbTableViewModel<Contact>
+    {
+        public ContactsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+
+        protected override void OnValidating()
+        {
+            base.OnValidating();
+
+            if (!EditEntity.Email.IsEmail())
+            {
+                ValidationErrors.Add("Email address is invalid");
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs
new file mode 100644
index 000000000..c4954f9b3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberShapesViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class FiberShapesViewVM : DbTableViewModel<FiberShape>
+    {
+        public FiberShapesViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs
new file mode 100644
index 000000000..6b157fc0d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/FiberSynthsViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class FiberSynthsViewVM : DbTableViewModel<FiberSynth>
+    {
+        public FiberSynthsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs
new file mode 100644
index 000000000..9ac38a7c4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LinearMassDensityUnitsViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class LinearMassDensityUnitsViewVM : DbTableViewModel<LinearMassDensityUnit>
+    {
+        public LinearMassDensityUnitsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
index 2ec2d59bb..eaa482a41 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -12,6 +13,64 @@ namespace Tango.MachineStudio.DB.ViewModels
     {
         public LiquidTypesViewVM(INotificationProvider notification) : base(notification)
         {
+            SelectedRmls = new ObservableCollection<MultiComboVM<Rml>>();
+        }
+
+        private ObservableCollection<MultiComboVM<Rml>> _selectedRmls;
+        public ObservableCollection<MultiComboVM<Rml>> SelectedRmls
+        {
+            get { return _selectedRmls; }
+            set { _selectedRmls = value; RaisePropertyChangedAuto(); }
+        }
+
+        protected override void OnEdit()
+        {
+            SelectedRmls = Adapter.Rmls.Select(x => new MultiComboVM<Rml>(x, () => RaisePropertyChanged(nameof(SelectedRmls)))).ToObservableCollection();
+
+            foreach (var rml in SelectedRmls)
+            {
+                if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity && !x.Deleted))
+                {
+                    rml.IsSelected = true;
+                }
+            }
+
+            base.OnEdit();
+        }
+
+        protected override void OnAdd()
+        {
+            SelectedRmls = Adapter.Rmls.Select(x => new MultiComboVM<Rml>(x, () => RaisePropertyChanged(nameof(SelectedRmls)))).ToObservableCollection();
+
+            base.OnAdd();
+        }
+
+        protected override void OnBeforeEntitySave(DialogOpenMode mode, LiquidType liquid)
+        {
+            base.OnBeforeEntitySave(mode, liquid);
+
+            foreach (var rml in SelectedRmls)
+            {
+                var liquidRml = liquid.LiquidTypesRmls.SingleOrDefault(x => x.Rml == rml.Entity);
+
+                if (liquidRml != null)
+                {
+                    liquidRml.Deleted = !rml.IsSelected;
+                }
+                else
+                {
+                    if (rml.IsSelected)
+                    {
+                        liquid.LiquidTypesRmls.Add(new LiquidTypesRml()
+                        {
+                            Rml = rml.Entity,
+                            LiquidTypes = liquid,
+                            RmlGuid = rml.Entity.Guid,
+                            LiquidTypeGuid = liquid.Guid
+                        });
+                    }
+                }
+            }
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
new file mode 100644
index 000000000..4227cc27a
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class MediaColorsViewVM : DbTableViewModel<MediaColor>
+    {
+        public MediaColorsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs
new file mode 100644
index 000000000..451e20ff0
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaConditionsViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class MediaConditionsViewVM : DbTableViewModel<MediaCondition>
+    {
+        public MediaConditionsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs
new file mode 100644
index 000000000..534ebc0d8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaMaterialsViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class MediaMaterialsViewVM : DbTableViewModel<MediaMaterial>
+    {
+        public MediaMaterialsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs
new file mode 100644
index 000000000..4850f6316
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaPurposesViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class MediaPurposesViewVM : DbTableViewModel<MediaPurpos>
+    {
+        public MediaPurposesViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs
new file mode 100644
index 000000000..740a4969b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RmlsViewVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class RmlsViewVM : DbTableViewModel<Rml>
+    {
+        public RmlsViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
index 6af1184aa..044b8a88a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
@@ -80,12 +80,17 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             if (EditEntity.Email != null)
             {
-                if (Adapter.Users.ToList().Exists(x => x.Email.ToLower() == EditEntity.Email.ToLower()))
+                if (Adapter.Users.ToList().Exists(x => x != EditEntity && x.Email.ToLower() == EditEntity.Email.ToLower()))
                 {
                     ValidationErrors.Add("Email already exist");
                 }
             }
 
+            if (!EditEntity.Email.IsEmail())
+            {
+                ValidationErrors.Add("Email address is invalid");
+            }
+
             if (!EditEntity.Password.IsMinLength(4))
             {
                 ValidationErrors.Add("Password must have at least 4 characters");