diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index 2a18052..6388427 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/MedAP/Content/Site.css b/MedAP/Content/Site.css index e483e53..a9817a9 100644 --- a/MedAP/Content/Site.css +++ b/MedAP/Content/Site.css @@ -229,21 +229,36 @@ textarea { white-space: nowrap; } /* rimozione margini/padding righe */ +.pZero { + padding: 0; +} .pLZero { padding-left: 0; } .pRZero { padding-right: 0; } -.pZero { - padding: 0; +.pBZero { + padding-bottom: 0; +} +.pTZero { + padding-top: 0; +} +.mZero { + margin: 0; } .mLZero { margin-left: 0; } +.mBZero { + margin-bottom: 0; +} .mRZero { margin-right: 0; } +.mTZero { + margin-top: 0; +} /* gestione tabelle borderless e con righe x stampa fatture */ .table.table-borderBott td, .table.table-borderBott th { diff --git a/MedAP/Content/Site.less b/MedAP/Content/Site.less index acd0e99..f5cb39c 100644 --- a/MedAP/Content/Site.less +++ b/MedAP/Content/Site.less @@ -274,6 +274,9 @@ textarea { } /* rimozione margini/padding righe */ +.pZero { + padding: 0; +} .pLZero { padding-left: 0; } @@ -281,18 +284,30 @@ textarea { .pRZero { padding-right: 0; } - -.pZero { - padding: 0; +.pBZero { + padding-bottom: 0; } +.pTZero { + padding-top: 0; +} + + +.mZero { + margin: 0; +} .mLZero { margin-left: 0; } - +.mBZero { + margin-bottom: 0; +} .mRZero { margin-right: 0; } +.mTZero { + margin-top: 0; +} /* gestione tabelle borderless e con righe x stampa fatture */ .table.table-borderBott td, .table.table-borderBott th { diff --git a/MedAP/Content/Site.min.css b/MedAP/Content/Site.min.css index 57d77d6..27b1661 100644 --- a/MedAP/Content/Site.min.css +++ b/MedAP/Content/Site.min.css @@ -1 +1 @@ -body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:5px;padding-right:5px;}input,select,textarea{max-width:100%;}.text-black{color:#000;}.navbar{margin-bottom:0;height:32px;}.navbar-left{min-width:250px;text-wrap:none;}@media all and (min-width:768px){#textWrapper{font-size:.8em;}#headData{margin-top:0;}.bottomnav{min-height:5em;}}@media all and (min-width:1024px){#textWrapper{font-size:.9em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.1em;}#headData{margin-top:0;}}@media all and (min-width:1900px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:2200px){#textWrapper{font-size:1.3em;}#headData{margin-top:0;}}@media all and (max-width:767px){#textWrapper{font-size:.7em;}#headData{margin-top:6px;}.bottomnav{min-height:6em;}}@media all and (max-width:480px){#textWrapper{font-size:.6em;}#headData{margin-top:14px;}.bottomnav{min-height:7em;}}@media all and (max-width:320px){#textWrapper{font-size:.5em;}#headData{margin-top:18px;}.bottomnav{min-height:8em;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0 15px;}}.docStrong{font-size:1.1em;font-weight:bold;}.docText{font-size:1em;}.docNote{font-size:.8em;color:#696969;}.fontSmall{font-size:.8em;}.fontStd{font-size:1em;}.fontBig{font-size:1.2em;}.textNoFlow{white-space:nowrap;}.GridPager a,.GridPager span{display:block;height:1.6em;width:2em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.greenBar{background-color:#98fb98;border:1px solid #008000;text-align:center;}.redBar{background-color:#d87093;border:1px solid #f00;text-align:center;}.grayBar{background-color:#cfcfcf;border:1px solid #696969;text-align:center;}.orangeBar{background-color:#ffa500;border:1px solid #ff4500;text-align:center;}.blueBar{background-color:#6495ed;border:1px solid #00f;text-align:center;}.max10em{max-width:10em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max20em{max-width:20em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max30em{max-width:30em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max40em{max-width:40em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max50em{max-width:50em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max60em{max-width:60em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.pLZero{padding-left:0;}.pRZero{padding-right:0;}.pZero{padding:0;}.mLZero{margin-left:0;}.mRZero{margin-right:0;}.table.table-borderBott td,.table.table-borderBott th{border-left:0 !important;border-right:0 !important;border-top:0 !important;}.table.table-borderBott{margin-bottom:0;border-left:0 !important;border-right:0 !important;border-top:0 !important;}.table.table-borderless td,.table.table-borderless th{border:0 !important;}.table.table-borderless{margin-bottom:0;border:0 !important;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media print{#header{display:none;}#adwrapper{display:none;}.alert-info{color:#31708f !important;background-color:#d9edf7 !important;border-color:#bce8f1 !important;}} \ No newline at end of file +body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:5px;padding-right:5px;}input,select,textarea{max-width:100%;}.text-black{color:#000;}.navbar{margin-bottom:0;height:32px;}.navbar-left{min-width:250px;text-wrap:none;}@media all and (min-width:768px){#textWrapper{font-size:.8em;}#headData{margin-top:0;}.bottomnav{min-height:5em;}}@media all and (min-width:1024px){#textWrapper{font-size:.9em;}#headData{margin-top:0;}}@media all and (min-width:1440px){#textWrapper{font-size:1em;}#headData{margin-top:0;}}@media all and (min-width:1600px){#textWrapper{font-size:1.1em;}#headData{margin-top:0;}}@media all and (min-width:1900px){#textWrapper{font-size:1.2em;}#headData{margin-top:0;}}@media all and (min-width:2200px){#textWrapper{font-size:1.3em;}#headData{margin-top:0;}}@media all and (max-width:767px){#textWrapper{font-size:.7em;}#headData{margin-top:6px;}.bottomnav{min-height:6em;}}@media all and (max-width:480px){#textWrapper{font-size:.6em;}#headData{margin-top:14px;}.bottomnav{min-height:7em;}}@media all and (max-width:320px){#textWrapper{font-size:.5em;}#headData{margin-top:18px;}.bottomnav{min-height:8em;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0 15px;}}.docStrong{font-size:1.1em;font-weight:bold;}.docText{font-size:1em;}.docNote{font-size:.8em;color:#696969;}.fontSmall{font-size:.8em;}.fontStd{font-size:1em;}.fontBig{font-size:1.2em;}.textNoFlow{white-space:nowrap;}.GridPager a,.GridPager span{display:block;height:1.6em;width:2em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.greenBar{background-color:#98fb98;border:1px solid #008000;text-align:center;}.redBar{background-color:#d87093;border:1px solid #f00;text-align:center;}.grayBar{background-color:#cfcfcf;border:1px solid #696969;text-align:center;}.orangeBar{background-color:#ffa500;border:1px solid #ff4500;text-align:center;}.blueBar{background-color:#6495ed;border:1px solid #00f;text-align:center;}.max10em{max-width:10em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max20em{max-width:20em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max30em{max-width:30em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max40em{max-width:40em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max50em{max-width:50em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.max60em{max-width:60em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.pZero{padding:0;}.pLZero{padding-left:0;}.pRZero{padding-right:0;}.pBZero{padding-bottom:0;}.pTZero{padding-top:0;}.mZero{margin:0;}.mLZero{margin-left:0;}.mBZero{margin-bottom:0;}.mRZero{margin-right:0;}.mTZero{margin-top:0;}.table.table-borderBott td,.table.table-borderBott th{border-left:0 !important;border-right:0 !important;border-top:0 !important;}.table.table-borderBott{margin-bottom:0;border-left:0 !important;border-right:0 !important;border-top:0 !important;}.table.table-borderless td,.table.table-borderless th{border:0 !important;}.table.table-borderless{margin-bottom:0;border:0 !important;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media print{#header{display:none;}#adwrapper{display:none;}.alert-info{color:#31708f !important;background-color:#d9edf7 !important;border-color:#bce8f1 !important;}} \ No newline at end of file diff --git a/MedAP/DocArchive.aspx b/MedAP/DocArchive.aspx index f842e82..3500fa9 100644 --- a/MedAP/DocArchive.aspx +++ b/MedAP/DocArchive.aspx @@ -16,48 +16,48 @@ -
-
-
+
+
+
TEMPLATE FATTURE
-
+
- - -
- +
- +
+ + +
-
-
+
+
TEMPLATE VOCI FATTURA
-
+
- + - + +
- +  
-
@@ -70,7 +70,7 @@
- DOCUMENTI + DOCUMENTI - FATTURE
diff --git a/MedAP/DocArchive.aspx.designer.cs b/MedAP/DocArchive.aspx.designer.cs index fc4cf15..d9682b4 100644 --- a/MedAP/DocArchive.aspx.designer.cs +++ b/MedAP/DocArchive.aspx.designer.cs @@ -30,24 +30,6 @@ namespace MedAP { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDocTpl; - /// - /// Controllo rblTipoFatt. - /// - /// - /// 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.RadioButtonList rblTipoFatt; - - /// - /// Controllo odsTipoDoc. - /// - /// - /// 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.ObjectDataSource odsTipoDoc; - /// /// Controllo divAddTemplate. /// @@ -75,6 +57,24 @@ namespace MedAP { /// protected global::System.Web.UI.WebControls.LinkButton lbtCancel; + /// + /// Controllo rblTipoFatt. + /// + /// + /// 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.RadioButtonList rblTipoFatt; + + /// + /// Controllo odsTipoDoc. + /// + /// + /// 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.ObjectDataSource odsTipoDoc; + /// /// Controllo divRowTpl. /// diff --git a/MedAP/WebUserControl/mod_DocsArchive.ascx b/MedAP/WebUserControl/mod_DocsArchive.ascx index 8049d1b..6bb6b42 100644 --- a/MedAP/WebUserControl/mod_DocsArchive.ascx +++ b/MedAP/WebUserControl/mod_DocsArchive.ascx @@ -29,7 +29,7 @@ }
- + @@ -41,8 +41,7 @@ / -
- +
diff --git a/MedAP/WebUserControl/mod_DocsDetail.ascx b/MedAP/WebUserControl/mod_DocsDetail.ascx index 3c4c260..c46cd7f 100644 --- a/MedAP/WebUserControl/mod_DocsDetail.ascx +++ b/MedAP/WebUserControl/mod_DocsDetail.ascx @@ -52,26 +52,26 @@
+
+
+ CONTRIBUTI +
-
- CONTRIBUTI +
+
- -
@@ -124,9 +124,60 @@
+
+
+ CONTRIBUTI +
-
- CONTRIBUTI +
+ +
+ + +
+
+
+
+
+ +
+
+
+   +   +   + +
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
@@ -144,67 +195,6 @@
- - -
-
-
-
-
- -
-
-
-   -   -   - -
-
-
-
-
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
- CONTRIBUTI -
-
-
- -