From f27893986e9fd647a69be8569ecd5d944f853869 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 18 Apr 2019 20:48:48 +0300
Subject: Implemented machine status animations.

---
 .../Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index 264f41131..3e8c6f280 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -4,12 +4,14 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.Integration.Operation;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Jobs.AppBarItems;
 using Tango.PPC.Jobs.AppButtons;
 using Tango.PPC.Jobs.Dialogs;
+using Tango.PPC.Jobs.NavigationObjects;
 using Tango.PPC.Jobs.Views;
 
 namespace Tango.PPC.Jobs.ViewModels
@@ -47,10 +49,24 @@ namespace Tango.PPC.Jobs.ViewModels
 
         #endregion
 
+        #region Commands
+
+        /// <summary>
+        /// Gets or sets the go to job command.
+        /// </summary>
+        /// <value>
+        /// The go to job command.
+        /// </value>
+        public RelayCommand GoToJobCommand { get; set; }
+
+        #endregion
+
         public JobProgressViewVM()
         {
             _stop_job_btn = new StopPrintingButton();
             _stop_job_btn.Pressed += _stop_job_btn_Pressed;
+
+            GoToJobCommand = new RelayCommand(GoToJob);
         }
 
         private void _stop_job_btn_Pressed()
@@ -61,6 +77,12 @@ namespace Tango.PPC.Jobs.ViewModels
             }
         }
 
+        private void GoToJob()
+        {
+            NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = _handler.Job });
+            NavigationManager.ClearHistoryExcept<JobsView>();
+        }
+
         #region Override Methods
 
         /// <summary>
-- 
cgit v1.3.1


From 46f5f70e6055234bce3e9a105ab1ba86248b1713 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 22 Apr 2019 22:46:43 +0300
Subject: Implemented Volume color space gradients. Implemented volume
 gradients on PPC. Improved job running aspects on PPC.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 .../Build/Shortcuts/Machine Studio.lnk             | Bin 1581 -> 1516 bytes
 .../ViewModels/MainViewVM.cs                       |  30 +++++--
 .../Views/JobView.xaml                             |   2 +-
 .../Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml  |   6 +-
 .../Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs |   2 +-
 .../Tango.PPC.Jobs/Views/JobProgressView.xaml      |   2 +-
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  |   8 +-
 .../Visual_Studio/Tango.BL/Entities/BrushStop.cs   |  80 +++++++++---------
 .../DefaultGradientGenerationConfiguration.cs      |  18 +++-
 .../Operation/IGradientGenerationConfiguration.cs  |   5 ++
 .../Tango.Integration/Operation/JobHandler.cs      |   2 +-
 .../Tango.Integration/Operation/MachineOperator.cs |  92 +++++++++++++++++----
 14 files changed, 174 insertions(+), 73 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 84785d8cf..87b59afc3 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 5e10994a1..79746966d 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index bd3a3933b..19334a605 100644
Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 0299940d3..4d8ec954e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -966,9 +966,23 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         private void MachineOperator_PreparingJobProgress(object sender, PreparingJobProgressEventArgs e)
         {
-            if (_preparingTaskItem != null)
+            var percent = (e.Progress / e.Total * 100d);
+
+            if (_preparingTaskItem == null && percent == 0)
+            {
+                _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
+            }
+            else if (percent == 100)
             {
-                _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+                _preparingTaskItem.Pop();
+                _preparingTaskItem = null;
+            }
+            else
+            {
+                if (_preparingTaskItem != null)
+                {
+                    _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+                }
             }
         }
 
