diff --git a/.vs/ScheMe-SP/v15/sqlite3/storage.ide b/.vs/ScheMe-SP/v15/sqlite3/storage.ide index 39b99e7..d3e0a1e 100644 Binary files a/.vs/ScheMe-SP/v15/sqlite3/storage.ide and b/.vs/ScheMe-SP/v15/sqlite3/storage.ide differ diff --git a/ScheMe-SP/AccettazioneEdit.aspx b/ScheMe-SP/AccettazioneEdit.aspx index c5630d0..3914795 100644 --- a/ScheMe-SP/AccettazioneEdit.aspx +++ b/ScheMe-SP/AccettazioneEdit.aspx @@ -35,8 +35,7 @@ ITEM - EMPTY - - +
    @@ -180,7 +179,7 @@
- +
@@ -328,7 +327,7 @@
- +
diff --git a/ScheMe-SP/Content/Style.css b/ScheMe-SP/Content/Style.css index 442fd5d..0eb9de1 100644 --- a/ScheMe-SP/Content/Style.css +++ b/ScheMe-SP/Content/Style.css @@ -54,6 +54,18 @@ background-color: #FF8833; color: #FFFFFF; } +.hBlock { + background-color: #D7D7D7; + color: black; +} +.hBlockDrk { + background-color: #585858; + color: white; +} +.fBlock { + background-color: #F2F2F2; + color: black; +} /*Buttons circolari*/ .btn-circle { width: 2.2em; diff --git a/ScheMe-SP/Content/Style.less b/ScheMe-SP/Content/Style.less index b5afce4..a513420 100644 --- a/ScheMe-SP/Content/Style.less +++ b/ScheMe-SP/Content/Style.less @@ -79,6 +79,21 @@ color: #FFFFFF; } +.hBlock { + background-color: #D7D7D7; + color: black; +} + +.hBlockDrk { + background-color: #585858; + color: white; +} + +.fBlock { + background-color: #F2F2F2; + color: black; +} + /*Buttons circolari*/ .btn-circle { width: 2.2em; /*30px*/ diff --git a/ScheMe-SP/Content/Style.min.css b/ScheMe-SP/Content/Style.min.css index 533285c..8fbec52 100644 --- a/ScheMe-SP/Content/Style.min.css +++ b/ScheMe-SP/Content/Style.min.css @@ -1 +1 @@ -.uppercase{text-transform:uppercase;}.bigBtn{min-height:2.2em;font-size:1.2em;}.VVF-CL-01{color:#060;background-color:#fff;}.VVF-CL-02{color:#ff3;background-color:#22f;}.VVF-CL-03{color:#ff3;background-color:#181;}.VVF-CL-04{background-color:#ff1;}.VVF-CL-05{color:#ff3;background-color:#e62;}.VVF-CL-06{color:#ff1;background-color:#ff0c0c;}.headerRow{background-color:#000;font-weight:600;color:#fff;}.text-center{text-align:center;margin:auto;}.tStrong{font-weight:bold;font-size:1.3em;}.flRight{float:right;}.errore{color:#f00;}.headLine{background-color:#f83;color:#fff;}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em;}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em;}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em;}.RowStyle{background-color:#fbf3ef;text-align:left;}.rowStyle{background-color:#fbf3ef;}.editRowStyle{background-color:#cf6124;}.selectedRowStyle{background-color:#f1ccc1;font-weight:bold;Color:#f63;}.alternatingRowStyle{background-color:#fff;}.footerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff;}.headerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff;}.spacedRow{line-height:3em;}.baseRow{background-color:#fbf3ef;}.altRow{background-color:#fff;}.editRow{background-color:#cf6124;}.selectedRow{background-color:#f1ccc1;font-weight:600;color:#333;}.headerHighlight{background-color:#ff7c50;font-weight:600;color:#fff;}.footerRow{background-color:#ff7c50;font-weight:600;color:#fff;}.pagerRow{background-color:#cf6124;color:#fff;text-align:center;margin:auto;}.stortAscCellStyle{background-color:#f5f7fb;}.stortAscHeadStyle{background-color:#6d95e1;}.stortDescCellStyle{background-color:#e9ebef;}.stortDescHeadStyle{background-color:#4870be;}.GridPager{background-color:#ff7c50;}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#cf6124;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold;}.imgNoPad{margin-top:-3px;margin-bottom:-7px;}@media all and (min-width:768px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em;}#headData{margin-top:0;}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em;}#headData{margin-top:0;}}@media all and (min-width:2200px){#textWrapper{font-size:2em;}#headData{margin-top:0;}}@media all and (max-width:767px){#textWrapper{font-size:.8em;}#headData{margin-top:6px;}}@media all and (max-width:480px){#textWrapper{font-size:.6em;}#headData{margin-top:14px;}}@media all and (max-width:320px){#textWrapper{font-size:.5em;}#headData{margin-top:18px;}} \ No newline at end of file +.uppercase{text-transform:uppercase}.bigBtn{min-height:2.2em;font-size:1.2em}.VVF-CL-01{color:#060;background-color:#fff}.VVF-CL-02{color:#ff3;background-color:#22f}.VVF-CL-03{color:#ff3;background-color:#181}.VVF-CL-04{background-color:#ff1}.VVF-CL-05{color:#ff3;background-color:#e62}.VVF-CL-06{color:#ff1;background-color:#ff0c0c}.headerRow{background-color:#000;font-weight:600;color:#fff}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.errore{color:#f00}.headLine{background-color:#f83;color:#fff}.hBlock{background-color:#d7d7d7;color:#000}.hBlockDrk{background-color:#585858;color:#fff}.fBlock{background-color:#f2f2f2;color:#000}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em}.RowStyle{background-color:#fbf3ef;text-align:left}.rowStyle{background-color:#fbf3ef}.editRowStyle{background-color:#cf6124}.selectedRowStyle{background-color:#f1ccc1;font-weight:bold;Color:#f63}.alternatingRowStyle{background-color:#fff}.footerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff}.headerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff}.spacedRow{line-height:3em}.baseRow{background-color:#fbf3ef}.altRow{background-color:#fff}.editRow{background-color:#cf6124}.selectedRow{background-color:#f1ccc1;font-weight:600;color:#333}.headerHighlight{background-color:#ff7c50;font-weight:600;color:#fff}.footerRow{background-color:#ff7c50;font-weight:600;color:#fff}.pagerRow{background-color:#cf6124;color:#fff;text-align:center;margin:auto}.stortAscCellStyle{background-color:#f5f7fb}.stortAscHeadStyle{background-color:#6d95e1}.stortDescCellStyle{background-color:#e9ebef}.stortDescHeadStyle{background-color:#4870be}.GridPager{background-color:#ff7c50}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#cf6124}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold}.imgNoPad{margin-top:-3px;margin-bottom:-7px}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em}#headData{margin-top:0}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em}#headData{margin-top:0}}@media all and (min-width:2200px){#textWrapper{font-size:2em}#headData{margin-top:0}}@media all and (max-width:767px){#textWrapper{font-size:.8em}#headData{margin-top:6px}}@media all and (max-width:480px){#textWrapper{font-size:.6em}#headData{margin-top:14px}}@media all and (max-width:320px){#textWrapper{font-size:.5em}#headData{margin-top:18px}} \ No newline at end of file diff --git a/ScheMe-SP/VBMA.aspx b/ScheMe-SP/VBMA.aspx index dfd839c..d5a0842 100644 --- a/ScheMe-SP/VBMA.aspx +++ b/ScheMe-SP/VBMA.aspx @@ -7,7 +7,7 @@

