diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 9486bdb2..53aefdc7 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index 639a6e68..551b462d 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index b5089985..0dd35eea 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-RT/bin/SteamWare.xml b/GMW-RT/bin/SteamWare.xml index 1b72ce64..cfa51b64 100644 --- a/GMW-RT/bin/SteamWare.xml +++ b/GMW-RT/bin/SteamWare.xml @@ -585,6 +585,16 @@ The tipo. + + + event handler generico + + + + + sollevo evento selezione + + classe gestione auth diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index cf9ec142..32dba20c 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index 639a6e68..551b462d 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll index b5089985..0dd35eea 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW-UT/bin/SteamWare.xml b/GMW-UT/bin/SteamWare.xml index 1b72ce64..cfa51b64 100644 --- a/GMW-UT/bin/SteamWare.xml +++ b/GMW-UT/bin/SteamWare.xml @@ -585,6 +585,16 @@ The tipo. + + + event handler generico + + + + + sollevo evento selezione + + classe gestione auth diff --git a/GMW/WebUserControls/mod_anagFormatiDtx.ascx b/GMW/WebUserControls/mod_anagFormatiDtx.ascx index 55f53615..9e7a5a62 100644 --- a/GMW/WebUserControls/mod_anagFormatiDtx.ascx +++ b/GMW/WebUserControls/mod_anagFormatiDtx.ascx @@ -160,7 +160,7 @@ - + diff --git a/GMW/WebUserControls/mod_anagFormatiDtx.ascx.cs b/GMW/WebUserControls/mod_anagFormatiDtx.ascx.cs index d7301d08..ba068f97 100644 --- a/GMW/WebUserControls/mod_anagFormatiDtx.ascx.cs +++ b/GMW/WebUserControls/mod_anagFormatiDtx.ascx.cs @@ -61,20 +61,28 @@ namespace GMW.WebUserControls public bool delEnabled(object idxObj) { bool answ = isWritable(); -#if false - // solo se ha diritti scrittura controllo + // solo se ha diritti scrittura controllo if (answ) { - int trovati = 0; - // controllo se ci siano celle associate - trovati = MagClass.magazzino.taSAO.getLastByPost(DateTime.Now.AddYears(-memLayer.ML.confReadInt("defaultYearSAO")), DateTime.Now.AddDays(1), idxObj.ToString()).Rows.Count; - // controllo se ci sono record correlati... - if (trovati > 0) + string cod = idxObj.ToString(); + // "" == ND NON VA modificato... + if (cod != "") + { + // se non ND cerco se ci sono specifiche --> non eliminabile! + int trovati = 0; + // controllo se ci siano celle associate + trovati = DataMatrix.mgr.taSpecDtmx.getByFormatoDtmx(cod).Rows.Count; + // controllo se ci sono record correlati... + if (trovati > 0) + { + answ = false; + } + } + else { answ = false; } - } -#endif // false + } return answ; } diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index bf998b33..b8a318b8 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 639a6e68..551b462d 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index b5089985..0dd35eea 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/SteamWare.xml b/GMW/bin/SteamWare.xml index 1b72ce64..cfa51b64 100644 --- a/GMW/bin/SteamWare.xml +++ b/GMW/bin/SteamWare.xml @@ -585,6 +585,16 @@ The tipo. + + + event handler generico + + + + + sollevo evento selezione + + classe gestione auth diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 702eff29..bdeded47 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_data/DataMatrix.cs b/GMW_data/DataMatrix.cs index 1f0cbb02..32198d82 100644 --- a/GMW_data/DataMatrix.cs +++ b/GMW_data/DataMatrix.cs @@ -27,6 +27,7 @@ namespace GMW_data public DS_DataMatrixTableAdapters.AnagFormatiDtmxTableAdapter taAnagFormDtx; public DS_DataMatrixTableAdapters.v_DtxAcquisitiTableAdapter taDtxAcquisiti; public DS_DataMatrixTableAdapters.v_ElencoDmtxTableAdapter taVED; + public DS_DataMatrixTableAdapters.TabSpecDtxTableAdapter taSpecDtmx; /// /// init dei table adapters @@ -48,6 +49,7 @@ namespace GMW_data taAnagFormDtx = new DS_DataMatrixTableAdapters.AnagFormatiDtmxTableAdapter(); taDtxAcquisiti = new DS_DataMatrixTableAdapters.v_DtxAcquisitiTableAdapter(); taVED = new DS_DataMatrixTableAdapters.v_ElencoDmtxTableAdapter(); + taSpecDtmx = new DS_DataMatrixTableAdapters.TabSpecDtxTableAdapter(); } /// /// effettua setup dei connection strings da web.config delal singola applicazione @@ -70,6 +72,7 @@ namespace GMW_data taAnagFormDtx.Connection.ConnectionString = connString; taDtxAcquisiti.Connection.ConnectionString = connString; taVED.Connection.ConnectionString = connString; + taSpecDtmx.Connection.ConnectionString = connString; } #endregion diff --git a/GMW_data/bin/Debug/GMW_data.dll.config b/GMW_data/bin/Debug/GMW_data.dll.config index 5297d14b..da2fd2ad 100644 --- a/GMW_data/bin/Debug/GMW_data.dll.config +++ b/GMW_data/bin/Debug/GMW_data.dll.config @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/GMW_data/bin/Debug/SteamWare.xml b/GMW_data/bin/Debug/SteamWare.xml index 1b72ce64..cfa51b64 100644 --- a/GMW_data/bin/Debug/SteamWare.xml +++ b/GMW_data/bin/Debug/SteamWare.xml @@ -585,6 +585,16 @@ The tipo. + + + event handler generico + + + + + sollevo evento selezione + + classe gestione auth diff --git a/GMW_data/bin/SP_test/GMW_data.dll b/GMW_data/bin/SP_test/GMW_data.dll index 639a6e68..24e4e2df 100644 Binary files a/GMW_data/bin/SP_test/GMW_data.dll and b/GMW_data/bin/SP_test/GMW_data.dll differ