1 files changed, 15 insertions, 10 deletions
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/JobUploadViewVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/JobUploadViewVM.cs
index f12e4edf1..896175400 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/JobUploadViewVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/JobUploadViewVM.cs
@@ -4,15 +4,23 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Entities;
 using Tango.Core.DI;
 using Tango.FSE.Common;
 using Tango.FSE.Common.Build;
+using Tango.FSE.Common.Connection;
 using Tango.PPC.Shared.Statistics;
 
 namespace Tango.FSE.UI.Dialogs
 {
     public class JobUploadViewVM : FSEDialogViewVM
     {
+        public class LiquidVolume
+        {
+            public LiquidType LiquidType { get; set; }
+            public double Volume { get; set; }
+        }
+
         private String _name;
         public String Name
         {
@@ -24,21 +32,18 @@ namespace Tango.FSE.UI.Dialogs
 
         public ThreadFilterData SelectedRML { get; set; }
 
-        public int Length { get; set; }
-
-        public double C { get; set; }
-
-        public double M { get; set; }
+        public List<LiquidVolume> Volumes { get; set; }
 
-        public double Y { get; set; }
-
-        public double K { get; set; }
+        public int Length { get; set; }
 
-        public JobUploadViewVM()
+        public JobUploadViewVM(IMachineProvider machineProvider)
         {
             Rmls = new List<ThreadFilterData>();
 
-            TangoIOC.Default.Inject(this);
+            Volumes = machineProvider.Machine.Configuration.NoneEmptyIdsPacks.OrderBy(x => x.LiquidType.PreferredIndex).Where(x => x.LiquidType.AvailableForStandardUser).Select(x => new LiquidVolume()
+            {
+                LiquidType = x.LiquidType
+            }).ToList();
 
             OKText = "UPLOAD";
             CancelText = "CANCEL";