ResinPrinters

Added option to manually define jobs for scheduling resin printers.
schereralf · Jul 6, 2024 · e84d659 · e84d659
1 parent 9df801c
commit e84d659
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/DispoAdmin/ViewModels/MainWindowViewModel.cs b/DispoAdmin/ViewModels/MainWindowViewModel.cs
@@ -339,8 +339,6 @@ public void AddOrder()
 
         public void RemoveOrder()
         {
-            foreach (PrintJob p in SelectedOrder.PrintJobs) { SelectedOrder.PrintJobs.Remove(p); }
-
             ListOrders.Remove(SelectedOrder);
         }
 

diff --git a/DispoAdmin/ViewModels/OrderWindowViewModel.cs b/DispoAdmin/ViewModels/OrderWindowViewModel.cs
@@ -103,8 +103,11 @@ orderby printJob.JobName
                         PrinterID = printJob.PrinterType
                     };
 
+                    Printer printJobPrinter = new();
                     Material printJobMaterial = Materials.FirstOrDefault(m => m.MaterialName.Trim() == printJob.Material.Trim());
-                    Printer printJobPrinter = Printers.FirstOrDefault(p => p.PrinterID == printJob.PrinterType);
+
+                    if (printJob.Material=="UV Resin") printJobPrinter= Printers.FirstOrDefault(p => p.PrinterType == "Resin Printer");
+                    else printJobPrinter = Printers.FirstOrDefault(p => p.PrinterID == printJob.PrinterType);
 
                     //The economic calculations are very rudimentary.  We assume:
                     //  - the amortization period for all printers is provided by the operator, as is the IRR

diff --git a/DispoAdmin/Views/DispoWindow.xaml.cs b/DispoAdmin/Views/DispoWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
@@ -12,8 +13,7 @@
 
 namespace DispoAdmin.Views
 {
-    // Interaction logic für DispoWindow.xaml
-
+    // Interaction logic für DispoWindow.xaml.  Sorry, but this bit cannot go in a Viewmodel :)
     public partial class DispoWindow : Window
     {
         public int ScheduleWeek;
-Original file line number
+Diff line change
@@ Expand Up / @@ -339,8 +339,6 @@ public void AddOrder() @@
             public void RemoveOrder()
             {
-                foreach (PrintJob p in SelectedOrder.PrintJobs) { SelectedOrder.PrintJobs.Remove(p); }
                 ListOrders.Remove(SelectedOrder);
             }
@@ Expand Down @@