diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index acda144..4a07f21 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide b/.vs/MedAP/v15/Server/sqlite3/storage.ide index 6513f7d..0f6d735 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide and b/.vs/MedAP/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal index 5f4a5df..aac15c7 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal and b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal differ diff --git a/MedAP/WebUserControl/mod_ElencoClienti.ascx b/MedAP/WebUserControl/mod_ElencoClienti.ascx index fa4ae10..dfa4c33 100644 --- a/MedAP/WebUserControl/mod_ElencoClienti.ascx +++ b/MedAP/WebUserControl/mod_ElencoClienti.ascx @@ -2,7 +2,7 @@ <%@ Register Src="~/WebUserControl/mod_searchBase.ascx" TagPrefix="uc1" TagName="mod_searchBase" %> - + @@ -27,8 +27,6 @@ - <%-- - --%> @@ -49,8 +47,10 @@ --%> - + + + diff --git a/MedAP/WebUserControl/mod_ElencoClienti.ascx.cs b/MedAP/WebUserControl/mod_ElencoClienti.ascx.cs index 3053240..1cf62b8 100644 --- a/MedAP/WebUserControl/mod_ElencoClienti.ascx.cs +++ b/MedAP/WebUserControl/mod_ElencoClienti.ascx.cs @@ -24,6 +24,8 @@ namespace SHERPA.WebUserControl /// private void Mod_searchBase_eh_ucev(object sender, EventArgs e) { + grView.SelectedIndex = -1; + grView.PageIndex = 0; grView.DataBind(); } @@ -46,5 +48,10 @@ namespace SHERPA.WebUserControl grView.DataBind(); //raiseEvent(ucEvType.Reset); } + + protected void grView_PageIndexChanged(object sender, EventArgs e) + { + grView.DataBind(); + } } } \ No newline at end of file diff --git a/MedAP/WebUserControl/mod_searchBase.ascx.cs b/MedAP/WebUserControl/mod_searchBase.ascx.cs index f074287..6fc7f17 100644 --- a/MedAP/WebUserControl/mod_searchBase.ascx.cs +++ b/MedAP/WebUserControl/mod_searchBase.ascx.cs @@ -19,7 +19,7 @@ namespace MedAP.WebUserControls { get { - return string.Format("searchVal_", uid); + return string.Format("searchVal_{0}", uid); } } /// diff --git a/MedAP/bin/MedAP_data.dll b/MedAP/bin/MedAP_data.dll index a9cf6fc..d538328 100644 Binary files a/MedAP/bin/MedAP_data.dll and b/MedAP/bin/MedAP_data.dll differ diff --git a/MedAP/bin/MedAP_data.pdb b/MedAP/bin/MedAP_data.pdb index a84da24..9172fd3 100644 Binary files a/MedAP/bin/MedAP_data.pdb and b/MedAP/bin/MedAP_data.pdb differ diff --git a/MedAP/bin/SHERPA.dll b/MedAP/bin/SHERPA.dll index 11bf24f..a352c09 100644 Binary files a/MedAP/bin/SHERPA.dll and b/MedAP/bin/SHERPA.dll differ diff --git a/MedAP/bin/SHERPA.pdb b/MedAP/bin/SHERPA.pdb index 9ddc9d1..4a98757 100644 Binary files a/MedAP/bin/SHERPA.pdb and b/MedAP/bin/SHERPA.pdb differ diff --git a/MedAP/logs/20180103.txt b/MedAP/logs/20180103.txt index 1cb1431..9c545fa 100644 --- a/MedAP/logs/20180103.txt +++ b/MedAP/logs/20180103.txt @@ -559,3 +559,179 @@ System.InvalidCastException: Impossibile eseguire il cast di oggetti di tipo 'Sy 14:21:57 6035 [LEMMA] - MODLANG 14:21:57 6051 [LEMMA] - MODLANGEXPL 14:21:57 6076 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:08:13 3993 [LEMMA] - ADMIN +15:08:13 4018 [LEMMA] - ADMINICON +15:08:13 4034 [LEMMA] - REVIEWTIMB +15:08:13 4044 [LEMMA] - REVIEWTIMBEXPL +15:08:13 4059 [LEMMA] - TIMBMENSILI +15:08:13 4069 [LEMMA] - TIMBMENSILIEXPL +15:08:13 4084 [LEMMA] - USERFUNC +15:08:13 4094 [LEMMA] - USERFUNCEXPL +15:08:13 4109 [LEMMA] - MODLANG +15:08:13 4124 [LEMMA] - MODLANGEXPL +15:08:13 4149 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:10:09 6669 [LEMMA] - ADMIN +15:10:09 6689 [LEMMA] - ADMINICON +15:10:09 6704 [LEMMA] - REVIEWTIMB +15:10:09 6719 [LEMMA] - REVIEWTIMBEXPL +15:10:09 6729 [LEMMA] - TIMBMENSILI +15:10:09 6744 [LEMMA] - TIMBMENSILIEXPL +15:10:09 6760 [LEMMA] - USERFUNC +15:10:09 6775 [LEMMA] - USERFUNCEXPL +15:10:09 6790 [LEMMA] - MODLANG +15:10:09 6805 [LEMMA] - MODLANGEXPL +15:10:09 6830 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:11:09 7352 [LEMMA] - ADMIN +15:11:09 7377 [LEMMA] - ADMINICON +15:11:09 7392 [LEMMA] - REVIEWTIMB +15:11:09 7407 [LEMMA] - REVIEWTIMBEXPL +15:11:09 7417 [LEMMA] - TIMBMENSILI +15:11:09 7432 [LEMMA] - TIMBMENSILIEXPL +15:11:09 7447 [LEMMA] - USERFUNC +15:11:09 7457 [LEMMA] - USERFUNCEXPL +15:11:09 7477 [LEMMA] - MODLANG +15:11:09 7487 [LEMMA] - MODLANGEXPL +15:11:09 7517 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:11:57 3656 [LEMMA] - ADMIN +15:11:57 3681 [LEMMA] - ADMINICON +15:11:57 3696 [LEMMA] - REVIEWTIMB +15:11:57 3711 [LEMMA] - REVIEWTIMBEXPL +15:11:57 3726 [LEMMA] - TIMBMENSILI +15:11:57 3736 [LEMMA] - TIMBMENSILIEXPL +15:11:57 3751 [LEMMA] - USERFUNC +15:11:57 3761 [LEMMA] - USERFUNCEXPL +15:11:57 3776 [LEMMA] - MODLANG +15:11:57 3786 [LEMMA] - MODLANGEXPL +15:11:57 3811 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:15:35 1447 [LEMMA] - ADMIN +15:15:35 1467 [LEMMA] - ADMINICON +15:15:35 1482 [LEMMA] - REVIEWTIMB +15:15:35 1492 [LEMMA] - REVIEWTIMBEXPL +15:15:35 1502 [LEMMA] - TIMBMENSILI +15:15:35 1517 [LEMMA] - TIMBMENSILIEXPL +15:15:35 1532 [LEMMA] - USERFUNC +15:15:35 1542 [LEMMA] - USERFUNCEXPL +15:15:35 1557 [LEMMA] - MODLANG +15:15:35 1567 [LEMMA] - MODLANGEXPL +15:15:35 1592 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:16:26 4412 [LEMMA] - ADMIN +15:16:26 4437 [LEMMA] - ADMINICON +15:16:26 4447 [LEMMA] - REVIEWTIMB +15:16:26 4462 [LEMMA] - REVIEWTIMBEXPL +15:16:26 4482 [LEMMA] - TIMBMENSILI +15:16:26 4492 [LEMMA] - TIMBMENSILIEXPL +15:16:26 4507 [LEMMA] - USERFUNC +15:16:26 4517 [LEMMA] - USERFUNCEXPL +15:16:26 4532 [LEMMA] - MODLANG +15:16:26 4547 [LEMMA] - MODLANGEXPL +15:16:26 4572 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:19:11 6414 [LEMMA] - ADMIN +15:19:11 6439 [LEMMA] - ADMINICON +15:19:11 6449 [LEMMA] - REVIEWTIMB +15:19:11 6459 [LEMMA] - REVIEWTIMBEXPL +15:19:11 6474 [LEMMA] - TIMBMENSILI +15:19:11 6484 [LEMMA] - TIMBMENSILIEXPL +15:19:11 6494 [LEMMA] - USERFUNC +15:19:11 6504 [LEMMA] - USERFUNCEXPL +15:19:11 6519 [LEMMA] - MODLANG +15:19:11 6529 [LEMMA] - MODLANGEXPL +15:19:11 6554 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:26:28 2089 [LEMMA] - ADMIN +15:26:28 2114 [LEMMA] - ADMINICON +15:26:28 2129 [LEMMA] - REVIEWTIMB +15:26:28 2144 [LEMMA] - REVIEWTIMBEXPL +15:26:28 2159 [LEMMA] - TIMBMENSILI +15:26:28 2174 [LEMMA] - TIMBMENSILIEXPL +15:26:28 2184 [LEMMA] - USERFUNC +15:26:28 2194 [LEMMA] - USERFUNCEXPL +15:26:28 2214 [LEMMA] - MODLANG +15:26:28 2224 [LEMMA] - MODLANGEXPL +15:26:28 2254 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:27:47 3451 [LEMMA] - ADMIN +15:27:47 3476 [LEMMA] - ADMINICON +15:27:47 3491 [LEMMA] - REVIEWTIMB +15:27:47 3501 [LEMMA] - REVIEWTIMBEXPL +15:27:47 3511 [LEMMA] - TIMBMENSILI +15:27:47 3526 [LEMMA] - TIMBMENSILIEXPL +15:27:47 3541 [LEMMA] - USERFUNC +15:27:47 3551 [LEMMA] - USERFUNCEXPL +15:27:47 3566 [LEMMA] - MODLANG +15:27:47 3576 [LEMMA] - MODLANGEXPL +15:27:47 3601 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:29:07 9743 [LEMMA] - ADMIN +15:29:08 0135 [LEMMA] - ADMINICON +15:29:08 0581 [LEMMA] - REVIEWTIMB +15:29:08 0927 [LEMMA] - REVIEWTIMBEXPL +15:29:08 1278 [LEMMA] - TIMBMENSILI +15:29:08 1694 [LEMMA] - TIMBMENSILIEXPL +15:29:08 2030 [LEMMA] - USERFUNC +15:29:08 2371 [LEMMA] - USERFUNCEXPL +15:29:08 2797 [LEMMA] - MODLANG +15:29:08 3143 [LEMMA] - MODLANGEXPL +15:29:08 3840 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:37:00 8609 [LEMMA] - ADMIN +15:37:00 8639 [LEMMA] - ADMINICON +15:37:00 8654 [LEMMA] - REVIEWTIMB +15:37:00 8669 [LEMMA] - REVIEWTIMBEXPL +15:37:00 8684 [LEMMA] - TIMBMENSILI +15:37:00 8704 [LEMMA] - TIMBMENSILIEXPL +15:37:00 8719 [LEMMA] - USERFUNC +15:37:00 8734 [LEMMA] - USERFUNCEXPL +15:37:00 8744 [LEMMA] - MODLANG +15:37:00 8764 [LEMMA] - MODLANGEXPL +15:37:00 8789 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:37:00 9010 [LEMMA] - ADMIN +15:37:00 9025 [LEMMA] - ADMINICON +15:37:00 9035 [LEMMA] - REVIEWTIMB +15:37:00 9050 [LEMMA] - REVIEWTIMBEXPL +15:37:00 9065 [LEMMA] - TIMBMENSILI +15:37:00 9075 [LEMMA] - TIMBMENSILIEXPL +15:37:00 9085 [LEMMA] - USERFUNC +15:37:00 9100 [LEMMA] - USERFUNCEXPL +15:37:00 9120 [LEMMA] - MODLANG +15:37:00 9135 [LEMMA] - MODLANGEXPL +15:37:00 9150 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:38:23 8097 [LEMMA] - ADMIN +15:38:23 8122 [LEMMA] - ADMINICON +15:38:23 8132 [LEMMA] - REVIEWTIMB +15:38:23 8147 [LEMMA] - REVIEWTIMBEXPL +15:38:23 8157 [LEMMA] - TIMBMENSILI +15:38:23 8167 [LEMMA] - TIMBMENSILIEXPL +15:38:23 8177 [LEMMA] - USERFUNC +15:38:23 8192 [LEMMA] - USERFUNCEXPL +15:38:23 8202 [LEMMA] - MODLANG +15:38:23 8217 [LEMMA] - MODLANGEXPL +15:38:23 8242 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:41:12 3275 [LEMMA] - ADMIN +15:41:12 3300 [LEMMA] - ADMINICON +15:41:12 3315 [LEMMA] - REVIEWTIMB +15:41:12 3330 [LEMMA] - REVIEWTIMBEXPL +15:41:12 3341 [LEMMA] - TIMBMENSILI +15:41:12 3351 [LEMMA] - TIMBMENSILIEXPL +15:41:12 3366 [LEMMA] - USERFUNC +15:41:12 3376 [LEMMA] - USERFUNCEXPL +15:41:12 3391 [LEMMA] - MODLANG +15:41:12 3406 [LEMMA] - MODLANGEXPL +15:41:12 3431 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:43:41 8794 [LEMMA] - ADMIN +15:43:41 8819 [LEMMA] - ADMINICON +15:43:41 8839 [LEMMA] - REVIEWTIMB +15:43:41 8849 [LEMMA] - REVIEWTIMBEXPL +15:43:41 8859 [LEMMA] - TIMBMENSILI +15:43:41 8874 [LEMMA] - TIMBMENSILIEXPL +15:43:41 8889 [LEMMA] - USERFUNC +15:43:41 8899 [LEMMA] - USERFUNCEXPL +15:43:41 8909 [LEMMA] - MODLANG +15:43:41 8924 [LEMMA] - MODLANGEXPL +15:43:41 8949 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +15:45:03 2048 [LEMMA] - ADMIN +15:45:03 2073 [LEMMA] - ADMINICON +15:45:03 2088 [LEMMA] - REVIEWTIMB +15:45:03 2098 [LEMMA] - REVIEWTIMBEXPL +15:45:03 2113 [LEMMA] - TIMBMENSILI +15:45:03 2128 [LEMMA] - TIMBMENSILIEXPL +15:45:03 2143 [LEMMA] - USERFUNC +15:45:03 2158 [LEMMA] - USERFUNCEXPL +15:45:03 2173 [LEMMA] - MODLANG +15:45:03 2188 [LEMMA] - MODLANGEXPL +15:45:03 2218 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente diff --git a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache index f6ae61f..2e92d84 100644 Binary files a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache and b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache differ diff --git a/MedAP/obj/Debug/SHERPA.dll b/MedAP/obj/Debug/SHERPA.dll index 11bf24f..a352c09 100644 Binary files a/MedAP/obj/Debug/SHERPA.dll and b/MedAP/obj/Debug/SHERPA.dll differ diff --git a/MedAP/obj/Debug/SHERPA.pdb b/MedAP/obj/Debug/SHERPA.pdb index 9ddc9d1..4a98757 100644 Binary files a/MedAP/obj/Debug/SHERPA.pdb and b/MedAP/obj/Debug/SHERPA.pdb differ diff --git a/MedAP_data/ClientiMod.cs b/MedAP_data/ClientiMod.cs deleted file mode 100644 index 358c2ad..0000000 --- a/MedAP_data/ClientiMod.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace MedAP_data -{ - public class MedAPModel - { - static MAPEntities ctx = new MAPEntities(); - /// - /// elenco completo - /// - /// - public static IEnumerable ElencoClienti() - { - return ElencoClienti(""); - } - /// - /// elenco filtrato da parametro ricerca - /// - /// - /// - public static IEnumerable ElencoClienti(string searchMe) - { - IEnumerable result; - if (searchMe != "" && searchMe != null) - { - result = from r in ctx.Clienti.Where(s => s.RagSoc.Contains(searchMe) || s.POBirth.Contains(searchMe) || s.Via.Contains(searchMe) || s.Località.Contains(searchMe) || s.Provincia.Contains(searchMe)) select r; - } - else - { - result = from r in ctx.Clienti select r; - } - return result; - } - } -} diff --git a/MedAP_data/MedAPModel.cs b/MedAP_data/MedAPModel.cs new file mode 100644 index 0000000..b754097 --- /dev/null +++ b/MedAP_data/MedAPModel.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MedAP_data +{ + public class MedAPModel + { + static MAPEntities ctx = new MAPEntities(); + /// + /// elenco completo + /// + /// + public static IEnumerable ElencoClienti() + { + return ElencoClienti("", 0, 10); + } + /// + /// elenco filtrato da parametro ricerca + /// + /// + /// + /// + /// + public static IEnumerable ElencoClienti(string searchMe, int startRowIndex, int maximumRows) + { + IQueryable query; + if (searchMe != "" && searchMe != null) + { + query = ctx.Clienti.Where(s => s.RagSoc.Contains(searchMe) || s.POBirth.Contains(searchMe) || s.Via.Contains(searchMe) || s.Località.Contains(searchMe) || s.Provincia.Contains(searchMe)); + } + else + { + query = ctx.Clienti; + } + var result = from r in query.OrderBy(s => s.RagSoc).Skip(startRowIndex).Take(maximumRows) select r; + return result; + } + /// + /// elenco filtrato da parametro ricerca + /// + /// + /// + /// + /// + public static int ElencoClientiCount(string searchMe, int startRowIndex, int maximumRows) + { + IQueryable query; + if (searchMe != "" && searchMe != null) + { + query = ctx.Clienti.Where(s => s.RagSoc.Contains(searchMe) || s.POBirth.Contains(searchMe) || s.Via.Contains(searchMe) || s.Località.Contains(searchMe) || s.Provincia.Contains(searchMe)); + } + else + { + query = ctx.Clienti; + } + return query.Count(); + } + } +} diff --git a/MedAP_data/MedAP_data.csproj b/MedAP_data/MedAP_data.csproj index 3b028ba..2489ab4 100644 --- a/MedAP_data/MedAP_data.csproj +++ b/MedAP_data/MedAP_data.csproj @@ -91,7 +91,7 @@ APModel.tt - + APModel.tt diff --git a/MedAP_data/bin/Debug/MedAP_data.dll b/MedAP_data/bin/Debug/MedAP_data.dll index a9cf6fc..d538328 100644 Binary files a/MedAP_data/bin/Debug/MedAP_data.dll and b/MedAP_data/bin/Debug/MedAP_data.dll differ diff --git a/MedAP_data/bin/Debug/MedAP_data.pdb b/MedAP_data/bin/Debug/MedAP_data.pdb index a84da24..9172fd3 100644 Binary files a/MedAP_data/bin/Debug/MedAP_data.pdb and b/MedAP_data/bin/Debug/MedAP_data.pdb differ diff --git a/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache b/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache index a00456d..7790bd3 100644 --- a/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache +++ b/MedAP_data/obj/Debug/MedAP_data.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1dc9865987d3f441f642713a8e81420098e2d525 +9f80f002ebadb11f6dcc63d9f9ddf2828e93148f diff --git a/MedAP_data/obj/Debug/MedAP_data.dll b/MedAP_data/obj/Debug/MedAP_data.dll index a9cf6fc..d538328 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.dll and b/MedAP_data/obj/Debug/MedAP_data.dll differ diff --git a/MedAP_data/obj/Debug/MedAP_data.pdb b/MedAP_data/obj/Debug/MedAP_data.pdb index a84da24..9172fd3 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.pdb and b/MedAP_data/obj/Debug/MedAP_data.pdb differ