Working on Developer Module.

26 files changed, 261 insertions, 37 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 8c88f40a2..9f292f6db 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 3eb7381ae..4babee4c8 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Graphics/calendar.png b/Software/Graphics/calendar.png
new file mode 100644
index 000000000..763783514
--- /dev/null
+++ b/Software/Graphics/calendar.png
diff --git a/Software/Graphics/description.png b/Software/Graphics/description.png
new file mode 100644
index 000000000..d6e3d76ea
--- /dev/null
+++ b/Software/Graphics/description.png
diff --git a/Software/Graphics/inter-segment.png b/Software/Graphics/inter-segment.png
new file mode 100644
index 000000000..e7c25faa2
--- /dev/null
+++ b/Software/Graphics/inter-segment.png
diff --git a/Software/Graphics/lubrication.png b/Software/Graphics/lubrication.png
new file mode 100644
index 000000000..bba463b31
--- /dev/null
+++ b/Software/Graphics/lubrication.png
diff --git a/Software/Graphics/name.png b/Software/Graphics/name.png
new file mode 100644
index 000000000..a25bded5c
--- /dev/null
+++ b/Software/Graphics/name.png
diff --git a/Software/Graphics/rgb.png b/Software/Graphics/rgb.png
new file mode 100644
index 000000000..42f69513b
--- /dev/null
+++ b/Software/Graphics/rgb.png
diff --git a/Software/Graphics/wind.png b/Software/Graphics/wind.png
new file mode 100644
index 000000000..23d2e0035
--- /dev/null
+++ b/Software/Graphics/wind.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/calendar.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/calendar.png
new file mode 100644
index 000000000..763783514
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/calendar.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/description.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/description.png
new file mode 100644
index 000000000..d6e3d76ea
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/description.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/inter-segment.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/inter-segment.png
new file mode 100644
index 000000000..e7c25faa2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/inter-segment.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/lubrication.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/lubrication.png
new file mode 100644
index 000000000..bba463b31
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/lubrication.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/machine-trans.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/machine-trans.png
new file mode 100644
index 000000000..a7cf65852
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/machine-trans.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/name.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/name.png
new file mode 100644
index 000000000..a25bded5c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/name.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/rgb.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/rgb.png
new file mode 100644
index 000000000..42f69513b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/rgb.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/wind.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/wind.png
new file mode 100644
index 000000000..23d2e0035
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Images/wind.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 5c90f04bd..f5da6fca4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -142,9 +142,24 @@
       <Name>Tango.MachineStudio.MachineDesigner</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\rgb.png" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\developer.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\description.png" />
+    <Resource Include="Images\inter-segment.png" />
+    <Resource Include="Images\lubrication.png" />
+    <Resource Include="Images\name.png" />
+    <Resource Include="Images\wind.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\calendar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\machine-trans.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
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 34a4ff470..2013de3c8 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
@@ -69,6 +69,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set { _groupsHistory = value; RaisePropertyChangedAuto(); }
         }
 
+        private Job _selectedJob;
+
+        public Job SelectedJob
+        {
+            get { return _selectedJob; }
+            set { _selectedJob = value; RaisePropertyChangedAuto(); }
+        }
 
 
         private Rml _selectedRML;
@@ -114,6 +121,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             ToggleSideBarCommand = new RelayCommand(() => IsSideBarOpened = !IsSideBarOpened);
             SaveProcessParametersCommand = new RelayCommand(SaveProcessParameters);
             SaveLiquidFactorsCommand = new RelayCommand(SaveLiquidFactors);
+            IsSideBarOpened = true;
         }
 
         private async void SaveLiquidFactors()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index fa6cbbd76..7d98fe2d7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -16,7 +16,7 @@
              xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=True}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="White" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=True}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <UserControl.Resources>
         <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
@@ -51,19 +51,24 @@
                     <Grid.Style>
                         <Style TargetType="Grid">
                             <Setter Property="Height" Value="350"></Setter>
+                            <Setter Property="LayoutTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
+                                </Setter.Value>
+                            </Setter>
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding IsSideBarOpened}" Value="True">
                                     <DataTrigger.EnterActions>
                                         <BeginStoryboard>
                                             <Storyboard>
-                                                <DoubleAnimation Storyboard.TargetProperty="Height" To="350" Duration="00:00:0.2"></DoubleAnimation>
+                                                <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleY" To="1" Duration="00:00:0.2"></DoubleAnimation>
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </DataTrigger.EnterActions>
                                     <DataTrigger.ExitActions>
                                         <BeginStoryboard>
                                             <Storyboard>
