From d2300036db1681042a29111ed6418f014b7633f1 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 3 Sep 2021 18:31:00 +0200
Subject: [PATCH] COmpletata visualizzazione ArchivioFilePage

---
 MP.FileData/Controllers/FileController.cs |   3 +
 MP.Prog/Pages/Archive.razor               | 113 +++++++++++-----------
 2 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs
index d6fa58a7..bf5619a3 100644
--- a/MP.FileData/Controllers/FileController.cs
+++ b/MP.FileData/Controllers/FileController.cs
@@ -3,6 +3,7 @@ using NLog;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -201,6 +202,8 @@ namespace MP.FileData.Controllers
             {
                 dbResult = localDbCtx
                 .DbSetProgFile
+                .Include(m => m.Macchina)
+                .Include(a => a.Articolo)
                 .Where(x => ((x.IdxMacchina == IdxMacchina || IdxMacchina == "0") || (x.CodArticolo == CodArticolo || CodArticolo == "ND" || CodArticolo == "")) && (x.Name.Contains(SearchVal) || string.IsNullOrEmpty(SearchVal)))
                 .OrderBy(x => x.Name)
                 .ToList();
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index cb76925d..4e567d7e 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -86,67 +86,68 @@
                         <thead>
                             <tr>
                                 <th></th>
-                                <th>Impianto</th>
-                                <th>Data Ordine</th>
-                                <th>Ordine</th>
-                                <th class="text-right">Fornitore</th>
-                                <th class="text-right">Richiesta</th>
-                                <th class="text-right">Carico</th>
-                                <th class="text-right">Effettivo</th>
+                                <th>Macchina</th>
+                                <th>Articolo</th>
+                                <th>File</th>
+                                <th>Rev</th>
+                                <th>Size</th>
+                                <th>Modifica</th>
+                                <th>Controllo</th>
+                                <th>OK</th>
+                                @*<th class="text-right">Fornitore</th>
+                                    <th class="text-right">Richiesta</th>
+                                    <th class="text-right">Carico</th>
+                                    <th class="text-right">Effettivo</th>*@
                             </tr>
                         </thead>
                         <tbody>
                             @foreach (var record in ListRecords)
                             {
-                                @*<tr class="@checkSelect(@record.OrderId)">
-                                        <td class="text-nowrap">
-                                            @if (currRecord == null)
-                                            {
-                                                <button class="btn btn-sm btn-info" @onclick="() => Edit(record)">
-                                                    <span class="oi oi-pencil"></span>
-                                                </button>
-                                            }
-                                            else
-                                            {
-                                                <button class="btn btn-sm btn-secondary disabled">
-                                                    <i class="oi oi-pencil"></i>
-                                                </button>
-                                            }
-                                        </td>
-                                        <td>
-                                            <div>@record.Plant.PlantCode</div>
-                                            <div class="small">@record.Plant.PlantDesc</div>
-                                        </td>
-                                        <td>
-                                            <div>@record.DtOrder.ToString("yyyy.MM.dd")</div>
-                                            <div class="small">@record.DtOrder.ToString("ddd HH:mm.ss")</div>
-                                        </td>
-                                        <td>@record.OrderCode | @record.OrderDesc</td>
-                                        <td class="text-right">
-                                            <div class="text-uppercase">
-                                                @record.Supplier.SupplierDesc
-                                            </div>
-                                            <div class="small">@record.Transporter.TransporterDesc</div>
-                                        </td>
-                                        <td class="text-right">
-                                            @record.OrderQty.ToString("N0")
-                                        </td>
-                                        <td class="text-right">
-                                            @if (!record.DtExecStart.Equals(@record.DtExecEnd))
-                                            {
-                                                <div>
-                                                    @record.DtExecStart.Date.ToString("ddd dd/MM/yyyyy")
-                                                </div>
-                                                <div class="small">@record.DtExecStart.ToString("HH:mm:ss") --> @record.DtExecEnd.ToString("HH:mm:ss")</div>
-                                            }
-                                        </td>
-                                        <td class="text-right">
-                                            @if (record.ExecutionQty > 0)
-                                            {
-                                                @record.ExecutionQty.ToString("N0")
-                                            }
-                                        </td>
-                                    </tr>*@
+                                <tr class="@checkSelect(record.FileId)">
+                                    <td class="text-nowrap">
+
+                                        @if (currRecord == null)
+                                        {
+                                            <button class="btn btn-sm btn-info" @onclick="() => Edit(record)">
+                                                <i class="oi oi-pencil"></i>
+                                            </button>
+                                        }
+                                        else
+                                        {
+                                            <button class="btn btn-sm btn-secondary disabled">
+                                                <i class="oi oi-pencil"></i>
+                                            </button>
+                                        }
+                                        <div class="small">[@record.FileId]</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.Macchina.CodMacchina</div>
+                                        <div class="small">@record.Macchina.Descrizione</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.Articolo.Disegno</div>
+                                        <div class="small">@record.Articolo.DescArticolo</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.Name</div>
+                                        <div class="small">@record.Path</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.Rev</div>
+                                    </td>
+                                    <td>
+                                        <div>@((double)record.Size)/1024</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.LastMod.ToString("yyyy.MM.dd")</div>
+                                        <div class="small">@record.LastMod.ToString("ddd HH:mm.ss")</div>
+                                    </td>
+                                    <td>
+                                        <div>@record.LastCheck.ToString("yyyy.MM.dd")</div>
+                                        <div class="small">@record.LastCheck.ToString("ddd HH:mm.ss")</div>
+                                    </td>
+                                    <td>@record.Changed</td>
+                                </tr>
                             }
                         </tbody>
                     </table>