Merge branch 'import-overhaul' into import-overhaul+CSS

Author: EyeBrawler

MESS/MESS.Blazor/Components/Pages/ProductionLog/WorkInstructionNodes/StepNodeListItem.razor

@@ -92,26 +92,35 @@
             </div>
 
             <div class="col col-md-6 secondary-content">
-                @if (Step.PrimaryMedia.Count > 0 || Step.SecondaryMedia.Count > 0)
+                @if (Step.PrimaryMedia.Count > 0 || Step.SecondaryMedia.Count > 0) 
                 {
-                    
-                    @if (ShowDetails && Step.SecondaryMedia.Count > 0)
+                    @if (ShowDetails)
                     {
-                        <Carousel
-                            Images="@Step.SecondaryMedia"
-                            AutoPlay="false"
-                            Interval="3000"
-                            ImageStyle="height: 500px; object-fit: contain;" />
+                        if (Step.SecondaryMedia.Count > 0)
+                        {
+                            <Carousel
+                                Images="@Step.SecondaryMedia"
+                                AutoPlay="false"
+                                Interval="3000"
+                                ImageStyle="height: 500px; object-fit: contain;" />
+                        }
+                        else if (Step.PrimaryMedia.Count > 0)
+                        {
+                            <Carousel
+                                Images="@Step.PrimaryMedia"
+                                AutoPlay="false"
+                                Interval="3000"
+                                ImageStyle="height: 500px; object-fit: contain;" />
+                        }
                     }
-                    else if (!ShowDetails && Step.PrimaryMedia.Count > 0)
+                    else if (Step.PrimaryMedia.Count > 0)
                     {
                         <Carousel
                             Images="@Step.PrimaryMedia"
                             AutoPlay="false"
                             Interval="3000"
                             ImageStyle="height: 500px; object-fit: contain;" />
                     }
-                      
                 }
             </div>
         </div>

MESS/MESS.Services/WorkInstruction/WorkInstructionService.cs

@@ -741,6 +741,16 @@ public async Task<WorkInstructionImportResult> ImportFromXlsx(IBrowserFile file)
             var shouldGenerateQrCode = worksheet.Cell(SHOULD_GENERATE_QR_CODE_CELL).GetValue<bool>();
             var collectsProductSerialNumber = worksheet.Cell(COLLECTS_PRODUCT_SERIAL_NUMBER_CELL).GetValue<bool>();
 
+            // Retrieve Product and assign relationship
+            var productString = worksheet.Cell(PRODUCT_NAME_CELL).GetString();
+            var product = await _productService.FindByTitleAsync(productString);
+
+            if (product == null)
+            {
+                Log.Information("Product not found. Cannot create Work Instruction");
+                return WorkInstructionImportResult.NoProductFound(file.Name, productString);
+            }
+            
             var originalIdString = worksheet.Cell(ORIGINAL_ID_CELL).GetString()?.Trim();
             int? originalId = null;
 
@@ -760,7 +770,7 @@ public async Task<WorkInstructionImportResult> ImportFromXlsx(IBrowserFile file)
             else
             {
                 versionQuery = context.WorkInstructions
-                    .Where(w => w.Title == workInstructionTitle);
+                    .Where(w => w.Title == workInstructionTitle && w.Products.Any(p => p.Id == product.Id));
             }
 
             // Duplicate check
@@ -804,16 +814,6 @@ public async Task<WorkInstructionImportResult> ImportFromXlsx(IBrowserFile file)
                 }
             }
 
-            // Retrieve Product and assign relationship
-            var productString = worksheet.Cell(PRODUCT_NAME_CELL).GetString();
-            var product = await _productService.FindByTitleAsync(productString);
-
-            if (product == null)
-            {
-                Log.Information("Product not found. Cannot create Work Instruction");
-                return WorkInstructionImportResult.NoProductFound(file.Name, productString);
-            }
-            
             workInstruction.Products.Add(product);
 
             // Create all steps within instruction and add part nodes where logical