Removed Deleted from most of DB Tables !!!!!!!!!!!

9 files changed, 52 insertions, 56 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs
index 278802863..5cdee0153 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/EventTypeActionsToStringConverter.cs
@@ -23,7 +23,7 @@ namespace Tango.MachineStudio.DB.Converters
             if (value is IEnumerable<EventTypesAction>)
             {
                 IEnumerable<EventTypesAction> eventActions = value as IEnumerable<EventTypesAction>;
-                return String.Join(", ", eventActions.Where(x => !x.Deleted).Select(x => x.ActionTypes.Name));
+                return String.Join(", ", eventActions.Select(x => x.ActionTypes.Name));
             }
             else
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs
index 05ffa684c..a8e82b69b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/LiquidTypeRmlsToStringConverter.cs
@@ -23,7 +23,7 @@ namespace Tango.MachineStudio.DB.Converters
             if (value is IEnumerable<LiquidTypesRml>)
             {
                 IEnumerable<LiquidTypesRml> liquidRmls = value as IEnumerable<LiquidTypesRml>;
-                return String.Join(", ", liquidRmls.Where(x => !x.Deleted).Select(x => x.Rml.Name));
+                return String.Join(", ", liquidRmls.Select(x => x.Rml.Name));
             }
             else
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs
index 6ad99213d..96c4d7d7d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/RolesPermissionsToStringConverter.cs
@@ -24,7 +24,7 @@ namespace Tango.MachineStudio.DB.Converters
             if (value is IEnumerable<RolesPermission>)
             {
                 IEnumerable<RolesPermission> rolesPermissions = value as IEnumerable<RolesPermission>;
-                return String.Join(", ", rolesPermissions.Where(x => !x.Deleted).Select(x => x.Permission.Name));
+                return String.Join(", ", rolesPermissions.Select(x => x.Permission.Name));
             }
             else
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index bc8d54ce9..a3d3e2486 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -156,21 +156,20 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             using (_notification.PushTaskItem("Saving changes to database..."))
             {
-                var dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid();
+                //var dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid();
 
-                if (dependenctEntities.Count > 0)
-                {
-                    _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, dependenctEntities.Select(x => x.Key + ", ID: " + x.Value)));
-                    return;
-                }
+                //if (dependenctEntities.Count > 0)
+                //{
+                //    _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, dependenctEntities.Select(x => x.Key + ", ID: " + x.Value)));
+                //    return;
+                //}
 
                 try
                 {
-                    await SelectedEntity.SoftDeleteAsync();
+                    await SelectedEntity.DeleteAsync();
                 }
                 catch (Exception ex)
                 {
-                    SelectedEntity.Deleted = false;
                     Adapter.Invalidate();
                     _notification.ShowError("Could not delete entity.");
                 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
index 69e3c9ff6..0325e42ee 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var actionType in SelectedActions)
             {
-                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionTypes == actionType.Entity && !x.Deleted))
+                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionTypes == actionType.Entity))
                 {
                     actionType.IsSelected = true;
                 }
@@ -51,24 +51,23 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var actionType in SelectedActions)
             {
-                var userRole = eventType.EventTypesActions.SingleOrDefault(x => x.ActionTypes == actionType.Entity);
+                var eventTypeAction = eventType.EventTypesActions.SingleOrDefault(x => x.ActionTypes == actionType.Entity);
 
-                if (userRole != null)
+                if (eventTypeAction != null && !actionType.IsSelected)
                 {
-                    userRole.Deleted = !actionType.IsSelected;
+                    eventTypeAction.Delete();
+                    continue;
                 }
-                else
+
+                if (actionType.IsSelected)
                 {
-                    if (actionType.IsSelected)
+                    eventType.EventTypesActions.Add(new EventTypesAction()
                     {
-                        eventType.EventTypesActions.Add(new EventTypesAction()
-                        {
-                            ActionTypes = actionType.Entity,
-                            EventTypes = eventType,
-                            ActionTypeGuid = actionType.Entity.Guid,
-                            EventTypeGuid = eventType.Guid
-                        });
-                    }
+                        ActionTypes = actionType.Entity,
+                        EventTypes = eventType,
+                        ActionTypeGuid = actionType.Entity.Guid,
+                        EventTypeGuid = eventType.Guid
+                    });
                 }
             }
         }
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 eaa482a41..49bd18822 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
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var rml in SelectedRmls)
             {
-                if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity && !x.Deleted))
+                if (SelectedEntity.LiquidTypesRmls.ToList().Exists(x => x.Rml == rml.Entity))
                 {
                     rml.IsSelected = true;
                 }
