Fixed FSE Gateway service with production slot cookie.

Implemented FSE dynamic csv job upload. extra inks.
Implemented PPC dynamic csv job read. extra inks.

1 files changed, 17 insertions, 18 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LayoutViewVM.cs
index 33297d103..c7b52df81 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/ViewModels/LayoutViewVM.cs
@@ -387,35 +387,34 @@ namespace Tango.FSE.UI.ViewModels
 
             var lastSelectedRml = data.Rmls.FirstOrDefault(x => x.Guid == Settings.LastJobUploadThreadGuid);
             if (lastSelectedRml == null) lastSelectedRml = data.Rmls.FirstOrDefault();
-            var vm = await NotificationProvider.ShowDialog(new JobUploadViewVM() { Rmls = data.Rmls, SelectedRML = lastSelectedRml });
+            var vm = await NotificationProvider.ShowDialog(new JobUploadViewVM(MachineProvider) { Rmls = data.Rmls, SelectedRML = lastSelectedRml });
 
             if (vm.DialogResult)
             {
-                TemporaryFile tmpFile = TemporaryManager.CreateFile(".csv");
+                TemporaryFile tmpFile = TemporaryManager.CreateImaginaryFile(".csv");
 
                 try
                 {
                     Settings.LastJobUploadThreadGuid = vm.SelectedRML.Guid;
                     Settings.Save();
 
-                    SegmentCsvModel model = new SegmentCsvModel();
-                    List<string> columnNames = model.GetType().GetProperties().Select(x => x.Name).ToList();
-                    CsvFile<SegmentCsvModel> csvFile = new CsvFile<SegmentCsvModel>(new CsvDestination(tmpFile), new CsvDefinition()
-                    {
-                        Columns = columnNames
-                    });
+                    CsvDynamicWriter csv = new CsvDynamicWriter();
+
+                    int cIndex = 0;
 
-                    model.Index = "1";
-                    model.ThreadName = vm.SelectedRML.Name;
-                    model.ColorSpace = ColorSpaces.Volume.ToDescription();
-                    model.Length = vm.Length.ToString();
-                    model.Cyan1 = vm.C.ToString();
-                    model.Magenta1 = vm.M.ToString();
-                    model.Yellow1 = vm.Y.ToString();
-                    model.Black1 = vm.K.ToString();
+                    csv.Write(1, "Index", 0, cIndex++);
+                    csv.Write(vm.SelectedRML.Name, "ThreadName", "", cIndex++);
+                    csv.Write(vm.Length, "Length", 0, cIndex++);
+                    csv.Write(ColorSpaces.Volume, "ColorSpace", ColorSpaces.Volume, cIndex++);
+                    foreach (var liquidVolume in vm.Volumes)
+                    {
+                        if (liquidVolume.Volume > 0)
+                        {
+                            csv.Write(liquidVolume.Volume, liquidVolume.LiquidType.DisplayName, 0, cIndex);
+                        }
+                    }
 
-                    csvFile.Append(model);
-                    csvFile.Dispose();
+                    csv.Save(tmpFile);
                 }
                 catch (Exception ex)
                 {