diff --git a/.vs/WebSCR/v15/.suo b/.vs/WebSCR/v15/.suo index dbc2bef..2773d1e 100644 Binary files a/.vs/WebSCR/v15/.suo and b/.vs/WebSCR/v15/.suo differ diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx index 609b5fb..37ee742 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx +++ b/WebSCR/WebUserControls/mod_dettInt.ascx @@ -1,97 +1,100 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettInt" %>
-
-
-
- - -
-
- +
+
+
+ + +
+
+ -
-
- -
+
+
+ +
- - - - - - - - - - - - - Nessuna Attivià - - - - - - -
- -
- - - - - - - -
- -
- note: + + + + + + + + + + + + + Nessuna Attivià + + + + + + +
+ +
+ + + + + + + +
+ +
+ note: -
-
- - -
-
- -
-
- ,  +
+
+ + +
+
+ +
+
+ ,  -
-
- note: +
+
+ note: -
-
- - - - - - - - - - +
+
+ + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs index 7a09c92..e6c4f0e 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -9,232 +9,232 @@ using WebSCR_data; namespace WebSCR.WebUserControls { - public partial class mod_dettInt : System.Web.UI.UserControl + public partial class mod_dettInt : System.Web.UI.UserControl + { + public event EventHandler eh_update; + /// + /// solleva evento selezione data + /// + protected void reportEvent() { - public event EventHandler eh_update; - /// - /// solleva evento selezione data - /// - protected void reportEvent() + // evento! + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// disabilita modalità EDIT record... + /// + public bool disableEdit { get; set; } + /// + /// determina se sia visibile... + /// + public string isVisible + { + get + { + string answ = "visible"; + if (disableEdit) { - // evento! - if (eh_update != null) - { - eh_update(this, new EventArgs()); - } + answ = "hidden"; } - /// - /// disabilita modalità EDIT record... - /// - public bool disableEdit { get; set; } - /// - /// determina se sia visibile... - /// - public string isVisible + return answ; + } + } + /// + /// determina altezza visibile + /// + public string visHeight + { + get + { + string answ = "1em"; + if (disableEdit) { - get - { - string answ = "visible"; - if (disableEdit) - { - answ = "hidden"; - } - return answ; - } + answ = "0px"; } - /// - /// determina altezza visibile - /// - public string visHeight - { - get - { - string answ = "1em"; - if (disableEdit) - { - answ = "0px"; - } - return answ; - } + return answ; + } - } - /// - /// impegno corrente - /// - public int idxImpegno + } + /// + /// impegno corrente + /// + public int idxImpegno + { + get + { + int answ = 0; + try { - get - { - int answ = 0; - try - { - answ = Convert.ToInt32(qsVal("IdxImpegno")); - } - catch - { } - return answ; - } + answ = Convert.ToInt32(qsVal("IdxImpegno")); } - /// - /// recupera valore querystring - /// - /// - /// - protected string qsVal(string nome) - { - string answ = ""; - try - { - answ = Request.QueryString[nome].ToString(); - } - catch - { } - return answ; - } - protected void Page_Load(object sender, EventArgs e) - { - doUpdate(); - } - /// - /// aggiunge il task corrente all'elenco dei task... - /// - /// - /// - protected void lbAdd_Click(object sender, EventArgs e) - { - // verifico se si possa inserire (ovvero totale tempo > minTempo e valore da inserire NEGATIVO...) - if (((actualMin + selTaskMin) >= minTempoInt)) - { - // fix warning - lblWarning.Visible = false; - lblWarning.Text = ""; + catch + { } + return answ; + } + } + /// + /// recupera valore querystring + /// + /// + /// + protected string qsVal(string nome) + { + string answ = ""; + try + { + answ = Request.QueryString[nome].ToString(); + } + catch + { } + return answ; + } + protected void Page_Load(object sender, EventArgs e) + { + doUpdate(); + } + /// + /// aggiunge il task corrente all'elenco dei task... + /// + /// + /// + protected void lbAdd_Click(object sender, EventArgs e) + { + // verifico se si possa inserire (ovvero totale tempo > minTempo e valore da inserire NEGATIVO...) + if (((actualMin + selTaskMin) >= minTempoInt)) + { + // fix warning + lblWarning.Visible = false; + lblWarning.Text = ""; - DtProxy.man.taDetImp.insertQuery(idxImpegno, matrOp, ddlTipoCons.SelectedValue); - //doUpdate(); - reportEvent(); - } - else - { - // fix warning - lblWarning.Visible = true; - lblWarning.Text = string.Format("Attenzione: impossibile inserire, tempo complessivo diventerebbe inferiore a soglia minima ({0} min)!", minTempoInt); - } - } - /// - /// verifica se si possano agigungere dati: ha patricola (OP) e l'intervento ha il record usato si/no compilato - /// - public bool canAddData + DtProxy.man.taDetImp.insertQuery(idxImpegno, user_std.UtSn.userNameAD, matrOp, ddlTipoCons.SelectedValue); + //doUpdate(); + reportEvent(); + } + else + { + // fix warning + lblWarning.Visible = true; + lblWarning.Text = string.Format("Attenzione: impossibile inserire, tempo complessivo diventerebbe inferiore a soglia minima ({0} min)!", minTempoInt); + } + } + /// + /// verifica se si possano agigungere dati: ha patricola (OP) e l'intervento ha il record usato si/no compilato + /// + public bool canAddData + { + get + { + return hasMatricola && isRitUsOk; + } + } + /// + /// verifica se il record sia OK x ritiro usato... + /// + public bool isRitUsOk + { + get + { + bool answ = false; + try { - get - { - return hasMatricola && isRitUsOk; - } + answ = DtProxy.man.taImp.getByKey(idxImpegno)[0].RitUsato >= 0; } - /// - /// verifica se il record sia OK x ritiro usato... - /// - public bool isRitUsOk + catch + { } + return answ; + } + } + /// + /// verifica se ci sia matricola in sessione + /// + public bool hasMatricola + { + get + { + return matrOp != ""; + } + } + /// + /// matricola OP (x utente) + /// + public string matrOp + { + get + { + string answ = ""; + try { - get - { - bool answ = false; - try - { - answ = DtProxy.man.taImp.getByKey(idxImpegno)[0].RitUsato >= 0; - } - catch - { } - return answ; - } + answ = memLayer.ML.StringSessionObj("matrOp"); } - /// - /// verifica se ci sia matricola in sessione - /// - public bool hasMatricola + catch + { } + return answ; + } + } + protected int minTempoInt + { + get + { + return memLayer.ML.CRI("minTempoInterv"); + } + } + protected int actualMin + { + get + { + int answ = 0; + try { - get - { - return matrOp != ""; - } - } - /// - /// matricola OP (x utente) - /// - public string matrOp - { - get - { - string answ = ""; - try - { - answ = memLayer.ML.StringSessionObj("matrOp"); - } - catch - { } - return answ; - } - } - protected int minTempoInt - { - get - { - return memLayer.ML.CRI("minTempoInterv"); - } - } - protected int actualMin - { - get - { - int answ = 0; - try - { - answ = DtProxy.man.taVRI.getByKey(idxImpegno)[0].TotMin; - } - catch - { } - return answ; - } + answ = DtProxy.man.taVRI.getByKey(idxImpegno)[0].TotMin; } + catch + { } + return answ; + } + } - protected int selTaskMin + protected int selTaskMin + { + get + { + int answ = 0; + try { - get - { - int answ = 0; - try - { - answ = DtProxy.man.taATC.getByKey(ddlTipoCons.SelectedValue)[0].MinutiStd; - } - catch - { } - return answ; - } + answ = DtProxy.man.taATC.getByKey(ddlTipoCons.SelectedValue)[0].MinutiStd; } + catch + { } + return answ; + } + } - protected void odsDettInt_Deleted(object sender, ObjectDataSourceStatusEventArgs e) - { - //doUpdate(); - reportEvent(); - } + protected void odsDettInt_Deleted(object sender, ObjectDataSourceStatusEventArgs e) + { + //doUpdate(); + reportEvent(); + } - protected void odsDettInt_Updated(object sender, ObjectDataSourceStatusEventArgs e) - { - //doUpdate(); - reportEvent(); - } - public void doUpdate() - { - lblWarning.Visible = false; - lbAdd.DataBind(); - grViewDettInt.DataBind(); - } - protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e) - { + protected void odsDettInt_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + //doUpdate(); + reportEvent(); + } + public void doUpdate() + { + lblWarning.Visible = false; + lbAdd.DataBind(); + grViewDettInt.DataBind(); + } + protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e) + { #if false // recupero valori consegna e note... e.InputParameters["CodConsegna"] = ((DropDownList)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("ddlTipoCons")).SelectedValue; e.InputParameters["Note"] = ((TextBox)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("txtNote")).Text; #endif - } } + } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs index 58fb598..4005263 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace WebSCR.WebUserControls { @@ -13,56 +13,56 @@ namespace WebSCR.WebUserControls { public partial class mod_dettInt { /// - /// ddlTipoCons control. + /// Controllo ddlTipoCons. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.DropDownList ddlTipoCons; /// - /// lbAdd control. + /// Controllo lbAdd. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.LinkButton lbAdd; /// - /// odsTipoCons control. + /// Controllo odsTipoCons. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsTipoCons; /// - /// lblWarning control. + /// Controllo lblWarning. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblWarning; /// - /// grViewDettInt control. + /// Controllo grViewDettInt. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.GridView grViewDettInt; /// - /// odsDettInt control. + /// Controllo odsDettInt. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsDettInt; } diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 0d2edce..0ba4e81 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 5547432..2d98439 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index b074f77..1243686 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -15579,6 +15579,8 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumCons", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOp", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = "dbo.stp_DettImp_getByImpegno"; @@ -15598,6 +15600,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; 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("@IdxImpegno", 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("@UserMod", 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("@MatrOp", 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("@CodConsegna", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); @@ -15608,6 +15611,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxImpegno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_NumCons", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodConsegna", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOp", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -15679,7 +15683,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int deleteQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons) { + public virtual int deleteQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons, string UserMod, string MatrOp) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; if ((Original_IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value)); @@ -15693,6 +15697,18 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq else { command.Parameters[2].Value = global::System.DBNull.Value; } + if ((UserMod == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(UserMod)); + } + if ((MatrOp == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(MatrOp)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -15713,7 +15729,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int insertQuery(global::System.Nullable IdxImpegno, string MatrOp, string CodConsegna) { + public virtual int insertQuery(global::System.Nullable IdxImpegno, string UserMod, string MatrOp, string CodConsegna) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxImpegno.Value)); @@ -15721,17 +15737,23 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq else { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((MatrOp == null)) { + if ((UserMod == null)) { command.Parameters[2].Value = global::System.DBNull.Value; } else { - command.Parameters[2].Value = ((string)(MatrOp)); + command.Parameters[2].Value = ((string)(UserMod)); } - if ((CodConsegna == null)) { + if ((MatrOp == null)) { command.Parameters[3].Value = global::System.DBNull.Value; } else { - command.Parameters[3].Value = ((string)(CodConsegna)); + command.Parameters[3].Value = ((string)(MatrOp)); + } + if ((CodConsegna == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(CodConsegna)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -15753,7 +15775,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons, string CodConsegna, string MatrOp, string Note) { + public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons, string CodConsegna, string UserMod, string MatrOp, string Note) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((Original_IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value)); @@ -15773,17 +15795,23 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq else { command.Parameters[3].Value = ((string)(CodConsegna)); } - if ((MatrOp == null)) { + if ((UserMod == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(MatrOp)); + command.Parameters[4].Value = ((string)(UserMod)); } - if ((Note == null)) { + if ((MatrOp == null)) { command.Parameters[5].Value = global::System.DBNull.Value; } else { - command.Parameters[5].Value = ((string)(Note)); + command.Parameters[5].Value = ((string)(MatrOp)); + } + if ((Note == null)) { + command.Parameters[6].Value = global::System.DBNull.Value; + } + else { + command.Parameters[6].Value = ((string)(Note)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 5b3e726..ed45825 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -1026,6 +1026,8 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + @@ -1060,6 +1062,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + @@ -1075,6 +1078,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 128266b..f2917e1 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -10,12 +10,12 @@ - + - + diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll index 5547432..2d98439 100644 Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index cfd3649..630552f 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index 5547432..2d98439 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