diff --git a/ScheMe/VVFAnz.aspx b/ScheMe/VVFAnz.aspx
index 6241ae2..d155cc2 100644
--- a/ScheMe/VVFAnz.aspx
+++ b/ScheMe/VVFAnz.aspx
@@ -20,8 +20,12 @@
- Elaborazioni:
-
-
-
+
+
+
+ -
+
+
-
@@ -30,7 +34,6 @@
-
- <%----%>
@@ -38,11 +41,23 @@
- FT - Flessibilità Tronco
-
- <%----%>
+
+
+ -
+
+
+
+
+
- FS - Flessibilità Spalle
-
- <%----%>
+
+
+
+ -
+
+
@@ -50,12 +65,24 @@
- GA - Grasso Addominale
- -
- <%----%>
+
-
+
+
+ -
+
+
+
+
+
- E - Equilibrio
-
- <%----%>
+
+
+
+ -
+
+
@@ -64,11 +91,23 @@
- FAI - Forza Arti Inferiori
-
- <%----%>
+
+
+ -
+
+
+
+
+
- FP - Forza Prensile
-
- <%----%>
+
+
+
+ -
+
+
@@ -104,11 +143,15 @@
- FT - Flessibilità Tronco
-
- <%----%>
+
+
+
+
- FS - Flessibilità Spalle
-
- <%----%>
+
+
@@ -117,11 +160,15 @@
- GA - Grasso Addominale
-
- <%----%>
+
+
+
+
- E - Equilibrio
-
- <%----%>
+
+
@@ -130,11 +177,15 @@
- FAI - Forza Arti Inferiori
-
- <%----%>
+
+
+
+
- FP - Forza Prensile
-
- <%----%>
+
+
@@ -170,11 +221,15 @@
- FT - Flessibilità Tronco
-
- <%----%>
+
+
+
+
- FS - Flessibilità Spalle
-
- <%----%>
+
+
@@ -183,11 +238,15 @@
- GA - Grasso Addominale
-
- <%----%>
+
+
+
+
- E - Equilibrio
-
- <%----%>
+
+
@@ -196,11 +255,15 @@
- FAI - Forza Arti Inferiori
-
- <%----%>
+
+
+
+
- FP - Forza Prensile
-
- <%----%>
+
+
@@ -253,7 +316,7 @@
-
+ <%--
@@ -294,6 +357,6 @@
-
+ --%>
diff --git a/ScheMe/VVFAnz.aspx.designer.cs b/ScheMe/VVFAnz.aspx.designer.cs
index 9c88a73..c786200 100644
--- a/ScheMe/VVFAnz.aspx.designer.cs
+++ b/ScheMe/VVFAnz.aspx.designer.cs
@@ -29,68 +29,5 @@ namespace ScheMe {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
-
- ///
- /// odsFAI control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsFAI;
-
- ///
- /// odsFP control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsFP;
-
- ///
- /// odsGA control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsGA;
-
- ///
- /// odsE control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsE;
-
- ///
- /// odsFT control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsFT;
-
- ///
- /// odsFS control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsFS;
-
- ///
- /// odsRischio control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsRischio;
}
}
diff --git a/ScheMe/bin/ScheMe.dll b/ScheMe/bin/ScheMe.dll
index ac43dee..4e0de82 100644
Binary files a/ScheMe/bin/ScheMe.dll and b/ScheMe/bin/ScheMe.dll differ
diff --git a/ScheMe/bin/ScheMe_Data.dll b/ScheMe/bin/ScheMe_Data.dll
index d6f8201..a7a5dd7 100644
Binary files a/ScheMe/bin/ScheMe_Data.dll and b/ScheMe/bin/ScheMe_Data.dll differ
diff --git a/ScheMe_Data/DS_Applicazione.Designer.cs b/ScheMe_Data/DS_Applicazione.Designer.cs
index 04ba63e..92eecb6 100644
--- a/ScheMe_Data/DS_Applicazione.Designer.cs
+++ b/ScheMe_Data/DS_Applicazione.Designer.cs
@@ -8158,6 +8158,8 @@ namespace ScheMe_Data {
private global::System.Data.DataColumn columnPenalty;
+ private global::System.Data.DataColumn columnScore;
+
private global::System.Data.DataColumn columnScorePerc;
private global::System.Data.DataColumn columnClasse;
@@ -8317,6 +8319,14 @@ 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 ScoreColumn {
+ get {
+ return this.columnScore;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public global::System.Data.DataColumn ScorePercColumn {
@@ -8394,6 +8404,7 @@ namespace ScheMe_Data {
int E_s,
int GA_s,
int Penalty,
+ int Score,
double ScorePerc,
int Classe,
string Performance) {
@@ -8414,6 +8425,7 @@ namespace ScheMe_Data {
E_s,
GA_s,
Penalty,
+ Score,
ScorePerc,
Classe,
Performance};
@@ -8465,6 +8477,7 @@ namespace ScheMe_Data {
this.columnE_s = base.Columns["E_s"];
this.columnGA_s = base.Columns["GA_s"];
this.columnPenalty = base.Columns["Penalty"];
+ this.columnScore = base.Columns["Score"];
this.columnScorePerc = base.Columns["ScorePerc"];
this.columnClasse = base.Columns["Classe"];
this.columnPerformance = base.Columns["Performance"];
@@ -8503,6 +8516,8 @@ namespace ScheMe_Data {
base.Columns.Add(this.columnGA_s);
this.columnPenalty = new global::System.Data.DataColumn("Penalty", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPenalty);
+ this.columnScore = new global::System.Data.DataColumn("Score", typeof(int), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnScore);
this.columnScorePerc = new global::System.Data.DataColumn("ScorePerc", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnScorePerc);
this.columnClasse = new global::System.Data.DataColumn("Classe", typeof(int), null, global::System.Data.MappingType.Element);
@@ -15931,6 +15946,22 @@ namespace ScheMe_Data {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public int Score {
+ get {
+ try {
+ return ((int)(this[this.tableVisValFunz.ScoreColumn]));
+ }
+ catch (global::System.InvalidCastException e) {
+ throw new global::System.Data.StrongTypingException("The value for column \'Score\' in table \'VisValFunz\' is DBNull.", e);
+ }
+ }
+ set {
+ this[this.tableVisValFunz.ScoreColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public double ScorePerc {
@@ -16002,6 +16033,18 @@ namespace ScheMe_Data {
this[this.tableVisValFunz.PenaltyColumn] = global::System.Convert.DBNull;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public bool IsScoreNull() {
+ return this.IsNull(this.tableVisValFunz.ScoreColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public void SetScoreNull() {
+ this[this.tableVisValFunz.ScoreColumn] = global::System.Convert.DBNull;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public bool IsScorePercNull() {
@@ -23291,7 +23334,14 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
tableMapping.ColumnMappings.Add("FS_s", "FS_s");
tableMapping.ColumnMappings.Add("E_s", "E_s");
tableMapping.ColumnMappings.Add("GA_s", "GA_s");
+ tableMapping.ColumnMappings.Add("FAI_p", "FAI_s");
+ tableMapping.ColumnMappings.Add("FP_p", "FP_s");
+ tableMapping.ColumnMappings.Add("FT_p", "FT_s");
+ tableMapping.ColumnMappings.Add("FS_p", "FS_s");
+ tableMapping.ColumnMappings.Add("E_p", "E_s");
+ tableMapping.ColumnMappings.Add("GA_p", "GA_s");
tableMapping.ColumnMappings.Add("Penalty", "Penalty");
+ tableMapping.ColumnMappings.Add("Score", "Score");
tableMapping.ColumnMappings.Add("ScorePerc", "ScorePerc");
tableMapping.ColumnMappings.Add("Classe", "Classe");
tableMapping.ColumnMappings.Add("Performance", "Performance");
@@ -23311,7 +23361,9 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
- this._commandCollection[0].CommandText = "SELECT * FROM v_VisValFunzAnz_l";
+ this._commandCollection[0].CommandText = "SELECT IdxPaziente, DataVisita, FAI, FP, FT, FS, E, GA, FAI_p, FP_p, FT_p," +
+ " FS_p, E_p, GA_p, Penalty, Score, ScorePerc, Classe, Performance\r\nFROM " +
+ " v_VisValFunzAnz_l";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
diff --git a/ScheMe_Data/DS_Applicazione.cs b/ScheMe_Data/DS_Applicazione.cs
index d167c6a..22bf3fb 100644
--- a/ScheMe_Data/DS_Applicazione.cs
+++ b/ScheMe_Data/DS_Applicazione.cs
@@ -1,17 +1,3 @@
namespace ScheMe_Data
{
-
-
- public partial class DS_Applicazione
- {
- }
-}
-
-namespace ScheMe_Data.DS_ApplicazioneTableAdapters
-{
-
-
- public partial class VisLabTableAdapter
- {
- }
-}
+}
\ No newline at end of file
diff --git a/ScheMe_Data/DS_Applicazione.xsd b/ScheMe_Data/DS_Applicazione.xsd
index 5f9eb28..7789786 100644
--- a/ScheMe_Data/DS_Applicazione.xsd
+++ b/ScheMe_Data/DS_Applicazione.xsd
@@ -1545,8 +1545,9 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
- SELECT * FROM v_VisValFunzAnz_l
+
+ SELECT IdxPaziente, DataVisita, FAI, FP, FT, FS, E, GA, FAI_p, FP_p, FT_p, FS_p, E_p, GA_p, Penalty, Score, ScorePerc, Classe, Performance
+FROM v_VisValFunzAnz_l
@@ -1567,7 +1568,14 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
+
+
+
+
+
+
+
@@ -1643,7 +1651,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1722,7 +1730,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1738,7 +1746,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1761,7 +1769,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1784,7 +1792,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1812,7 +1820,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1826,7 +1834,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1878,7 +1886,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -1895,7 +1903,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -2384,7 +2392,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -2436,7 +2444,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
+
@@ -2454,6 +2462,7 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
+
@@ -2519,14 +2528,14 @@ SELECT IdxPaziente, DataVisita, Note, Score1, Score2 FROM VisRelazFin WHERE (Dat
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ScheMe_Data/bin/Release/ScheMe_Data.dll b/ScheMe_Data/bin/Release/ScheMe_Data.dll
index d6f8201..a7a5dd7 100644
Binary files a/ScheMe_Data/bin/Release/ScheMe_Data.dll and b/ScheMe_Data/bin/Release/ScheMe_Data.dll differ