From 68b9cd4d782cb189a5673e84e6cfc1072eee01fb Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 6 Sep 2021 18:34:38 +0200
Subject: [PATCH] Abbozzato controllo x filtraggio dati ricerca articoli

---
 MP.Prog/Components/CodArtSelector.razor | 110 ++++++++++++++++++++++++
 MP.Prog/Components/FileEditor.razor     |  37 +++++++-
 MP.Prog/Components/FileEditor.razor.cs  |   8 +-
 MP.Prog/Components/SearchMod.razor      |   4 +-
 MP.Prog/Data/FileArchDataService.cs     |   3 +-
 MP.Prog/Pages/Archive.razor             |   3 +-
 MP.Prog/Pages/Archive.razor.cs          |  23 +++--
 MP.Prog/Pages/Setup.razor               |  23 +++++
 8 files changed, 198 insertions(+), 13 deletions(-)
 create mode 100644 MP.Prog/Components/CodArtSelector.razor
 create mode 100644 MP.Prog/Pages/Setup.razor

diff --git a/MP.Prog/Components/CodArtSelector.razor b/MP.Prog/Components/CodArtSelector.razor
new file mode 100644
index 00000000..f76926fc
--- /dev/null
+++ b/MP.Prog/Components/CodArtSelector.razor
@@ -0,0 +1,110 @@
+@using MP.FileData.DatabaseModels
+@using MP.Prog.Data
+
+@inject FileArchDataService DataService
+@inject MessageService AppMService
+
+@if (ArtList == null)
+{
+    <LoadingData></LoadingData>
+}
+else
+{
+    <div class="input-group">
+        <div class="input-group-prepend">
+            <span class="input-group-text">
+                <span class="fas fa-search" aria-hidden="true"></span>
+            </span>
+        </div>
+        <input type="text" class="form-control form-control-sm" placeholder="Ricerca Articolo" @bind-value="@SearchArt" />
+        <select @bind="@SelCodArt" class="form-control form-control-sm">
+            @if (ArtList != null)
+            {
+                foreach (var item in ArtList)
+                {
+                    <option value="@item.CodArticolo">@item.Disegno | @item.DescArticolo [@item.CodArticolo]</option>
+                }
+            }
+        </select>
+        <div class="input-group-append">
+            <button id="searchReset" class="btn btn-sm btn-secondary" @onclick="() => ResetSearchArt()" title="Reset ricerca articolo"><i class="fas fa-ban"></i></button>
+        </div>
+    </div>
+}
+
+@code {
+
+    [Parameter]
+    public EventCallback<string> searchUpdated { get; set; }
+    [Parameter]
+    public string SelCodArt
+    {
+        get
+        {
+            string answ = "";
+            if (AppMService.File_Filter != null)
+            {
+                answ = AppMService.File_Filter.CodArticolo;
+            }
+            return answ;
+        }
+        set
+        {
+            if (!AppMService.File_Filter.CodArticolo.Equals(value))
+            {
+                AppMService.File_Filter.CodArticolo = value;
+            }
+            reportChange();
+        }
+    }
+
+    private void reportChange()
+    {
+        searchUpdated.InvokeAsync(SelCodArt);
+    }
+
+    protected string _SearchArt;
+    protected string defCodArt = "";
+    protected List<ArticoloModel> ArtList;
+
+    protected string SearchArt
+    {
+        get
+        {
+            return _SearchArt;
+        }
+        set
+        {
+            _SearchArt = value;
+            // se son > 3 char... debounce...
+            if (string.IsNullOrEmpty(value))
+            {
+                _SearchArt = defCodArt;
+            }
+            if (value.Length >= defCodArt.Length)
+            {
+                var pUpd = Task.Run(async () =>
+                {
+                    ArtList = await DataService.ArticoliGetFilt(SearchArt);
+                });
+                pUpd.Wait();
+            }
+        }
+    }
+    protected override async Task OnInitializedAsync()
+    {
+        await ReloadAllData();
+        _SearchArt = defCodArt;
+    }
+
+    protected async Task ReloadAllData()
+    {
+        SelCodArt = defCodArt;
+        ArtList = await DataService.ArticoliGetFilt(SearchArt);
+    }
+
+    protected void ResetSearchArt()
+    {
+        SearchArt = defCodArt;
+    }
+}
\ No newline at end of file
diff --git a/MP.Prog/Components/FileEditor.razor b/MP.Prog/Components/FileEditor.razor
index 96c4e735..1e805d32 100644
--- a/MP.Prog/Components/FileEditor.razor
+++ b/MP.Prog/Components/FileEditor.razor
@@ -7,12 +7,45 @@
             <DataAnnotationsValidator />
             <div class="row">
                 <div class="col-12 col-lg-2">
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text">
+                                <span class="fas fa-industry" aria-hidden="true"></span>
+                            </span>
+                        </div>
+                        <select @bind="@_currItem.IdxMacchina" class="form-control form-control-sm">
+                            @if (MacList != null)
+                            {
+                                foreach (var item in MacList)
+                                {
+                                    <option value="@item.IdxMacchina">@item.Descrizione (@item.CodMacchina)</option>
+                                }
+                            }
+                        </select>
+                    </div>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text">
+                                <span class="fas fa-search" aria-hidden="true"></span>
+                            </span>
+                        </div>
+                        <select @bind="@_currItem.CodArticolo" class="form-control form-control-sm">
+                            @if (ArtList != null)
+                            {
+                                foreach (var item in ArtList)
+                                {
+                                    <option value="@item.CodArticolo">@item.Disegno | @item.DescArticolo</option>
+                                }
+                            }
+                        </select>
+                    </div>
                     <button type="button" class="btn btn-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
                     <button type="button" class="btn btn-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
                     <button type="button" class="btn btn btn-danger btn-block" value="Delete" @onclick="deleteRecord" title="Delete">Delete <i class="fas fa-trash"></i></button>
                 </div>
