diff --git a/.vs/ScheMe-SP/v15/sqlite3/storage.ide b/.vs/ScheMe-SP/v15/sqlite3/storage.ide index 708befb..294ea30 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/Accettazione.aspx b/ScheMe-SP/Accettazione.aspx index 0b7e0a3..9486a49 100644 --- a/ScheMe-SP/Accettazione.aspx +++ b/ScheMe-SP/Accettazione.aspx @@ -3,120 +3,120 @@ -
-
- - - - - - - - -
-
- - - - - - - -
+
+
+ + + + + + + +
-
- - - - - - - - - - - - - - - - - -
- - -
-
-
- - -
- - -
- -
-
-
+
+ + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + +
+ + +
+
+
+ + +
+ + +
+ +
+
+
- - - - - - - -
- -
-
- - -
-
-
- <%-- + + + + + + + +
+ +
+
+ + +
+
+
+ <%-- --%> - - -
- -
- -
-
-
- - -
- -
- -
-
-
-
- - -
- -
-
-
-
+ + +
+ +
+ +
+
+
+ + +
+ +
+ +
+
+
+
+ + +
+ +
+
+
+ -
- - - - - - - - - - -
+ + + + + + + + + + + +
diff --git a/ScheMe-SP/Content/Style.css b/ScheMe-SP/Content/Style.css index c3b6f79..d23149c 100644 --- a/ScheMe-SP/Content/Style.css +++ b/ScheMe-SP/Content/Style.css @@ -32,7 +32,7 @@ background-color: #CF6124; } .selectedRow { - background-color: #D1DDF1; + background-color: #F1CCC1; font-weight: 600; color: #333; } @@ -66,6 +66,52 @@ .errore { color: red; } +.headLine { + background-color: #FF8833; + color: #FFFFFF; +} +/*Gestione tabella*/ +.RowStyle { + background-color: #FBF3EF; + text-align: left; +} +.selectedRowStyle { + background-color: #F1CCC1; + font-weight: bold; + Color: #333333; +} +.alternatingRowStyle { + background-color: white; +} +/* Paginazione... */ +.GridPager { + background-color: #FF7C50; + /*text-align: center; + margin: auto;*/ +} +.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; +} /* Query selezione dimensioni display... */ @media all and (min-width: 768px) { #textWrapper { diff --git a/ScheMe-SP/Content/Style.less b/ScheMe-SP/Content/Style.less index b812386..94df038 100644 --- a/ScheMe-SP/Content/Style.less +++ b/ScheMe-SP/Content/Style.less @@ -2,159 +2,219 @@ } @colore: #FF7C50; -@coloreChiaro: #D1DDF1; +@coloreChiaro: #F1CCC1; @coloreScuro: #CF6124; @testoScuro: #333; /* punteggi colore */ -.VVF-CL-01{ - color: #006600; - background-color: white; +.VVF-CL-01 { + color: #006600; + background-color: white; } -.VVF-CL-02{ - color: #FFFF33; - background-color: #2222FF; + +.VVF-CL-02 { + color: #FFFF33; + background-color: #2222FF; } -.VVF-CL-03{ - color: #FFFF33; - background-color: #118811; + +.VVF-CL-03 { + color: #FFFF33; + background-color: #118811; } -.VVF-CL-04{ - background-color: #FFFF11; + +.VVF-CL-04 { + background-color: #FFFF11; } -.VVF-CL-05{ - color: #FFFF33; - background-color: #EE6622; + +.VVF-CL-05 { + color: #FFFF33; + background-color: #EE6622; } -.VVF-CL-06{ - color: #FFFF11; - background-color: #FF0c0c; + +.VVF-CL-06 { + color: #FFFF11; + background-color: #FF0c0c; } .baseRow { - background-color: #FBF3EF; + background-color: #FBF3EF; } .altRow { - background-color: #FFF; + background-color: #FFF; } .editRow { - background-color: @coloreScuro; + background-color: @coloreScuro; } .selectedRow { - background-color: @coloreChiaro; - font-weight: 600; - color: @testoScuro; + background-color: @coloreChiaro; + font-weight: 600; + color: @testoScuro; } .headerRow { - background-color: @colore; - font-weight: 600; - color: white; + background-color: @colore; + font-weight: 600; + color: white; } .footerRow { - background-color: @colore; - font-weight: 600; - color: white; + background-color: @colore; + font-weight: 600; + color: white; } .pagerRow { - background-color: @coloreScuro; - color: white; - text-align: center; - margin: auto; + background-color: @coloreScuro; + color: white; + text-align: center; + margin: auto; } .text-center { - text-align: center; - margin: auto; + text-align: center; + margin: auto; } .tStrong { - font-weight: bold; - font-size: 1.3em; + font-weight: bold; + font-size: 1.3em; } .flRight { - float: right; + float: right; } -.errore{ - color: red; +.errore { + color: red; } +.headLine { + background-color: #FF8833; + color: #FFFFFF; +} + + +/*Gestione tabella*/ +.RowStyle { + background-color: #FBF3EF; + text-align: left; +} +.selectedRowStyle { + background-color: #F1CCC1; + font-weight: bold; + Color: #333333; +} +.alternatingRowStyle { + background-color: white; +} + +/* Paginazione... */ +.GridPager { + background-color: #FF7C50; + /*text-align: center; + margin: auto;*/ +} + + .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; +} + + + /* Query selezione dimensioni display... */ @media all and (min-width: 768px) { - #textWrapper { - font-size: 1.0em; - } + #textWrapper { + font-size: 1.0em; + } - #headData { - margin-top: 0px; - } + #headData { + margin-top: 0px; + } } @media all and (min-width: 1024px) { - #textWrapper { - font-size: 1.1em; - } + #textWrapper { + font-size: 1.1em; + } - #headData { - margin-top: 0px; - } + #headData { + margin-top: 0px; + } } @media all and (min-width: 1440px) { - #textWrapper { - font-size: 1.2em; - } + #textWrapper { + font-size: 1.2em; + } - #headData { - margin-top: 0px; - } + #headData { + margin-top: 0px; + } } @media all and (min-width: 1600px) { - #textWrapper { - font-size: 1.3em; - } + #textWrapper { + font-size: 1.3em; + } - #headData { - margin-top: 0px; - } + #headData { + margin-top: 0px; + } } @media all and (max-width: 767px) { - #textWrapper { - font-size: 0.8em; - } + #textWrapper { + font-size: 0.8em; + } - #headData { - margin-top: 6px; - } + #headData { + margin-top: 6px; + } } @media all and (max-width: 480px) { - #textWrapper { - font-size: 0.6em; - } + #textWrapper { + font-size: 0.6em; + } - #headData { - margin-top: 14px; - } + #headData { + margin-top: 14px; + } } @media all and (max-width: 320px) { - #textWrapper { - font-size: 0.5em; - } + #textWrapper { + font-size: 0.5em; + } - #headData { - margin-top: 18px; - } + #headData { + margin-top: 18px; + } } diff --git a/ScheMe-SP/Content/Style.min.css b/ScheMe-SP/Content/Style.min.css index e3b1be2..0e1247b 100644 --- a/ScheMe-SP/Content/Style.min.css +++ b/ScheMe-SP/Content/Style.min.css @@ -1 +1 @@ -.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:#d1ddf1;font-weight:600;color:#333;}.headerRow{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;}@media all and (min-width:768px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1024px){#textWrapper{font-size:1.1em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.3em;}#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 +.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:#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}.RowStyle{background-color:#fbf3ef;text-align:left}.selectedRowStyle{background-color:#f1ccc1;font-weight:bold;Color:#333}.alternatingRowStyle{background-color:#fff}.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.1em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.3em}#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/WebUserControls/mod_elencoRichResetUtenti.ascx b/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx index bd1b030..884b2b7 100644 --- a/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx +++ b/ScheMe-SP/WebUserControls/mod_elencoRichResetUtenti.ascx @@ -5,7 +5,7 @@ - + diff --git a/ScheMe-SP/WebUserControls/mod_fileUpload.ascx b/ScheMe-SP/WebUserControls/mod_fileUpload.ascx index adbdaa9..be6187c 100644 --- a/ScheMe-SP/WebUserControls/mod_fileUpload.ascx +++ b/ScheMe-SP/WebUserControls/mod_fileUpload.ascx @@ -18,7 +18,7 @@ - + diff --git a/ScheMe-SP/WebUserControls/mod_header.ascx b/ScheMe-SP/WebUserControls/mod_header.ascx index 5e0325b..807eb49 100644 --- a/ScheMe-SP/WebUserControls/mod_header.ascx +++ b/ScheMe-SP/WebUserControls/mod_header.ascx @@ -4,14 +4,14 @@ User Admin -
+
<%: CognomeNome %>
<%: DateTime.Now.ToString("ddd dd/MM/yyyy HH:mm:ss") %>
-
+
<%: pazienteSel %>
diff --git a/ScheMe-SP/WebUserControls/mod_header.ascx.designer.cs b/ScheMe-SP/WebUserControls/mod_header.ascx.designer.cs index 7177f69..4fb23fe 100644 --- a/ScheMe-SP/WebUserControls/mod_header.ascx.designer.cs +++ b/ScheMe-SP/WebUserControls/mod_header.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ namespace ScheMe.WebUserControls { @@ -13,20 +13,20 @@ namespace ScheMe.WebUserControls { public partial class mod_header { /// - /// Timer1 control. + /// Controllo Timer1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.Timer Timer1; /// - /// lblVers control. + /// Controllo lblVers. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblVers; } diff --git a/ScheMe-SP/bin/ScheMe.dll b/ScheMe-SP/bin/ScheMe.dll index b6432a7..69300ae 100644 Binary files a/ScheMe-SP/bin/ScheMe.dll and b/ScheMe-SP/bin/ScheMe.dll differ diff --git a/ScheMe-SP/obj/Debug/ScheMe.dll b/ScheMe-SP/obj/Debug/ScheMe.dll index b6432a7..69300ae 100644 Binary files a/ScheMe-SP/obj/Debug/ScheMe.dll and b/ScheMe-SP/obj/Debug/ScheMe.dll differ