From 729aba268c416391525ba6a16347d24a59ec8f91 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 26 Jul 2022 12:07:17 +0300
Subject: Version Tag Rescued from old PC.

---
 .../ViewModels/MainViewVM.cs                               | 14 +++++++++++++-
 .../Views/MachineSettingsView.xaml                         |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')

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 00ee4f3bd..2333bf60a 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
@@ -188,6 +188,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _tupViewVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private List<String> _tags;
+        public List<String> Tags
+        {
+            get { return _tags; }
+            set { _tags = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -299,7 +306,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
         public override void OnApplicationReady()
         {
-            
+
         }
 
         private void OnDispensersFilterChanged()
@@ -494,6 +501,11 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     ActiveMachineAdapter.MachineVersions = (await ActiveMachineAdapter.Context.MachineVersions.ToListAsync()).ToObservableCollection();
                     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 = tags;
+
                     bool initHwConfig = true;
 
                     Configuration machineConfigBeforeClone = null;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index c6d285b36..4ba79d3f5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -56,6 +56,9 @@
                                     <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
                                     <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}" ></ComboBox>
 
+                                    <TextBlock FontWeight="SemiBold">Version Tag</TextBlock>
+                                    <ComboBox Background="Transparent" ItemsSource="{Binding Tags}" SelectedItem="{Binding ActiveMachine.VersionTag}" Style="{StaticResource TransparentComboBoxStyle}" ></ComboBox>
+
                                     <TextBlock FontWeight="SemiBold">Organization</TextBlock>
                                     <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
-- 
cgit v1.3.1