From 2534273c1fdfc7f7353cd2ed6e7f44e34a6cae2a Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 23 Feb 2017 17:00:46 +0100 Subject: [PATCH] fix gestione peso/altezza con override (salva su VBMA e anagrafica) --- ScheMe/VVFAnz.aspx | 85 +++++++---------- ScheMe/VVFGT.aspx | 51 ++++++++-- ScheMe_Data/DS_Applicazione.Designer.cs | 122 ++++++++++++------------ ScheMe_Data/DS_Applicazione.xsd | 54 +++++------ 4 files changed, 166 insertions(+), 146 deletions(-) diff --git a/ScheMe/VVFAnz.aspx b/ScheMe/VVFAnz.aspx index 92f0423..e4f594f 100644 --- a/ScheMe/VVFAnz.aspx +++ b/ScheMe/VVFAnz.aspx @@ -13,9 +13,18 @@
    -
  • Data
  • +
  • Visita - Antropometria
  • - <%: Request.QueryString["DataVisita"] %> + + <%: Request.QueryString["DataVisita"] %> +
  • +
  • + + +
  • +
  • + +
    @@ -134,9 +143,18 @@
      -
    • Data
    • +
    • Visita - Antropometria
    • - <%: Request.QueryString["DataVisita"] %> + + <%: Request.QueryString["DataVisita"] %> +
    • +
    • + + +
    • +
    • + +
    @@ -212,9 +230,18 @@
      -
    • Data
    • +
    • Visita - Antropometria
    • - <%: Request.QueryString["DataVisita"] %> + + <%: Request.QueryString["DataVisita"] %> +
    • +
    • + + +
    • +
    • + +
    @@ -301,6 +328,8 @@ + + @@ -313,51 +342,11 @@ + + - <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --%>
    diff --git a/ScheMe/VVFGT.aspx b/ScheMe/VVFGT.aspx index 7c7468c..a78d56c 100644 --- a/ScheMe/VVFGT.aspx +++ b/ScheMe/VVFGT.aspx @@ -13,9 +13,18 @@
      -
    • Data
    • +
    • Visita - Antropometria
    • - <%: Request.QueryString["DataVisita"] %> + + <%: Request.QueryString["DataVisita"] %> +
    • +
    • + + +
    • +
    • + +
      @@ -140,9 +149,18 @@
        -
      • Data
      • +
      • Visita - Antropometria
      • - <%: Request.QueryString["DataVisita"] %> + + <%: Request.QueryString["DataVisita"] %> +
      • +
      • + + +
      • +
      • + +
      @@ -224,9 +242,18 @@
        -
      • Data
      • +
      • Visita - Antropometria
      • - <%: Request.QueryString["DataVisita"] %> + + <%: Request.QueryString["DataVisita"] %> +
      • +
      • + + +
      • +
      • + +
      @@ -305,14 +332,14 @@
      - + - + @@ -321,6 +348,8 @@ + + @@ -328,15 +357,17 @@ - + - + + +
      diff --git a/ScheMe_Data/DS_Applicazione.Designer.cs b/ScheMe_Data/DS_Applicazione.Designer.cs index ef641b9..92cc28a 100644 --- a/ScheMe_Data/DS_Applicazione.Designer.cs +++ b/ScheMe_Data/DS_Applicazione.Designer.cs @@ -741,6 +741,10 @@ namespace ScheMe_Data { private global::System.Data.DataColumn columnSesso; + private global::System.Data.DataColumn columnAltezza; + + private global::System.Data.DataColumn columnPeso; + private global::System.Data.DataColumn columnCodF; private global::System.Data.DataColumn columnIndirizzo; @@ -753,10 +757,6 @@ namespace ScheMe_Data { private global::System.Data.DataColumn columnNote; - private global::System.Data.DataColumn columnAltezza; - - private global::System.Data.DataColumn columnPeso; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public AnagPazientiDataTable() { @@ -846,6 +846,22 @@ namespace ScheMe_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn AltezzaColumn { + get { + return this.columnAltezza; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn PesoColumn { + get { + return this.columnPeso; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn CodFColumn { @@ -894,22 +910,6 @@ namespace ScheMe_Data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn AltezzaColumn { - get { - return this.columnAltezza; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn PesoColumn { - get { - return this.columnPeso; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -947,7 +947,7 @@ namespace ScheMe_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public AnagPazientiRow AddAnagPazientiRow(string Gruppo, string Cognome, string Nome, System.DateTime DataNasc, string LuogoNascita, string Sesso, string CodF, string Indirizzo, double Eta, string RecTel, string Medico, string Note, double Altezza, double Peso) { + public AnagPazientiRow AddAnagPazientiRow(string Gruppo, string Cognome, string Nome, System.DateTime DataNasc, string LuogoNascita, string Sesso, double Altezza, double Peso, string CodF, string Indirizzo, double Eta, string RecTel, string Medico, string Note) { AnagPazientiRow rowAnagPazientiRow = ((AnagPazientiRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -957,14 +957,14 @@ namespace ScheMe_Data { DataNasc, LuogoNascita, Sesso, + Altezza, + Peso, CodF, Indirizzo, Eta, RecTel, Medico, - Note, - Altezza, - Peso}; + Note}; rowAnagPazientiRow.ItemArray = columnValuesArray; this.Rows.Add(rowAnagPazientiRow); return rowAnagPazientiRow; @@ -1001,14 +1001,14 @@ namespace ScheMe_Data { this.columnDataNasc = base.Columns["DataNasc"]; this.columnLuogoNascita = base.Columns["LuogoNascita"]; this.columnSesso = base.Columns["Sesso"]; + this.columnAltezza = base.Columns["Altezza"]; + this.columnPeso = base.Columns["Peso"]; this.columnCodF = base.Columns["CodF"]; this.columnIndirizzo = base.Columns["Indirizzo"]; this.columnEta = base.Columns["Eta"]; this.columnRecTel = base.Columns["RecTel"]; this.columnMedico = base.Columns["Medico"]; this.columnNote = base.Columns["Note"]; - this.columnAltezza = base.Columns["Altezza"]; - this.columnPeso = base.Columns["Peso"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1028,6 +1028,10 @@ namespace ScheMe_Data { base.Columns.Add(this.columnLuogoNascita); this.columnSesso = new global::System.Data.DataColumn("Sesso", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnSesso); + this.columnAltezza = new global::System.Data.DataColumn("Altezza", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnAltezza); + this.columnPeso = new global::System.Data.DataColumn("Peso", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnPeso); this.columnCodF = new global::System.Data.DataColumn("CodF", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCodF); this.columnIndirizzo = new global::System.Data.DataColumn("Indirizzo", typeof(string), null, global::System.Data.MappingType.Element); @@ -1040,10 +1044,6 @@ namespace ScheMe_Data { base.Columns.Add(this.columnMedico); this.columnNote = new global::System.Data.DataColumn("Note", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNote); - this.columnAltezza = new global::System.Data.DataColumn("Altezza", typeof(double), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnAltezza); - this.columnPeso = new global::System.Data.DataColumn("Peso", typeof(double), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnPeso); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxPaziente}, true)); this.columnIdxPaziente.AutoIncrement = true; @@ -1063,6 +1063,8 @@ namespace ScheMe_Data { this.columnLuogoNascita.MaxLength = 50; this.columnSesso.AllowDBNull = false; this.columnSesso.MaxLength = 1; + this.columnAltezza.AllowDBNull = false; + this.columnPeso.AllowDBNull = false; this.columnCodF.AllowDBNull = false; this.columnCodF.MaxLength = 20; this.columnIndirizzo.AllowDBNull = false; @@ -1074,8 +1076,6 @@ namespace ScheMe_Data { this.columnMedico.MaxLength = 50; this.columnNote.AllowDBNull = false; this.columnNote.MaxLength = 500; - this.columnAltezza.AllowDBNull = false; - this.columnPeso.AllowDBNull = false; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9477,6 +9477,28 @@ namespace ScheMe_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double Altezza { + get { + return ((double)(this[this.tableAnagPazienti.AltezzaColumn])); + } + set { + this[this.tableAnagPazienti.AltezzaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double Peso { + get { + return ((double)(this[this.tableAnagPazienti.PesoColumn])); + } + set { + this[this.tableAnagPazienti.PesoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string CodF { @@ -9548,28 +9570,6 @@ namespace ScheMe_Data { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public double Altezza { - get { - return ((double)(this[this.tableAnagPazienti.AltezzaColumn])); - } - set { - this[this.tableAnagPazienti.AltezzaColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public double Peso { - get { - return ((double)(this[this.tableAnagPazienti.PesoColumn])); - } - set { - this[this.tableAnagPazienti.PesoColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsEtaNull() { @@ -17991,14 +17991,14 @@ namespace ScheMe_Data.DS_ApplicazioneTableAdapters { tableMapping.ColumnMappings.Add("DataNasc", "DataNasc"); tableMapping.ColumnMappings.Add("LuogoNascita", "LuogoNascita"); tableMapping.ColumnMappings.Add("Sesso", "Sesso"); + tableMapping.ColumnMappings.Add("Altezza", "Altezza"); + tableMapping.ColumnMappings.Add("Peso", "Peso"); tableMapping.ColumnMappings.Add("CodF", "CodF"); tableMapping.ColumnMappings.Add("Indirizzo", "Indirizzo"); tableMapping.ColumnMappings.Add("Eta", "Eta"); tableMapping.ColumnMappings.Add("RecTel", "RecTel"); tableMapping.ColumnMappings.Add("Medico", "Medico"); tableMapping.ColumnMappings.Add("Note", "Note"); - tableMapping.ColumnMappings.Add("Altezza", "Altezza"); - tableMapping.ColumnMappings.Add("Peso", "Peso"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -25352,8 +25352,8 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TR2", 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("@SU", 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("@GA", 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("@Altezza", 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("@Peso", 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("@Altezza", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Peso", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataVisita", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxPaziente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -25536,7 +25536,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat [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")] - public virtual int UpdateQuery(global::System.Nullable SJ, global::System.Nullable FT, global::System.Nullable PU, global::System.Nullable TR0, global::System.Nullable TR1, global::System.Nullable TR2, global::System.Nullable SU, global::System.Nullable GA, global::System.Nullable Altezza, global::System.Nullable Peso, global::System.Nullable Original_DataVisita, global::System.Nullable Original_IdxPaziente) { + public virtual int UpdateQuery(global::System.Nullable SJ, global::System.Nullable FT, global::System.Nullable PU, global::System.Nullable TR0, global::System.Nullable TR1, global::System.Nullable TR2, global::System.Nullable SU, global::System.Nullable GA, global::System.Nullable Altezza, global::System.Nullable Peso, global::System.Nullable Original_DataVisita, global::System.Nullable Original_IdxPaziente) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((SJ.HasValue == true)) { command.Parameters[1].Value = ((int)(SJ.Value)); @@ -25587,13 +25587,13 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat command.Parameters[8].Value = global::System.DBNull.Value; } if ((Altezza.HasValue == true)) { - command.Parameters[9].Value = ((int)(Altezza.Value)); + command.Parameters[9].Value = ((double)(Altezza.Value)); } else { command.Parameters[9].Value = global::System.DBNull.Value; } if ((Peso.HasValue == true)) { - command.Parameters[10].Value = ((int)(Peso.Value)); + command.Parameters[10].Value = ((double)(Peso.Value)); } else { command.Parameters[10].Value = global::System.DBNull.Value; diff --git a/ScheMe_Data/DS_Applicazione.xsd b/ScheMe_Data/DS_Applicazione.xsd index 05da719..96c787b 100644 --- a/ScheMe_Data/DS_Applicazione.xsd +++ b/ScheMe_Data/DS_Applicazione.xsd @@ -108,14 +108,14 @@ SELECT IdxPaziente, Gruppo, Cognome, Nome, DataNasc, LuogoNascita, Sesso, Altezz + + - - @@ -1767,8 +1767,8 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - - + + @@ -1785,7 +1785,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -1825,6 +1825,8 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat + + @@ -1861,12 +1863,10 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - - - + @@ -1882,7 +1882,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -1905,7 +1905,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -1928,7 +1928,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -1956,7 +1956,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -1970,7 +1970,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -2022,7 +2022,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -2039,7 +2039,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -2528,7 +2528,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -2580,7 +2580,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -2613,7 +2613,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - + @@ -2707,15 +2707,15 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat - - - - - - - - - + + + + + + + + + \ No newline at end of file