From 992208add11db73cb1ffb48c5ccedb0c883aafd0 Mon Sep 17 00:00:00 2001
From: Roy <Roy.mail.net@gmail.com>
Date: Wed, 2 Nov 2022 04:49:10 +0200
Subject: PPC multi version support completed on PPC,FSE,MS,DB.

---
 .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs       | 3 +--
 .../Views/MachineUpdateDetailsDialog.xaml                              | 2 +-
 .../Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 2333bf60a..c31ea0a53 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -502,8 +502,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     ActiveMachineAdapter.Organizations = (await ActiveMachineAdapter.Context.Organizations.ToListAsync()).ToObservableCollection();
 
                     var tags = (await ActiveMachineAdapter.Context.TangoVersions.Select(x => x.Tag).Where(x => x != null).Distinct().ToListAsync());
-                    tags.Insert(0, null);
-
+                    tags.Insert(0, String.Empty);
                     Tags = tags;
 
                     bool initHwConfig = true;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml
index 0e793dc6a..03b32f8c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdateDetailsDialog.xaml
@@ -72,7 +72,7 @@
                             <TextBlock Text="Started On:" FontWeight="SemiBold" />
                             <TextBlock Text="{Binding Update.StartDate,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}"></TextBlock>
                             <TextBlock Text="Application:" FontWeight="SemiBold" />
-                            <TextBlock Text="{Binding Update.ApplicationVersion}"></TextBlock>
+                            <TextBlock Text="{Binding Update.VersionAndTag}"></TextBlock>
                             <TextBlock Text="Firmware:" FontWeight="SemiBold" />
                             <TextBlock Text="{Binding Update.FirmwareVersion}"></TextBlock>
                             <TextBlock Text="Ended:" FontWeight="SemiBold" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml
index bd272718d..dbd369ab0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineUpdatesView.xaml
@@ -99,7 +99,7 @@
                                     </DataGridTemplateColumn.CellTemplate>
                                 </DataGridTemplateColumn>
                                 <DataGridTextColumn Header="STARTED" Binding="{Binding StartDate,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
-                                <DataGridTextColumn Header="APPLICATION" Binding="{Binding ApplicationVersion}" Width="Auto" />
+                                <DataGridTextColumn Header="APPLICATION" Binding="{Binding VersionAndTag}" Width="Auto" />
                                 <DataGridTextColumn Header="FIRMWARE" Binding="{Binding FirmwareVersion}" Width="Auto" />
                                 <DataGridTextColumn Header="ENDED" Binding="{Binding EndDate,TargetNullValue='Never',FallbackValue='Never',Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="Auto" />
                                 <DataGridTextColumn Header="STATUS" Binding="{Binding UpdateStatus,Converter={StaticResource EnumToDescriptionConverter}}" Width="Auto" />
-- 
cgit v1.3.1