@@ -1327,11 +1341,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 if (resumeFunc == null)
                 {
-                    using (var item = _notification.PushTaskItem("Preparing job for printing..."))
-                    {
-                        _preparingTaskItem = item;
-                        JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
-                    }
+                    JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
                 }
                 else
                 {
@@ -1408,6 +1418,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Canceled += (x, y) =>
                 {
+                    if (_preparingTaskItem != null)
+                    {
+                        _preparingTaskItem.Pop();
+                        _preparingTaskItem = null;
+                    }
+
                     LogManager.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     _eventLogger.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     StopRecordingIfInProgress();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index bfa951c3b..a5d137e67 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1220,7 +1220,7 @@
                                     </Grid>
 
                                     <Grid DockPanel.Dock="Right" Margin="0 0 10 0">
-                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}" IsEnabled="{Binding MachineOperator.CanPrint}">
                                             <Button Height="60" Width="280" Command="{Binding StartJobCommand}" Click="OnJobStartClick">
                                                 <StackPanel Orientation="Horizontal">
                                                     <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="ClockFast" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
index be151678d..fd0a63456 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
@@ -31,9 +31,9 @@
                         <Grid x:Name="grid">
                             <Grid.Width>
                                 <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
-                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Length" IsAsync="True"></Binding>
-                                    <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth" IsAsync="True"></Binding>
-                                    <Binding Path="LengthWithFactor" IsAsync="True"></Binding>
+                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Length"></Binding>
+                                    <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
+                                    <Binding Path="LengthWithFactor"></Binding>
                                 </MultiBinding>
                             </Grid.Width>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index 3e8c6f280..d37ce7583 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -100,7 +100,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             base.OnNavigatedFrom();
 
-            if (MachineProvider.MachineOperator.IsPrinting)
+            if (MachineProvider.MachineOperator.IsPrinting && _handler != null && !_handler.IsCanceled)
             {
                 NotificationProvider.PushAppBarItem<JobProgressAppBarItem>().Pressed += (_, __) =>
                 {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index e44d194bd..037fac09c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -203,7 +203,7 @@
                     <Grid>
                         <controls:RunningJobViewer Height="30" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
 
-                        <TextBlock Margin="0 0 -40 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
+                        <TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
                         </TextBlock>
                     </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index cb12805f5..02e4cb6eb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -138,7 +138,7 @@
                                 <ColumnDefinition Width="2*" />
                             </Grid.ColumnDefinitions>
 
-                            <touch:TouchNumericTextBox Value="{Binding OffsetMeters,IsAsync=True}" HasDecimalPoint="True" StringFormat="0.0" Maximum="{Binding Segment.Length,IsAsync=True}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
+                            <touch:TouchNumericTextBox Value="{Binding OffsetMeters}" HasDecimalPoint="True" StringFormat="0.0" Maximum="{Binding Segment.Length,IsAsync=True}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
                             <!--<touch:TouchSlider Grid.Column="1" Height="30" Margin="10 0 0 -23" Maximum="{Binding Segment.Length}" Value="{Binding OffsetMeters}" />-->
                         </Grid>
                     </DockPanel>
@@ -284,7 +284,7 @@
                                         </Canvas>
                                         <DockPanel LastChildFill="False" Margin="0 20 0 0">
                                             <controls:FastTextBlock VerticalAlignment="Bottom" DockPanel.Dock="Left" Text="Length (m):"></controls:FastTextBlock>
-                                            <touch:TouchNumericTextBox Width="180" DockPanel.Dock="Right" Value="{Binding Length,IsAsync=True}" StringFormat="0.0" AutoCalculateJogStep="False" HasDecimalPoint="True" Minimum="1" Maximum="100000" KeyboardContainer="{Binding ElementName=Container}" />
+                                            <touch:TouchNumericTextBox Width="180" DockPanel.Dock="Right" Value="{Binding Length}" StringFormat="0.0" AutoCalculateJogStep="False" HasDecimalPoint="True" Minimum="1" Maximum="100000" KeyboardContainer="{Binding ElementName=Container}" />
                                         </DockPanel>
                                     </StackPanel>
                                 </DockPanel>
@@ -478,12 +478,12 @@
                                                     </StackPanel.Style>
                                                     <UniformGrid Columns="2" Rows="1">
                                                         <DockPanel Margin="0 0 10 0">
-                                                            <TextBlock Text="Number of units:" VerticalAlignment="Center"></TextBlock>
+                                                            <TextBlock Text="Number of units:" VerticalAlignment="Bottom"></TextBlock>
                                                             <touch:TouchNumericTextBox Margin="20 0 0 0" Value="{Binding Job.NumberOfUnits}" Minimum="1" Maximum="10000" JoggingFactor="0.01" />
                                                         </DockPanel>
 
                                                         <DockPanel Margin="10 0 0 0">
-                                                            <TextBlock Text="Number of heads:" VerticalAlignment="Center"></TextBlock>
+                                                            <TextBlock Text="Number of heads:" VerticalAlignment="Bottom"></TextBlock>
                                                             <touch:TouchNumericTextBox Margin="20 0 0 0" Value="{Binding Job.NumberOfHeads}" Minimum="1" Maximum="1000" JoggingFactor="0.1" />
                                                         </DockPanel>
                                                     </UniformGrid>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index 6738ad99c..10f9bc0ac 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -459,51 +459,53 @@ namespace Tango.BL.Entities
         {
             Task.Factory.StartNew(() =>
             {
-                Rgb rgb = new Rgb(Red, Green, Blue);
-                Cmyk cmyk = new Cmyk(Cyan, Magenta, Yellow, Black);
-                Lab lab = new Lab(L, A, B);
-                Rgb rgb_twine = new Rgb(255, 255, 255);
-
-                if (ColorCatalog != null)
+                if (ColorSpace != null)
                 {
-                    rgb_twine = new Rgb(ColorCatalog.Red, ColorCatalog.Green, ColorCatalog.Blue);
-                }
+                    Rgb rgb = new Rgb(Red, Green, Blue);
+                    Cmyk cmyk = new Cmyk(Cyan, Magenta, Yellow, Black);
+                    Lab lab = new Lab(L, A, B);
+                    Rgb rgb_twine = new Rgb(255, 255, 255);
 
-                switch ((ColorSpaces)ColorSpace.Code)
-                {
-                    case ColorSpaces.RGB:
-                        cmyk = rgb.To<Cmyk>();
-                        lab = rgb.To<Lab>();
-                        break;
-                    case ColorSpaces.CMYK:
-                        rgb = cmyk.To<Rgb>();
-                        lab = cmyk.To<Lab>();
-                        break;
-                    case ColorSpaces.LAB:
-                        rgb = lab.To<Rgb>();
-                        cmyk = lab.To<Cmyk>();
-                        break;
-                    case ColorSpaces.Twine:
-                        cmyk = rgb_twine.To<Cmyk>();
-                        lab = rgb_twine.To<Lab>();
-                        rgb = rgb_twine;
-                        Validate(null);
-                        break;
-                }
+                    if (ColorCatalog != null)
+                    {
+                        rgb_twine = new Rgb(ColorCatalog.Red, ColorCatalog.Green, ColorCatalog.Blue);
+                    }
 
-                _red = (int)rgb.R;
-                _green = (int)rgb.G;
-                _blue = (int)rgb.B;
+                    switch ((ColorSpaces)ColorSpace.Code)
+                    {
+                        case ColorSpaces.RGB:
+                            cmyk = rgb.To<Cmyk>();
+                            lab = rgb.To<Lab>();
+                            break;
+                        case ColorSpaces.CMYK:
+                            rgb = cmyk.To<Rgb>();
+                            lab = cmyk.To<Lab>();
+                            break;
+                        case ColorSpaces.LAB:
+                            rgb = lab.To<Rgb>();
+                            cmyk = lab.To<Cmyk>();
+                            break;
+                        case ColorSpaces.Twine:
+                            cmyk = rgb_twine.To<Cmyk>();
+                            lab = rgb_twine.To<Lab>();
+                            rgb = rgb_twine;
+                            Validate(null);
+                            break;
+                    }
 
-                _cyan = cmyk.C;
-                _magenta = cmyk.M;
-                _yellow = cmyk.Y;
-                _black = cmyk.K;
+                    _red = (int)rgb.R;
+                    _green = (int)rgb.G;
+                    _blue = (int)rgb.B;
 
-                _l = lab.L;
-                _a = lab.A;
-                _b = lab.B;
+                    _cyan = cmyk.C;
+                    _magenta = cmyk.M;
+                    _yellow = cmyk.Y;
+                    _black = cmyk.K;
 
+                    _l = lab.L;
+                    _a = lab.A;
+                    _b = lab.B;
+                }
                 onComplete?.Invoke();
             });
         }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
index 68fd14ac2..41c23a747 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
@@ -25,6 +25,8 @@ namespace Tango.Integration.Operation
             public double OffsetPercent { get; set; }
         }
 
+        private bool aborted;
+
         private bool _isEnabled;
         /// <summary>
         /// Gets or sets a value indicating whether to generate the gradient steps.
@@ -63,6 +65,8 @@ namespace Tango.Integration.Operation
         /// <returns></returns>
         public List<BrushStop> Generate(Segment segment, Job job, ProcessParametersTable processParameters, Action<PreparingJobProgressEventArgs> progress = null)
         {
+            aborted = false;
+
             //var stops = TangoColorConverter.CreateSegmentLinearGradient(segment, processParameters, ResolutionCM);
 
             List<BrushStop> stops = new List<BrushStop>();
@@ -88,6 +92,8 @@ namespace Tango.Integration.Operation
 
             for (double cm = 0; cm <= segment.Length; cm += (ResolutionCM / 100d))
             {
+                if (aborted) return stops;
+
                 double offset = (double)cm / segment.Length;
 
                 if (colorSpace == ColorSpaces.RGB || colorSpace == ColorSpaces.LAB || colorSpace == ColorSpaces.CMYK)
@@ -133,7 +139,7 @@ namespace Tango.Integration.Operation
                 progress?.Invoke(new PreparingJobProgressEventArgs()
                 {
                     Job = job,
-                    Total = job.Length,
+                    Total = job.Segments.Sum(x => x.Length),
                     Progress = previousSegmentsLength + cm,
                 });
             }
@@ -144,7 +150,7 @@ namespace Tango.Integration.Operation
             progress?.Invoke(new PreparingJobProgressEventArgs()
             {
                 Job = job,
-                Total = job.Length,
+                Total = job.Segments.Sum(x => x.Length),
                 Progress = previousSegmentsLength + segment.Length,
             });
 
@@ -236,5 +242,13 @@ namespace Tango.Integration.Operation
 
             return color;
         }
+
+        /// <summary>
+        /// Aborts the current generation.
+        /// </summary>
+        public void AbortCurrentGeneration()
+        {
+            aborted = true;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs
index 510b0149d..be0f7fad3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs
@@ -31,5 +31,10 @@ namespace Tango.Integration.Operation
         /// <param name="progress">Progress callback.</param>
         /// <returns></returns>
         List<BrushStop> Generate(Segment segment, Job job, ProcessParametersTable processParameters, Action<PreparingJobProgressEventArgs> progress = null);
+
+        /// <summary>
+        /// Aborts the current generation.
+        /// </summary>
+        void AbortCurrentGeneration();
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index ed008cae8..1bc1ae662 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -296,7 +296,7 @@ namespace Tango.Integration.Operation
             }
             else
             {
-                if (Status.IsSettingUp)
+                if (Status.IsSettingUp && Status.Progress > 0)
                 {
                     Status.IsSettingUp = false;
                 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index dd0872898..d820db7e4 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1290,7 +1290,7 @@ namespace Tango.Integration.Operation
 
                 job = job.Clone();
 
-                int max = job.OrderedSegments.Last().SegmentIndex;
+                int max = job.OrderedSegments.Last().SegmentIndex  + 1;
 
                 var segments = job.OrderedSegments.ToList();
 
@@ -1332,23 +1332,29 @@ namespace Tango.Integration.Operation
                 processParameters.MapPrimitivesTo(process);
                 ticket.ProcessParameters = process;
 
-                foreach (var segment in job.OrderedSegments)
-                {
-                    ticket.Segments.Add(CreatePMRJobSegment(segment, job, processParameters));
-                }
-
-                request.JobTicket = ticket.Clone();
-
                 JobHandler handler = null;
 
+                bool canceled = false;
+                bool requestSent = false;
+
                 handler = new JobHandler(async () =>
                 {
                     try
                     {
-                        var result = await SendRequest<AbortJobRequest, AbortJobResponse>(new AbortJobRequest());
-                        PrintingAborted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
-                        PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, originalJob));
-                        handler.RaiseCanceled();
+                        if (!canceled)
+                        {
+                            canceled = true;
+                            GradientGenerationConfiguration.AbortCurrentGeneration();
+
+                            if (requestSent)
+                            {
+                                var result = await SendRequest<AbortJobRequest, AbortJobResponse>(new AbortJobRequest());
+                            }
+
+                            PrintingAborted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
+                            PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, originalJob));
+                            handler.RaiseCanceled();
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -1367,14 +1373,58 @@ namespace Tango.Integration.Operation
                     return handler;
                 }
 
-                request.JobTicket.UploadStrategy = JobUploadStrategy;
-
                 ThreadFactory.StartNew(async () =>
                 {
                     Status = MachineStatuses.GettingReady;
                     RunningJob = originalJob;
                     PrintingStarted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
 
+                    Thread.Sleep(100);
+
+                    handler.RaiseStatusReceived(new JobStatus()
+                    {
+                        CurrentSegmentIndex = 0,
+                        Progress = 0,
+                        Message = "Preparing Job...",
+                    });
+
+                    foreach (var segment in originalJob.OrderedSegments)
+                    {
+                        ticket.Segments.Add(CreatePMRJobSegment(segment, originalJob, processParameters));
+
+                        if (handler.IsCanceled)
+                        {
+                            Status = MachineStatuses.ReadyToDye;
+                            return;
+                        }
+                    }
+
+                    if (handler.IsCanceled)
+                    {
+                        Status = MachineStatuses.ReadyToDye;
+                        return;
+                    }
+
+                    var segs = new List<JobSegment>();
+
+                    for (int i = 0; i < job.NumberOfUnits; i++)
+                    {
+                        foreach (var s in ticket.Segments)
+                        {
+                            var cloned = s.Clone();
+                            segs.Add(cloned);
+                        }
+                    }
+
+                    if (segs.Count > 0)
+                    {
+                        ticket.Segments.Clear();
+                        ticket.Segments.AddRange(segs);
+                    }
+
+                    request.JobTicket = ticket.Clone();
+                    request.JobTicket.UploadStrategy = JobUploadStrategy;
+
                     if (JobUploadStrategy == JobUploadStrategy.JobDescriptionFile)
                     {
                         try
@@ -1384,6 +1434,13 @@ namespace Tango.Integration.Operation
                             JobDescriptionFile jobDescriptionFile = new JobDescriptionFile(ticket.Segments);
                             MemoryStream ms = jobDescriptionFile.ToStream();
 
+                            handler.RaiseStatusReceived(new JobStatus()
+                            {
+                                CurrentSegmentIndex = 0,
+                                Progress = 0,
+                                Message = "Uploading job description file...",
+                            });
+
                             var storage = CreateStorageManager();
 
                             var storageInfo = await storage.GetStorageDrive();
@@ -1414,6 +1471,12 @@ namespace Tango.Integration.Operation
                         }
                     }
 
+                    if (handler.IsCanceled)
+                    {
+                        Status = MachineStatuses.ReadyToDye;
+                        return;
+                    }
+
                     LogRequestSent(request);
                     bool responseLogged = false;
 
@@ -1423,6 +1486,7 @@ namespace Tango.Integration.Operation
 
                         if (!responseLogged)
                         {
+                            requestSent = true;
                             responseLogged = true;
                             LogResponseReceived(response.Message);
                         }
-- 
cgit v1.3.1


From f95997c235bab4106f4bdfa33b4b8adb9921bb48 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 23 Apr 2019 12:21:12 +0300
Subject: Added guidance to event types. Implemented general event view on PPC.
 Improved job resume tracking. Improved job resume on PPC. Added corruption
 emulation to machine emulator.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/TCC/TCC.mdf                            | Bin 8388608 -> 8388608 bytes
 Software/DB/TCC/TCC_log.ldf                        | Bin 8388608 -> 8388608 bytes
 .../Build/Shortcuts/Machine Emulator.lnk           | Bin 1530 -> 1445 bytes
 .../Tango.PPC.Events/EventsViews/GeneralView.xaml  |  25 +++-
 .../Tango.PPC.Events/Images/machine_small.png      | Bin 0 -> 37734 bytes
 .../Tango.PPC.Events/Tango.PPC.Events.csproj       |   5 +-
 .../Tango.PPC.Events/ViewModels/MainViewVM.cs      |   2 +-
 .../Modules/Tango.PPC.Events/Views/MainView.xaml   |   4 +-
 .../Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs |   2 +
 .../Tango.PPC.Jobs/ViewModels/MainViewVM.cs        |  10 +-
 .../Connection/DefaultMachineProvider.cs           |  10 +-
 .../PPC/Tango.PPC.Common/Resources/Merged.xaml     |   1 +
 .../Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs |   8 ++
 .../Tango.BL/Entities/EventTypeBase.cs             |  38 ++++++
 .../Tango.DAL.Remote/DB/EVENT_TYPES.cs             |   1 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             |   3 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     | 140 ++++++++++-----------
 .../Tango.Emulations/Emulators/MachineEmulator.cs  |  72 +++++++----
 .../Tango.Integration/Operation/JobHandler.cs      |   2 +-
 .../Tango.Integration/Operation/MachineOperator.cs |  12 +-
 .../Converters/StringToLinesConverter.cs           |  32 +++++
 .../Tango.SharedUI/Tango.SharedUI.csproj           |   3 +-
 .../Visual_Studio/Tango.Transport/ITransporter.cs  |   5 +
 .../Tango.Transport/TransporterBase.cs             |   8 +-
 Software/Visual_Studio/Tango.sln                   |  12 +-
 .../Tango.EventsTypesGenerator/Program.cs          |   1 +
 .../Tango.MachineEM.UI/Views/MainView.xaml         |   1 +
 29 files changed, 282 insertions(+), 115 deletions(-)
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/machine_small.png
 create mode 100644 Software/Visual_Studio/Tango.SharedUI/Converters/StringToLinesConverter.cs

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 87b59afc3..385ec2708 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 79746966d..c94ea41e5 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf
index 7670a3170..488624b20 100644
Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ
diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf
index 1cf272342..6e8a53f2e 100644
Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
index 697cc906e..10e5b56da 100644
Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml
index edec8cb55..8ba021afb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml
@@ -3,10 +3,29 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.PPC.Events.EventsViews"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <Image Source="../Images/event_demo.png" RenderOptions.BitmapScalingMode="Fant" />
+             d:DesignHeight="220" d:DesignWidth="750" d:DataContext="{d:DesignInstance Type=entities:MachinesEvent, IsDesignTimeCreatable=False}">
+    <Grid Background="{StaticResource TangoPrimaryBackgroundBrush}">
+        <DockPanel>
+            <Image Stretch="None" Margin="20" DockPanel.Dock="Right" Source="../Images/machine_small.png" RenderOptions.BitmapScalingMode="Fant" />
+            <DockPanel Margin="35 20 20 20">
+                <TextBlock FontSize="{StaticResource TangoTitleFontSize}" FontWeight="SemiBold" DockPanel.Dock="Top" Text="{Binding EventType.Title,FallbackValue='Unknown Event'}"></TextBlock>
+
+                <StackPanel Margin="0 30 0 0">
+                    <TextBlock TextWrapping="Wrap" FontWeight="SemiBold" Text="{Binding EventType.Description,FallbackValue='No Description'}"></TextBlock>
+                    <Rectangle Margin="0 5 0 10" StrokeThickness="2" Stroke="{StaticResource TangoDividerBrush}" />
+
+                    <ItemsControl ItemsSource="{Binding EventType.Guidance,Converter={StaticResource StringToLinesConverter}}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Margin="0 10 0 0" Text="{Binding}" TextWrapping="Wrap"></TextBlock>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
+            </DockPanel>
+        </DockPanel>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/machine_small.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/machine_small.png
new file mode 100644
index 000000000..8b86bfe25
Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Images/machine_small.png differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj
index 815223834..e446e3812 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj
@@ -167,10 +167,13 @@
   <ItemGroup>
     <Resource Include="Images\events.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine_small.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs
index 9ee24ad38..49e0763d9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs
@@ -132,7 +132,7 @@ namespace Tango.PPC.Events.ViewModels
                     var notificationItem = new MessageNotificationItem();
                     notificationItem.CanClose = false;
                     notificationItem.Message = ev.EventType.Title;
-                    notificationItem.ExpandedMessage = ev.Description;
+                    notificationItem.ExpandedMessage = ev.EventType.Description;
                     notificationItem.Pressed += async (_, __) =>
                     {
                         SelectedEventsSource = EventsSource.CURRENT;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Views/MainView.xaml
index 3477a5349..af42a5576 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Views/MainView.xaml
@@ -83,7 +83,7 @@
                                 <touch:LightTouchDataGridColumn Width="1*" Header="Title" SortMember="Name" HorizontalContentAlignment="Left">
                                     <touch:LightTouchDataGridColumn.CellTemplate>
                                         <DataTemplate>
-                                            <TextBlock IsHitTestVisible="False" Text="{Binding Name,Mode=OneWay}"></TextBlock>
+                                            <TextBlock IsHitTestVisible="False" Text="{Binding EventType.Title,Mode=OneWay}"></TextBlock>
                                         </DataTemplate>
                                     </touch:LightTouchDataGridColumn.CellTemplate>
                                 </touch:LightTouchDataGridColumn>
@@ -168,7 +168,7 @@
                                 <touch:LightTouchDataGridColumn Width="1*" Header="Title" SortMember="Name" HorizontalContentAlignment="Left">
                                     <touch:LightTouchDataGridColumn.CellTemplate>
                                         <DataTemplate>
-                                            <TextBlock IsHitTestVisible="False" Text="{Binding Name,Mode=OneWay}"></TextBlock>
+                                            <TextBlock IsHitTestVisible="False" Text="{Binding EventType.Title,Mode=OneWay}"></TextBlock>
                                         </DataTemplate>
                                     </touch:LightTouchDataGridColumn.CellTemplate>
                                 </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index d37ce7583..103a10b28 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -141,6 +141,8 @@ namespace Tango.PPC.Jobs.ViewModels
             e.JobHandler.StatusChanged += JobHandler_StatusChanged;
             e.JobHandler.SpoolChangeRequired += JobHandler_SpoolChangeRequired;
             e.JobHandler.Stopped += JobHandler_Stopped;
+
+            _stop_job_btn.Push();
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
index d72f4544a..ed1e28f55 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
@@ -23,6 +23,8 @@ namespace Tango.PPC.Jobs.ViewModels
     /// <seealso cref="Tango.PPC.Common.PPCViewModel" />
     public class MainViewVM : PPCViewModel
     {
+        private NotificationItem _last_failed_job_notification;
+
         /// <summary>
         /// Called when the application has been started.
         /// </summary>
@@ -52,6 +54,12 @@ namespace Tango.PPC.Jobs.ViewModels
                 InvokeUI(() =>
                 {
                     NavigationManager.NavigateTo<JobsModule>(nameof(JobProgressView));
+
+                    if (_last_failed_job_notification != null)
+                    {
+                        _last_failed_job_notification.Close();
+                        _last_failed_job_notification = null;
+                    }
                 });
             }
             catch (Exception ex)
@@ -71,7 +79,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <param name="e">The <see cref="Integration.Operation.PrintingFailedEventArgs"/> instance containing the event data.</param>
         private void MachineOperator_PrintingFailed(object sender, PrintingFailedEventArgs e)
         {
-            NotificationProvider.PushNotification(new MessageNotificationItem(
+            _last_failed_job_notification = NotificationProvider.PushNotification(new MessageNotificationItem(
                 String.Format("'{0}' failed.", e.Job.Name),
                 String.Format("The job '{1}' has failed due to unexpected error.{0}{2}{0}{0}Tap to view this job details.", Environment.NewLine, e.Job.Name, e.Exception), MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
                  {
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 3ffb6f634..61ddfdb2b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -119,7 +119,15 @@ namespace Tango.PPC.Common.Connection
                                 MachineOperator.Adapter = response.Adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                                 LogManager.Log("Connecting machine operator...", LogCategory.Debug);
-                                await MachineOperator.Connect();
+                                try
+                                {
+                                    await MachineOperator.Connect();
+                                }
+                                catch (Exception)
+                                {
+                                    await response.Adapter.Disconnect();
+                                    throw;
+                                }
 
 
                                 await Task.Delay(1000);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 62f248a8c..b5b9f9b23 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -48,6 +48,7 @@
     <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
     <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
     <converters:IsNullToVisibilityConverter x:Key="IsNullToVisibilityConverter" />
+    <converters:StringToLinesConverter x:Key="StringToLinesConverter" />
 
     <Style TargetType="FrameworkElement">
         <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs
index 6dcc6ffd1..7b8e30dff 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs
@@ -114,5 +114,13 @@ namespace Tango.BL.DTO
             get; set; 
         }
 
+        /// <summary>
+        /// guidance
+        /// </summary>
+        public String Guidance 
+        {
+            get; set; 
+        }
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs
index cb5035f9b..7bbcb5780 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs
@@ -52,6 +52,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> RequiresUserInterventionChanged;
 
+        public event EventHandler<String> GuidanceChanged;
+
         public event EventHandler<SynchronizedObservableCollection<MachinesEvent>> MachinesEventsChanged;
 
         protected Int32 _code;
@@ -372,6 +374,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _guidance;
+
+        /// <summary>
+        /// Gets or sets the eventtypebase guidance.
+        /// </summary>
+
+        [Column("GUIDANCE")]
+
+        public  String Guidance
+        {
+            get 
+            {
+                return _guidance; 
+            }
+
+            set 
+            {
+                if (_guidance != value)
+                {
+                    _guidance = value;
+
+                    OnGuidanceChanged(value);
+
+                }
+            }
+        }
+
         protected SynchronizedObservableCollection<MachinesEvent> _machinesevents;
 
         /// <summary>
@@ -496,6 +525,15 @@ namespace Tango.BL.Entities
             RaisePropertyChanged(nameof(RequiresUserIntervention));
         }
 
+        /// <summary>
+        /// Called when the Guidance has changed.
+        /// </summary>
+        protected virtual void OnGuidanceChanged(String guidance)
+        {
+            GuidanceChanged?.Invoke(this, guidance);
+            RaisePropertyChanged(nameof(Guidance));
+        }
+
         /// <summary>
         /// Called when the MachinesEvents has changed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
index 737f22965..9b4079131 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/EVENT_TYPES.cs
@@ -34,6 +34,7 @@ namespace Tango.DAL.Remote.DB
         public int EVENT_NOTIFICATION_TIME { get; set; }
         public string EVENT_ACTIONS { get; set; }
         public bool REQUIRES_USER_INTERVENTION { get; set; }
+        public string GUIDANCE { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index f889898fd..03b1057eb 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -258,6 +258,7 @@
           <Property Name="EVENT_NOTIFICATION_TIME" Type="int" Nullable="false" />
           <Property Name="EVENT_ACTIONS" Type="varchar" MaxLength="50" />
           <Property Name="REQUIRES_USER_INTERVENTION" Type="bit" Nullable="false" />
+          <Property Name="GUIDANCE" Type="nvarchar(max)" />
         </EntityType>
         <EntityType Name="FIBER_SHAPES">
           <Key>
@@ -3117,6 +3118,7 @@
           <Property Name="EVENT_NOTIFICATION_TIME" Type="Int32" Nullable="false" />
           <Property Name="EVENT_ACTIONS" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
           <Property Name="REQUIRES_USER_INTERVENTION" Type="Boolean" Nullable="false" />
+          <Property Name="GUIDANCE" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="MACHINES_EVENTS" Relationship="RemoteModel.FK_MACHINES_EVENTS_EVENTS" FromRole="EVENT_TYPES" ToRole="MACHINES_EVENTS" />
         </EntityType>
         <EntityType Name="FIBER_SHAPES">
@@ -5288,6 +5290,7 @@
           <EntitySetMapping Name="EVENT_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.EVENT_TYPES">
               <MappingFragment StoreEntitySet="EVENT_TYPES">
+                <ScalarProperty Name="GUIDANCE" ColumnName="GUIDANCE" />
                 <ScalarProperty Name="REQUIRES_USER_INTERVENTION" ColumnName="REQUIRES_USER_INTERVENTION" />
                 <ScalarProperty Name="EVENT_ACTIONS" ColumnName="EVENT_ACTIONS" />
                 <ScalarProperty Name="EVENT_NOTIFICATION_TIME" ColumnName="EVENT_NOTIFICATION_TIME" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index 061d97c22..a1e09fab5 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,76 +5,76 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="7.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="39.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="32.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="23.125" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="16.25" PointY="20" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="22.875" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="61.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="38" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="4" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="14" PointY="52" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="16.25" PointY="51.375" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="45.375" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="29.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="32.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="23.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="54.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="39.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="50.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="35.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="3.75" PointY="48.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6" PointY="42.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="48.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="42.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="47.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="58.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="43.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="35.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="18.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="33.625" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="16.25" PointY="12.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="18.5" PointY="25.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.5" PointY="30.5" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22.5" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="25.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="20" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="17.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="29.125" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="16.25" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="54.375" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="22.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="27" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="11.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="18.75" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="13.5" PointY="8.625" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="0.75" PointY="5.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="5.75" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="7.75" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="0.75" PointY="9.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="12.25" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="2.25" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="38.625" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="0.75" PointY="44.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="4.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="14.5" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="11" PointY="52.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="26.125" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="61.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="5.25" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="3" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="10" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="0.75" PointY="40.75" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="39" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="57" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="11" PointY="56.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="30.25" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="26.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="23.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="8.75" PointY="60.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="0.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="40.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="5.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="3.75" PointY="46.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6" PointY="8.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="10.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="3.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="11" PointY="46.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="13.25" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.5" PointY="24.375" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="35.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="36.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="26.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="64.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3" PointY="37.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="5.25" PointY="17.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="29.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="20.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="32.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="11" PointY="49.75" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="2" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.75" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="50.375" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="23.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="28.125" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="3" PointY="33.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="7.5" PointY="20.125" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="14.625" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="15.5" PointY="20.375" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="14.75" PointY="9.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="2.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="35.875" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 8d1aefe54..5ec04fb41 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -83,6 +83,21 @@ namespace Tango.Emulations.Emulators
             set { _performNativeRoundTrip = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _emulateCorruption;
+        /// <summary>
+        /// Gets or sets a value indicating whether emulate corruption in keep alive and job response.
+        /// </summary>
+        public bool EmulateCorruption
+        {
+            get { return _emulateCorruption; }
+            set
+            {
+                _emulateCorruption = value;
+                RaisePropertyChangedAuto();
+                Transporter.EnableKeepAliveAutoResponse = !_emulateCorruption;
+            }
+        }
+
         #endregion
 
         #region Constructors
@@ -570,21 +585,24 @@ namespace Tango.Emulations.Emulators
                         status.Message = "Demo Message From Emulator...";
                     }
 
-                    if (_current_job_resume_token == null)
+                    if (!EmulateCorruption)
                     {
-                        Transporter.SendResponse<JobResponse>(new JobResponse()
+                        if (_current_job_resume_token == null)
                         {
-                            Status = status,
+                            Transporter.SendResponse<JobResponse>(new JobResponse()
+                            {
+                                Status = status,
 
-                        }, request.Container.Token);
-                    }
-                    else
-                    {
-                        Transporter.SendResponse<ResumeCurrentJobResponse>(new ResumeCurrentJobResponse()
+                            }, request.Container.Token);
+                        }
+                        else
                         {
-                            Status = status,
+                            Transporter.SendResponse<ResumeCurrentJobResponse>(new ResumeCurrentJobResponse()
+                            {
+                                Status = status,
 
-                        }, _current_job_resume_token);
+                            }, _current_job_resume_token);
+                        }
                     }
 
                     progress += Math.Min((centimeter_per_second / 1000d), (job.Length + job.ProcessParameters.DryerBufferLength) - progress);
@@ -880,25 +898,28 @@ namespace Tango.Emulations.Emulators
 
         private void HandleConnectRequest(TangoMessage<ConnectRequest> request)
         {
-            foreach (var cancelToken in _continousResponseTokens)
+            if (!EmulateCorruption)
             {
-                cancelToken.Canceled = true;
-            }
+                foreach (var cancelToken in _continousResponseTokens)
+                {
+                    cancelToken.Canceled = true;
+                }
 
-            _continousResponseTokens.Clear();
+                _continousResponseTokens.Clear();
 
-            Transporter.SendResponse<ConnectResponse>(new ConnectResponse()
-            {
-                DeviceInformation = new DeviceInformation()
+                Transporter.SendResponse<ConnectResponse>(new ConnectResponse()
                 {
-                    Version = "1.0.0.0",
-                    BuildDate = DateTime.Now.ToString(),
-                    Name = "Machine Emulator",
-                    FPGA1Version = "1.1",
-                    FPGA2Version = "2.2",
-                    FPGA3Version = "3.3"
-                },
-            }, request.Container.Token, null, request.Message.Password == "1234" ? ErrorCode.None : ErrorCode.UnauthorizedConnection);
+                    DeviceInformation = new DeviceInformation()
+                    {
+                        Version = "1.0.0.0",
+                        BuildDate = DateTime.Now.ToString(),
+                        Name = "Machine Emulator",
+                        FPGA1Version = "1.1",
+                        FPGA2Version = "2.2",
+                        FPGA3Version = "3.3"
+                    },
+                }, request.Container.Token, null, request.Message.Password == "1234" ? ErrorCode.None : ErrorCode.UnauthorizedConnection);
+            }
         }
 
         private void HandleStopDebugLogRequest(TangoMessage<StopDebugLogRequest> request)
@@ -1224,7 +1245,6 @@ namespace Tango.Emulations.Emulators
         #region Public Methods
 
 
-
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 1bc1ae662..ec36e5d8a 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -96,7 +96,7 @@ namespace Tango.Integration.Operation
         public RunningJobStatus Status
         {
             get { return _Status; }
-            private set { _Status = value; RaisePropertyChangedAuto(); }
+            internal set { _Status = value; RaisePropertyChangedAuto(); }
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index d820db7e4..d116f8760 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -52,6 +52,7 @@ namespace Tango.Integration.Operation
         private bool _eventsSent;
         private bool _debugSent;
         private EmbeddedLogItem _last_embedded_debug_log;
+        private RunningJobStatus _last_job_status;
 
         public static String EmbeddedLogsFolder { get; private set; }
         public static String EmbeddedLogsTag { get; private set; }
@@ -858,6 +859,14 @@ namespace Tango.Integration.Operation
 
                         SendContinuousRequest<ResumeCurrentJobRequest, ResumeCurrentJobResponse>(request, null, TimeSpan.FromSeconds(2)).Subscribe((response) =>
                         {
+                            if (!responseLogged)
+                            {
+                                _last_job_status.IsCanceled = false;
+                                _last_job_status.IsCompleted = false;
+                                _last_job_status.IsFailed = false;
+                                handler.Status = _last_job_status;
+                            }
+
                             handler.RaiseStatusReceived(response.Message.Status);
 
                             if (!responseLogged)
@@ -1290,7 +1299,7 @@ namespace Tango.Integration.Operation
 
                 job = job.Clone();
 
-                int max = job.OrderedSegments.Last().SegmentIndex  + 1;
+                int max = job.OrderedSegments.Last().SegmentIndex + 1;
 
                 var segments = job.OrderedSegments.ToList();
 
@@ -1483,6 +1492,7 @@ namespace Tango.Integration.Operation
                     SendContinuousRequest<JobRequest, JobResponse>(request, null, TimeSpan.FromSeconds(2)).Subscribe((response) =>
                     {
                         handler.RaiseStatusReceived(response.Message.Status);
+                        _last_job_status = handler.Status;
 
                         if (!responseLogged)
                         {
diff --git a/Software/Visual_Studio/Tango.SharedUI/Converters/StringToLinesConverter.cs b/Software/Visual_Studio/Tango.SharedUI/Converters/StringToLinesConverter.cs
new file mode 100644
index 000000000..1d1c420ed
--- /dev/null
+++ b/Software/Visual_Studio/Tango.SharedUI/Converters/StringToLinesConverter.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.SharedUI.Converters
+{
+    /// <summary>
+    /// Converts a string to list of lines.
+    /// </summary>
+    /// <seealso cref="System.Windows.Data.IValueConverter" />
+    public class StringToLinesConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value != null)
+            {
+                return value.ToString().ToLines();
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
index 37ba006f0..53462afbf 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -127,6 +127,7 @@
     <Compile Include="Converters\StringEllipsisConverter.cs" />
     <Compile Include="Converters\StringFormatConverter.cs" />
     <Compile Include="Converters\StringNullOrEmptyToBooleanConverter.cs" />
+    <Compile Include="Converters\StringToLinesConverter.cs" />
     <Compile Include="Converters\StringToWordsConverter.cs" />
     <Compile Include="Converters\TimeSpanToTwoDigitsTimeConverter.cs" />
     <Compile Include="Converters\VersionToShortVersionConverter.cs" />
@@ -236,7 +237,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Transport/ITransporter.cs b/Software/Visual_Studio/Tango.Transport/ITransporter.cs
index a2b22f41f..b114b4681 100644
--- a/Software/Visual_Studio/Tango.Transport/ITransporter.cs
+++ b/Software/Visual_Studio/Tango.Transport/ITransporter.cs
@@ -148,6 +148,11 @@ namespace Tango.Transport
         /// </summary>
         bool UseKeepAlive { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to auto respond to keep alive requests.
+        /// </summary>
+        bool EnableKeepAliveAutoResponse { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether the transporter will get in to a failed state if the <see cref="Adapter"/> has failed.
         /// </summary>
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index e68e3c919..c1a13ce26 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -117,6 +117,11 @@ namespace Tango.Transport
             }
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to auto respond to keep alive requests.
+        /// </summary>
+        public bool EnableKeepAliveAutoResponse { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether the transporter will get in to a failed state if any adapter has failed.
         /// </summary>
@@ -239,6 +244,7 @@ namespace Tango.Transport
             _pendingRequests = new ConcurrentList<TransportMessageBase>();
             _arrivedResponses = new ProducerConsumerQueue<byte[]>();
             RequestTimeout = TimeSpan.FromSeconds(5);
+            EnableKeepAliveAutoResponse = true;
         }
 
         /// <summary>
@@ -1030,7 +1036,7 @@ namespace Tango.Transport
                             LogManager.Log("Saving request token: " + container.Token, LogCategory.Debug);
                             _pendingResponses.Add(container.Token, new PendingResponse(container.Continuous));
 
-                            if (container.Type == MessageType.KeepAliveRequest)
+                            if (container.Type == MessageType.KeepAliveRequest && EnableKeepAliveAutoResponse)
                             {
                                 LogManager.Log("Submitting keep alive response...", LogCategory.Debug);
                                 SendResponse<KeepAliveResponse>(new KeepAliveResponse(), container.Token);
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index a3e349ad0..880ff9c4a 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -5296,12 +5296,12 @@ Global
 		{B822CBD9-1113-4668-85C9-22AA9C24CE60} = {EC62BC9C-F2FE-4333-B7E4-110E38D43958}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal
diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
index 51782b02b..f69281e94 100644
--- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs
@@ -65,6 +65,7 @@ namespace Tango.EventsTypesGenerator
                     newEvent.Category = (EventTypeCategories)Enum.Parse(typeof(EventTypeCategories), evType.Category.Replace(" ", ""), true);
                     newEvent.Group = (EventTypeGroups)Enum.Parse(typeof(EventTypeGroups), evType.Group.Replace(" ", ""), true);
                     newEvent.NotificationTime = (EventTypeNotificationTimes)Enum.Parse(typeof(EventTypeNotificationTimes), evType.NotificationTime.Replace(" ", ""), true);
+                    newEvent.Guidance = !String.IsNullOrWhiteSpace(evType.Guidance) ? evType.Guidance : null;
 
                     //TODO: Do this when Nadav fixes the excel.
 
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
index cd73c0a3d..68ca150d6 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
@@ -179,6 +179,7 @@
                             <SolidColorBrush Color="#151515" Opacity="0.8" />
                         </Grid.Background>
                         <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Margin="5">
+                            <CheckBox Margin="0 0 20 0" VerticalAlignment="Center" IsChecked="{Binding Emulator.EmulateCorruption}" Foreground="Red">Emulate Corruption</CheckBox>
 							<CheckBox Margin="0 0 20 0" VerticalAlignment="Center" IsChecked="{Binding Emulator.PerformNativeRoundTrip}">Perform Native RoundTrip</CheckBox>
                             <ComboBox IsEnabled="{Binding Emulator.IsStarted,Converter={StaticResource BooleanInverseConverter}}" MinWidth="140" Margin="5" BorderThickness="0" ItemsSource="{Binding Ports}" SelectedItem="{Binding SelectedPort}"></ComboBox>
                             <Button Margin="5" MinWidth="100" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding ClearCommand}">
-- 
cgit v1.3.1