Attenzione!

- Nessun record presente.Prego cliccare qui per tornare alla pagina visite. + Nessun record presente.Prego cliccare qui per tornare alla pagina visite.
diff --git a/ScheMe-SP/VBMA.aspx.cs b/ScheMe-SP/VBMA.aspx.cs index f2fb0bd..6c1dad5 100644 --- a/ScheMe-SP/VBMA.aspx.cs +++ b/ScheMe-SP/VBMA.aspx.cs @@ -52,7 +52,7 @@ namespace ScheMe /// protected void ods_Deleted(object sender, ObjectDataSourceStatusEventArgs e) { - Response.Redirect("Visite"); + Response.Redirect("Valutazioni"); } /// /// variabile per modo pre comando di update mode... diff --git a/ScheMe-SP/VL.aspx b/ScheMe-SP/VL.aspx index 26df69c..06347ce 100644 --- a/ScheMe-SP/VL.aspx +++ b/ScheMe-SP/VL.aspx @@ -7,7 +7,7 @@

Attenzione!

- Nessun record presente.Prego cliccare qui per tornare alla pagina visite. + Nessun record presente.Prego cliccare qui per tornare alla pagina visite.
diff --git a/ScheMe-SP/VL.aspx.cs b/ScheMe-SP/VL.aspx.cs index 98c37c5..2a436dd 100644 --- a/ScheMe-SP/VL.aspx.cs +++ b/ScheMe-SP/VL.aspx.cs @@ -53,7 +53,7 @@ namespace ScheMe /// protected void ods_Deleted(object sender, ObjectDataSourceStatusEventArgs e) { - Response.Redirect("Visite"); + Response.Redirect("Valutazioni"); } /// /// variabile per modo pre comando di update mode... diff --git a/ScheMe-SP/VRF.aspx b/ScheMe-SP/VRF.aspx index c3d0e6d..5537c5b 100644 --- a/ScheMe-SP/VRF.aspx +++ b/ScheMe-SP/VRF.aspx @@ -23,7 +23,7 @@

