diff --git a/CMS_SC/Content/Style.css b/CMS_SC/Content/Style.css index c43ff00..caa7d51 100644 --- a/CMS_SC/Content/Style.css +++ b/CMS_SC/Content/Style.css @@ -15,6 +15,59 @@ .fontSmall { font-size: 0.7em; } +/* Gestione switch*/ +/* The switch - the box around the slider */ +.switch { + position: relative; + display: inline-block; + width: 60px; + height: 34px; +} +/* Hide default HTML checkbox */ +.switch input { + display: none; +} +/* The slider */ +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + -webkit-transition: .4s; + transition: .4s; +} +.slider:before { + position: absolute; + content: ""; + height: 26px; + width: 26px; + left: 4px; + bottom: 4px; + background-color: white; + -webkit-transition: .4s; + transition: .4s; +} +input:checked + .slider { + background-color: #2196F3; +} +input:focus + .slider { + box-shadow: 0 0 1px #2196F3; +} +input:checked + .slider:before { + -webkit-transform: translateX(26px); + -ms-transform: translateX(26px); + transform: translateX(26px); +} +/* Rounded sliders */ +.slider.round { + border-radius: 34px; +} +.slider.round:before { + border-radius: 50%; +} .table > thead > tr > th, .table > tbody > tr > th, .table > tfoot > tr > th, diff --git a/CMS_SC/Content/Style.less b/CMS_SC/Content/Style.less index 27bba35..108d69f 100644 --- a/CMS_SC/Content/Style.less +++ b/CMS_SC/Content/Style.less @@ -21,6 +21,67 @@ font-size: 0.7em; } +/* Gestione switch*/ +/* The switch - the box around the slider */ +.switch { + position: relative; + display: inline-block; + width: 60px; + height: 34px; +} + + /* Hide default HTML checkbox */ + .switch input { + display: none; + } + +/* The slider */ +.slider { + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + -webkit-transition: .4s; + transition: .4s; +} + + .slider:before { + position: absolute; + content: ""; + height: 26px; + width: 26px; + left: 4px; + bottom: 4px; + background-color: white; + -webkit-transition: .4s; + transition: .4s; + } + +input:checked + .slider { + background-color: #2196F3; +} + +input:focus + .slider { + box-shadow: 0 0 1px #2196F3; +} + +input:checked + .slider:before { + -webkit-transform: translateX(26px); + -ms-transform: translateX(26px); + transform: translateX(26px); +} + +/* Rounded sliders */ +.slider.round { + border-radius: 34px; +} + + .slider.round:before { + border-radius: 50%; + } .table > thead > tr > th, .table > tbody > tr > th, diff --git a/CMS_SC/Content/Style.min.css b/CMS_SC/Content/Style.min.css index dd266af..36ab7df 100644 --- a/CMS_SC/Content/Style.min.css +++ b/CMS_SC/Content/Style.min.css @@ -1 +1 @@ -#uppFeatured{margin-top:78px}.table{margin:.25em}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#e3e3e3 0,#acacac 100%)}.table-striped>tbody>tr:nth-child(odd){background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 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}.paginatore{text-align:center;margin:auto}.paginatore>td>table>tbody>tr>td{padding:0 4px}.paginatore>td>table>tbody>tr>td>a{text-decoration:underline}body{font:12px/1.5em 'Open Sans';color:#333;background-color:#fafafa}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.divHalf{width:50%;float:left}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.bg-default{background-color:#fff}.limitText{display:inline-block;max-width:100%;overflow:hidden;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}.sc{font-weight:bold}.sc_0{color:#666}.sc_1{color:#bababa}.sc_2{color:#000}.sc_3{color:#f33}.sc_4{color:#cc6}.sc_5{color:#00bd00}.didascalia{color:#696969;font-size:7pt}.didascaliaMed{color:#696969;font-size:9pt}.menuAddNew{padding:4px;background-color:#d0eeee;font-size:1.2em}.warnRed{color:#f00}.warnOrange{color:#ffa500}.allOk{color:#008000}.running{color:#242499}.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}.navbar-brand{padding-left:20px;margin-top:-10px}.subnavbar{margin-bottom:.5em}.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-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}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#363636;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:2px;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:#33afff}.subnavbar .mainnav>li.active>a .caret{border-top-color:#33afff;border-bottom-color:#33afff}.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{min-width:160px;min-height:100px;display:inline-block;padding:8px 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:36px;color:#555}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;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-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:#666}.shortcuts .shortcut-sm: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}}.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}.hiddenBtn{height:0;width:0;visibility:hidden}.checkOk{color:#9f9}.checkKo{color:#5f2121} \ No newline at end of file +#uppFeatured{margin-top:78px}.table{margin:.25em}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#e3e3e3 0,#acacac 100%)}.table-striped>tbody>tr:nth-child(odd){background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%)}.fontSmall{font-size:.7em}.switch{position:relative;display:inline-block;width:60px;height:34px}.switch input{display:none}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s}input:checked+.slider{background-color:#2196f3}input:focus+.slider{box-shadow:0 0 1px #2196f3}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px)}.slider.round{border-radius:34px}.slider.round:before{border-radius:50%}.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}.paginatore{text-align:center;margin:auto}.paginatore>td>table>tbody>tr>td{padding:0 4px}.paginatore>td>table>tbody>tr>td>a{text-decoration:underline}body{font:12px/1.5em 'Open Sans';color:#333;background-color:#fafafa}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.divHalf{width:50%;float:left}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.bg-default{background-color:#fff}.limitText{display:inline-block;max-width:100%;overflow:hidden;-ms-text-overflow:ellipsis;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap}.sc{font-weight:bold}.sc_0{color:#666}.sc_1{color:#bababa}.sc_2{color:#000}.sc_3{color:#f33}.sc_4{color:#cc6}.sc_5{color:#00bd00}.didascalia{color:#696969;font-size:7pt}.didascaliaMed{color:#696969;font-size:9pt}.menuAddNew{padding:4px;background-color:#d0eeee;font-size:1.2em}.warnRed{color:#f00}.warnOrange{color:#ffa500}.allOk{color:#008000}.running{color:#242499}.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}.navbar-brand{padding-left:20px;margin-top:-10px}.subnavbar{margin-bottom:.5em}.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-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}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#363636;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:2px;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:#33afff}.subnavbar .mainnav>li.active>a .caret{border-top-color:#33afff;border-bottom-color:#33afff}.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{min-width:160px;min-height:100px;display:inline-block;padding:8px 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:36px;color:#555}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;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-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:#666}.shortcuts .shortcut-sm: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){body{font-size:.75em}.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){body{font-size:.7em}.subnav-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}}@media(min-width:1024px){body{font-size:.8em}}@media(min-width:1200px){body{font-size:.9em}.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}}@media(min-width:1440px){body{font-size:1em}}.table-sm td{padding:.1rem}.GridPager{background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%)}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;text-decoration:none;padding:.1rem}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold}.hiddenBtn{height:0;width:0;visibility:hidden}.checkOk{color:#9f9}.checkKo{color:#5f2121} \ No newline at end of file diff --git a/CMS_SC/ElencoSchede.aspx b/CMS_SC/ElencoSchede.aspx index ced9fad..b88b830 100644 --- a/CMS_SC/ElencoSchede.aspx +++ b/CMS_SC/ElencoSchede.aspx @@ -14,7 +14,21 @@
- <%: traduci("ElencoSchede") %> +
+
+ <%: traduci("ElencoSchede") %> +
+
+
<%:traduci("EnableDelDoss") %>
+ <%: traduci("EnableIfCompiled") %> +
+
+ +
+
diff --git a/CMS_SC/ElencoSchede.aspx.cs b/CMS_SC/ElencoSchede.aspx.cs index c733453..b87bbc5 100644 --- a/CMS_SC/ElencoSchede.aspx.cs +++ b/CMS_SC/ElencoSchede.aspx.cs @@ -23,6 +23,7 @@ namespace CMS_SC btnAddFromScheda.DataBind(); btnInsMisFasi.DataBind(); fixBtnVisibility(); + enableDel = false; } mod_righePag.eh_newNum += mod_righePag_eh_newNum; mod_elencoDossiers.eh_selezioneValore += mod_elencoDossiers_eh_selezioneValore; @@ -32,7 +33,7 @@ namespace CMS_SC if (memLayer.ML.QSS("Matricola") != "") { ((Bootstrap)this.Master).searchVal = memLayer.ML.QSS("Matricola"); - Response.Redirect(devicesAuthProxy.pagCorrente); + Response.Redirect(devicesAuthProxy.getPage(Request.Url)); } } /// @@ -57,6 +58,7 @@ namespace CMS_SC /// private void fixBtnVisibility() { + chkEnableDel.Visible = userIsAdmin; bool addVisib = mod_elencoDossiers.idxDossier != 0; divDetail.Visible = addVisib; if (addVisib) @@ -149,5 +151,40 @@ namespace CMS_SC // salvo... memLayer.ML.setSessionVal("ES_CodSchedaSel", ddlSelScheda.SelectedValue); } + + protected void chkEnableDel_CheckedChanged(object sender, EventArgs e) + { + memLayer.ML.setSessionVal("enableDelDossier", chkEnableDel.Checked); + mod_elencoDossiers.doUpdate(); + } + protected bool enableDel + { + get + { + return chkEnableDel.Checked; + } + set + { + chkEnableDel.Checked = value; + memLayer.ML.setSessionVal("enableDelDossier", value); + } + } + /// + /// determina se user sia SuperAdmin + /// + public bool userIsAdmin + { + get + { + bool answ = false; + try + { + answ = devicesAuthProxy.stObj.userHasRight("SuperAdmin"); + } + catch + { } + return answ; + } + } } } \ No newline at end of file diff --git a/CMS_SC/ElencoSchede.aspx.designer.cs b/CMS_SC/ElencoSchede.aspx.designer.cs index a6159fc..535b714 100644 --- a/CMS_SC/ElencoSchede.aspx.designer.cs +++ b/CMS_SC/ElencoSchede.aspx.designer.cs @@ -12,6 +12,15 @@ namespace CMS_SC { public partial class ElencoSchede { + /// + /// Controllo chkEnableDel. + /// + /// + /// 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.CheckBox chkEnableDel; + /// /// Controllo mod_elencoDossiers. /// diff --git a/CMS_SC/SchemaCollMacc.aspx.cs b/CMS_SC/SchemaCollMacc.aspx.cs index 2bd142d..6f6d70d 100644 --- a/CMS_SC/SchemaCollMacc.aspx.cs +++ b/CMS_SC/SchemaCollMacc.aspx.cs @@ -5,43 +5,43 @@ using System.Web.UI; namespace CMS_SC { - public partial class SchemaCollMacc : System.Web.UI.Page + public partial class SchemaCollMacc : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - btnAddNew.DataBind(); - acMacchina.DataBind(); - } - } - /// - /// url base area services - /// - public string serviceUrl(string method) - { - return string.Format("{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method); - } - /// - /// wrapper traduzione - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - - - protected void btnAddNew_Click(object sender, EventArgs e) - { - if (acMacchina.valore != "") - { - // seleziono macchina --> verifico se non ci sia scheda, se non c'è creo --> vado ad elenco con filtro su macchina e posso editare... - DtProxy.man.taED.insertQuery(acMacchina.valore, user_std.UtSn.utente); - // rimando ad elenco con filtro su matricola... - Response.Redirect(string.Format("ElencoSchede?Matricola={0}", acMacchina.valore)); - } - } + if (!Page.IsPostBack) + { + btnAddNew.DataBind(); + acMacchina.DataBind(); + } } + /// + /// url base area services + /// + public string serviceUrl(string method) + { + return string.Format("{0}/WS_data.asmx/{1}", memLayer.ML.confReadString("serviceUrl"), method); + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + + + protected void btnAddNew_Click(object sender, EventArgs e) + { + if (acMacchina.valore != "") + { + // seleziono macchina --> verifico se non ci sia scheda, se non c'è creo --> vado ad elenco con filtro su macchina e posso editare... + DtProxy.man.taED.insertQuery(acMacchina.valore, user_std.UtSn.utente); + // rimando ad elenco con filtro su matricola... + Response.Redirect(string.Format("ElencoSchede?Matricola={0}", acMacchina.valore)); + } + } + } } \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_dossier.ascx.cs b/CMS_SC/WebUserControls/mod_dossier.ascx.cs index eae20b4..a05f6d6 100644 --- a/CMS_SC/WebUserControls/mod_dossier.ascx.cs +++ b/CMS_SC/WebUserControls/mod_dossier.ascx.cs @@ -58,19 +58,26 @@ namespace CMS_SC.WebUserControls /// public void fixControls() { - if (idxDossier > 0) + try { - DS_Applicazione.ElencoDossierRow riga = DtProxy.man.taED.getByDossier(idxDossier)[0]; - txtNote.Text = riga.Note; - ddlFase.SelectedValue = riga.FaseAct; - lblRevAct.Text = riga.RevAct.ToString(); - ddlFase.Enabled = editFaseRev; - txtNote.Enabled = editFaseRev; - icnCancel.Visible = editFaseRev; - icnEdit.Visible = !editFaseRev; - lbtNewRev.Visible = editFaseRev; - lblRevAct.Visible = !editFaseRev; - lblWarn.Visible = false; + if (idxDossier > 0) + { + DS_Applicazione.ElencoDossierRow riga = DtProxy.man.taED.getByDossier(idxDossier)[0]; + txtNote.Text = riga.Note; + ddlFase.SelectedValue = riga.FaseAct; + lblRevAct.Text = riga.RevAct.ToString(); + ddlFase.Enabled = editFaseRev; + txtNote.Enabled = editFaseRev; + icnCancel.Visible = editFaseRev; + icnEdit.Visible = !editFaseRev; + lbtNewRev.Visible = editFaseRev; + lblRevAct.Visible = !editFaseRev; + lblWarn.Visible = false; + } + } + catch + { + idxDossier = 0; } } /// diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx index 35c8ef9..71dbd17 100644 --- a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx +++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoDossiers.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_elencoDossiers" %> - + diff --git a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs index badc2ee..fad1462 100644 --- a/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs +++ b/CMS_SC/WebUserControls/mod_elencoDossiers.ascx.cs @@ -109,31 +109,36 @@ namespace CMS_SC.WebUserControls } } } + protected bool enableDelDossier + { + get + { + return memLayer.ML.BoolSessionObj("enableDelDossier"); + } + } public bool userCanDel(object _idxDossier) { - // se è superuser è SEMPRE true... - bool answ = userIsAdmin; - if (!answ) + // se è superuser è true SE non ha misure... + bool answ = false; + int idxDossier = 0; + int trovati = 0; + // altrimenti verifico se sia un dossier "vuoto" e quindi eliminabile... + try { - int idxDossier = 0; - int trovati = 0; - // altrimenti verifico se sia un dossier "vuoto" e quindi eliminabile... - try - { - idxDossier = Convert.ToInt32(_idxDossier); - // cerco se ci sono record misure (NON devono esserci...) - trovati = DtProxy.man.taMis.getByDossier(idxDossier).Rows.Count; - } - catch - { } - if (trovati == 0) - { - answ = true; - } + idxDossier = Convert.ToInt32(_idxDossier); + // cerco se ci sono record misure (NON devono esserci...) + trovati = DtProxy.man.taMis.getByDossier(idxDossier).Rows.Count; } - return answ; + catch + { } + if (trovati == 0) + { + answ = true; + } + return answ || (userIsAdmin && enableDelDossier); } + /// /// determina se user sia SuperAdmin /// @@ -165,6 +170,10 @@ namespace CMS_SC.WebUserControls eh_deleteVal(this, new EventArgs()); } } - + + protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) + { + + } } } \ No newline at end of file diff --git a/CMS_SC/sql/Update_3.2.sql b/CMS_SC/sql/Update_3.2.sql index 590b4fa..88b8ce1 100644 --- a/CMS_SC/sql/Update_3.2.sql +++ b/CMS_SC/sql/Update_3.2.sql @@ -13,3 +13,8 @@ VALUES ('Settings_About','SuperAdmin','S') exec voc.stp_insNewLemma 'UpdMan','Update Manager' exec voc.stp_insNewLemma 'About','About CMS-SC' +-- 2018.03.05 aggiunta nuovi step +exec voc.stp_insNewLemma 'EnableDelDoss','Abilita Cancellazione' +exec voc.stp_insNewLemma 'EnableIfCompiled','(in presenza di record misure)' + + diff --git a/Jenkinsfile b/Jenkinsfile index 588625b..cac3871 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4233']) { + withEnv(['NEXT_BUILD_NUMBER=4234']) { // env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '3.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'CMS-SC'