diff --git a/C2P/C2P.csproj.user b/C2P/C2P.csproj.user index 516e0e1..7102cee 100644 --- a/C2P/C2P.csproj.user +++ b/C2P/C2P.csproj.user @@ -2,7 +2,7 @@ ShowAllFiles - WinLab + 218 diff --git a/C2P/Content/Style.css b/C2P/Content/Style.css index aca7c74..dcdca5d 100644 --- a/C2P/Content/Style.css +++ b/C2P/Content/Style.css @@ -1,6 +1,6 @@ /* fix inizio pagina (menu top) */ #uppFeatured { - margin-top: 140px; + margin-top: 78px; } /* fix testata tabella grigia */ .table-striped > tbody > tr:nth-child(odd) > th { @@ -73,7 +73,8 @@ a:focus { .navbar.navbar-inverse .navbar-form .search-query { width: 225px; margin-top: 2px; - background-color: #333; + background-color: #ededed; + /*background-color: #333;*/ font-size: 11px; font-weight: bold; line-height: 20px; @@ -82,7 +83,10 @@ a:focus { box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15); } .navbar.navbar-inverse .navbar-form .search-query:focus { - background-color: #FFF; + /*background-color: #9CF;*/ + border-color: #9CF; + border-width: 2px; + /*background-color: #FFF;*/ } .navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder { color: #666; diff --git a/C2P/Content/Style.less b/C2P/Content/Style.less index e5b742f..3248aba 100644 --- a/C2P/Content/Style.less +++ b/C2P/Content/Style.less @@ -1,6 +1,6 @@ /* fix inizio pagina (menu top) */ #uppFeatured { - margin-top: 140px; + margin-top: 78px; } /* fix testata tabella grigia */ @@ -95,7 +95,8 @@ a { .navbar.navbar-inverse .navbar-form .search-query { width: 225px; margin-top: 2px; - background-color: #333; + background-color: #ededed; + /*background-color: #333;*/ font-size: 11px; font-weight: bold; line-height: 20px; @@ -105,7 +106,10 @@ a { } .navbar.navbar-inverse .navbar-form .search-query:focus { - background-color: #FFF; + /*background-color: #9CF;*/ + border-color: #9CF; + border-width:2px; + /*background-color: #FFF;*/ } .navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder { diff --git a/C2P/Content/Style.min.css b/C2P/Content/Style.min.css index b33c56d..71582f8 100644 --- a/C2P/Content/Style.min.css +++ b/C2P/Content/Style.min.css @@ -1 +1 @@ -#uppFeatured{margin-top:140px}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#f5f5f5 0%,#e2e2e2 100%)}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:2px}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:4px 8px;font-size:12px;line-height:1.5;border-radius:3px}body{font:12px/1.5em 'Open Sans';color:#333;background:#e9e9e9 url(../images/tiny_grid.png) repeat 0 0;background-color:#fff}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.didascalia{color:#696969;font-size:7pt}.warnRed{color:red}.warnOrange{color:#ffa500}.allOk{color:green}.navbar{min-height:15px}.navbar-text{margin-top:1px;margin-bottom:1px}.navbar.navbar-inverse .navbar-form .search-query{width:225px;margin-top:2px;background-color:#333;font-size:11px;font-weight:bold;line-height:20px;border-color:#000;border-radius:20px;box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15)}.navbar.navbar-inverse .navbar-form .search-query:focus{background-color:#fff}.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder{color:#666}.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder{color:#666}.titleBar{color:#f90}.subnavbar{margin-bottom:.5em;border-top:1px solid #595959}.subnavbar .subnav-toggle{display:none;padding:.5em 0;margin:0 auto;font-size:18px;text-align:center;color:#f90}.subnavbar .subnav-toggle:hover{text-decoration:none}.subnavbar .subnavbar-inner{height:70px;border-bottom:1px solid #000}.subnavbar .btn-subnavbar{display:none;padding:10px 0 8px;color:#f90;font-size:16px;text-align:center;cursor:pointer}.subnavbar .btn-subnavbar:hover{text-decoration:none}.subnavbar .dropdown .caret{margin-top:-16px;border-top-color:#888;border-bottom-color:#888;opacity:35;filter:alpha(opacity=3500)}.subnavbar .dropdown.open .caret{display:none}.subnavbar .mainnav{display:inline-block;height:70px;padding:0;margin:0;border-left:1px solid #292929;border-right:1px solid #4a4a4a}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none;border-left:1px solid #4a4a4a;border-right:1px solid #292929}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#636363;text-shadow:1px 1px 1px rgba(0,0,0,.2)}.subnavbar .mainnav>li>a:hover{color:#888;text-decoration:none}.subnavbar .mainnav>li>a>i{position:relative;top:2px;display:inline-block;width:24px;height:24px;margin-top:12px;margin-bottom:9px;font-size:28px}.subnavbar .mainnav>li>a>span{display:block;padding-bottom:2px}.subnavbar .mainnav>li.open>a{text-decoration:none}.subnavbar .mainnav>li.active>a{background:#333;color:#f90}.subnavbar .mainnav>li.active>a .caret{border-top-color:#f90;border-bottom-color:#f90}.subnavbar .dropdown>.dropdown-menu{top:97%;text-align:left;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.subnavbar .dropdown>.dropdown-menu a{font-size:12px}.subnavbar .dropdown>.dropdown-menu::before,.subnavbar .dropdown>.dropdown-menu::after{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:9px}.subnavbar .dropdown>.dropdown-menu::after{border-left-width:6px;border-right-width:6px;border-bottom-width:6px;border-bottom-color:#fff;top:-6px;left:10px}.subnavbar .dropdown-submenu .dropdown-menu:after,.subnavbar .dropdown-submenu .dropdown-menu:before{display:none}.subnavbar .subnav-collapse.collapse{height:auto\9;overflow:visible\9}.shortcuts{text-align:center}.shortcuts .shortcut{width:140px;display:inline-block;padding:15px 0;margin:0 5px 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:5px}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#555}.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:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}.widget{position:relative;clear:both;width:auto;margin-bottom:2em}.widget .widget-header{position:relative;height:40px;line-height:40px;background:#e9e9e9;background:-moz-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#fafafa),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-o-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-ms-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:linear-gradient(top,#fafafa 0%,#e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E9E9E9');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";border:1px solid #d5d5d5;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px;-webkit-background-clip:padding-box}.widget .widget-header h3{top:0;position:relative;left:10px;display:inline-block;margin-right:3em;font-size:15px;font-weight:400;color:#555;line-height:18px;text-shadow:1px 1px 2px rgba(255,255,255,.5)}.widget .widget-header [class^="fa-"],.widget .widget-header [class*=" fa-"]{display:inline-block;margin-top:-3px;margin-left:13px;margin-right:-2px;font-size:16px;color:#555;vertical-align:middle}.widget .widget-content{padding:25px 15px 15px;background:#fff;border:1px solid #d5d5d5;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.widget .widget-header+.widget-content{border-top:none;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.widget.widget-nopad .widget-content{padding:0}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget.widget-table .widget-content{padding:0}.widget.widget-table .table{margin-bottom:0;border:none}.widget.widget-table .table tr td:first-child,.widget.widget-table .table tr th:first-child{border-left:none}.widget.widget-plain{background:transparent;border:none}.widget.widget-plain .widget-content{padding:0;background:transparent;border:none}.widget.widget-box .widget-content{background:#e3e3e3;background:#fff}.stacked{position:relative}.stacked:after,.stacked:before{content:'';position:absolute;display:block;height:1px;bottom:-2px;left:3px;right:3px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;border:1px solid #d3d3d3;border-top:0}.stacked:before{bottom:-4px;left:6px;right:6px}.stats{width:100%;display:table;padding:0 0 0 10px;margin-top:.5em;margin-bottom:1.9em}.stats .stat{display:table-cell;width:40%;vertical-align:top;font-size:11px;font-weight:bold;color:#999}.stat-value{display:block;margin-bottom:.55em;font-size:30px;font-weight:bold;letter-spacing:-2px;color:#444}.stat-time{text-align:center;padding-top:1.5em}.stat-time .stat-value{color:#f90;font-size:40px}.stats #donut-chart{height:100px;margin-left:-20px}.news-items{padding:0;margin:1em 0 0}.news-items li{display:table;padding:0 2em 0 1.5em;padding-bottom:1em;margin-bottom:1em;border-bottom:1px dotted #ccc}.news-items li:last-child{padding-bottom:0;border:none}.news-item-date{display:table-cell}.news-item-detail{display:table-cell}.news-item-title{font-size:13px;font-weight:600}.news-item-date{width:75px;vertical-align:middle;text-align:right}.news-item-day{display:block;margin-bottom:.25em;font-size:24px;color:#888}.news-item-preview{margin-bottom:0;color:#777}.news-item-month{display:block;padding-right:1px;font-size:12px;font-weight:600;color:#888}.action-table .btn-small{padding:4px 5px 5px;font-size:10px}.action-table .td-actions{width:80px;text-align:center}.action-table .td-actions .btn{margin-right:.5em}.action-table .td-actions .btn:last-child{margin-rigth:0}@media(max-width:480px){.stats .stat{margin-bottom:3em}.stats .stat .stat-value{margin-bottom:.15em;font-size:20px}.stats{float:left;display:block;margin-bottom:0}#chart-stats{margin:2em 0 1em}}@media(max-width:480px){.error-container h1{font-size:72px}.shortcuts .shortcut{width:95px}.shortcuts .shortcut .shortcut-label{font-size:12px}.shortcuts .shortcut .shortcut-icon{font-size:24px}}@media(max-width:979px){.navbar-fixed-top{position:static;margin-bottom:0}.navbar .btn-navbar{font-size:18px;background:none;filter:none;border:none;-webkit-box-shadow:none;box-shadow:none}.navbar .container{padding:0 10px}.subnavbar .subnavbar .container{width:auto}}@media(max-width:768px){.navbar{padding-left:10px;padding-right:10px;margin-right:-20px;margin-left:-20px}.navbar .navbar-nav>li>.dropdown-menu::before,.navbar .navbar-nav>li>.dropdown-menu::after{display:none}.subnavbar .subnav-toggle{display:block}#main{padding:0 10px;margin-right:-20px;margin-left:-20px}.extra{margin-right:-20px;margin-left:-20px}.main .container{padding:0}.main .row{margin-right:-15px;margin-left:-15px}.footer{margin-right:-20px;margin-left:-20px}.footer #footer-terms{margin-top:1em;text-align:left}.footer #footer-terms a{margin-left:0;margin-right:1em}.item-row{display:block}.item-row:before,.item-row:after{content:" ";display:table}.item-row:after{clear:both}.item-row .item-label{display:block;width:100%;margin-bottom:1.5em}.item-row .item-content{display:block;width:100%}.subnavbar{margin-left:-20px;margin-right:-20px}.subnavbar .btn-subnavbar{display:block}.subnavbar .subnavbar-inner{height:auto}.subnavbar .mainnav{display:block;width:100%;height:auto;margin-top:1em;margin-bottom:1.5em;border:none}.subnavbar .mainnav>li{float:none;width:100%;height:auto;margin-bottom:1em;text-align:left;border:none}.subnavbar .mainnav>li>a{display:block;padding-top:5px;padding-bottom:5px;margin-right:.5em;color:#ccc;font-size:13px;font-weight:600}.subnavbar .mainnav>li>a>span{display:inline}.subnavbar .mainnav>li>a>i{display:inline;margin-right:.5em;margin-bottom:0;font-size:14px}.subnavbar .mainnav>li>a .caret{margin-top:-2px;margin-left:3px}.subnavbar .mainnav>li.active>a{color:#f90;background:transparent}.subnavbar .dropdown .dropdown-menu{position:static;float:none;width:100%;background:transparent;border:none;box-shadow:none}.subnavbar .dropdown .dropdown-menu a{padding:12px 40px;color:#fff;font-weight:600}.subnavbar .dropdown .dropdown-menu a:active,.subnavbar .dropdown .dropdown-menu a:focus{background:#555!important;outline:none}.subnavbar .dropdown .dropdown-menu::before,.subnavbar .dropdown .dropdown-menu::after{display:none}.subnavbar .dropdown.open .caret{display:inline-block}.subnavbar .dropdown-submenu>a:after{display:none}.subnavbar .dropdown-submenu>.dropdown-menu{display:block}.subnavbar .dropdown-submenu>.dropdown-menu>li>a{padding-right:20px;padding-left:60px}}@media(min-width:768px){.subnav-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}}@media(min-width:1200px){.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}} \ No newline at end of file +#uppFeatured{margin-top:78px}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#f5f5f5 0%,#e2e2e2 100%)}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:2px}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:4px 8px;font-size:12px;line-height:1.5;border-radius:3px}body{font:12px/1.5em 'Open Sans';color:#333;background:#e9e9e9 url(../images/tiny_grid.png) repeat 0 0;background-color:#fff}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.didascalia{color:#696969;font-size:7pt}.warnRed{color:red}.warnOrange{color:#ffa500}.allOk{color:green}.navbar{min-height:15px}.navbar-text{margin-top:1px;margin-bottom:1px}.navbar.navbar-inverse .navbar-form .search-query{width:225px;margin-top:2px;background-color:#ededed;font-size:11px;font-weight:bold;line-height:20px;border-color:#000;border-radius:20px;box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15)}.navbar.navbar-inverse .navbar-form .search-query:focus{border-color:#9cf;border-width:2px}.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder{color:#666}.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder{color:#666}.titleBar{color:#f90}.subnavbar{margin-bottom:.5em;border-top:1px solid #595959}.subnavbar .subnav-toggle{display:none;padding:.5em 0;margin:0 auto;font-size:18px;text-align:center;color:#f90}.subnavbar .subnav-toggle:hover{text-decoration:none}.subnavbar .subnavbar-inner{height:70px;border-bottom:1px solid #000}.subnavbar .btn-subnavbar{display:none;padding:10px 0 8px;color:#f90;font-size:16px;text-align:center;cursor:pointer}.subnavbar .btn-subnavbar:hover{text-decoration:none}.subnavbar .dropdown .caret{margin-top:-16px;border-top-color:#888;border-bottom-color:#888;opacity:35;filter:alpha(opacity=3500)}.subnavbar .dropdown.open .caret{display:none}.subnavbar .mainnav{display:inline-block;height:70px;padding:0;margin:0;border-left:1px solid #292929;border-right:1px solid #4a4a4a}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none;border-left:1px solid #4a4a4a;border-right:1px solid #292929}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#636363;text-shadow:1px 1px 1px rgba(0,0,0,.2)}.subnavbar .mainnav>li>a:hover{color:#888;text-decoration:none}.subnavbar .mainnav>li>a>i{position:relative;top:2px;display:inline-block;width:24px;height:24px;margin-top:12px;margin-bottom:9px;font-size:28px}.subnavbar .mainnav>li>a>span{display:block;padding-bottom:2px}.subnavbar .mainnav>li.open>a{text-decoration:none}.subnavbar .mainnav>li.active>a{background:#333;color:#f90}.subnavbar .mainnav>li.active>a .caret{border-top-color:#f90;border-bottom-color:#f90}.subnavbar .dropdown>.dropdown-menu{top:97%;text-align:left;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.subnavbar .dropdown>.dropdown-menu a{font-size:12px}.subnavbar .dropdown>.dropdown-menu::before,.subnavbar .dropdown>.dropdown-menu::after{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:9px}.subnavbar .dropdown>.dropdown-menu::after{border-left-width:6px;border-right-width:6px;border-bottom-width:6px;border-bottom-color:#fff;top:-6px;left:10px}.subnavbar .dropdown-submenu .dropdown-menu:after,.subnavbar .dropdown-submenu .dropdown-menu:before{display:none}.subnavbar .subnav-collapse.collapse{height:auto\9;overflow:visible\9}.shortcuts{text-align:center}.shortcuts .shortcut{width:140px;display:inline-block;padding:15px 0;margin:0 5px 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:5px}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#555}.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:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}.widget{position:relative;clear:both;width:auto;margin-bottom:2em}.widget .widget-header{position:relative;height:40px;line-height:40px;background:#e9e9e9;background:-moz-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#fafafa),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-o-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-ms-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:linear-gradient(top,#fafafa 0%,#e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E9E9E9');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";border:1px solid #d5d5d5;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px;-webkit-background-clip:padding-box}.widget .widget-header h3{top:0;position:relative;left:10px;display:inline-block;margin-right:3em;font-size:15px;font-weight:400;color:#555;line-height:18px;text-shadow:1px 1px 2px rgba(255,255,255,.5)}.widget .widget-header [class^="fa-"],.widget .widget-header [class*=" fa-"]{display:inline-block;margin-top:-3px;margin-left:13px;margin-right:-2px;font-size:16px;color:#555;vertical-align:middle}.widget .widget-content{padding:25px 15px 15px;background:#fff;border:1px solid #d5d5d5;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.widget .widget-header+.widget-content{border-top:none;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.widget.widget-nopad .widget-content{padding:0}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget.widget-table .widget-content{padding:0}.widget.widget-table .table{margin-bottom:0;border:none}.widget.widget-table .table tr td:first-child,.widget.widget-table .table tr th:first-child{border-left:none}.widget.widget-plain{background:transparent;border:none}.widget.widget-plain .widget-content{padding:0;background:transparent;border:none}.widget.widget-box .widget-content{background:#e3e3e3;background:#fff}.stacked{position:relative}.stacked:after,.stacked:before{content:'';position:absolute;display:block;height:1px;bottom:-2px;left:3px;right:3px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;border:1px solid #d3d3d3;border-top:0}.stacked:before{bottom:-4px;left:6px;right:6px}.stats{width:100%;display:table;padding:0 0 0 10px;margin-top:.5em;margin-bottom:1.9em}.stats .stat{display:table-cell;width:40%;vertical-align:top;font-size:11px;font-weight:bold;color:#999}.stat-value{display:block;margin-bottom:.55em;font-size:30px;font-weight:bold;letter-spacing:-2px;color:#444}.stat-time{text-align:center;padding-top:1.5em}.stat-time .stat-value{color:#f90;font-size:40px}.stats #donut-chart{height:100px;margin-left:-20px}.news-items{padding:0;margin:1em 0 0}.news-items li{display:table;padding:0 2em 0 1.5em;padding-bottom:1em;margin-bottom:1em;border-bottom:1px dotted #ccc}.news-items li:last-child{padding-bottom:0;border:none}.news-item-date{display:table-cell}.news-item-detail{display:table-cell}.news-item-title{font-size:13px;font-weight:600}.news-item-date{width:75px;vertical-align:middle;text-align:right}.news-item-day{display:block;margin-bottom:.25em;font-size:24px;color:#888}.news-item-preview{margin-bottom:0;color:#777}.news-item-month{display:block;padding-right:1px;font-size:12px;font-weight:600;color:#888}.action-table .btn-small{padding:4px 5px 5px;font-size:10px}.action-table .td-actions{width:80px;text-align:center}.action-table .td-actions .btn{margin-right:.5em}.action-table .td-actions .btn:last-child{margin-rigth:0}@media(max-width:480px){.stats .stat{margin-bottom:3em}.stats .stat .stat-value{margin-bottom:.15em;font-size:20px}.stats{float:left;display:block;margin-bottom:0}#chart-stats{margin:2em 0 1em}}@media(max-width:480px){.error-container h1{font-size:72px}.shortcuts .shortcut{width:95px}.shortcuts .shortcut .shortcut-label{font-size:12px}.shortcuts .shortcut .shortcut-icon{font-size:24px}}@media(max-width:979px){.navbar-fixed-top{position:static;margin-bottom:0}.navbar .btn-navbar{font-size:18px;background:none;filter:none;border:none;-webkit-box-shadow:none;box-shadow:none}.navbar .container{padding:0 10px}.subnavbar .subnavbar .container{width:auto}}@media(max-width:768px){.navbar{padding-left:10px;padding-right:10px;margin-right:-20px;margin-left:-20px}.navbar .navbar-nav>li>.dropdown-menu::before,.navbar .navbar-nav>li>.dropdown-menu::after{display:none}.subnavbar .subnav-toggle{display:block}#main{padding:0 10px;margin-right:-20px;margin-left:-20px}.extra{margin-right:-20px;margin-left:-20px}.main .container{padding:0}.main .row{margin-right:-15px;margin-left:-15px}.footer{margin-right:-20px;margin-left:-20px}.footer #footer-terms{margin-top:1em;text-align:left}.footer #footer-terms a{margin-left:0;margin-right:1em}.item-row{display:block}.item-row:before,.item-row:after{content:" ";display:table}.item-row:after{clear:both}.item-row .item-label{display:block;width:100%;margin-bottom:1.5em}.item-row .item-content{display:block;width:100%}.subnavbar{margin-left:-20px;margin-right:-20px}.subnavbar .btn-subnavbar{display:block}.subnavbar .subnavbar-inner{height:auto}.subnavbar .mainnav{display:block;width:100%;height:auto;margin-top:1em;margin-bottom:1.5em;border:none}.subnavbar .mainnav>li{float:none;width:100%;height:auto;margin-bottom:1em;text-align:left;border:none}.subnavbar .mainnav>li>a{display:block;padding-top:5px;padding-bottom:5px;margin-right:.5em;color:#ccc;font-size:13px;font-weight:600}.subnavbar .mainnav>li>a>span{display:inline}.subnavbar .mainnav>li>a>i{display:inline;margin-right:.5em;margin-bottom:0;font-size:14px}.subnavbar .mainnav>li>a .caret{margin-top:-2px;margin-left:3px}.subnavbar .mainnav>li.active>a{color:#f90;background:transparent}.subnavbar .dropdown .dropdown-menu{position:static;float:none;width:100%;background:transparent;border:none;box-shadow:none}.subnavbar .dropdown .dropdown-menu a{padding:12px 40px;color:#fff;font-weight:600}.subnavbar .dropdown .dropdown-menu a:active,.subnavbar .dropdown .dropdown-menu a:focus{background:#555!important;outline:none}.subnavbar .dropdown .dropdown-menu::before,.subnavbar .dropdown .dropdown-menu::after{display:none}.subnavbar .dropdown.open .caret{display:inline-block}.subnavbar .dropdown-submenu>a:after{display:none}.subnavbar .dropdown-submenu>.dropdown-menu{display:block}.subnavbar .dropdown-submenu>.dropdown-menu>li>a{padding-right:20px;padding-left:60px}}@media(min-width:768px){.subnav-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}}@media(min-width:1200px){.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}} \ No newline at end of file diff --git a/C2P/ExistingProductOffer.aspx b/C2P/ExistingProductOffer.aspx index 284bb9c..1d5e3b6 100644 --- a/C2P/ExistingProductOffer.aspx +++ b/C2P/ExistingProductOffer.aspx @@ -7,6 +7,7 @@ fare clonando pagina QUOTE + <%-- <%: traduci("CheckStd") %>--%>

