Implemented new machine clone and creation.

Implemented auto dispenser generation.

4 files changed, 183 insertions, 22 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
index 0f6ab3314..4584d3508 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
@@ -13,5 +13,50 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         public List<MachineVersion> MachineVersions { get; set; }
 
         public MachineVersion SelectedMachineVersion { get; set; }
+
+        private bool _isNewMachine;
+        public bool IsNewMachine
+        {
+            get { return _isNewMachine; }
+            set { _isNewMachine = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _serialNumber;
+        public String SerialNumber
+        {
+            get { return _serialNumber; }
+            set { _serialNumber = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private String _name;
+        public String Name
+        {
+            get { return _name; }
+            set { _name = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private bool _generateDispensers;
+        public bool GenerateDispensers
+        {
+            get { return _generateDispensers; }
+            set { _generateDispensers = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _dispenserFactor;
+        public double DispenserFactor
+        {
+            get { return _dispenserFactor; }
+            set { _dispenserFactor = value; RaisePropertyChangedAuto(); }
+        }
+
+        public MachineCreationDialogVM() : base()
+        {
+            DispenserFactor = 2.34;
+        }
+
+        protected override bool CanOK()
+        {
+            return base.CanOK() && !String.IsNullOrWhiteSpace(SerialNumber) && !String.IsNullOrWhiteSpace(Name);
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 8b0401dc7..1bd790eb6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -39,10 +39,16 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         private ActionTimer _machines_action_timer;
         private ActionTimer _dispensers_action_timer;
         private MachineDTO _machineBeforeSave;
-        private bool _isNewMachine;
 
         #region Properties
 
+        private bool _isNewMachine;
+        public bool IsNewMachine
+        {
+            get { return _isNewMachine; }
+            set { _isNewMachine = value; RaisePropertyChangedAuto(); }
+        }
+
         private ObservablesStaticCollections _machinesAdapter;
         public ObservablesStaticCollections MachinesAdapter
         {
@@ -441,9 +447,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             InvalidateRelayCommands();
         }
 
-        private async void LoadSelectedMachine(bool newMachine = false, bool clone = false, MachineVersion selectedVersion = null)
+        private async void LoadSelectedMachine(bool newMachine = false, bool clone = false, MachineCreationDialogVM machineCreationDialogVM = null)
         {
-            _isNewMachine = false;
+            IsNewMachine = false;
 
             using (_notification.PushTaskItem("Loading machine details..."))
             {
@@ -478,6 +484,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                     bool initHwConfig = true;
 
+                    Configuration machineConfigBeforeClone = null;
+
                     if (!newMachine)
                     {
                         ActiveMachine = (await new MachineBuilder(ActiveMachineAdapter.Context).Set(SelectedMachine.Guid).WithOrganization().WithConfiguration().WithSpools().BuildAsync());
@@ -486,10 +494,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                         if (clone)
                         {
-                            _isNewMachine = true;
+                            machineConfigBeforeClone = ActiveMachine.Configuration;
+
+                            IsNewMachine = true;
                             ActiveMachine = ActiveMachine.Clone();
-                            ActiveMachine.Name = "";
-                            ActiveMachine.SerialNumber = "";
+                            ActiveMachine.Name = machineCreationDialogVM.Name;
+                            ActiveMachine.SerialNumber = machineCreationDialogVM.SerialNumber;
                             ActiveMachine.IsDeviceRegistered = false;
                             ActiveMachine.DeviceId = null;
                             ActiveMachine.DeviceName = null;
@@ -498,12 +508,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     }
                     else
                     {
-                        _isNewMachine = true;
+                        IsNewMachine = true;
 
-                        if (selectedVersion == null)
+                        if (machineCreationDialogVM.SelectedMachineVersion == null)
                         {
                             ActiveMachine = new Machine();
                             ActiveMachine.Configuration = new Configuration();
+                            ActiveMachine.SerialNumber = machineCreationDialogVM.SerialNumber;
+                            ActiveMachine.Name = machineCreationDialogVM.Name;
                             ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
                         }
                         else
@@ -511,7 +523,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                             try
                             {
                                 initHwConfig = false;
-                                ActiveMachine = selectedVersion.CreatePrototypeMachine(ActiveMachineAdapter.Context);
+                                ActiveMachine = machineCreationDialogVM.SelectedMachineVersion.CreatePrototypeMachine(ActiveMachineAdapter.Context);
+                                ActiveMachine.SerialNumber = machineCreationDialogVM.SerialNumber;
+                                ActiveMachine.Name = machineCreationDialogVM.Name;
                                 ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
 
                                 HardwareConfigurationViewVM = new HardwareConfigurationViewVM(_notification);
@@ -527,6 +541,47 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         }
                     }
 
+                    if ((newMachine || clone) && machineCreationDialogVM.GenerateDispensers)
+                    {
+                        for (int i = 0; i < 8; i++)
+                        {
+                            Dispenser dispenser = new Dispenser();
+                            dispenser.SerialNumber = machineCreationDialogVM.SerialNumber + "-" + (i + 1);
+
+                            if (newMachine)
+                            {
+                                dispenser.NlPerPulse = machineCreationDialogVM.DispenserFactor;
+                                dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.First().Guid;
+                            }
+                            else
+                            {
+                                var packBefore = machineConfigBeforeClone.NoneEmptyIdsPacks.SingleOrDefault(x => x.PackIndex == i);
+
+                                if (packBefore != null)
+                                {
+                                    dispenser.NlPerPulse = packBefore.Dispenser.NlPerPulse;
+                                    dispenser.DispenserTypeGuid = packBefore.Dispenser.DispenserType.Guid;
+                                }
+                                else
+                                {
+                                    continue;
+                                }
+                            }
+
+                            dispenser.ProductionDate = DateTime.UtcNow;
+
+                            ActiveMachineAdapter.Context.Dispensers.Add(dispenser);
+
+                            var idsPack = ActiveMachine.Configuration.NoneEmptyIdsPacks.SingleOrDefault(x => x.PackIndex == i);
+
+                            if (idsPack != null)
+                            {
+                                idsPack.Dispenser = dispenser;
+                                idsPack.DispenserGuid = dispenser.Guid;
+                            }
+                        }
+                    }
+
                     Sites = await ActiveMachineAdapter.Context.Sites.ToListAsync();
                     Sites.Insert(0, new Site() { Name = "NONE", ID = -1 });
                     SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
@@ -722,7 +777,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     ActiveMachine.Configuration.SetHardwareConfiguration(hwConfig);
                     await ActiveMachineAdapter.Context.SaveChangesAsync();
 
-                    if (_isNewMachine)
+                    if (IsNewMachine)
                     {
                         _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineCreated, _authentication.CurrentUser, ActiveMachine.Name, ActiveMachine, "New machine created using Machine Studio.");
                     }
@@ -756,16 +811,23 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         private void AddNewMachine()
         {
             MachineCreationDialogVM vm = new MachineCreationDialogVM();
+            vm.IsNewMachine = true;
             vm.MachineVersions = MachinesAdapter.MachineVersions.ToList();
             _notification.ShowModalDialog<MachineCreationDialogVM, Views.MachineCreationDialog>(vm, (x) =>
             {
+                if (MachinesAdapter.Context.Machines.Any(y => y.SerialNumber == vm.SerialNumber || y.Name.ToLower() == vm.Name.ToLower()))
+                {
+                    _notification.ShowError("Machine serial number or name already exists.");
+                    return;
+                }
+
                 if (vm.SelectedMachineVersion != null && String.IsNullOrWhiteSpace(vm.SelectedMachineVersion.PrototypeMachineData))
                 {
                     _notification.ShowError("The selected version does not contain any prototype machine data.");
                     return;
                 }
 
-                LoadSelectedMachine(true, false, vm.SelectedMachineVersion);
+                LoadSelectedMachine(true, false, vm);
             }, () => { });
         }
 
@@ -779,8 +841,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         IsFree = false;
                         await SelectedMachine.DeleteCascadeAsync(MachinesAdapter.Context);
-                        MachinesAdapter.Context.Machines.Remove(SelectedMachine);
                         _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, SelectedMachine, "Machine deleted using Machine Studio.");
+                        MachinesAdapter.Context.Machines.Remove(SelectedMachine);
+                        MachinesAdapter.Machines.Remove(SelectedMachine);
                     }
                     catch (Exception ex)
                     {
@@ -844,7 +907,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         private void CloneMachine()
         {
-            LoadSelectedMachine(false, true);
+            MachineCreationDialogVM vm = new MachineCreationDialogVM();
+            vm.IsNewMachine = false;
+            vm.MachineVersions = MachinesAdapter.MachineVersions.ToList();
+            _notification.ShowModalDialog<MachineCreationDialogVM, Views.MachineCreationDialog>(vm, (x) =>
+            {
+                if (MachinesAdapter.Context.Machines.Any(y => y.SerialNumber == vm.SerialNumber || y.Name.ToLower() == vm.Name.ToLower()))
+                {
+                    _notification.ShowError("Machine serial number or name already exists.");
+                    return;
+                }
+
+                LoadSelectedMachine(false, true, vm);
+            }, () => { });
         }
 
         private void AddNewSpool()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
index 2d380c0d2..417dfbc0b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
@@ -6,9 +6,15 @@
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="700" Height="400" Width="700" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:MachineCreationDialogVM, IsDesignTimeCreatable=False}">
+             d:DesignHeight="400" d:DesignWidth="700" Height="460" Width="750" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:MachineCreationDialogVM, IsDesignTimeCreatable=False}">
+
+    <UserControl.Resources>
+        <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></converters:BooleanToVisibilityConverter>
+    </UserControl.Resources>
+
     <Grid Margin="10">
         <DockPanel>
             <Grid DockPanel.Dock="Top">
@@ -17,7 +23,18 @@
                         <Image Source="../Images/machine-full-fx.png" Width="120" RenderOptions.BitmapScalingMode="Fant"></Image>
                         <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -10 -10" Kind="PlusCircle" Foreground="#15C315" Width="42" Height="42" />
                     </Grid>
-                    <TextBlock Margin="30 0 0 0" VerticalAlignment="Bottom" FontSize="22">NEW MACHINE</TextBlock>
+                    <TextBlock Margin="30 0 0 0" VerticalAlignment="Bottom" FontSize="22">
+                        <TextBlock.Style>
+                            <Style TargetType="TextBlock">
+                                <Setter Property="Text" Value="CLONE MACHINE"></Setter>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding IsNewMachine}" Value="True">
+                                        <Setter Property="Text" Value="NEW MACHINE"></Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </TextBlock.Style>
+                    </TextBlock>
                 </StackPanel>
             </Grid>
 
@@ -33,12 +50,30 @@
             </Grid>
 
             <Grid>
-                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="400">
-                    <TextBlock TextWrapping="Wrap" TextAlignment="Center">
-                        <Run>Please specify the machine version in order to prototype the new machine with default machine settings and configuartion.</Run>
+                <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="20 20 0 0" Width="400">
+                    <TextBlock TextWrapping="Wrap" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Run>Please specify the machine version in order to prototype the new machine with default machine settings and configuration.</Run>
                     </TextBlock>
 
-                    <ComboBox ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
+                    <ComboBox Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}" ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
+
+                    <TextBlock Margin="0 20 0 0" FontSize="10">Serial Number</TextBlock>
+                    <TextBox Margin="0 2 0 0" Text="{Binding SerialNumber,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+
+                    <TextBlock Margin="0 20 0 0" FontSize="10">Name</TextBlock>
+                    <TextBox Margin="0 2 0 0" Text="{Binding Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+
+                    <CheckBox Margin="0 30 0 0" IsChecked="{Binding GenerateDispensers}">
+                        <TextBlock>
+                            <Run>Automatically generate 8 dispensers for this machine</Run>
+                            <Run>(</Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10" Text="{Binding SerialNumber}"></Run><Run Foreground="{StaticResource GrayBrush}" FontSize="10">-1-8</Run><Run>)</Run>
+                        </TextBlock>
+                    </CheckBox>
+
+                    <StackPanel Margin="20 10 0 0" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <TextBlock FontSize="10">Dispenser max nl/cm</TextBlock>
+                        <mahapps:NumericUpDown Minimum="0" StringFormat="0.00" Maximum="10" InterceptMouseWheel="True" Value="{Binding DispenserFactor,Mode=TwoWay}" HorizontalContentAlignment="Left" Width="95" HorizontalAlignment="Left" BorderThickness="0 0 0 1" Margin="0 2 0 0" HideUpDownButtons="True" HasDecimals="True"></mahapps:NumericUpDown>
+                    </StackPanel>
                 </StackPanel>
             </Grid>
         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
index b3cef3083..b2b770698 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -5,11 +5,17 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
-              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
+    </UserControl.Resources>
+    
     <Grid Margin="20">
         <DockPanel>
             <Grid DockPanel.Dock="Top">
@@ -61,10 +67,10 @@
                     <TabItem Header="HW CONFIGURATION">
                         <local:HardwareConfigurationView/>
                     </TabItem>
-                    <TabItem Header="UPDATES">
+                    <TabItem Header="UPDATES" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <local:MachineUpdatesView/>
                     </TabItem>
-                    <TabItem Header="TUP">
+                    <TabItem Header="TUP" Visibility="{Binding IsNewMachine,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                         <local:TupView/>
                     </TabItem>
                 </TabControl>