Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into FeaturepaginaUser

2023-09-29 12:18:56 +02:00
parent e05352f055 384b783111
commit 17ea6d7b92
4 changed files with 29 additions and 18 deletions
@@ -49,7 +49,7 @@
                    {
                        <tr>
                            <td colspan="5">
-                                <div class="alert alert-warning fs-5 w-100">Nessun record trovato</div>
+                                <div class="alert alert-warning fs-3 w-100">Nessun record trovato</div>
                            </td>
                        </tr>
                    }
@@ -88,7 +88,6 @@
                                @* <td class="text-end">
                    </td> *@
                            </tr>
-                            <p>@item.IdxOdl</p>
                        }
                    }
                }
@@ -109,11 +108,11 @@

    protected int SearchMinChar = 3;
    protected string CodArt = "";
-    protected string IdxMacc = "";
+    protected string IdxMacc = "*";
    protected string BaseAddr = "";
    protected bool isLoading = false;

-    protected int NumRecPage = 10;
+    protected int NumRecPage = 5;
    protected int TotalCount = 0;
    protected int PageNum = 1;

@@ -151,14 +150,7 @@
                    ListComplete = rawData;
                    TotalCount = ListComplete.Count;
                    // esegue paginazione
-                    if (TotalCount > NumRecPage)
-                    {
-                        ListODL = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList();
-                    }
-                    else
-                    {
-                        ListODL = ListComplete;
-                    }
+                    UpdateTable();
                }
            }
            catch (Exception exc)
@@ -169,16 +161,29 @@
        isLoading = false;
    }

-    protected async Task SavePage(int newNum)
+    protected void UpdateTable()
    {
-        PageNum = newNum;
-        await ReloadData();
+        // esegue paginazione
+        if (TotalCount > NumRecPage)
+        {
+            ListODL = ListComplete.Skip((PageNum - 1) * NumRecPage).Take(NumRecPage).ToList();
+        }
+        else
+        {
+            ListODL = ListComplete;
+        }
    }

-    protected async Task SaveNumRec(int newNum)
+    protected void SavePage(int newNum)
+    {
+        PageNum = newNum;
+        UpdateTable();
+    }
+
+    protected void SaveNumRec(int newNum)
    {
        NumRecPage = newNum;
-        await ReloadData();
+        UpdateTable();
    }

    private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
@@ -3,7 +3,13 @@

 <head>
    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    @* <meta name="viewport" content="width=device-width, initial-scale=1" /> *@
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="description" content="MP Tablet" />
+    <meta name="author" content="EgalWare" />
+    <link rel="shortcut icon" href="~/favicon.ico" />
    <base href="/MP/TAB2/" />
    @* <link rel="stylesheet" href="bootstrap/bootstrap.min.css" /> *@
    <link rel="stylesheet" href="lib/font-awesome/css/all.min.css" />
@@ -11,7 +17,7 @@
    <link rel="stylesheet" href="font.min.css" />
    <link rel="stylesheet" href="app.min.css" />
    <link rel="stylesheet" href="MP-TAB.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
+    <link rel="icon" type="image/png" href="images/favicon.png" />
    <HeadOutlet />
 </head>