Fixed issues with reset counters.

Display general authorization error instead of unexpected application error.
Display environment on FSE.
Completed cleaner dispensing dialog.
Hide/show "Open/Close dyeing head lid" on Flat/Arc.
Emulator will raise proper "Opened" events after "Open dyeing head lid" command.
Updated EF Extensions version to all project due to a bug in "DeleteFromQuery".

3 files changed, 29 insertions, 11 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml
index 5fa737221..98be45608 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingView.xaml
@@ -6,28 +6,45 @@
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:local="clr-namespace:Tango.PPC.Maintenance.Dialogs"
              mc:Ignorable="d" 
-             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="600" Height="800" d:DataContext="{d:DesignInstance Type=local:CleanerDispensingViewVM, IsDesignTimeCreatable=False}">
+             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="600" Height="950" d:DataContext="{d:DesignInstance Type=local:CleanerDispensingViewVM, IsDesignTimeCreatable=False}">
     <Grid>
         <StackPanel Margin="0 50 0 0" HorizontalAlignment="Center">
             <Image Source="../Images/head_cleaning.png" RenderOptions.BitmapScalingMode="Fant" Stretch="Uniform" Height="120"></Image>
             <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Margin="0 30 0 0">Dispense Cleaning Liquid</TextBlock>
 
+
+            <DockPanel Margin="20 40" HorizontalAlignment="Center">
+                <touch:TouchIcon Icon="Alert" Foreground="{StaticResource TangoErrorBrush}" />
+                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}">Please put on safety glasses</TextBlock>
+            </DockPanel>
+            
             <Label Margin="20 10" HorizontalAlignment="Center">
                 <Label.Style>
                     <Style TargetType="Label">
                         <Setter Property="Content">
                             <Setter.Value>
-                                <TextBlock>
-                                    <Run>Press 'start' to initiate the cleaner liquid dispensing</Run>
+                                <TextBlock LineHeight="30" TextWrapping="Wrap">
+                                    <Run>1. Pull the thread aside and clean with Q tip when the liquid is dispensed.</Run>
+                                    <LineBreak/>
+                                    <Run>2. Dispense again if the liquid isn't enough for cleaning.</Run>
+                                    <LineBreak/>
+                                    <Run>3. When cleaning is completed, return the thread back to the V-Groove and press the 'Close Dyeing Head Lid' button to close the head lid</Run>
                                 </TextBlock>    
                             </Setter.Value>
                         </Setter>
                         <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsStarted}" Value="True">
-                                <Setter Property="Content" Value="Cleaner dispensing in progress"></Setter>
-                            </DataTrigger>
-                            <DataTrigger Binding="{Binding IsCompleted}" Value="True">
-                                <Setter Property="Content" Value="Cleaner dispensing completed"></Setter>
+                            <DataTrigger Binding="{Binding MachineProvider.Machine.MachineHeadType}" Value="Arc">
+                                <Setter Property="Content">
+                                    <Setter.Value>
+                                        <TextBlock LineHeight="30" TextWrapping="Wrap">
+                                            <Run>1. Open the dyeing head lid,  pull the thread aside and clean with Q tip when the liquid is dispensed.</Run>
+                                            <LineBreak/>
+                                            <Run>2. Dispense again if the liquid isn't enough for cleaning.</Run>
+                                            <LineBreak/>
+                                            <Run>3. When cleaning is completed, return the thread back to the V-Groove and install the head lid back.</Run>
+                                        </TextBlock>
+                                    </Setter.Value>
+                                </Setter>
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -40,7 +57,7 @@
 
             <StackPanel Margin="40 150 40 40">
                 <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Status}"></TextBlock>
-                <touch:TouchProgressBar Margin="0 5 0 0" VerticalAlignment="Bottom" Width="500" Height="10" Minimum="0" Maximum="100" Value="0" IsIndeterminate="{Binding IsStarted}">
+                <touch:TouchProgressBar Margin="0 5 0 0" VerticalAlignment="Bottom" Height="10" Minimum="0" Maximum="100" Value="0" IsIndeterminate="{Binding IsStarted}">
                     
                 </touch:TouchProgressBar>
             </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs
index b84cd83de..e37be417f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs
@@ -23,7 +23,7 @@ namespace Tango.PPC.Maintenance.Dialogs
         private const int JOGGING_SPEED = 400;
 
         [TangoInject]
-        private IMachineProvider MachineProvider { get; set; }
+        public IMachineProvider MachineProvider { get; set; }
 
         [TangoInject]
         private INotificationProvider NotificationProvider { get; set; }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
index 286485d47..d00b4abb2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
@@ -10,6 +10,7 @@
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
              xmlns:localConverters="clr-namespace:Tango.PPC.Maintenance.Converters"
              xmlns:localControls="clr-namespace:Tango.PPC.Maintenance.Controls"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:local="clr-namespace:Tango.PPC.Maintenance.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1800" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MaintenanceViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MaintenanceViewVM}">
@@ -247,7 +248,7 @@
                                         <localControls:ButtonState Value="Opened" Content="CLOSE RIGHT LEADING WHEELS" />
                                     </localControls:StateTouchButton>
 
-                                    <localControls:StateTouchButton Command="{Binding OpenCloseDyeingHeadCommand.Command}" SelectedState="{Binding OpenCloseDyeingHeadCommand.State}" Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}">
+                                    <localControls:StateTouchButton Command="{Binding OpenCloseDyeingHeadCommand.Command}" SelectedState="{Binding OpenCloseDyeingHeadCommand.State}" Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}" Visibility="{Binding MachineProvider.Machine.MachineHeadType,Converter={StaticResource IsToStringEqualToVisibilityConverter},ConverterParameter='Flat'}">
                                         <localControls:ButtonState Value="Closed" Content="OPEN DYEING HEAD LID" />
                                         <localControls:ButtonState Value="Opened" Content="CLOSE DYEING HEAD LID" />
                                     </localControls:StateTouchButton>