-                <div class="col-12 col-lg-10">
-                    <textarea @bind="_currItem.FileStringContent" rows="20" class="w-100"></textarea>
+                <div class="col-12 col-lg-10" style="height: 20rem;">
+                    @*<p>@((MarkupString )_currItem.FileStringContent)</p>*@
+                    <textarea @bind="_currItem.FileStringContent" rows="20" class="bg-light text-dark w-100" contenteditable="false" readonly="readonly"></textarea>
                     @*<InputTextArea @bind-Value="_currItem.FileStringContent" rows></InputTextArea>*@
                 </div>
             </div>
diff --git a/MP.Prog/Components/FileEditor.razor.cs b/MP.Prog/Components/FileEditor.razor.cs
index 18995c51..0cae76b3 100644
--- a/MP.Prog/Components/FileEditor.razor.cs
+++ b/MP.Prog/Components/FileEditor.razor.cs
@@ -29,6 +29,9 @@ namespace MP.Prog.Components
 
         #region Public Properties
 
+        [Parameter]
+        public List<ArticoloModel> ArtList { get; set; }
+
         [Parameter]
         public FileModel currItem
         {
@@ -48,6 +51,9 @@ namespace MP.Prog.Components
         [Parameter]
         public EventCallback<int> DataUpdated { get; set; }
 
+        [Parameter]
+        public List<MacchinaModel> MacList { get; set; }
+
         #endregion Public Properties
 
         #region Private Methods
@@ -77,7 +83,7 @@ namespace MP.Prog.Components
         {
             if (_currItem != null)
             {
-                DataService.FileUpdate(_currItem);
+                await DataService.FileUpdate(_currItem);
                 await DataUpdated.InvokeAsync(1);
             }
             else
diff --git a/MP.Prog/Components/SearchMod.razor b/MP.Prog/Components/SearchMod.razor
index 2d4f63ef..ba4df62a 100644
--- a/MP.Prog/Components/SearchMod.razor
+++ b/MP.Prog/Components/SearchMod.razor
@@ -28,9 +28,9 @@
         }
     }
 
-    private void reportChange()
+    private async Task reportChange()
     {
-        searchUpdated.InvokeAsync(searchVal);
+        await searchUpdated.InvokeAsync(searchVal);
     }
 
     private void reset()
diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs
index ef621dce..a29e5bb9 100644
--- a/MP.Prog/Data/FileArchDataService.cs
+++ b/MP.Prog/Data/FileArchDataService.cs
@@ -197,7 +197,8 @@ namespace MP.Prog.Data
 
         public Task<List<MP.FileData.DatabaseModels.ArticoloModel>> ArticoliGetFilt(string SearchVal)
         {
-            return Task.FromResult(dbController.ArtGetFilt(SearchVal, 20).ToList());
+            return Task.FromResult(dbController.ArtGetFilt(SearchVal, 200).ToList());
+            //return Task.FromResult(dbController.ArtGetFilt(SearchVal, 20).ToList());
         }
 
         public void Dispose()
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor
index dc5618a8..37bf279d 100644
--- a/MP.Prog/Pages/Archive.razor
+++ b/MP.Prog/Pages/Archive.razor
@@ -64,6 +64,7 @@
                                 <button id="searchReset" class="btn btn-sm btn-secondary" @onclick="() => ResetSearchArt()" title="Reset ricerca articolo"><i class="fas fa-ban"></i></button>
                             </div>
                         </div>