Attenzione!

- Nessun record presente.Prego cliccare qui per tornare alla pagina visite. + Nessun record presente.Prego cliccare qui per tornare alla pagina visite.
diff --git a/ScheMe-SP/VRF.aspx.cs b/ScheMe-SP/VRF.aspx.cs index e4cc9e0..71510a4 100644 --- a/ScheMe-SP/VRF.aspx.cs +++ b/ScheMe-SP/VRF.aspx.cs @@ -76,7 +76,7 @@ namespace ScheMe /// protected void ods_Deleted(object sender, ObjectDataSourceStatusEventArgs e) { - Response.Redirect("Visite"); + Response.Redirect("Valutazioni"); } /// /// variabile per modo pre comando di update mode... diff --git a/ScheMe-SP/VVSP_12.aspx b/ScheMe-SP/VVSP_12.aspx index d51b9c5..3becd1e 100644 --- a/ScheMe-SP/VVSP_12.aspx +++ b/ScheMe-SP/VVSP_12.aspx @@ -6,22 +6,22 @@

Attenzione!

- Nessun record presente.Prego cliccare qui per tornare alla pagina visite. + Nessun record presente.Prego cliccare qui per tornare alla pagina visite.
    -
  • Sintesi Valutazione
    • -
  • +
  • Sintesi Valutazione
    • +
  • <%# Eval("Score","{0}/24") %> Score
    • -
  • +
  • <%# Eval("ScorePerc","{0:P2}") %> Percentile
    • -
  • +
  • <%# Eval("Classe") %> Classe
    • @@ -33,7 +33,7 @@
    -
  • Visita / Antropometria
    • +
  • Visita / Antropometria
  • <%: Request.QueryString["DataVisita"] %> Data @@ -50,8 +50,8 @@
    -
  • - CD @@ -78,7 +78,7 @@ <%# Eval("CD", "{0:N1}") %> secondi
    • -
  • +
  • <%# Eval("CD_s") %> score
    • @@ -86,8 +86,8 @@
    -
  • - SP @@ -107,9 +107,9 @@
  • - +
    • -
  • +
  • score
    • @@ -119,8 +119,8 @@
      -
    • - GL @@ -140,9 +140,9 @@
  • - +
    • -
  • +
  • <%# Eval("GL_s") %> score
    • @@ -150,8 +150,8 @@
      -
    • - LM @@ -176,7 +176,7 @@ <%# Eval("LM") %> successi
      • -
    • +
    • <%# Eval("LM_s") %> score
      • @@ -184,8 +184,8 @@
      -
    • - SA @@ -205,9 +205,9 @@
  • - +
    • -
  • +
  • score
    • @@ -215,8 +215,8 @@
      -
    • - RP @@ -237,9 +237,9 @@
  • - +
    • -
  • +
  • score
    • @@ -247,100 +247,280 @@
    -
    - -
    -
    - +
    +
      +
    • +
      +
      + +
      +
      + +
      +
      +
      • +
    - -
    -
    -
      -
    • Visita - Antropometria
      • -
    • - - <%: Request.QueryString["DataVisita"] %> +
      +
      +
        +
      • Sintesi Valutazione
        • +
      • + <%# Eval("Score","{0}/24") %> + Score
        • -
      • - - - +
      • + <%# Eval("ScorePerc","{0:P2}") %> + Percentile
        • -
      • - - - +
      • + <%# Eval("Classe") %> + Classe +
        • +
      • + <%# Eval("Performance") %> + Performance
      -
      -
        -
      • CD - Circuito di Destrezza di Harre
        • -
      • - - - - +
        +
          +
        • Visita / Antropometria
          • +
        • + <%: Request.QueryString["DataVisita"] %> + Data
          • -
        -
          -
        • SP - Saltelli in avanti su un Piede
          • -
        • - +
        • +
          +
          + Altezza cm + +
          +
          + +
          +
          +
          • +
        • +
          +
          + Peso kg + +
          +
          + +
          +
        -
        - -
          -
        • GL - Galoppo Laterale
          • -
        • - +
          +
            +
          • + + CD
            • -
          -
            -
          • LM - Lancio Mirato
            • -
          • - - +
          • +
            +
            + Circuito Destrezza di HARRE +
            + MATERIALE +
              +
            • Materassina
              • +
            • Cono
              • +
            • 3 panche (che permettono il passaggio sotto e sopra)
              • +
            • Cronometro
              • +
            + PROTOCOLLO
            + Il soggetto parte in pedi verso il materassino, esegue una capovolta in avanti, corre verso il pallone medicinale e si dirige verso la panca 1, la salta e poi vi passa di sotto ed ancora pallone - panca 2 - pallone - panca 3 - pallone - linea di arrivo.
            + Il pallone quando il soggetto gira deve sempre trovarsi alla sua destra e non deve essere toccato mentre la capovolta deve essere effettuata solo una volta dopo la partenza. +
            +
            +
            • +
          • +
            +
            + secondi + + +
            +
            + +
            +
          -
          - -
            -
          • SA - Saltelli Alternati in avanti su un piede
            • -
          • - +
            +
              +
            • + + SP
              • -
            -
              -
            • RP - Ricevere con le mani una Palla lanciata
              • -
            • - +
            • +
              +
              + Saltelli in avanti su un Piede +
              + MATERIALE +
                +
              • Nastro adesivo colorato o linee già tracciate
                • +
              + PROTOCOLLO
              + Il soggetto deve saltare in avanti su un piede lungo una linea (prima su un piede e poi sull'altro). +
              +
              +
              • +
            • +
          -
          -
          -
            -
          • -
            -
            - +
            +
            +
              +
            • + + GL +
              • +
            • +
              +
              + Galoppo Laterale +
              + MATERIALE +
                +
              • Nastro adesivo colorato o linee già tracciate
                • +
              + PROTOCOLLO
              + Il soggetto deve galoppare lateralmente su un lato e sull'altro.
              -
              - -
              -
            +
          +
          • +
        • +
        +
        +
          +
        • + + LM +
          • +
        • +
          +
          + Lancio Mirato +
          + Impianto consigliato: PALESTRA
          + MATERIALE +
            +
          • 10 palline da tennis
            • +
          • Un bersaglio circolare con diametro di cm 60 posto ad una altezza di cm 120 da terra
            • +
          + PROTOCOLLO
          + Il soggetto, posto ad una distanza variabile di mt 9 (per i più piccoli maschi e femmine) e di mt 10,50 (per i soli maschi più grandi) cerca di colpire il bersaglio. Il test si compone di due Serie di lanci. +
          +
          +
          • +
        • +
          +
          + successi +
          +
          + +
          +
          +
          • +
        +
        +
        +
          +
        • + + SA +
          • +
        • +
          +
          + Saltelli Alternati in avanti su un piede +
          + MATERIALE +
            +
          • Nastro adesivo colorato o linee già tracciate
            • +
          + PROTOCOLLO
          + Il soggetto deve saltare in avanti alternando il piede in appoggio fino all'arrivo (due volte su un piede e due volte sull'altro, tre volte su un piede e tre volte sull'altro) – andata e ritorno. +
          +
          +
          • +
        • +
          • +
        +
        +
        +
          +
        • + + RP +
          • +
        • +
          +
          + Ricevere con le mani una Palla lanciata +
          + MATERIALE +
            +
          • Palla Colorata
            • +
          • Nastro adesivo colorato o linee già tracciate
            • +
          + PROTOCOLLO
          + Il soggetto deve ricevere la palla da 5mt 4 volte consecutive. +
          +
          +
          • +
        • +
          • +
        +
        +
      +
      +
      +
        +
      • +
        +
        + +
        +
        + +
        +
        +
        • +
      +
      +
      diff --git a/ScheMe-SP/VVSP_12.aspx.cs b/ScheMe-SP/VVSP_12.aspx.cs index 0fd68f6..3a94e09 100644 --- a/ScheMe-SP/VVSP_12.aspx.cs +++ b/ScheMe-SP/VVSP_12.aspx.cs @@ -62,7 +62,7 @@ namespace ScheMe /// protected void ods_Deleted(object sender, ObjectDataSourceStatusEventArgs e) { - Response.Redirect("Visite"); + Response.Redirect("Valutazioni"); } /// /// variabile per modo pre comando di update mode... diff --git a/ScheMe-SP/VVSP_345.aspx b/ScheMe-SP/VVSP_345.aspx index fece210..d7a51a6 100644 --- a/ScheMe-SP/VVSP_345.aspx +++ b/ScheMe-SP/VVSP_345.aspx @@ -10,7 +10,7 @@

      Attenzione!

      - Nessun record presente.Prego cliccare qui per tornare alla pagina visite. + Nessun record presente.Prego cliccare qui per tornare alla pagina visite.
      diff --git a/ScheMe-SP/VVSP_345.aspx.cs b/ScheMe-SP/VVSP_345.aspx.cs index de92632..74df465 100644 --- a/ScheMe-SP/VVSP_345.aspx.cs +++ b/ScheMe-SP/VVSP_345.aspx.cs @@ -62,7 +62,7 @@ namespace ScheMe /// protected void ods_Deleted(object sender, ObjectDataSourceStatusEventArgs e) { - Response.Redirect("Visite"); + Response.Redirect("Valutazioni"); } /// /// variabile per modo pre comando di update mode... diff --git a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx index 8e884d4..5fff992 100644 --- a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx +++ b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx @@ -33,7 +33,7 @@
      - + @@ -44,20 +44,20 @@
    - + - - + + - - + + <%-- diff --git a/ScheMe-SP/WebUserControls/mod_bottom.ascx b/ScheMe-SP/WebUserControls/mod_bottom.ascx index c9c53a8..5f34d0d 100644 --- a/ScheMe-SP/WebUserControls/mod_bottom.ascx +++ b/ScheMe-SP/WebUserControls/mod_bottom.ascx @@ -6,7 +6,7 @@  Accettazione
    - <%-- Visite--%> + <%-- Visite--%>  Valutazioni
    diff --git a/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx.cs b/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx.cs index e197073..db921c4 100644 --- a/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx.cs +++ b/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx.cs @@ -120,7 +120,7 @@ namespace ScheMe.WebUserControls // se utente abilitato ad accesso privilegiato if (false) // !!!FARE controllo livello accesso { - Response.Redirect("Visite"); + Response.Redirect("Valutazioni"); } } #endif diff --git a/ScheMe-SP/WebUserControls/mod_footer.ascx b/ScheMe-SP/WebUserControls/mod_footer.ascx index c83732e..3ef0cae 100644 --- a/ScheMe-SP/WebUserControls/mod_footer.ascx +++ b/ScheMe-SP/WebUserControls/mod_footer.ascx @@ -2,7 +2,7 @@ diff --git a/ScheMe-SP/obj/Debug/ScheMe.dll b/ScheMe-SP/obj/Debug/ScheMe.dll index e0c141e..bde670e 100644 Binary files a/ScheMe-SP/obj/Debug/ScheMe.dll and b/ScheMe-SP/obj/Debug/ScheMe.dll differ