Merge pull request #64 from SensitTechnologies/import-overhaul+CSS

Production Log Editing and Spreadsheet Changes

Author: EyeBrawler

MESS/MESS.Blazor/Components/Pages/Auth/Login.razor

@@ -45,8 +45,8 @@
                                 <div @ref="_dropdownContainer"
                                      @onmouseenter="OnDropdownMouseEnter"
                                      @onmouseleave="OnDropdownMouseLeave"
-                                    class="position-absolute w-100 mt-1 shadow bg-white border rounded"
-                                 style="max-height: 200px; overflow-y: auto; z-index: 1000;">
+                                     class="login-dropdown position-absolute w-100 mt-1 shadow border rounded"
+                                     style="max-height: 200px; overflow-y: auto; z-index: 1000;">
                                 @if (ApplicationUsers != null)
                                 {
                                     @foreach (var lineOperator in ApplicationUsers.Where(u =>

MESS/MESS.Blazor/Components/Pages/Phoebe/WorkInstruction/WorkInstructionImport.razor

@@ -11,6 +11,24 @@
         </button>
         <InputFile OnChange="LoadFile" accept=".xlsx" class="form-control mb-3"/>
     </div>
+
+    @if (IsImporting)
+    {
+        <div class="mt-3">
+            <div class="progress">
+                <div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 100%">
+                    Importing...
+                </div>
+            </div>
+        </div>
+    }
+
+    @if (!string.IsNullOrEmpty(StatusMessage))
+    {
+        <div class="alert alert-info mt-3">
+            @StatusMessage
+        </div>
+    }
 </FluentCard>
 
 

MESS/MESS.Blazor/Components/Pages/ProductionLog/Create.razor.cs

@@ -18,7 +18,7 @@ internal enum Status
 /// </summary>
 public partial class Create : ComponentBase, IAsyncDisposable
 {
-    private string Title = "Add";
+    private const string Title = "Production Log";
     private bool IsLoading { get; set; } = true;
     private ConfirmationModal? popupRef;
     private bool IsWorkflowActive { get; set; }
@@ -42,7 +42,7 @@ public partial class Create : ComponentBase, IAsyncDisposable
     private string? ProductSerialNumber { get; set; }
     private string? QRCodeDataUrl;
     private IJSObjectReference? module;
-    private List<SerialNumberLog> _serialNumberLogs { get; set; } = [];
+    private List<ProductionLogPart> ProductionLogParts { get; set; } = [];
 
     private Func<ProductionLog, Task>? _autoSaveHandler;
     /// <inheritdoc />
@@ -82,9 +82,9 @@ await InvokeAsync((() =>
         ProductionLogEventService.AutoSaveTriggered += _autoSaveHandler;
         ProductSerialNumber = SerializationService.CurrentProductNumber;
 
-        SerializationService.CurrentSerialNumberLogChanged += HandleSerialNumberLogsChanged;
+        SerializationService.CurrentProductionLogPartChanged += HandleProductionLogPartsChanged;
         SerializationService.CurrentProductNumberChanged += HandleProductNumberChanged;
-        _serialNumberLogs = SerializationService.CurrentSerialNumberLogs;
+        ProductionLogParts = SerializationService.CurrentProductionLogParts;
 
         IsLoading = false;
     }
@@ -310,7 +310,7 @@ protected async Task HandleSubmit()
         }
 
 
-        bool allStepsHavePartsNeeded = _serialNumberLogs.Count >= totalPartsNeeded;
+        bool allStepsHavePartsNeeded = ProductionLogParts.Count >= totalPartsNeeded;
 
         if (!allStepsHavePartsNeeded)
         {
@@ -353,12 +353,16 @@ private async Task CompleteSubmit()
         {
             await ProductionLogService.UpdateAsync(ProductionLog);
         }
+
+        if (ActiveWorkInstruction is { ShouldGenerateQrCode: true })
+        {
+            await PrintQRCode();
+        }
 
-        await PrintQRCode();
         ToastService.ShowSuccess("Successfully Created Production Log", 3000);
 
         // Create any associated SerialNumberLogs
-        await SerializationService.SaveCurrentSerialNumberLogsAsync(ProductionLog.Id);
+        await SerializationService.SaveCurrentProductionLogPartsAsync(ProductionLog.Id);
 
         // Reset the local storage values
         await LocalCacheManager.SetNewProductionLogFormAsync(null);
@@ -369,9 +373,9 @@ private async Task CompleteSubmit()
         await ResetFormState();
     }
 
-    private void HandleSerialNumberLogsChanged()
+    private void HandleProductionLogPartsChanged()
     {
-        _serialNumberLogs = SerializationService.CurrentSerialNumberLogs;
+        ProductionLogParts = SerializationService.CurrentProductionLogParts;
 
         InvokeAsync(StateHasChanged);
     }
@@ -492,7 +496,7 @@ await Task.Run(() =>
     /// <inheritdoc />
     public async ValueTask DisposeAsync()
     {
-        SerializationService.CurrentSerialNumberLogChanged -= HandleSerialNumberLogsChanged;
+        SerializationService.CurrentProductionLogPartChanged -= HandleProductionLogPartsChanged;
         SerializationService.CurrentProductNumberChanged -= HandleProductNumberChanged;
         ProductionLogEventService.AutoSaveTriggered -= _autoSaveHandler;
         try

MESS/MESS.Blazor/Components/Pages/ProductionLog/CreateHeader.razor

@@ -1,7 +1,6 @@
 @using MESS.Data.Models
 @using MESS.Services.ProductionLog
-@using Microsoft.AspNetCore.Components.Authorization
-@inject IProductionLogEventService ProductionLogEventService
+@inject NavigationManager NavigationManager
 
 <div class="d-flex justify-content-between gap-4 flex-sm-wrap header-container">
 
@@ -13,6 +12,10 @@
 @if (!string.IsNullOrWhiteSpace(ActiveLineOperator))
 {
     <div class="d-flex align-items-center justify-content-end">
+        <button class="btn btn-primary btn-sm me-4" @onclick="NavigateToLogs">
+            <i class="bi bi-card-list me-1"></i>My Production Logs
+        </button>
+        
         <span class="me-3">@ActiveLineOperator</span>
         <form method="post" action="/api/auth/logout">
             <button type="submit" class="btn btn-danger btn-sm">
@@ -68,4 +71,9 @@ else
     /// </summary>
     [Parameter]
     public string? ActiveLineOperator { get; set; }
+    
+    private void NavigateToLogs()
+    {
+        NavigationManager.NavigateTo("/production-logs");
+    }
 }

MESS/MESS.Blazor/Components/Pages/ProductionLog/RequiredPartInput.razor

@@ -0,0 +1,69 @@
+@using MESS.Data.Models
+@using MESS.Services.Serialization
+@inject ISerializationService SerializationService
+
+@if (_initialized)
+{
+    <RequiredPartsList ProductionLogParts="ProductionLogParts" AfterSerialNumberInput="@AfterSerialNumberInput" />
+}
+
+@code {
+
+    /// <summary>
+    /// The part node that contains the parts to be displayed.
+    /// This parameter is required.
+    /// </summary>
+    [Parameter]
+    public required PartNode PartNode { get; set; }
+    
+    private List<ProductionLogPart> ProductionLogParts { get; set; } = [];
+    private bool _initialized = false;
+
+    /// <inheritdoc />
+    protected override void OnAfterRender(bool firstRender)
+    {
+        base.OnAfterRender(firstRender);
+
+        if (firstRender)
+        {
+            _initialized = true;
+            StateHasChanged();
+        }
+    }
+    
+    /// <inheritdoc />
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+        InitializeProductionLogParts();
+    }
+
+
+    /// Each part gets its own production log part
+    private void InitializeProductionLogParts()
+    {
+        // No need to initialize production log parts if they are present in the UI
+        if (ProductionLogParts.Count > 0)
+        {
+            return;
+        }
+        
+        foreach (var part in PartNode.Parts)
+        {
+            ProductionLogParts.Add(new ProductionLogPart
+            {
+                Part = part
+            });
+        }
+    }
+    
+    private void AfterSerialNumberInput(ProductionLogPart productionLogPart)
+    {
+        productionLogPart.SubmitTimeQc = DateTimeOffset.UtcNow;
+
+        var updatedList = new List<ProductionLogPart>(SerializationService.CurrentProductionLogParts);
+        updatedList.Add(productionLogPart);
+
+        SerializationService.CurrentProductionLogParts = updatedList;
+    }
+}

MESS/MESS.Blazor/Components/Pages/ProductionLog/RequiredPartsList.razor

@@ -0,0 +1,23 @@
+@using MESS.Data.Models
+
+<div class="form-floating flex-grow-1 m-0">
+    <InputText id="productionLogPart" class="form-control col custom-input" @bind-Value="@ActiveProductionLogPart.PartSerialNumber"
+               @bind-Value:after="@(() => AfterSerialNumberInput.InvokeAsync(ActiveProductionLogPart))"></InputText>
+    <label class="form-label col custom-label" for="productionLogPart" style="color: gray; background-color: transparent;">@ActiveProductionLogPart.Part?.PartName</label>
+</div>
+
+@code {
+    /// <summary>
+    /// The active production log part.
+    /// This parameter is required.
+    /// </summary>
+    [Parameter]
+    public required ProductionLogPart ActiveProductionLogPart { get; set; }
+
+    /// <summary>
+    /// The callback to be invoked after the serial number input is updated.
+    /// This parameter is required.
+    /// </summary>
+    [Parameter]
+    public required EventCallback<ProductionLogPart> AfterSerialNumberInput { get; set; }
+}

MESS/MESS.Blazor/Components/Pages/ProductionLog/WorkInstructionNodes/PartNode/PartNodeListItem.razor

@@ -0,0 +1,20 @@
+@using MESS.Data.Models
+<div class="d-flex flex-wrap gap-2 mt-2 justify-content-around align-content-center">
+    @foreach (var log in ProductionLogParts)
+    {
+        <RequiredPartInput ActiveProductionLogPart="log" AfterSerialNumberInput="AfterSerialNumberInput" />
+    }
+</div>
+
+@code {
+    /// <summary>
+    /// A list of production log parts to be displayed in the component.
+    /// </summary>
+    [Parameter] public required List<ProductionLogPart> ProductionLogParts { get; set; }
+
+    /// <summary>
+    /// An event callback triggered after a serial number input is processed.
+    /// </summary>
+    [Parameter]
+    public required EventCallback<ProductionLogPart> AfterSerialNumberInput { get; set; }
+}