diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 1ed1fa3..1db7f46 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -2036,7 +2036,7 @@ namespace CMS_SC_Data { this.columnCodScheda.MaxLength = 50; this.columnVers.AllowDBNull = false; this.columnDescrizione.AllowDBNull = false; - this.columnDescrizione.MaxLength = 2147483647; + this.columnDescrizione.MaxLength = 500; this.columnPath.AllowDBNull = false; this.columnPath.MaxLength = 2147483647; this.columnFasiEnab.AllowDBNull = false; @@ -3948,7 +3948,7 @@ namespace CMS_SC_Data { this.columnCodScheda.MaxLength = 50; this.columnVers.AllowDBNull = false; this.columnNumScheda.AllowDBNull = false; - this.columnDescrizione.MaxLength = 250; + this.columnDescrizione.MaxLength = 500; this.columnopz.AllowDBNull = false; this.columnopz.MaxLength = 50; this.columnFasiEnab.AllowDBNull = false; @@ -11325,7 +11325,7 @@ SELECT CodScheda, Vers, Descrizione, Path, FasiEnab, CodVisib FROM AnagSchede WH this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodScheda", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Vers", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Path", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FasiEnab", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodVisib", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -14209,7 +14209,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin this._commandCollection[7].CommandText = "dbo.stp_SCM_updateQuery"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@opz", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FasiEnab", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxDossier", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index 399ab5c..6120c91 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -341,7 +341,7 @@ SELECT CodScheda, Vers, Descrizione, Path, FasiEnab, CodVisib FROM AnagSchede WH - + @@ -1013,7 +1013,7 @@ SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordin dbo.stp_SCM_updateQuery - + @@ -1636,7 +1636,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + @@ -1859,7 +1859,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + diff --git a/CMS-SC-Data/DS_Applicazione.xss b/CMS-SC-Data/DS_Applicazione.xss index 835fb2e..16cd632 100644 --- a/CMS-SC-Data/DS_Applicazione.xss +++ b/CMS-SC-Data/DS_Applicazione.xss @@ -9,18 +9,18 @@ - - + + - + - + - - + + diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index d07b99a..80f5f97 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx index e943720..ced9fad 100644 --- a/CMS_SC/ElencoSchede.aspx +++ b/CMS_SC/ElencoSchede.aspx @@ -49,8 +49,12 @@
- - + + + + + +
diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index 434ce87..df4d2a7 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -130,5 +130,18 @@ namespace CMS_SC mod_elencoSchedeDossier.doUpdate(); } + protected void ddlSelScheda_DataBound(object sender, EventArgs e) + { + if (memLayer.ML.isInSessionObject("ES_CodSchedaSel")) + { + ddlSelScheda.SelectedValue = memLayer.ML.StringSessionObj("ES_CodSchedaSel"); + } + } + + protected void ddlSelScheda_SelectedIndexChanged(object sender, EventArgs e) + { + // salvo... + memLayer.ML.setSessionVal("ES_CodSchedaSel", ddlSelScheda.SelectedValue); + } } } \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx b/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx index e3ab79a..08ffa97 100644 --- a/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx +++ b/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selSchedaUrl.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_selSchedaUrl" %>
- + diff --git a/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx.cs b/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx.cs index 5210958..4b862fb 100644 --- a/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx.cs +++ b/CMS_SC/WebUserControls/mod_selSchedaUrl.ascx.cs @@ -15,26 +15,29 @@ namespace CMS_SC.WebUserControls { if (!Page.IsPostBack) { - // cerco in URL cod scheda, se c'è seleziono... - if (memLayer.ML.QSS(QSName) != "") - { - ddlSelScheda.SelectedValue = memLayer.ML.QSS(QSName); - } - else - { - try - { - ddlSelScheda.DataBind(); - ddlSelScheda.SelectedIndex = 0; - updateAndRedirect(); - } - catch - { } - } - fixUrl(); + doUpdate(); } } - + public void doUpdate() + { + // cerco in URL cod scheda, se c'è seleziono... + if (memLayer.ML.QSS(QSName) != "") + { + ddlSelScheda.SelectedValue = memLayer.ML.QSS(QSName); + } + else + { + try + { + ddlSelScheda.DataBind(); + ddlSelScheda.SelectedIndex = 0; + updateAndRedirect(); + } + catch + { } + } + fixUrl(); + } private void updateAndRedirect() { Response.Redirect(string.Format("{0}?{3}={1}&CodFam={2}", devicesAuthProxy.pagCorrente, ddlSelScheda.SelectedValue, memLayer.ML.QSS("CodFam"), QSName)); @@ -116,5 +119,10 @@ namespace CMS_SC.WebUserControls } } public bool showLinkDoc { get; set; } + + protected void ddlSelScheda_DataBound(object sender, EventArgs e) + { + doUpdate(); + } } } \ 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 cd16849..88e5a52 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/sql/Update_3.1.sql b/CMS_SC/sql/Update_3.1.sql index 42b9067..d6da83d 100644 --- a/CMS_SC/sql/Update_3.1.sql +++ b/CMS_SC/sql/Update_3.1.sql @@ -48,3 +48,9 @@ UPDATE Dettscheda SET NomeMisura = '[IT]' + NomeMisura + '[/IT]' + CHAR(10) + '[ ALTER TABLE SchemaCollFamMacc ALTER COLUMN Descrizione NVARCHAR(500) NOT NULL --aggiorno DETTAGLIO scheda... UPDATE SchemaCollFamMacc SET Descrizione = '[IT]' + Descrizione + '[/IT]' + CHAR(10) + '[EN]' + Descrizione + '[/EN]' + + +-- sistemo le ISTANZE delle schede configurate x i vari dossier... +ALTER TABLE SchemaCollMacc ALTER COLUMN Descrizione NVARCHAR(500) NOT NULL +--aggiorno DETTAGLIO scheda... +UPDATE SchemaCollMacc SET Descrizione = '[IT]' + Descrizione + '[/IT]' + CHAR(10) + '[EN]' + Descrizione + '[/EN]' \ No newline at end of file