-                                                <DoubleAnimation Storyboard.TargetProperty="Height" To="0" Duration="00:00:0.2"></DoubleAnimation>
+                                                <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleY" To="0" Duration="00:00:0.2"></DoubleAnimation>
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </DataTrigger.ExitActions>
@@ -283,7 +288,159 @@
                 </Grid>
 
                 <Grid Grid.Row="1">
-                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Margin="344,265,343,352" Grid.Row="1">CENTER</TextBlock>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="234*"/>
+                            <RowDefinition Height="131*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="173*"/>
+                            <ColumnDefinition Width="467*"/>
+                        </Grid.ColumnDefinitions>
+
+
+                        <Grid>
+                            <Rectangle HorizontalAlignment="Right" StrokeDashArray="5" StrokeThickness="1" Stroke="Silver" Margin="0 40 0 40"></Rectangle>
+                            <DockPanel Margin="10">
+                                <StackPanel DockPanel.Dock="Top" >
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="../Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant" Width="70"></Image>
+                                        <TextBlock VerticalAlignment="Top" FontWeight="SemiBold" Margin="10 10 0 0" FontSize="14">MACHINE JOBS</TextBlock>
+                                    </StackPanel>
+
+                                    <Rectangle VerticalAlignment="Bottom" StrokeDashArray="7" StrokeThickness="1" Stroke="Silver" Margin="0 8 0 0"></Rectangle>
+                                </StackPanel>
+                                <ListBox ItemsSource="{Binding SelectedMachine.Jobs}" SelectedItem="{Binding SelectedJob}" Margin="0 10 0 0">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid>
+                                                <StackPanel Orientation="Horizontal">
+                                                    <Image Source="../Images/rgb.png" Width="32"></Image>
+
+                                                    <StackPanel VerticalAlignment="Center" Margin="10 0 0 0">
+                                                        <TextBlock FontWeight="Bold" Text="{Binding Name}"></TextBlock>
+                                                        <TextBlock Foreground="Gray" FontStyle="Italic" FontSize="10" Text="{Binding CreationDate}"></TextBlock>
+                                                    </StackPanel>
+
+
+                                                </StackPanel>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                            </DockPanel>
+                        </Grid>
+
+                        <Grid Grid.Column="1" Margin="10">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid>
+                                <StackPanel>
+                                    <Grid>
+                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                            <Image Source="../Images/rgb.png" Width="24"></Image>
+                                            <TextBlock Margin="5 0 0 0" Text="{Binding SelectedJob.Name,FallbackValue='UNSET'}" FontSize="16" FontWeight="SemiBold" VerticalAlignment="Center"></TextBlock>
+                                        </StackPanel>
+
+                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0" HorizontalAlignment="Right">
+                                            <TextBlock Margin="0 0 5 0" Text="{Binding SelectedJob.CreationDate,FallbackValue='UNSET'}" FontSize="12" Foreground="Gray" FontStyle="Italic" VerticalAlignment="Center"></TextBlock>
+                                            <Image Source="../Images/calendar.png" Width="16"></Image>
+                                        </StackPanel>
+                                    </Grid>
+
+                                    <StackPanel Orientation="Horizontal" Margin="0 20 0 0" MaxWidth="800" HorizontalAlignment="Left">
+                                        <StackPanel Margin="5" Width="140">
+                                            <StackPanel Orientation="Horizontal">
+                                                <Image Source="../Images/name.png" Width="32"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Name</TextBlock>
+                                            </StackPanel>
+                                            <TextBox Margin="0 3 0 0" Text="{Binding SelectedJob.Name,UpdateSourceTrigger=PropertyChanged}" materialDesign:HintAssist.Hint="Name"></TextBox>
+                                        </StackPanel>
+
+                                        <StackPanel Margin="20 5 5 5" Width="140">
+                                            <StackPanel Orientation="Horizontal">
+                                                <Image Source="../Images/wind.png" Width="32"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Winding Method</TextBlock>
+                                            </StackPanel>
+                                            <ComboBox ItemsSource="{Binding Adapter.WindingMethods}" SelectedItem="{Binding SelectedJob.WindingMethods}" DisplayMemberPath="Name" materialDesign:HintAssist.Hint="Winding Method"></ComboBox>
+                                        </StackPanel>
+
+                                        <StackPanel Margin="20 5 5 5"  Width="140">
+                                            <StackPanel Orientation="Horizontal">
+                                                <Image Source="../Images/inter-segment.png" Width="32"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Inter Segment</TextBlock>
+                                            </StackPanel>
+                                            <DockPanel LastChildFill="True">
+                                                <ToggleButton DockPanel.Dock="Right" VerticalAlignment="Bottom" HorizontalAlignment="Right" IsChecked="{Binding SelectedJob.EnableInterSegment}"></ToggleButton>
+                                                <mahapps:NumericUpDown IsEnabled="{Binding SelectedJob.EnableInterSegment}" Margin="0 2 0 0" HideUpDownButtons="True" Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedJob.InterSegmentLength,Mode=TwoWay}"></mahapps:NumericUpDown>
+                                            </DockPanel>
+                                        </StackPanel>
+
+                                        <StackPanel Margin="20 5 5 5"  Width="140">
+                                            <StackPanel Orientation="Horizontal">
+                                                <Image Source="../Images/lubrication.png" Width="32"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Lubrication</TextBlock>
+                                            </StackPanel>
+                                            <DockPanel LastChildFill="True" Margin="0 10 0 0">
+                                                <ToggleButton DockPanel.Dock="Right" VerticalAlignment="Center" HorizontalAlignment="Right" IsChecked="{Binding SelectedJob.EnableLubrication}"></ToggleButton>
+                                                <TextBlock HorizontalAlignment="Left">Enable</TextBlock>
+                                            </DockPanel>
+                                        </StackPanel>
+                                    </StackPanel>
+
+
+                                    <StackPanel Orientation="Horizontal" Margin="10 20 0 0">
+                                        <Image Source="../Images/description.png" Width="32"></Image>
+                                        <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Description</TextBlock>
+                                    </StackPanel>
+
+                                    <Border BorderThickness="1" BorderBrush="Silver" CornerRadius="5" Margin="0 0 5 5">
+                                        <TextBox Style="{x:Null}" BorderThickness="0" Margin="5" Height="80" Text="{Binding SelectedJob.Description}" VerticalAlignment="Stretch" materialDesign:HintAssist.Hint="Enter description" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"></TextBox>
+                                    </Border>
+                                </StackPanel>
+                            </Grid>
+
+                            <Grid Grid.Column="1" Background="{StaticResource SideBarBackground}" Margin="10 0 0 0" Width="400">
+                                <Grid.Style>
+                                    <Style TargetType="Grid">
+                                        <Setter Property="LayoutTransform">
+                                            <Setter.Value>
+                                                <ScaleTransform ScaleY="1" ScaleX="1"></ScaleTransform>
+                                            </Setter.Value>
+                                        </Setter>
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsSideBarOpened}" Value="True">
+                                                <DataTrigger.EnterActions>
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleX" To="0" Duration="00:00:0.2"></DoubleAnimation>
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </DataTrigger.EnterActions>
+                                                <DataTrigger.ExitActions>
+                                                    <BeginStoryboard>
+                                                        <Storyboard>
+                                                            <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleX" To="1" Duration="00:00:0.2"></DoubleAnimation>
+                                                        </Storyboard>
+                                                    </BeginStoryboard>
+                                                </DataTrigger.ExitActions>
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Grid.Style>
+
+                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">CAMERAS</TextBlock>
+                            </Grid>
+                        </Grid>
+
+                  
+
+                        <Grid Grid.Row="1" Grid.ColumnSpan="2">
+
+                        </Grid>
+                    </Grid>
                 </Grid>
             </Grid>
 
