diff --git a/.vs/ScheMe-SP/v15/sqlite3/storage.ide b/.vs/ScheMe-SP/v15/sqlite3/storage.ide index ba21a94..f17fe1c 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/Content/Style.css b/ScheMe-SP/Content/Style.css index 2d908cc..442fd5d 100644 --- a/ScheMe-SP/Content/Style.css +++ b/ScheMe-SP/Content/Style.css @@ -31,41 +31,11 @@ color: #FFFF11; background-color: #FF0c0c; } -.baseRow { - background-color: #FBF3EF; -} -.altRow { - background-color: #FFF; -} -.editRow { - background-color: #CF6124; -} -.selectedRow { - background-color: #F1CCC1; - font-weight: 600; - color: #333; -} .headerRow { background-color: black; font-weight: 600; color: white; } -.headerHighlight { - background-color: #FF7C50; - font-weight: 600; - color: white; -} -.footerRow { - background-color: #FF7C50; - font-weight: 600; - color: white; -} -.pagerRow { - background-color: #CF6124; - color: white; - text-align: center; - margin: auto; -} .text-center { text-align: center; margin: auto; @@ -156,6 +126,39 @@ font-weight: bold; color: white; } +.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: white; +} +.footerRow { + background-color: #FF7C50; + font-weight: 600; + color: white; +} +.pagerRow { + background-color: #CF6124; + color: white; + text-align: center; + margin: auto; +} .stortAscCellStyle { background-color: #F5F7FB; } diff --git a/ScheMe-SP/Content/Style.less b/ScheMe-SP/Content/Style.less index 53c0973..b5afce4 100644 --- a/ScheMe-SP/Content/Style.less +++ b/ScheMe-SP/Content/Style.less @@ -50,49 +50,12 @@ background-color: #FF0c0c; } -.baseRow { - background-color: #FBF3EF; -} - -.altRow { - background-color: #FFF; -} - -.editRow { - background-color: @coloreScuro; -} - -.selectedRow { - background-color: @coloreChiaro; - font-weight: 600; - color: @testoScuro; -} - .headerRow { background-color: @headerCol; font-weight: 600; color: white; } -.headerHighlight { - background-color: @colore; - font-weight: 600; - color: white; -} - -.footerRow { - background-color: @colore; - font-weight: 600; - color: white; -} - -.pagerRow { - background-color: @coloreScuro; - color: white; - text-align: center; - margin: auto; -} - .text-center { text-align: center; margin: auto; @@ -181,6 +144,48 @@ color: white; } +.spacedRow { + line-height: 3em; +} + +.baseRow { + background-color: #FBF3EF; +} + +.altRow { + background-color: #FFF; +} + +.editRow { + background-color: @coloreScuro; +} + +.selectedRow { + background-color: @coloreChiaro; + font-weight: 600; + color: @testoScuro; +} + + +.headerHighlight { + background-color: @colore; + font-weight: 600; + color: white; +} + +.footerRow { + background-color: @colore; + font-weight: 600; + color: white; +} + +.pagerRow { + background-color: @coloreScuro; + color: white; + text-align: center; + margin: auto; +} + .stortAscCellStyle { background-color: #F5F7FB; } diff --git a/ScheMe-SP/Content/Style.min.css b/ScheMe-SP/Content/Style.min.css index 1f4e282..79b4dd3 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;}.baseRow{background-color:#fbf3ef;}.altRow{background-color:#fff;}.editRow{background-color:#cf6124;}.selectedRow{background-color:#f1ccc1;font-weight:600;color:#333;}.headerRow{background-color:#000;font-weight:600;color:#fff;}.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;}.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;}.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}.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/ScheMe-SP.csproj b/ScheMe-SP/ScheMe-SP.csproj index 4661b1d..dc9c0ef 100644 --- a/ScheMe-SP/ScheMe-SP.csproj +++ b/ScheMe-SP/ScheMe-SP.csproj @@ -484,7 +484,7 @@ - + Designer @@ -595,12 +595,12 @@ VBMA.aspx - - Visite.aspx + + Valutazioni.aspx ASPXCodeBehind - - Visite.aspx + + Valutazioni.aspx VL.aspx diff --git a/ScheMe-SP/Visite.aspx b/ScheMe-SP/Valutazioni.aspx similarity index 55% rename from ScheMe-SP/Visite.aspx rename to ScheMe-SP/Valutazioni.aspx index 4c16382..9f2cfad 100644 --- a/ScheMe-SP/Visite.aspx +++ b/ScheMe-SP/Valutazioni.aspx @@ -1,10 +1,10 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Visite.aspx.cs" Inherits="ScheMe.Visite" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="Valutazioni.aspx.cs" Inherits="ScheMe.Valutazioni" %> <%@ Register Src="~/WebUserControls/mod_ElencoVisitePaziente.ascx" TagPrefix="uc1" TagName="mod_ElencoVisitePaziente" %> - + diff --git a/ScheMe-SP/Visite.aspx.cs b/ScheMe-SP/Valutazioni.aspx.cs similarity index 81% rename from ScheMe-SP/Visite.aspx.cs rename to ScheMe-SP/Valutazioni.aspx.cs index d76201e..3477887 100644 --- a/ScheMe-SP/Visite.aspx.cs +++ b/ScheMe-SP/Valutazioni.aspx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace ScheMe { - public partial class Visite : System.Web.UI.Page + public partial class Valutazioni : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { diff --git a/ScheMe-SP/Valutazioni.aspx.designer.cs b/ScheMe-SP/Valutazioni.aspx.designer.cs new file mode 100644 index 0000000..4a50b63 --- /dev/null +++ b/ScheMe-SP/Valutazioni.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace ScheMe { + + + public partial class Valutazioni { + + /// + /// Controllo ElencoVisite. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::ScheMe.WebUserControls.mod_ElencoVisitePaziente ElencoVisite; + } +} diff --git a/ScheMe-SP/Visite.aspx.designer.cs b/ScheMe-SP/Visite.aspx.designer.cs deleted file mode 100644 index 77d06fa..0000000 --- a/ScheMe-SP/Visite.aspx.designer.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ScheMe { - - - public partial class Visite { - - /// - /// ElencoVisite control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::ScheMe.WebUserControls.mod_ElencoVisitePaziente ElencoVisite; - } -} diff --git a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx index 9f33c34..8e884d4 100644 --- a/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx +++ b/ScheMe-SP/WebUserControls/mod_ElencoVisitePaziente.ascx @@ -1,68 +1,77 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ElencoVisitePaziente.ascx.cs" Inherits="ScheMe.WebUserControls.mod_ElencoVisitePaziente" %> -

Elenco Visite

-
+
+
+ Cronologia Valutazioni +
+
- - - - - - - - - - - - -
-
-
- Visita Generale -
+ + + + + + + + + + + + +

NO DATA

+ + + + + + + + + +
+ SP-12
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- + + + + + + + + +
+ SP-345 +
+ + + + + + + + + + + + + + + + + + + <%-- --%> - + - - - + + + +
diff --git a/ScheMe-SP/WebUserControls/mod_bottom.ascx b/ScheMe-SP/WebUserControls/mod_bottom.ascx index 8ee3c35..6523ee5 100644 --- a/ScheMe-SP/WebUserControls/mod_bottom.ascx +++ b/ScheMe-SP/WebUserControls/mod_bottom.ascx @@ -6,7 +6,8 @@  Accettazione
-  Visite + <%-- Visite--%> +  Valutazioni 
 Files diff --git a/ScheMe-SP/obj/Debug/ScheMe.dll b/ScheMe-SP/obj/Debug/ScheMe.dll index 68a829d..08af250 100644 Binary files a/ScheMe-SP/obj/Debug/ScheMe.dll and b/ScheMe-SP/obj/Debug/ScheMe.dll differ