diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-26 08:07:35 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-12-26 08:07:35 +0200 |
| commit | 3d21d04d1dffe6fa13e64281ab004000a0ded41d (patch) | |
| tree | 79bdd19a23cf57b8d0ea2d671860602cba64d204 /Software/Visual_Studio/PPC/Modules | |
| parent | e1a2dde7fe9c728dfb3247b34d89b947b4132fd2 (diff) | |
| parent | 1ef776620088308e380a69271518c2c66fd673a0 (diff) | |
| download | Tango-3d21d04d1dffe6fa13e64281ab004000a0ded41d.tar.gz Tango-3d21d04d1dffe6fa13e64281ab004000a0ded41d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
3 files changed, 7 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs index fb3818e41..08f3adba6 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs @@ -321,7 +321,7 @@ namespace Tango.PPC.Jobs.ViewModels RaiseMessage(new JobSelectedMessage() { Job = job, Context = _db }); - if (!directlyToEdit && MachineProvider.MachineOperator.Status == Integration.Operation.MachineStatuses.ReadyToDye) + if (!directlyToEdit && MachineProvider.MachineOperator.CanPrint) { await NavigationManager.NavigateWithObject<JobsModule, JobSummeryView, JobSummeryNavigationObject>(new JobSummeryNavigationObject() { diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/UpdateDetailsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/UpdateDetailsView.xaml index 1f0f57be0..ccf2062c1 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/UpdateDetailsView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Dialogs/UpdateDetailsView.xaml @@ -39,6 +39,9 @@ <DataTrigger Binding="{Binding IsOfflineUpdate}" Value="True"> <Setter Property="Icon" Value="Sd"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding IsOfflineFirmwareUpgrade}" Value="True"> + <Setter Property="Icon" Value="Chip"></Setter> + </DataTrigger> <DataTrigger Binding="{Binding IsStarted}" Value="True"> <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter> </DataTrigger> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/UpdatesView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/UpdatesView.xaml index df2e2d65f..501632bfa 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/UpdatesView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/UpdatesView.xaml @@ -63,6 +63,9 @@ <DataTrigger Binding="{Binding IsOfflineUpdate}" Value="True"> <Setter Property="Icon" Value="Sd"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding IsOfflineFirmwareUpgrade}" Value="True"> + <Setter Property="Icon" Value="Chip"></Setter> + </DataTrigger> <DataTrigger Binding="{Binding IsStarted}" Value="True"> <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter> </DataTrigger> |