Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

8 files changed, 73 insertions, 33 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
index ff46f9c9f..523281b9e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Jobs Module")]
-[assembly: AssemblyVersion("2.0.3.1536")]
+[assembly: AssemblyVersion("2.0.4.1407")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
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 28ff1793b..389349f54 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
@@ -21,26 +21,28 @@ namespace Tango.PPC.Jobs.ViewModels
 
         private void MachineOperator_PrintingFailed(object sender, Integration.Operation.PrintingFailedEventArgs e)
         {
-            NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("Job failed. ({0})", e.Exception.Message), MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
-            {
-                NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
-                NavigationManager.ClearHistoryExcept<JobsView>();
-            }));
+            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, () =>
+                 {
+                     NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
+                     NavigationManager.ClearHistoryExcept<JobsView>();
+                 }));
         }
 
         private void MachineOperator_PrintingCompleted(object sender, Integration.Operation.PrintingEventArgs e)
         {
             if (e.Job.Designation == BL.Enumerations.JobDesignations.SampleDye)
             {
-                NotificationProvider.PushNotification(new MessageNotificationItem("Sample completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
-                {
-                    NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job, Intent = JobNavigationIntent.SampleDye });
-                    NavigationManager.ClearHistoryExcept<JobsView>();
-                }));
+                NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' sample dye completed successfully", e.Job.Name), "Tap to approve or repeat.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+                   {
+                       NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job, Intent = JobNavigationIntent.SampleDye });
+                       NavigationManager.ClearHistoryExcept<JobsView>();
+                   }));
             }
             else if (e.Job.Designation == BL.Enumerations.JobDesignations.FineTuning)
             {
-                NotificationProvider.PushNotification(new MessageNotificationItem("Fine tuning completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+                NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' fine tuning completed successfully", e.Job.Name), "Tap to approve or repeat.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
                 {
                     NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job, Intent = JobNavigationIntent.FineTuning });
                     NavigationManager.ClearHistoryExcept<JobsView>();
@@ -48,7 +50,7 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             else
             {
-                NotificationProvider.PushNotification(new MessageNotificationItem("Job completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+                NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' completed successfully", e.Job.Name), "Tap to view this job details.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
                 {
                     NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job });
                     NavigationManager.ClearHistoryExcept<JobsView>();
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 eb5497bd8..612c850a3 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
@@ -47,8 +47,34 @@
                     </touch:TouchRingProgress.Style>
                 </touch:TouchRingProgress>
 
-                <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" IsIndeterminate="{Binding RunningJobStatus.IsSettingUp}" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
-
+                <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <touch:TouchBusyIndicator.Style>
+                        <Style TargetType="touch:TouchBusyIndicator">
+                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                            <Setter Property="Value" Value="0"></Setter>
+                            <Setter Property="IsIndeterminate" Value="False"></Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                    <Setter Property="Value" Value="0"></Setter>
+                                    <Setter Property="IsIndeterminate" Value="True"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                    <Setter Property="Value" Value="99.9"></Setter>
+                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                    <Setter Property="Value" Value="99.9"></Setter>
+                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </touch:TouchBusyIndicator.Style>
                 </touch:TouchBusyIndicator>
 
                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
index 7252dea6d..52774bee8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Module")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
index 5e120ab8c..b7f206e7c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
@@ -23,6 +23,13 @@ namespace Tango.PPC.Common.Notifications.NotificationItems
             set { _message = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _expandedMessage;
+        public String ExpandedMessage
+        {
+            get { return _expandedMessage; }
+            set { _expandedMessage = value; RaisePropertyChangedAuto(); }
+        }
+
         private MessageNotificationItemTypes _messageType;
 
         public MessageNotificationItemTypes MessageType
@@ -41,14 +48,25 @@ namespace Tango.PPC.Common.Notifications.NotificationItems
 
         }
 
-        public MessageNotificationItem(String message, MessageNotificationItemTypes type, Action pressed) : this()
+        public MessageNotificationItem(String message, String expandedMessage, MessageNotificationItemTypes type, Action pressed) : this()
         {
             Message = message;
+            ExpandedMessage = expandedMessage;
             MessageType = type;
             Pressed += (_, __) => pressed?.Invoke();
         }
 
-        public MessageNotificationItem(String message, MessageNotificationItemTypes type) : this(message, type, null)
+        public MessageNotificationItem(String message, MessageNotificationItemTypes type, Action pressed) : this(message, null, type, pressed)
+        {
+
+        }
+
+        public MessageNotificationItem(String message, String expandedMessage, MessageNotificationItemTypes type) : this(message, expandedMessage, type, null)
+        {
+
+        }
+
+        public MessageNotificationItem(String message, MessageNotificationItemTypes type) : this(message, null, type)
         {
 
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
index 057e86a13..9b583a117 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
@@ -7,7 +7,7 @@
              xmlns:local="clr-namespace:Tango.PPC.Common.Notifications.NotificationItems"
              mc:Ignorable="d" 
              d:DesignHeight="60" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=local:MessageNotificationItem, IsDesignTimeCreatable=False}" MinHeight="60" Height="60" MaxHeight="150">
-    
+
     <ContentControl>
         <ContentControl.Style>
             <Style TargetType="ContentControl">
@@ -50,18 +50,12 @@
                     </Style>
                 </touch:TouchIcon.Style>
             </touch:TouchIcon>
-            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Text="{Binding Message}" TextTrimming="CharacterEllipsis">
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Setter Property="TextWrapping" Value="NoWrap"></Setter>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsExpanded}" Value="True">
-                                <Setter Property="TextWrapping" Value="Wrap"></Setter>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </TextBlock.Style>
-            </TextBlock>
+
+            <StackPanel Margin="10 0 0 0" VerticalAlignment="Center">
+                <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap"></TextBlock>
+
+                <TextBlock Margin="0 20 0 0" Text="{Binding ExpandedMessage}" TextWrapping="Wrap" Visibility="{Binding IsExpanded,Converter={StaticResource BooleanToVisibilityConverter}}"></TextBlock>
+            </StackPanel>
         </DockPanel>
     </ContentControl>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
index 254e25c85..3f5a630f6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Common Library")]
-[assembly: AssemblyVersion("2.0.3.1536")]
+[assembly: AssemblyVersion("2.0.4.1407")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index a55e18b30..8554905d2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Application")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]