diff --git a/CMS-SC-Data/DtProxy.cs b/CMS-SC-Data/DtProxy.cs index 4fc9b17..a92c7b7 100644 --- a/CMS-SC-Data/DtProxy.cs +++ b/CMS-SC-Data/DtProxy.cs @@ -25,6 +25,7 @@ namespace CMS_SC_Data { taAF = new DS_ApplicazioneTableAdapters.AnagFasiTableAdapter(); taASC = new DS_ApplicazioneTableAdapters.AnagSchedeTableAdapter(); + taAT = new DS_ApplicazioneTableAdapters.AnagTagsTableAdapter(); taDS = new DS_ApplicazioneTableAdapters.DettSchedaTableAdapter(); taED = new DS_ApplicazioneTableAdapters.ElencoDossierTableAdapter(); taEFM = new DS_ApplicazioneTableAdapters.ElencoFamMaccTableAdapter(); @@ -48,6 +49,7 @@ namespace CMS_SC_Data // connections del db vocabolario taAF.Connection.ConnectionString = connStr; taASC.Connection.ConnectionString = connStr; + taAT.Connection.ConnectionString = connStr; taDS.Connection.ConnectionString = connStr; taED.Connection.ConnectionString = connStr; taEFM.Connection.ConnectionString = connStr; @@ -68,6 +70,7 @@ namespace CMS_SC_Data public DS_ApplicazioneTableAdapters.AnagFasiTableAdapter taAF; public DS_ApplicazioneTableAdapters.AnagSchedeTableAdapter taASC; + public DS_ApplicazioneTableAdapters.AnagTagsTableAdapter taAT; public DS_ApplicazioneTableAdapters.DettSchedaTableAdapter taDS; public DS_ApplicazioneTableAdapters.ElencoDossierTableAdapter taED; public DS_ApplicazioneTableAdapters.ElencoFamMaccTableAdapter taEFM; diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index b27cb01..c3dba33 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index b27cb01..c3dba33 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS_SC/ToDo.txt b/CMS_SC/ToDo.txt index 4ca9fb4..37dc800 100644 --- a/CMS_SC/ToDo.txt +++ b/CMS_SC/ToDo.txt @@ -10,6 +10,5 @@ - gestione allegati tipo FILE (blob? in scheda o "generale"?) - In Dossier la singola SC deve avere descrizione MODIFICABILE - NON SERVE GESTIONE STATO --> bastano FASI -- anag tags (da aggiungere) - anag macchine/matricole: gestione tags diff --git a/CMS_SC/Web.config b/CMS_SC/Web.config index 4fff1bc..0f5cb62 100644 --- a/CMS_SC/Web.config +++ b/CMS_SC/Web.config @@ -56,6 +56,8 @@ + + diff --git a/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs b/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs index 1aceb61..9ed769c 100644 --- a/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs +++ b/CMS_SC/WebUserControls/mod_anagMatricole.ascx.cs @@ -13,7 +13,6 @@ namespace CMS_SC.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - } /// diff --git a/CMS_SC/WebUserControls/mod_anagTags.ascx b/CMS_SC/WebUserControls/mod_anagTags.ascx index 21f2e1b..14c6cde 100644 --- a/CMS_SC/WebUserControls/mod_anagTags.ascx +++ b/CMS_SC/WebUserControls/mod_anagTags.ascx @@ -1,33 +1,22 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_anagTags.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_anagTags" %> - - - + - +   + +   + + <%: traduci("Reset") %> + - - - - - - - - - - - - - - - - + + @@ -41,21 +30,23 @@ + + - + - + - - + + - - - + + + diff --git a/CMS_SC/WebUserControls/mod_anagTags.ascx.cs b/CMS_SC/WebUserControls/mod_anagTags.ascx.cs index 98e132f..2d41e28 100644 --- a/CMS_SC/WebUserControls/mod_anagTags.ascx.cs +++ b/CMS_SC/WebUserControls/mod_anagTags.ascx.cs @@ -11,6 +11,21 @@ namespace CMS_SC.WebUserControls { public partial class mod_anagTags : System.Web.UI.UserControl { + /// + /// selezione valore in DettScheda + /// + public event EventHandler eh_selezioneValore; + /// + /// sollevo evento selezione + /// + protected void raiseEvent() + { + // sollevo evento nuovo valore... + if (eh_selezioneValore != null) + { + eh_selezioneValore(this, new EventArgs()); + } + } protected void Page_Load(object sender, EventArgs e) { @@ -30,6 +45,15 @@ namespace CMS_SC.WebUserControls } } /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// /// richiesta di aggiunta record, tutto a zero! /// /// @@ -37,9 +61,22 @@ namespace CMS_SC.WebUserControls protected void lbAddNew_Click(object sender, EventArgs e) { // inserisco nuovo record - DtProxy.man.taAF.insertQuery(memLayer.ML.CRS("defAF01"), memLayer.ML.CRS("defAF02")); + DtProxy.man.taAT.insertQuery(memLayer.ML.CRS("defAT01"), memLayer.ML.CRS("defAT02")); // update! grView.DataBind(); } + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + /// + /// resetto selezione + /// + private void resetSelezione() + { + grView.SelectedIndex = -1; + grView.DataBind(); + raiseEvent(); + } } } \ No newline at end of file diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index b27cb01..c3dba33 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index d9da806..1a59355 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