From 7ae452b5edf226e02de077b0181bd50723124fbb Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 9 Dec 2024 10:21:13 +0200
Subject: Minor fixes.

---
 .../PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml  | 8 ++++----
 .../PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs            | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'Software/Visual_Studio/PPC')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml
index 5f1ff4c9d..68b0a839c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionView.xaml
@@ -614,8 +614,8 @@
 
                             <Grid x:Name="CMYKgrid"  Grid.Row="2" Margin="80 0 93 0" Style="{StaticResource DisableOnSaveMyColorsGrid}">
                                 <DockPanel>
-                                    <touch:TouchListBox DockPanel.Dock="Top" ItemsSource="{Binding SelectedBrushStop.LiquidVolumes}" IsTabStop="False" MinWidth="200">
-                                        <touch:TouchListBox.ItemTemplate>
+                                    <ItemsControl DockPanel.Dock="Top" ItemsSource="{Binding SelectedBrushStop.LiquidVolumes}" IsTabStop="False" MinWidth="200">
+                                        <ItemsControl.ItemTemplate>
                                             <DataTemplate DataType="{x:Type models:LiquidVolumeModel}">
                                                 <touch:TouchColorPickerControl Margin=" 0 10 0 0" MinWidth="200" MinValue="0" IsTabStop="False"
                                                            ColorPickerText="{Binding IdsPack.LiquidType.Name}"
@@ -636,8 +636,8 @@
                                                     </touch:TouchColorPickerControl.PickerBrush>
                                                 </touch:TouchColorPickerControl>
                                             </DataTemplate>
-                                        </touch:TouchListBox.ItemTemplate>
-                                    </touch:TouchListBox>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
 
                                     <!--<touch:TouchColorPickerCMYKControl DockPanel.Dock="Top" x:Name="CMYKPicker" ThumbHeight="30" ThumbHeightInside="28" 
                                                             IsTabStop="False"
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
index ff66130bb..1966d88f6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -431,7 +431,8 @@ namespace Tango.PPC.UI.ViewModels
                 Max = x.MidTankType.LiterCapacity,
                 IDSPack = x,
                 JerricanPresent = true,
-            }).OrderBy(y => y.IDSPack.LiquidType.Type).ToList();
+            }).ToList();
+
             var LubLevel = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.Where(x => x.MidTankType.Type == MidTankTypes.LubricantMidTank).FirstOrDefault();
 
             MidTankLubLevel = new JerricanLevelModel() { JerricanPresent = true };
@@ -483,10 +484,9 @@ namespace Tango.PPC.UI.ViewModels
                 foreach (var item in status.IDSPacksLevels)
                 {
                     JerricanLevelModel model = null;
-                    if (item.Index == 8)//lub
+                    if (item.Index == MidTankLubLevel.IDSPack.PackIndex)//lub
                     {
                         model = MidTankLubLevel;
-
                     }
                     else
                     {
@@ -610,7 +610,7 @@ namespace Tango.PPC.UI.ViewModels
 
             List<LiquidOutputModel> outputs = new List<LiquidOutputModel>();
 
-            var idsPacks = MachineProvider.Machine.Configuration.GetSupportedIdsPacks(Job.Rml);
+            var idsPacks = MachineProvider.Machine.Configuration.GetSupportedIdsPacks(Job.Rml).OrderBy(x => x.PackIndex).ToList();
 
             foreach (var idsPack in idsPacks.Where(x => x.LiquidType.HasPigment))
             {
-- 
cgit v1.3.1