@@ -291,19 +448,24 @@
                 <Grid.Style>
                     <Style TargetType="Grid">
                         <Setter Property="Width" Value="550"></Setter>
+                        <Setter Property="LayoutTransform">
+                            <Setter.Value>
+                                <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
+                            </Setter.Value>
+                        </Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding IsSideBarOpened}" Value="True">
                                 <DataTrigger.EnterActions>
                                     <BeginStoryboard>
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="Width" To="550" Duration="00:00:0.2"></DoubleAnimation>
+                                            <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleX" To="1" Duration="00:00:0.2"></DoubleAnimation>
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </DataTrigger.EnterActions>
                                 <DataTrigger.ExitActions>
                                     <BeginStoryboard>
                                         <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetProperty="Width" To="0" Duration="00:00:0.2"></DoubleAnimation>
+                                            <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleX" To="0" Duration="00:00:0.2"></DoubleAnimation>
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </DataTrigger.ExitActions>
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs
index 8eca92ea9..cfbc66d9b 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Job.cs
@@ -10,6 +10,25 @@ namespace Tango.DAL.Observables
     public partial class Job : ObservableEntity<JOB>
     {
 
+        private DateTime _creationdate;
+        /// <summary>
+        /// Gets or sets the job creation date.
+        /// </summary>
+        [EntityFieldName("CREATION_DATE")]
+        public DateTime CreationDate
+        {
+            get 
+            {
+                return _creationdate; 
+            }
+
+            set 
+            {
+                _creationdate = value; RaisePropertyChanged(nameof(CreationDate)); 
+            }
+
+        }
+
         private String _machineguid;
         /// <summary>
         /// Gets or sets the job machine guid.
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs
index 94a19faa2..95e6d5e6d 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Enumerations/WindingMethods.cs
@@ -8,5 +8,18 @@ namespace Tango.DAL.Observables
 {
     public enum WindingMethods
     {
+
+        /// <summary>
+        /// (Embroidery Winding)
+        /// </summary>
+        [Description("Embroidery Winding")]
+        Embroidery = 0,
+
+        /// <summary>
+        /// (Calibration Winding)
+        /// </summary>
+        [Description("Calibration Winding")]
+        Calibration = 1,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
index b61f9ae77..6fe53fce8 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
@@ -160,6 +160,7 @@ namespace Tango.DAL.Observables
             foreach (var machine in Machines)
             {
                 machine.MachinesConfigurations = machine.MachinesConfigurations.OrderByDescending(x => x.Configuration.CreationDate).Take(30).ToObservableCollection();
+                machine.Jobs = machine.Jobs.OrderByDescending(x => x.CreationDate).ToObservableCollection();
             }
 
             MachinesConfigurations = Context.MACHINES_CONFIGURATIONS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity<MachinesConfiguration>(x)).ToObservableCollection();
@@ -256,6 +257,8 @@ namespace Tango.DAL.Observables
                 group.ProcessParametersTables = group.ProcessParametersTables.OrderBy(x => x.TableIndex).ToObservableCollection();
             }
 
+            WindingMethods = Context.WINDING_METHODS.ToList().Select(x => ObservableEntity.CreateObservableFromEntity<WindingMethod>(x)).ToObservableCollection();
+
             InitCollectionSources();
 
             //BindingOperations.EnableCollectionSynchronization(Machines, _syncLock);
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
index 991891f4b..e1d4055a1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB.cs
@@ -24,6 +24,7 @@ namespace Tango.DAL.Remote.DB
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
+        public System.DateTime CREATION_DATE { get; set; }
         public string MACHINE_GUID { get; set; }
         public string RML_GUID { get; set; }
         public string WINDING_METHOD_GUID { 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 e2cfc2521..fae420ad2 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -292,6 +292,7 @@
           <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="CREATION_DATE" Type="datetime2" Precision="7" Nullable="false" />
           <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="WINDING_METHOD_GUID" Type="varchar" MaxLength="36" Nullable="false" />
@@ -2116,6 +2117,7 @@
           <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="CREATION_DATE" Type="DateTime" Nullable="false" Precision="7" />
           <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="WINDING_METHOD_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
@@ -3465,6 +3467,7 @@
                 <ScalarProperty Name="WINDING_METHOD_GUID" ColumnName="WINDING_METHOD_GUID" />
                 <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
                 <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
+                <ScalarProperty Name="CREATION_DATE" ColumnName="CREATION_DATE" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
                 <ScalarProperty Name="ID" ColumnName="ID" />
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 e13562f05..f73dbe9e8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,50 +5,50 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="8.75" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="5.75" PointY="61.125" />
         <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="48.25" />
         <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="78" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="52.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="66.375" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="55.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="9.75" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="8" PointY="51.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="1.5" PointY="72.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="9.75" PointY="3.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="6" PointY="44.75" />
         <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="9.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="7.5" PointY="33.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="5.25" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="7.5" PointY="23.625" />
         <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="59.625" />
         <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="36.125" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="8" PointY="45.25" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="69.25" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6" PointY="56.75" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="55.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="66.375" />
         <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="3.75" PointY="48" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="11" PointY="48.125" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="22.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10.25" PointY="33.625" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="20.875" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="14.5" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="6" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="8" PointY="51.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="25.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="17" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="52.5" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="8.25" PointY="44.125" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="7.5" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="5.25" PointY="7.375" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="19.875" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="27" />
         <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="9.25" />
         <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="44" />
         <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="42.875" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="5.25" PointY="52.75" />
         <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="6" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="6.25" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="16.875" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="8" PointY="48.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="0.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="22.75" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="6.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="9" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="6" PointY="47.625" />
         <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="31.5" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="6.75" PointY="56.375" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="27.375" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="28.625" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="3.75" PointY="23.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="18.625" />
         <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="10.625" />
         <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="3.75" PointY="34.375" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="9" PointY="38.375" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="6" PointY="33.375" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="7.5" PointY="5.625" />
         <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="0.75" PointY="0.75" />
         <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="3.75" PointY="37.75" />
         <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="6" PointY="37.375" />