+                        <MP.Prog.Components.CodArtSelector searchUpdated="searchArtUpd"></MP.Prog.Components.CodArtSelector>
                     </div>
                     <div class="col-1">
                         <div class="form-group mb-0">
@@ -77,7 +78,7 @@
     <div class="card-body p-1">
         @if (currRecord != null)
         {
-            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData"></MP.Prog.Components.FileEditor>
+            <MP.Prog.Components.FileEditor currItem="@currRecord" DataReset="ResetData" DataUpdated="UpdateData" ArtList="@ArtList" MacList="@MacList"></MP.Prog.Components.FileEditor>
         }
         @if (ListRecords == null)
         {
diff --git a/MP.Prog/Pages/Archive.razor.cs b/MP.Prog/Pages/Archive.razor.cs
index 0e843027..13ef9388 100644
--- a/MP.Prog/Pages/Archive.razor.cs
+++ b/MP.Prog/Pages/Archive.razor.cs
@@ -15,6 +15,7 @@ namespace MP.Prog.Pages
         #region Private Fields
 
         private List<ArticoloModel> ArtList;
+
         private FileModel currRecord = null;
         private List<FileModel> ListRecords;
         private List<MacchinaModel> MacList;
@@ -24,7 +25,9 @@ namespace MP.Prog.Pages
 
         #region Protected Fields
 
-        protected string _SearchArt = "###";
+        protected string _SearchArt;
+
+        protected string defCodArt = "";
 
         #endregion Protected Fields
 
@@ -159,9 +162,9 @@ namespace MP.Prog.Pages
                 // se son > 3 char... debounce...
                 if (string.IsNullOrEmpty(value))
                 {
-                    _SearchArt = "###";
+                    _SearchArt = defCodArt;
                 }
-                if (value.Length >= 3)
+                if (value.Length >= defCodArt.Length)
                 {
                     var pUpd = Task.Run(async () =>
                     {
@@ -234,6 +237,7 @@ namespace MP.Prog.Pages
         protected override async Task OnInitializedAsync()
         {
             DataService.ResetController();
+            SearchArt = defCodArt;
             AppMService.ShowSearch = false;
             AppMService.PageName = "Archivio File Programmi";
             AppMService.PageIcon = "fas fa-folder pr-2";
@@ -246,8 +250,10 @@ namespace MP.Prog.Pages
             isLoading = true;
             MacList = await DataService.MacchineGetAll();
             SelIdxMacc = "0";
+            SearchArt = defCodArt;
+
             ArtList = await DataService.ArticoliGetFilt(SearchArt);
-            SelCodArt = "###";
+
             isLoading = false;
             await ReloadData();
         }
@@ -264,13 +270,18 @@ namespace MP.Prog.Pages
             SearchRecords = null;
             ListRecords = null;
             AppMService.File_Filter = SelectData.Init(5, 10);
-            SearchArt = "###";
+            SearchArt = defCodArt;
             await ReloadAllData();
         }
 
         protected void ResetSearchArt()
         {
-            SearchArt = "###";
+            SearchArt = defCodArt;
+        }
+
+        protected void searchArtUpd(string newCod)
+        {
+            SelCodArt = newCod;
         }
 
         protected void Select(FileModel selRecord)
diff --git a/MP.Prog/Pages/Setup.razor b/MP.Prog/Pages/Setup.razor
new file mode 100644
index 00000000..9c7b1836
--- /dev/null
+++ b/MP.Prog/Pages/Setup.razor
@@ -0,0 +1,23 @@
+@page "/Setup"
+
+@using MP.Prog.Components
+@using MP.Prog.Data
+
+@inject MessageService AppMService
+
+<h3>Setup</h3>
+
+<CodArtSelector searchUpdated="searchUpd"></CodArtSelector>
+
+<p>Selezionato <b>@CurrCodArt</b></p>
+
+@code {
+
+    protected string CurrCodArt { get; set; } = "";
+
+    protected void searchUpd(string newCod)
+    {
+        CurrCodArt = newCod;
+    }
+
+}
\ No newline at end of file