diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 2c7b32f..3722e00 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Setup.aspx b/WebSCR/Setup.aspx index 0fb0057..5eeca7c 100644 --- a/WebSCR/Setup.aspx +++ b/WebSCR/Setup.aspx @@ -19,8 +19,8 @@ Zone Calendario - - - - + + + + diff --git a/WebSCR/Setup.aspx.cs b/WebSCR/Setup.aspx.cs index b8f9ee3..bf4da95 100644 --- a/WebSCR/Setup.aspx.cs +++ b/WebSCR/Setup.aspx.cs @@ -22,6 +22,11 @@ namespace WebSCR /// private void showDetail(string dettaglio) { + // fix base css buttons + btnSquadre.CssClass = "ui-btn ui-corner-all ui-icon-user ui-btn-icon-left"; + btnTipoInt.CssClass = "ui-btn ui-corner-all ui-icon-bullets ui-btn-icon-left"; + btnZone.CssClass = "ui-btn ui-corner-all ui-icon-grid ui-btn-icon-left"; + btnCalendario.CssClass = "ui-btn ui-corner-all ui-icon-calendar ui-btn-icon-left"; switch (dettaglio) { case "calendario": @@ -29,24 +34,32 @@ namespace WebSCR mod_elencoSquadre.Visible = false; mod_elencoTipoInt.Visible = false; mod_elencoZone.Visible = false; + + btnCalendario.CssClass += " ui-btn-active"; break; case "squadre": mod_elencoDisp.Visible = false; mod_elencoSquadre.Visible = true; mod_elencoTipoInt.Visible = false; mod_elencoZone.Visible = false; + + btnSquadre.CssClass += " ui-btn-active"; break; case "tipoInt": mod_elencoDisp.Visible = false; mod_elencoSquadre.Visible = false; mod_elencoTipoInt.Visible = true; mod_elencoZone.Visible = false; + + btnTipoInt.CssClass += " ui-btn-active"; break; case "zone": mod_elencoDisp.Visible = false; mod_elencoSquadre.Visible = false; mod_elencoTipoInt.Visible = false; mod_elencoZone.Visible = true; + + btnZone.CssClass += " ui-btn-active"; break; default: mod_elencoDisp.Visible = false; diff --git a/WebSCR/Web.config b/WebSCR/Web.config index a895d99..9dc6b3a 100644 --- a/WebSCR/Web.config +++ b/WebSCR/Web.config @@ -34,8 +34,8 @@ - + + diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index 7e6dfb1..819cc29 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -354,7 +354,9 @@ - + + Designer + diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx b/WebSCR/WebUserControls/mod_elencoSquadre.ascx index 474a362..ebca038 100644 --- a/WebSCR/WebUserControls/mod_elencoSquadre.ascx +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx @@ -15,18 +15,57 @@ + + + -
- <%----%> - +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -34,6 +73,10 @@ + + + + @@ -42,6 +85,10 @@ + + + + @@ -50,20 +97,50 @@ + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx.cs b/WebSCR/WebUserControls/mod_elencoSquadre.ascx.cs index dc6f9f8..b14f95c 100644 --- a/WebSCR/WebUserControls/mod_elencoSquadre.ascx.cs +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using WebSCR_data; namespace WebSCR.WebUserControls { @@ -21,7 +22,18 @@ namespace WebSCR.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { - } + /// + /// crea nuovo record squadre + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + // creo novo record e vado in editing... + DtProxy.man.taAS.InsertQuery(" -ND", "Inserire Descrizione", 0, true, false, false); + grView.EditIndex = 0; + } + } } \ No newline at end of file diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 84b5ffa..410e54e 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index e628be4..9c45f70 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 1a1ce34..d19b7e5 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 508b84d..8b15f19 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index e628be4..9c45f70 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index 8db659a..b9d6503 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -904,7 +904,7 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM dbo.AnagSqua" + @@ -916,6 +916,29 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; 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_CodSquadra", 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_AS_InsertQuery"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].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[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumOp", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Elettrod", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Clima", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Inform", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_AS_UpdateQuery"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DescrSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumOp", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Elettrod", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Clima", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Inform", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1134,6 +1157,130 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre } return returnValue; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)] + public virtual int InsertQuery(string CodSquadra, string DescrSquadra, global::System.Nullable NumOp, global::System.Nullable Elettrod, global::System.Nullable Clima, global::System.Nullable Inform) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((CodSquadra == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodSquadra)); + } + if ((DescrSquadra == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(DescrSquadra)); + } + if ((NumOp.HasValue == true)) { + command.Parameters[3].Value = ((int)(NumOp.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((Elettrod.HasValue == true)) { + command.Parameters[4].Value = ((bool)(Elettrod.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Clima.HasValue == true)) { + command.Parameters[5].Value = ((bool)(Clima.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + if ((Inform.HasValue == true)) { + command.Parameters[6].Value = ((bool)(Inform.Value)); + } + else { + command.Parameters[6].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, false)] + public virtual int UpdateQuery(string CodSquadra, string DescrSquadra, global::System.Nullable NumOp, global::System.Nullable Elettrod, global::System.Nullable Clima, global::System.Nullable Inform, string Original_CodSquadra) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((CodSquadra == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(CodSquadra)); + } + if ((DescrSquadra == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(DescrSquadra)); + } + if ((NumOp.HasValue == true)) { + command.Parameters[3].Value = ((int)(NumOp.Value)); + } + else { + command.Parameters[3].Value = global::System.DBNull.Value; + } + if ((Elettrod.HasValue == true)) { + command.Parameters[4].Value = ((bool)(Elettrod.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Clima.HasValue == true)) { + command.Parameters[5].Value = ((bool)(Clima.Value)); + } + else { + command.Parameters[5].Value = global::System.DBNull.Value; + } + if ((Inform.HasValue == true)) { + command.Parameters[6].Value = ((bool)(Inform.Value)); + } + else { + command.Parameters[6].Value = global::System.DBNull.Value; + } + if ((Original_CodSquadra == null)) { + command.Parameters[7].Value = global::System.DBNull.Value; + } + else { + command.Parameters[7].Value = ((string)(Original_CodSquadra)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 5b554f2..398ef8b 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -85,6 +85,39 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform FROM AnagSquadre + + + + dbo.stp_AS_InsertQuery + + + + + + + + + + + + + + + + dbo.stp_AS_UpdateQuery + + + + + + + + + + + + + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 83a98e1..85333e4 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -6,7 +6,7 @@ --> - + \ No newline at end of file diff --git a/WebSCR_data/DtProxy.cs b/WebSCR_data/DtProxy.cs index 26d604f..216034f 100644 --- a/WebSCR_data/DtProxy.cs +++ b/WebSCR_data/DtProxy.cs @@ -23,13 +23,13 @@ namespace WebSCR_data protected virtual void avvioTableAdapters() { #if false - taAP = new DS_ApplicazioneTableAdapters.AnagPazientiTableAdapter(); taVAC = new DS_ApplicazioneTableAdapters.VisAnamCliTableAdapter(); taVCP = new DS_ApplicazioneTableAdapters.VisCardioPolTableAdapter(); taVLab = new DS_ApplicazioneTableAdapters.VisLabTableAdapter(); taVRF = new DS_ApplicazioneTableAdapters.VisRelazFinTableAdapter(); taRepVis = new DS_ApplicazioneTableAdapters.stp_rep_DatiFullByPazienteDataTableAdapter(); #endif + taAS = new DS_ApplicazioneTableAdapters.AnagSquadreTableAdapter(); taFile = new DS_UtilityTableAdapters.tblFilesTableAdapter(); } /// @@ -41,13 +41,13 @@ namespace WebSCR_data string connStrFiles = memLayer.ML.confReadString("WebSCRFilesConnectionString"); // connections del db vocabolario #if false - taAP.Connection.ConnectionString = connStr; taVAC.Connection.ConnectionString = connStr; taVCP.Connection.ConnectionString = connStr; taVLab.Connection.ConnectionString = connStr; taVRF.Connection.ConnectionString = connStr; taRepVis.Connection.ConnectionString = connStr; #endif + taAS.Connection.ConnectionString = connStr; taFile.Connection.ConnectionString = connStrFiles; } @@ -56,7 +56,6 @@ namespace WebSCR_data #region area public #if false - public DS_ApplicazioneTableAdapters.AnagPazientiTableAdapter taAP; public DS_ApplicazioneTableAdapters.VisAnamCliTableAdapter taVAC; public DS_ApplicazioneTableAdapters.VisCardioPolTableAdapter taVCP; public DS_ApplicazioneTableAdapters.VisLabTableAdapter taVLab; @@ -64,6 +63,7 @@ namespace WebSCR_data public DS_ApplicazioneTableAdapters.stp_rep_DatiFullByPazienteDataTableAdapter taRepVis; #endif + public DS_ApplicazioneTableAdapters.AnagSquadreTableAdapter taAS; public DS_UtilityTableAdapters.tblFilesTableAdapter taFile; public static DtProxy man = new DtProxy(); diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 84b5ffa..410e54e 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 1a1ce34..d19b7e5 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 040d468..5f80a92 100644 Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 2a598d5..8e87b62 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 1a1ce34..d19b7e5 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