Added IDS_PACK_FORMULA.

Added necessary login to machine designer & db module.
Started working on job segments.

2 files changed, 26 insertions, 8 deletions

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 ae4fa8a07..e1be2aa9b 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,14 +156,6 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             using (_notification.PushTaskItem("Saving changes to database..."))
             {
-                //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;
-                //}
-
                 try
                 {
                     await SelectedEntity.DeleteAsync();
@@ -226,12 +218,21 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             using (_notification.PushTaskItem("Saving changes to database..."))
             {
+                if (mode == DialogOpenMode.Adding)
+                {
+                    entity.Attach();
+                }
+
                 try
                 {
                     await entity.SaveAsync();
                 }
                 catch (DbUpdateException ex)
                 {
+                    if (mode == DialogOpenMode.Adding)
+                    {
+                        entity.Detach();
+                    }
                     Adapter.Invalidate();
                     _notification.ShowError("Could not save entity." + Environment.NewLine + ex.InnerException.InnerException != null ? ex.InnerException.InnerException.Message : ex.InnerException.Message);
                 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.cs
new file mode 100644
index 000000000..a2763a257
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/IdsPackFormulasViewVM.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 IdsPackFormulasViewVM : DbTableViewModel<IdsPackFormula>
+    {
+        public IdsPackFormulasViewVM(INotificationProvider notification) : base(notification)
+        {
+        }
+    }
+}