@@ -53,22 +53,21 @@ namespace Tango.MachineStudio.DB.ViewModels
             {
                 var liquidRml = liquid.LiquidTypesRmls.SingleOrDefault(x => x.Rml == rml.Entity);
 
-                if (liquidRml != null)
+                if (liquidRml != null && !rml.IsSelected)
                 {
-                    liquidRml.Deleted = !rml.IsSelected;
+                    liquidRml.Delete();
+                    continue;
                 }
-                else
+
+                if (rml.IsSelected)
                 {
-                    if (rml.IsSelected)
+                    liquid.LiquidTypesRmls.Add(new LiquidTypesRml()
                     {
-                        liquid.LiquidTypesRmls.Add(new LiquidTypesRml()
-                        {
-                            Rml = rml.Entity,
-                            LiquidTypes = liquid,
-                            RmlGuid = rml.Entity.Guid,
-                            LiquidTypeGuid = liquid.Guid
-                        });
-                    }
+                        Rml = rml.Entity,
+                        LiquidTypes = liquid,
+                        RmlGuid = rml.Entity.Guid,
+                        LiquidTypeGuid = liquid.Guid
+                    });
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
index d09722ec9..8ce95f736 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
@@ -30,7 +30,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var permission in SelectedPermissions)
             {
-                if (SelectedEntity.RolesPermissions.ToList().Exists(x => x.Permission == permission.Entity && !x.Deleted))
+                if (SelectedEntity.RolesPermissions.ToList().Exists(x => x.Permission == permission.Entity))
                 {
                     permission.IsSelected = true;
                 }
@@ -54,22 +54,21 @@ namespace Tango.MachineStudio.DB.ViewModels
             {
                 var rolePermission = role.RolesPermissions.SingleOrDefault(x => x.Permission == permission.Entity);
 
-                if (rolePermission != null)
+                if (rolePermission != null && !permission.IsSelected)
                 {
-                    rolePermission.Deleted = !permission.IsSelected;
+                    rolePermission.Delete();
+                    continue;
                 }
-                else
+
+                if (permission.IsSelected)
                 {
-                    if (permission.IsSelected)
+                    role.RolesPermissions.Add(new RolesPermission()
                     {
-                        role.RolesPermissions.Add(new RolesPermission()
-                        {
-                            Permission = permission.Entity,
-                            Role = role,
-                            PermissionGuid = permission.Entity.Guid,
-                            RoleGuid = role.Guid
-                        });
-                    }
+                        Permission = permission.Entity,
+                        Role = role,
+                        PermissionGuid = permission.Entity.Guid,
+                        RoleGuid = role.Guid
+                    });
                 }
             }
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml
index 699a9ceb6..543e6b40c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPackView.xaml
@@ -28,11 +28,11 @@
             <TextBox Text="{Binding EditEntity.Name}"></TextBox>
             <TextBlock Text="Configuration:" FontWeight="Bold"></TextBlock>
             <ComboBox ItemsSource="{Binding Adapter.Configurations}" SelectedItem="{Binding EditEntity.Configuration,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-            <TextBlock Text="Dispenser:" FontWeight="Bold"></TextBlock>
-            <ComboBox ItemsSource="{Binding Adapter.Dispensers}" SelectedItem="{Binding EditEntity.Dispenser,Mode=TwoWay}">
+            <TextBlock Text="Dispenser Type:" FontWeight="Bold"></TextBlock>
+            <ComboBox ItemsSource="{Binding Adapter.DispenserTypes}" SelectedItem="{Binding EditEntity.DispenserTypes,Mode=TwoWay}">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
-                        <TextBlock><Run Text="{Binding SerialNumber}"></Run><Run>,</Run> <Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
+                        <TextBlock><Run Text="{Binding Name}"></Run></TextBlock>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
             </ComboBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
index 4a35b1900..e5043e3e2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/IdsPacksView.xaml
@@ -22,10 +22,10 @@
                     <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
                     <DataGridTextColumn Header="Configuration" Binding="{Binding Configuration.Name}"></DataGridTextColumn>
-                    <DataGridTemplateColumn Header="Dispenser">
+                    <DataGridTemplateColumn Header="Dispenser Type">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <TextBlock><Run Text="{Binding Dispenser.SerialNumber}"></Run><Run>,</Run> <Run Text="{Binding Dispenser.DispenserTypes.Name}"></Run></TextBlock>
+                                <TextBlock><Run Text="{Binding DispenserTypes.Name}"></Run></TextBlock>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>