diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index bbd11ed..acda144 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 16d23d2..6513f7d 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 999e48e..5f4a5df 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 5cd6e74..fa4ae10 100644 --- a/MedAP/WebUserControl/mod_ElencoClienti.ascx +++ b/MedAP/WebUserControl/mod_ElencoClienti.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ElencoClienti.ascx.cs" Inherits="SHERPA.WebUserControl.mod_ElencoClienti" %> <%@ Register Src="~/WebUserControl/mod_searchBase.ascx" TagPrefix="uc1" TagName="mod_searchBase" %> - + @@ -49,7 +49,7 @@ --%> - + diff --git a/MedAP/WebUserControl/mod_searchBase.ascx.cs b/MedAP/WebUserControl/mod_searchBase.ascx.cs index 6eb03fc..f074287 100644 --- a/MedAP/WebUserControl/mod_searchBase.ascx.cs +++ b/MedAP/WebUserControl/mod_searchBase.ascx.cs @@ -22,6 +22,35 @@ namespace MedAP.WebUserControls return string.Format("searchVal_", uid); } } + /// + /// placeholder ricerca + /// + public string placeholderSearch + { + get + { + return txtCerca.Attributes["placeholder"]; + } + set + { + txtCerca.Attributes["placeholder"] = value; + } + } + /// + /// Chiave per ricerca ALT + searchKey + /// + public string searchKey + { + get + { + return txtCerca.AccessKey; + } + set + { + txtCerca.AccessKey = value; + } + } + /// /// cambiato valore in ricerca /// diff --git a/MedAP/bin/MedAP_data.dll b/MedAP/bin/MedAP_data.dll index d1b876b..a9cf6fc 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 e80e6aa..a84da24 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 2f6c96b..11bf24f 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 ccc153c..9ddc9d1 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 e907dd0..1cb1431 100644 --- a/MedAP/logs/20180103.txt +++ b/MedAP/logs/20180103.txt @@ -526,3 +526,36 @@ System.InvalidCastException: Impossibile eseguire il cast di oggetti di tipo 'Sy 13:02:31 9628 [LEMMA] - MODLANG 13:02:31 9638 [LEMMA] - MODLANGEXPL 13:02:31 9668 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +13:08:32 1805 [LEMMA] - ADMIN +13:08:32 1835 [LEMMA] - ADMINICON +13:08:32 1845 [LEMMA] - REVIEWTIMB +13:08:32 1865 [LEMMA] - REVIEWTIMBEXPL +13:08:32 1875 [LEMMA] - TIMBMENSILI +13:08:32 1885 [LEMMA] - TIMBMENSILIEXPL +13:08:32 1895 [LEMMA] - USERFUNC +13:08:32 1905 [LEMMA] - USERFUNCEXPL +13:08:32 1925 [LEMMA] - MODLANG +13:08:32 1935 [LEMMA] - MODLANGEXPL +13:08:32 1965 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +14:17:33 7222 [LEMMA] - ADMIN +14:17:33 7247 [LEMMA] - ADMINICON +14:17:33 7262 [LEMMA] - REVIEWTIMB +14:17:33 7272 [LEMMA] - REVIEWTIMBEXPL +14:17:33 7287 [LEMMA] - TIMBMENSILI +14:17:33 7302 [LEMMA] - TIMBMENSILIEXPL +14:17:33 7317 [LEMMA] - USERFUNC +14:17:33 7327 [LEMMA] - USERFUNCEXPL +14:17:33 7342 [LEMMA] - MODLANG +14:17:33 7357 [LEMMA] - MODLANGEXPL +14:17:33 7387 [INFO] - L'utente Locatelli Samuele (steamw\samuele) ha effettuato il login correttamente +14:21:57 5900 [LEMMA] - ADMIN +14:21:57 5925 [LEMMA] - ADMINICON +14:21:57 5945 [LEMMA] - REVIEWTIMB +14:21:57 5960 [LEMMA] - REVIEWTIMBEXPL +14:21:57 5975 [LEMMA] - TIMBMENSILI +14:21:57 5990 [LEMMA] - TIMBMENSILIEXPL +14:21:57 6005 [LEMMA] - USERFUNC +14:21:57 6020 [LEMMA] - USERFUNCEXPL +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 diff --git a/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache b/MedAP/obj/Debug/MedAP.csprojResolveAssemblyReference.cache index 199ad63..f6ae61f 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 2f6c96b..11bf24f 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 ccc153c..9ddc9d1 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 index 52ccee2..358c2ad 100644 --- a/MedAP_data/ClientiMod.cs +++ b/MedAP_data/ClientiMod.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace MedAP_data { - public class ClientiMod + public class MedAPModel { static MAPEntities ctx = new MAPEntities(); /// diff --git a/MedAP_data/bin/Debug/MedAP_data.dll b/MedAP_data/bin/Debug/MedAP_data.dll index d1b876b..a9cf6fc 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 e80e6aa..a84da24 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/DesignTimeResolveAssemblyReferences.cache b/MedAP_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..e0ee042 Binary files /dev/null and b/MedAP_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/MedAP_data/obj/Debug/MedAP_data.dll b/MedAP_data/obj/Debug/MedAP_data.dll index d1b876b..a9cf6fc 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 e80e6aa..a84da24 100644 Binary files a/MedAP_data/obj/Debug/MedAP_data.pdb and b/MedAP_data/obj/Debug/MedAP_data.pdb differ