Aggiunta filtro per macchine ODL

2022-10-17 09:09:43 +02:00
parent 7f9685a007
commit 9e4822d529
14 changed files with 45 additions and 14 deletions
@@ -497,14 +497,14 @@ namespace MP.Data.Controllers
        /// <param name="startDate">Data inizio</param>
        /// <param name="endDate">Data fine</param>
        /// <returns></returns>
-        public List<ODLModel> ListODLFilt(bool inCorso, string codArt, string keyRichPart, DateTime startDate, DateTime endDate)
+        public List<ODLModel> ListODLFilt(bool inCorso, string codArt, string keyRichPart, string IdxMacchina, DateTime startDate, DateTime endDate)
        {
            List<ODLModel> dbResult = new List<ODLModel>();
            using (var dbCtx = new MoonProContext(_configuration))
            {
                dbResult = dbCtx
                .DbSetODL
-                .Where(x => ((inCorso && x.DataFine == null) || ((!inCorso && x.DataFine != null) && x.DataInizio >= startDate && x.DataInizio <= endDate)) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
+                .Where(x => ((inCorso && x.DataFine == null) || ((!inCorso && x.DataFine != null) && x.DataInizio >= startDate && x.DataInizio <= endDate)) && (x.KeyRichiesta.Contains(keyRichPart) || keyRichPart == "*") && (x.IdxMacchina.Contains(IdxMacchina) || IdxMacchina == "*") && (codArt == "*" || x.CodArticolo.Contains(codArt)))
                .AsNoTracking()
                .Include(m => m.MachineNav)
                .Include(a => a.ArticoloNav)
@@ -170,7 +170,7 @@ namespace MP.SPEC.Components
        private async Task reloadData()
        {
            isLoading = true;
-            SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodStato, currFilter.DtStart, currFilter.DtEnd);
+            SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodStato, currFilter.IdxMacchina, currFilter.DtStart, currFilter.DtEnd);
            totalCount = SearchRecords.Count;
            ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
            await Task.Delay(1);
@@ -537,10 +537,11 @@ namespace MP.SPEC.Data
        /// <param name="inCorso">Stato ODL: true=in corso/completato</param>
        /// <param name="codArt">Cod articolo</param>
        /// <param name="keyRichPart">KeyRich (parziale) da cercare (es cod stato x yacht)</param>
+        /// <param name="IdxMacchina">id macchina da cercare</param>
        /// <returns></returns>
-        public async Task<List<ODLModel>> ListODLFilt(bool inCorso, string codArt, string keyRichPart, DateTime startDate, DateTime endDate)
+        public async Task<List<ODLModel>> ListODLFilt(bool inCorso, string codArt, string keyRichPart, string IdxMacchina, DateTime startDate, DateTime endDate)
        {
-            return await Task.FromResult(dbController.ListODLFilt(inCorso, codArt, keyRichPart, startDate, endDate));
+            return await Task.FromResult(dbController.ListODLFilt(inCorso, codArt, keyRichPart, IdxMacchina, startDate, endDate));
        }

        /// <summary>
@@ -14,6 +14,7 @@ namespace MP.SPEC.Data
        #region Public Properties

        public string CodStato { get; set; } = "*";
+        public string IdxMacchina { get; set; } = "*";
        public int CurrPage { get; set; } = 1;
        public int NumRec { get; set; } = 10;
        public DateTime DtEnd { get; set; } = Utils.InitDatetime(DateTime.Now, 5);
@@ -37,6 +38,9 @@ namespace MP.SPEC.Data
            if (CodStato != item.CodStato)
                return false;

+            if (IdxMacchina != item.IdxMacchina)
+                return false;
+
            if (MaxRecord != item.MaxRecord)
                return false;

@@ -5,7 +5,7 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2210.1417</Version>
+    <Version>6.16.2210.1709</Version>
  </PropertyGroup>

  <ItemGroup>
@@ -37,7 +37,7 @@
                        <div>

                            <div class="small mt-2">
-                                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Macchina</label>
+                                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Fase</label>
                            </div>
                            <div class="input-group px-2">
                                <label class="input-group-text" for="macchina" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
@@ -53,6 +53,25 @@
                                </select>
                            </div>
                        </div>
+                        <div>
+
+                            <div class="small mt-2">
+                                <label class="px-2" for="macchina" title="Selezionare inizio periodo">Macchina</label>
+                            </div>
+                            <div class="input-group px-2">
+                                <label class="input-group-text" for="macchina" title="Selezionare la fase da visualizzare"><i class="fa-solid fa-screwdriver-wrench"></i></label>
+                                <select @bind="@selMacchina" id="macchina" class="form-select" title="Selezionare la fase da visualizzare">
+                                    <option value="*">--- Tutti ---</option>
+                                    @if (ListMacchine != null)
+                                    {
+                                        foreach (var item in ListMacchine)
+                                        {
+                                            <option value="@item">@item</option>
+                                        }
+                                    }
+                                </select>
+                            </div>
+                        </div>
                        @if (!isActive)
                        {
                            <div class="small mt-2">
@@ -92,6 +92,7 @@ namespace MP.SPEC.Pages
            // resetto search
            MsgService.SearchVal = "";
            ListStati = await MDService.AnagStatiComm();
+            ListMacchine = await MDService.MacchineWithFlux();
 #if false
            // carico dati
            await reloadData();
@@ -123,6 +124,7 @@ namespace MP.SPEC.Pages
        #region Private Fields

        private List<MP.Data.DatabaseModels.ListValues>? ListStati;
+        private List<string>? ListMacchine;

        #endregion Private Fields

@@ -159,6 +161,11 @@ namespace MP.SPEC.Pages
            get => currFilter.CodStato;
            set => currFilter.CodStato = value;
        }
+        private string selMacchina
+        {
+            get => currFilter.IdxMacchina;
+            set => currFilter.IdxMacchina = value;
+        }

        private int totalCount
        {
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2210.1417</h4>
+    <h4>Versione: 6.16.2210.1709</h4>
    <br /> Note di rilascio:
    <ul>
        <li>
@@ -1 +1 @@
-6.16.2210.1417
+6.16.2210.1709
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.1417</version>
+  <version>6.16.2210.1709</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>
@@ -4,7 +4,7 @@
        <TargetFramework>net6.0</TargetFramework>
        <RootNamespace>MP.Stats</RootNamespace>
        <UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
-        <Version>6.16.2210.0716</Version>
+        <Version>6.16.2210.1708</Version>
    </PropertyGroup>

    <ItemGroup>
@@ -1,6 +1,6 @@
 <body>
    <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 6.16.2210.0716</h4>
+    <h4>Versione: 6.16.2210.1708</h4>
    <br />
    Note di rilascio:
    <ul>
@@ -1 +1 @@
-6.16.2210.0716
+6.16.2210.1708
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2210.0716</version>
+  <version>6.16.2210.1708</version>
  <url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
  <changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
  <mandatory>false</mandatory>