diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2022-07-26 12:07:17 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2022-07-26 12:07:17 +0300 |
| commit | 729aba268c416391525ba6a16347d24a59ec8f91 (patch) | |
| tree | 0ad35c212634b853078bb77b925370a2bb7dd1a1 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager | |
| parent | e564cbdf27ba9568d59d8cce9b26c60322821bec (diff) | |
| download | Tango-729aba268c416391525ba6a16347d24a59ec8f91.tar.gz Tango-729aba268c416391525ba6a16347d24a59ec8f91.zip | |
Version Tag Rescued from old PC.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager')
3 files changed, 14 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Models/MachineModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Models/MachineModel.cs index 4b7e94b1e..0ff5892c9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Models/MachineModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Models/MachineModel.cs @@ -45,6 +45,13 @@ namespace Tango.MachineStudio.MachineManager.Models set { _firmwareVersion = value; RaisePropertyChangedAuto(); } } + private String _versionTag; + public String VersionTag + { + get { return _versionTag; } + set { _versionTag = value; RaisePropertyChangedAuto(); } + } + private String _hardwareVersionName; public String HardwareVersionName { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/ViewModels/MainViewVM.cs index 7d8314860..b50ce5028 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/ViewModels/MainViewVM.cs @@ -141,7 +141,8 @@ namespace Tango.MachineStudio.MachineManager.ViewModels HardwareVersionName = x.Configuration.HardwareVersion.Name, HardwareVersionVersion = x.Configuration.HardwareVersion.Version, OrganizationName = x.Organization.Name, - x.SiteGuid + x.SiteGuid, + x.VersionTag }).ToListAsync(); var models = new List<MachineModel>(); @@ -159,6 +160,7 @@ namespace Tango.MachineStudio.MachineManager.ViewModels model.HardwareVersionName = machine.HardwareVersionName; model.HardwareVersionVersion = machine.HardwareVersionVersion; model.OrganizationName = machine.OrganizationName; + model.VersionTag = machine.VersionTag; model.Site = sites.FirstOrDefault(x => x.Guid == machine.SiteGuid)?.Name; models.Add(model); } @@ -171,7 +173,8 @@ namespace Tango.MachineStudio.MachineManager.ViewModels x.SerialNumber.ToLower().StartsWith(filter) || x.Name.ToLower().StartsWith(filter) || x.OrganizationName.ToLower().StartsWith(filter) || - x.Site.ToStringOrEmpty().ToLower().StartsWith(filter) + x.Site.ToStringOrEmpty().ToLower().StartsWith(filter) || + x.VersionTag.ToStringOrEmpty().ToLower().StartsWith(filter) ).ToList(); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Views/MainView.xaml index 04386b10f..b08e8baa9 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineManager/Views/MainView.xaml @@ -18,7 +18,7 @@ <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 40 0 0"> <materialDesign:PackIcon VerticalAlignment="Center" Kind="Magnify" Width="32" Height="32" /> - <TextBox Width="500" FontSize="20" Margin="10 0 0 0" materialDesign:HintAssist.Hint="Organization / Serial Number / Name / Site" Text="{Binding Filter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Delay=500}"></TextBox> + <TextBox Width="500" FontSize="20" Margin="10 0 0 0" materialDesign:HintAssist.Hint="Organization / Serial Number / Name / Site / Tag" Text="{Binding Filter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Delay=500}"></TextBox> </StackPanel> </StackPanel> @@ -59,6 +59,7 @@ <DataGridTextColumn Header="HW" Binding="{Binding HardwareVersion}" Width="Auto" IsReadOnly="True" /> <DataGridTextColumn Header="APPLICATION" Binding="{Binding ApplicationVersion}" Width="Auto" IsReadOnly="True" /> <DataGridTextColumn Header="FIRMWARE" Binding="{Binding FirmwareVersion}" Width="Auto" IsReadOnly="True" /> + <DataGridTextColumn Header="TAG" Binding="{Binding VersionTag}" Width="Auto" IsReadOnly="True" /> <DataGridTemplateColumn Header="UPDATE SOFTWARE" IsReadOnly="True"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> |