Attenzione!
diff --git a/C2P/ExistingProductOffer.aspx.designer.cs b/C2P/ExistingProductOffer.aspx.designer.cs index ff41dc9..22f9c53 100644 --- a/C2P/ExistingProductOffer.aspx.designer.cs +++ b/C2P/ExistingProductOffer.aspx.designer.cs @@ -3,15 +3,13 @@ // This code was generated by a tool. // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ -namespace C2P -{ - - - public partial class ExistingProductOffer - { +namespace C2P { + + + public partial class ExistingProductOffer { } } diff --git a/C2P/OffersArchive.aspx b/C2P/OffersArchive.aspx index 481b9b9..5df02af 100644 --- a/C2P/OffersArchive.aspx +++ b/C2P/OffersArchive.aspx @@ -1,6 +1,6 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="OffersArchive.aspx.cs" Inherits="C2P.OffersArchive" %> -<%@ Register Src="WebUserControls/mod_OffersArchive.ascx" TagName="mod_OffersArchive" TagPrefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_OffersArchive.ascx" TagName="mod_OffersArchive" TagPrefix="uc1" %> @@ -14,10 +14,6 @@
-
-
-
-
diff --git a/C2P/OffersArchive.aspx.designer.cs b/C2P/OffersArchive.aspx.designer.cs index 2b84289..ef881ce 100644 --- a/C2P/OffersArchive.aspx.designer.cs +++ b/C2P/OffersArchive.aspx.designer.cs @@ -20,14 +20,5 @@ namespace C2P { /// To modify move field declaration from designer file to code-behind file. /// protected global::C2P.WebUserControls.mod_OffersArchive mod_OffersArchive1; - - /// - /// HyperLink3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink3; } } diff --git a/C2P/Quote.aspx b/C2P/Quote.aspx index 98f9643..9b1b8ab 100644 --- a/C2P/Quote.aspx +++ b/C2P/Quote.aspx @@ -1,35 +1,10 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="Quote.aspx.cs" Inherits="C2P.Quote" %> + <%@ Register Src="~/WebUserControls/mod_QuoteDet.ascx" TagName="mod_QuoteDet" TagPrefix="uc1" %> - - -
-
-
-
-
-

Nuova offerta (click x dettaglio)

-
-
- -
-
-
-
-
-
-

Alternativa meno preferita (click x dettaglio)

-
-
- -
-
-
-
-
diff --git a/C2P/Quote.aspx.designer.cs b/C2P/Quote.aspx.designer.cs index 3e350d0..e924d0c 100644 --- a/C2P/Quote.aspx.designer.cs +++ b/C2P/Quote.aspx.designer.cs @@ -20,23 +20,5 @@ namespace C2P { /// To modify move field declaration from designer file to code-behind file. /// protected global::C2P.WebUserControls.mod_QuoteDet mod_QuoteDet1; - - /// - /// HyperLink1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink1; - - /// - /// HyperLink2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink2; } } diff --git a/C2P/Web.config b/C2P/Web.config index ad0062c..4fce682 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -39,9 +39,10 @@ - - - + + + + diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index 40f9ccb..0a012b6 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -2,13 +2,71 @@ <%@ Register Src="mod_autocomplete.ascx" TagPrefix="uc1" TagName="mod_autocomplete" %> <%@ Register Src="mod_selPeriodo.ascx" TagName="mod_selPeriodo" TagPrefix="uc2" %> <%@ Register Src="mod_slider.ascx" TagName="mod_slider" TagPrefix="uc3" %> + <%if (false) { %> <%} %> +
-
-
+
+
+
+

<%: traduci("SearchFilters") %>

+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+ + <%: traduci("NumOfferta") %> + + + + + +
+
+
+
+
+ +
+
+
+
+
+ <%: traduci("Search") %> +
+
+ <%: traduci("Reset") %> +
+
+
+
+
+
+
<%:traduci("Open") %>
@@ -22,152 +80,90 @@ <%:traduci("Print") %>
-
-
-
-
-
-
+
-

- <%: traduci("SearchFilters") %> -

-
-
-
-
- -- Date disabilitate -- - -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
-
- - <%: traduci("NumOfferta") %> - - - - - -
-
-
-
-
- -
-
-
-
-
- <%: traduci("Search") %> -
-
- <%: traduci("Reset") %> -
-
-
-
- - - <%# traduci("NoRecords") %> - - - - - - - - - - - - - - <%-- + + + <%# traduci("NoRecords") %> + + + + + + + + + + + + + + <%-- --%> - - - - - - <%-- + + + + + + <%-- --%> - - - - - - <%-- + + + + + + <%-- --%> - - - - - - <%-- + + + + + + <%-- --%> - - - - - - - - - - - - - - - - - - - <%: numRecords %> - - <%--FilterExpression="ClientName LIKE '%{0}%' OR RawMat LIKE '%{0}%' OR CodItem LIKE '%{0}%'" - - - --%> - - - - - <%-- - - --%> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + <%: numRecords %> + + + + + + + + + + + + + + + + + + +
+
diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.cs index 191e449..3751491 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.cs @@ -5,6 +5,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using SteamWare; +using C2P_Data; namespace C2P.WebUserControls { @@ -21,31 +22,61 @@ namespace C2P.WebUserControls /// protected void Page_Load(object sender, EventArgs e) { - // calcolo il range dello slider... - setSliderVal(); // al caricamento NON mostro risultati ricerca... if (!Page.IsPostBack) { + // calcolo il range dello slider... + setSliderVal(); + // altri fix grView.Visible = false; lblResults.Visible = false; numSel = 0; } setBtnVisib(); + mod_selPeriodo1.eh_doUpdate += mod_selPeriodo1_eh_doUpdate; } + void mod_selPeriodo1_eh_doUpdate(object sender, EventArgs e) + { + setSliderVal(); + } + /// + /// calcola valori ammissibili slider + /// private void setSliderVal() { - // !!!FARE!!! - - /* - * - Filtro su parametri attuali (prima apertura = ALL DATA con filtro sul periodo...) - * - cerco min/max qta - * - le impongo al selettore slicer - * - * */ - - rangeQta.minVal = 0; - rangeQta.maxVal = 5555; +#if false + // recupero data min/max... + int minDate = Convert.ToInt32(mod_selPeriodo1.intervalloAnalisi.inizio.ToString("yyMMdd0000")); + int maxDate = Convert.ToInt32(mod_selPeriodo1.intervalloAnalisi.fine.ToString("yyMMdd0000")); + DS_Quotes.QuoteFull_QDataTable tab = DtProxy.man.taQFQ.getMinMax(minDate, maxDate); + try + { + if (tab.Rows.Count > 0) + { + if (tab[0].BatchQty < tab[1].BatchQty) + { + rangeQta.minVal = tab[0].BatchQty; + rangeQta.maxVal = tab[1].BatchQty; + } + else + { + rangeQta.minVal = tab[1].BatchQty; + rangeQta.maxVal = tab[0].BatchQty; + } + } + else + { + //rangeQta.minVal = 0; + //rangeQta.maxVal = 10000; + } + } + catch + { + //rangeQta.minVal = 0; + //rangeQta.maxVal = 10000; + } +#endif } /// /// sistema visibilità button... @@ -225,6 +256,7 @@ namespace C2P.WebUserControls { SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument); } + /// /// richiesta ricerca e visualizzaizone con i parametri attuali... /// @@ -244,9 +276,6 @@ namespace C2P.WebUserControls protected void lbtReset_Click(object sender, EventArgs e) { Response.Redirect("OffersArchive"); - // nascondo il gridview! - grView.Visible = false; - lblResults.Visible = false; } /// /// seleziona/deseleziona le righe indicate... diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs b/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs index d05aa5f..ca0bbc3 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs +++ b/C2P/WebUserControls/mod_OffersArchive.ascx.designer.cs @@ -21,42 +21,6 @@ namespace C2P.WebUserControls { /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - /// - /// lbOpen control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbOpen; - - /// - /// lbDuplicate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbDuplicate; - - /// - /// lbSimulate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbSimulate; - - /// - /// lbPrint control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbPrint; - /// /// mod_selPeriodo1 control. /// @@ -147,6 +111,42 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbtReset; + /// + /// lbOpen control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbOpen; + + /// + /// lbDuplicate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbDuplicate; + + /// + /// lbSimulate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbSimulate; + + /// + /// lbPrint control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbPrint; + /// /// grView control. /// diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index c888399..2f2752b 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -26,9 +26,8 @@ -
-
+
<%--
--%>
@@ -55,18 +54,6 @@
-
-
- spostare button check... -  <%: traduci("CheckStd") %> -
-
- <%: traduci("EsitoCheck") %> -
-
-
-   -
<%--
--%> diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.cs index eefff56..56e1b83 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.cs @@ -282,7 +282,6 @@ namespace C2P.WebUserControls // fix visibilità button creazione offerta lbCreateOffer.Visible = okCreate; // fix altri button x edit.. - lbChkStandard.Visible = false;// showEdit; if (!showEdit) { lbCosts.CssClass = "btn btn-default disabled"; @@ -333,16 +332,6 @@ namespace C2P.WebUserControls } } /// - /// Verifica se si possibile creare offerta standard (o si debba passare a SIMULAZIONE) - /// - /// - /// - protected void lbChkStandard_Click(object sender, EventArgs e) - { - // controllo se sia tutto ok in generazione !!!FARE!!! andrà fatto avendo un campo (o + di 1) da controllare su tab... - lblEsitoChk.Visible = true; - } - /// /// Crea un offerta (SE /// /// diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs index d9e1d9c..8d33d55 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs +++ b/C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs @@ -156,24 +156,6 @@ namespace C2P.WebUserControls { /// protected global::C2P.WebUserControls.mod_Q_PackPar mod_Q_PackPar1; - /// - /// lbChkStandard control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton lbChkStandard; - - /// - /// lblEsitoChk control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblEsitoChk; - /// /// lbQuotation control. /// diff --git a/C2P/WebUserControls/mod_selPeriodo.ascx b/C2P/WebUserControls/mod_selPeriodo.ascx index e3a34af..220e443 100644 --- a/C2P/WebUserControls/mod_selPeriodo.ascx +++ b/C2P/WebUserControls/mod_selPeriodo.ascx @@ -32,8 +32,8 @@ }); }); -
-
+
+
@@ -50,7 +50,7 @@
-
+
<%: traduci("ToDate") %> diff --git a/C2P/WebUserControls/mod_selPeriodo.ascx.cs b/C2P/WebUserControls/mod_selPeriodo.ascx.cs index 319be3b..5aa1930 100644 --- a/C2P/WebUserControls/mod_selPeriodo.ascx.cs +++ b/C2P/WebUserControls/mod_selPeriodo.ascx.cs @@ -169,7 +169,6 @@ namespace C2P.WebUserControls _intervallo.fine = Convert.ToDateTime(txtFine.Text); verificaCoerenzaDate(); reportUpdate(); - } /// /// verifica che le date dell'intervallo siano coerenti (inizio < fine) @@ -251,7 +250,6 @@ namespace C2P.WebUserControls eh_doUpdate(this, new EventArgs()); } } - public intervalloDate intervalloAnalisi { get @@ -268,6 +266,20 @@ namespace C2P.WebUserControls aggiornaDateMostrate(false); } } + public DateTime inizio + { + get + { + return intervalloAnalisi.inizio; + } + } + public DateTime fine + { + get + { + return intervalloAnalisi.fine; + } + } /// /// effettua update /// diff --git a/C2P/WebUserControls/mod_slider.ascx b/C2P/WebUserControls/mod_slider.ascx index 1bb05e6..5a12f0d 100644 --- a/C2P/WebUserControls/mod_slider.ascx +++ b/C2P/WebUserControls/mod_slider.ascx @@ -42,5 +42,6 @@ <%--controlli "accessori"--%> - - + + +...rifare, juiceui? http://juiceui.com/controls/slider \ No newline at end of file diff --git a/C2P/WebUserControls/mod_slider.ascx.cs b/C2P/WebUserControls/mod_slider.ascx.cs index 596c175..fbaea65 100644 --- a/C2P/WebUserControls/mod_slider.ascx.cs +++ b/C2P/WebUserControls/mod_slider.ascx.cs @@ -52,7 +52,7 @@ namespace C2P.WebUserControls } set { - txtMax.Text = value.ToString(); ; + txtMax.Text = value.ToString(); } } /// diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index 6085968..d9a8ee0 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -33,7 +33,7 @@ -
  • +
  • Offers @@ -96,7 +96,7 @@
    • diff --git a/C2P/WebUserControls/mod_testata.ascx.cs b/C2P/WebUserControls/mod_testata.ascx.cs index 20c2cc2..f2462c6 100644 --- a/C2P/WebUserControls/mod_testata.ascx.cs +++ b/C2P/WebUserControls/mod_testata.ascx.cs @@ -75,5 +75,15 @@ namespace C2P.WebUserControls { return user_std.UtSn.Traduci(lemma.ToString()); } + /// + /// modifica campo ricerca... + /// + /// + /// + protected void txtSearch_TextChanged(object sender, EventArgs e) + { + // salvo in sessione + memLayer.ML.setSessionVal("searchVal", txtSearch.Text.Trim()); + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_testata.ascx.designer.cs b/C2P/WebUserControls/mod_testata.ascx.designer.cs index 226d7b1..52ce5cf 100644 --- a/C2P/WebUserControls/mod_testata.ascx.designer.cs +++ b/C2P/WebUserControls/mod_testata.ascx.designer.cs @@ -38,5 +38,14 @@ namespace C2P.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlAnchor A4; + + /// + /// txtSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSearch; } } diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 4ec1d08..7a61657 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index ae036a9..7105d39 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 93f5e96..7760cff 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Data/DS_Quotes.Designer.cs b/C2P_Data/DS_Quotes.Designer.cs index deeb8bf..d75dad0 100644 --- a/C2P_Data/DS_Quotes.Designer.cs +++ b/C2P_Data/DS_Quotes.Designer.cs @@ -12197,7 +12197,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[9]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[10]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_QL_fullDataAll"; @@ -12229,61 +12229,68 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_QLF_Insert"; + this._commandCollection[4].CommandText = "dbo.stp_QLF_getMinMax"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DateMin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DateMax", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_QuoteFull_Q_update"; + this._commandCollection[5].CommandText = "dbo.stp_QLF_Insert"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_QLF_UpdCosts"; + this._commandCollection[6].CommandText = "dbo.stp_QuoteFull_Q_update"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 5, global::System.Data.ParameterDirection.Input, 9, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[7].Connection = this.Connection; - this._commandCollection[7].CommandText = "dbo.stp_QLF_UpdHead"; + this._commandCollection[7].CommandText = "dbo.stp_QLF_UpdCosts"; this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PriceOff", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; - this._commandCollection[8].CommandText = "dbo.stp_QLF_UpdQState"; + this._commandCollection[8].CommandText = "dbo.stp_QLF_UpdHead"; this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxQState", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodClient", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodItem", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMat", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RawMatExtraCost", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchQty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodInco", global::System.Data.SqlDbType.NVarChar, 5, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[9].Connection = this.Connection; + this._commandCollection[9].CommandText = "dbo.stp_QLF_UpdQState"; + this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteType", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodQuote", global::System.Data.SqlDbType.BigInt, 8, global::System.Data.ParameterDirection.Input, 19, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_QuoteRev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxQState", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12401,8 +12408,31 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_Quotes.QuoteFull_QDataTable insertNew(string QuoteType, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note) { + public virtual DS_Quotes.QuoteFull_QDataTable getMinMax(global::System.Nullable DateMin, global::System.Nullable DateMax) { this.Adapter.SelectCommand = this.CommandCollection[4]; + if ((DateMin.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(DateMin.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((DateMax.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(DateMax.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + DS_Quotes.QuoteFull_QDataTable dataTable = new DS_Quotes.QuoteFull_QDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Quotes.QuoteFull_QDataTable insertNew(string QuoteType, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note) { + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -12467,7 +12497,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Quotes.QuoteFull_QDataTable updateCosts(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable PriceOff) { - this.Adapter.SelectCommand = this.CommandCollection[6]; + this.Adapter.SelectCommand = this.CommandCollection[7]; if ((Original_QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -12502,7 +12532,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Quotes.QuoteFull_QDataTable updateHeaders(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, string CodClient, string CodItem, string RawMat, global::System.Nullable RawMatCost, global::System.Nullable RawMatExtraCost, global::System.Nullable BatchQty, string CodInco, string Note) { - this.Adapter.SelectCommand = this.CommandCollection[7]; + this.Adapter.SelectCommand = this.CommandCollection[8]; if ((Original_QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -12579,7 +12609,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Quotes.QuoteFull_QDataTable updateQState(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable IdxQState) { - this.Adapter.SelectCommand = this.CommandCollection[8]; + this.Adapter.SelectCommand = this.CommandCollection[9]; if ((Original_QuoteType == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } @@ -12613,7 +12643,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int QuoteFull_Q_update(string Original_QuoteType, global::System.Nullable Original_CodQuote, global::System.Nullable Original_QuoteRev, global::System.Nullable PriceOff) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((Original_QuoteType == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/C2P_Data/DS_Quotes.xsd b/C2P_Data/DS_Quotes.xsd index 3e9f472..43cdc89 100644 --- a/C2P_Data/DS_Quotes.xsd +++ b/C2P_Data/DS_Quotes.xsd @@ -862,6 +862,18 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas + + + + dbo.stp_QLF_getMinMax + + + + + + + + @@ -954,7 +966,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1038,7 +1050,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1074,7 +1086,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1099,7 +1111,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1179,7 +1191,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1216,7 +1228,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1286,7 +1298,7 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - + @@ -1563,11 +1575,11 @@ SELECT QuoteType, CodQuote, QuoteRev, NumEx, ProcessNum, CodPlant, Class01, Clas - - - - - + + + + + \ No newline at end of file diff --git a/C2P_Data/bin/Release/C2P_Data.dll b/C2P_Data/bin/Release/C2P_Data.dll index ae036a9..969f207 100644 Binary files a/C2P_Data/bin/Release/C2P_Data.dll and b/C2P_Data/bin/Release/C2P_Data.dll differ diff --git a/C2P_Data/bin/Release/SteamWare.dll b/C2P_Data/bin/Release/SteamWare.dll index 93f5e96..3235201 100644 Binary files a/C2P_Data/bin/Release/SteamWare.dll and b/C2P_Data/bin/Release/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index 28cce88..25dbecc 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.50.142")] -[assembly: AssemblyFileVersion("0.6.50.142")] +[assembly: AssemblyVersion("0.6.51.143")] +[assembly: AssemblyFileVersion("0.6.51.143")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 7453c95..f7d83b4 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.6.50.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.6.50.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.6.51.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.6.51.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+