diff --git a/ETS-WS/ETS-WS/bin/ETS-DIP.dll b/ETS-WS/ETS-WS/bin/ETS-DIP.dll index 4b8e9e4..309768a 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-DIP.dll and b/ETS-WS/ETS-WS/bin/ETS-DIP.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index 8750556..133d2a8 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ReleaseClienti/ETS-WS.zip b/ETS-WS/ReleaseClienti/ETS-WS.zip index 752c7c1..95a754b 100644 Binary files a/ETS-WS/ReleaseClienti/ETS-WS.zip and b/ETS-WS/ReleaseClienti/ETS-WS.zip differ diff --git a/ETS_Data/ETS_Data.csproj b/ETS_Data/ETS_Data.csproj index a0aef83..0206590 100644 --- a/ETS_Data/ETS_Data.csproj +++ b/ETS_Data/ETS_Data.csproj @@ -154,6 +154,7 @@ + diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index 28aa486..90e11e3 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll index 867e3ec..133d2a8 100644 Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache index 05582b7..a451686 100644 Binary files a/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/ETS/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index 28aa486..90e11e3 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.css b/PROJ-ETS/PROJ-ETS/Content/Style.css index 6872ac0..0da4533 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.css @@ -1085,3 +1085,6 @@ div > ul > li > a.selected.menuNav { vertical-align: middle; } /*#endregion */ +.lblErrore { + color: #ff0000; +} diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less index 01ac354..fcf06fd 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.less +++ b/PROJ-ETS/PROJ-ETS/Content/Style.less @@ -1210,3 +1210,6 @@ div > ul > li > a.selected.menuNav { /*#endregion */ +.lblErrore { + color: @rossoStart; +} diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css index 0cbbb3e..d98408d 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.min.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.min.css @@ -1 +1 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:Verdana,Arial;vertical-align:baseline}:focus{outline:0}body{line-height:1;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal}blockquote:before,blockquote:after,q:before,q:after{content:""}blockquote,q{quotes:"" ""}.fullscreen{display:block;top:0;left:0;width:100%;height:100%}.bottomWrite{vertical-align:bottom;border-top:#0d0083 1px solid;margin-top:2px;padding-top:2px}.smallText{font-size:8pt}.ui-dialog-sw{padding:.2em;overflow:hidden;-moz-box-shadow:0 5px 10px rgba(0,0,0,.8);-webkit-box-shadow:0 5px 10px rgba(0,0,0,.8);box-shadow:0 5px 10px rgba(0,0,0,.8)}.ui-dialog-sw .ui-dialog-sw-titlebar{padding:.5em 1em .3em;position:relative}.ui-dialog-sw .ui-dialog-sw-title{float:left;margin:.1em 16px .2em 0}.ui-dialog-sw .ui-dialog-sw-titlebar-close{position:absolute;right:.3em;top:50%;width:19px;margin:-10px 0 0 0;padding:1px;height:18px;-moz-border-radius:10px}.ui-dialog-sw .ui-dialog-sw-titlebar-close span{display:block;margin:1px}.ui-dialog-sw .ui-dialog-sw-titlebar-close:hover,.ui-dialog-sw .ui-dialog-sw-titlebar-close:focus{padding:0}.ui-dialog-sw .ui-dialog-sw-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto;zoom:1}.ui-dialog-sw .ui-dialog-sw-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin:.5em 0 0 0;padding:.3em 1em .5em .4em}.ui-dialog-sw .ui-dialog-sw-buttonpane .ui-dialog-sw-buttonset{float:right}.ui-dialog-sw .ui-dialog-sw-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog-sw .ui-resizable-se{width:14px;height:14px;right:3px;bottom:3px}.ui-draggable .ui-dialog-sw-titlebar{cursor:move}.ui-dialog-sw{padding:0}.ui-dialog-sw .ui-dialog-sw-titlebar{border-top:none;border-right:none;border-left:none;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.ui-widget-sw{font-family:Arial,sans-serif;font-size:1.1em}.ui-widget-sw .ui-widget-sw{font-size:1em}.ui-widget-sw input,.ui-widget-sw select,.ui-widget-sw textarea,.ui-widget-sw button{font-family:Arial,sans-serif;font-size:1em}.ui-widget-sw-content{border:1px solid #a8a8a8;background:#fff;color:#4f4f4f}.ui-widget-sw-header{border:1px solid #a8a8a8;background:silver url('../images/ui-bg_highlight-soft_100_c0c0c0_1x100.png') repeat-x 50% top;color:#333;font-weight:bold;text-shadow:0 1px 0 rgba(255,255,255,.7)}.ui-widget-sw-header a{color:#4f4f4f}.areaTitolo{background-color:#0a64a4;background-image:url('../images/bg-menu-main.png');background-repeat:repeat-x;color:#ececec}.priCol-1{background-color:#00b060}.priCol-2{background-color:#218457}.priCol-3{background-color:#00733e}.priCol-4{background-color:#36d88e}.priCol-5{background-color:#c3ffe4}.secColA-1{background-color:#2d9eff;background-image:-webkit-gradient(linear,left top,left bottom,from(#0a64a4),to(#4481df));background-image:-webkit-linear-gradient(#0a64a4,#4481df);background-image:-moz-linear-gradient(#0a64a4,#4481df);background-image:-ms-linear-gradient(#0a64a4,#4481df);background-image:-o-linear-gradient(#0a64a4,#4481df);background-image:linear-gradient(#0a64a4,#4481df)}.secColA-2{background-color:#24577b}.secColA-3{background-color:#03406a}.secColA-4{background-image:-webkit-gradient(linear,left top,left bottom,from(#4683ff),to(#2461bf));background-image:-webkit-linear-gradient(#4683ff,#2461bf);background-image:-moz-linear-gradient(#4683ff,#2461bf);background-image:-ms-linear-gradient(#4683ff,#2461bf);background-image:-o-linear-gradient(#4683ff,#2461bf);background-image:linear-gradient(#4683ff,#2461bf)}.secColA-5{background-image:-webkit-gradient(linear,left top,left bottom,from(#b8e1fd),to(#2461bf));background-image:-webkit-linear-gradient(#b8e1fd,#2461bf);background-image:-moz-linear-gradient(#b8e1fd,#2461bf);background-image:-ms-linear-gradient(#b8e1fd,#2461bf);background-image:-o-linear-gradient(#b8e1fd,#2461bf);background-image:linear-gradient(#b8e1fd,#2461bf)}.secColB-1{background-color:#ff9000}.secColB-2{background-color:#bf8130}.secColB-3{background-color:#a65e00}.secColB-4{background-color:#ffac40}.secColB-5{background-color:#fdd7a6}.comCol-1{background-color:#ff4500}.comCol-2{background-color:#bf5730}.comCol-3{background-color:#a62d00}.comCol-4{background-color:#ff7340}.comCol-5{background-color:#ffcebc}.lightBlue{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff)}.lightGray{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd}.headerStyle{background-color:#507cd1;font-weight:bold;color:#fff;white-space:nowrap}.footeStyle{background-color:#507cd1;font-weight:bold;color:#fff;white-space:nowrap}.footerRowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#ff7a00),to(#cc3800));background-image:-webkit-linear-gradient(#ff7a00,#cc3800);background-image:-moz-linear-gradient(#ff7a00,#cc3800);background-image:-ms-linear-gradient(#ff7a00,#cc3800);background-image:-o-linear-gradient(#ff7a00,#cc3800);background-image:linear-gradient(#ff7a00,#cc3800)}.pagerStyle{background-color:#2461bf;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff)}.editRowStyle{border:1px solid #5282de;background-image:-webkit-gradient(linear,left top,left bottom,from(#e2ebff),to(#94b4ea));background-image:-webkit-linear-gradient(#e2ebff,#94b4ea);background-image:-moz-linear-gradient(#e2ebff,#94b4ea);background-image:-ms-linear-gradient(#e2ebff,#94b4ea);background-image:-o-linear-gradient(#e2ebff,#94b4ea);background-image:linear-gradient(#e2ebff,#94b4ea)}.selectedRowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#dfd),to(#80ff80));background-image:-webkit-linear-gradient(#dfd,#80ff80);background-image:-moz-linear-gradient(#dfd,#80ff80);background-image:-ms-linear-gradient(#dfd,#80ff80);background-image:-o-linear-gradient(#dfd,#80ff80);background-image:linear-gradient(#dfd,#80ff80);font-weight:bold}.sortAscHead{background-color:#6d95e1}.sortDescHead{background-color:#4870be}.sortAscCell{background-color:#f5f7fb}.sortDescCell{background-color:#e9ebef}.divTitoloAdmin{background-color:#bf8130;padding:5px 0 5px 5px;color:#fff}A:hover{color:red}.float-left{float:left}.float-right{float:right}.divSx{float:left}.divDx{float:right}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}.padSxDx{padding-left:2px;padding-right:2px}.shadowBox{-moz-box-shadow:0 4px 8px rgba(0,0,0,.5);-webkit-box-shadow:0 4px 8px rgba(0,0,0,.5);box-shadow:0 4px 8px rgba(0,0,0,.5)}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.modalBackground{background-color:gray;filter:alpha(opacity=70);opacity:.7}.btnNew{background-image:url(../images/new_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnDelete{background-image:url(../images/elimina_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnUpdate{background-image:url(../images/reload_l.png);background-repeat:no-repeat;background-position:center right;background-color:#dedede;width:160px;height:40px;border:1px solid #333;vertical-align:middle;margin:auto;font-size:10pt;font-family:Arial}.btnMoveBig{background-image:url(../images/InOutArrows_l.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:8px;padding-right:32px}.btnEditBig{background-image:url(../images/edit_l.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnEdit{background-image:url(../images/edit_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnClonaBig{background-image:url(../images/clonaObj_l.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnClona{background-image:url(../images/clonaObj_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.btnRossoGrad{border:solid 2px red;background-color:#faa;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#faa),to(red));background-image:-webkit-linear-gradient(#faa,red);background-image:-moz-linear-gradient(#faa,red);background-image:-ms-linear-gradient(#faa,red);background-image:-o-linear-gradient(#faa,red);background-image:linear-gradient(#faa,red)}.btnArancio{border:solid 2px #e48800;background-color:#ffb44d;width:100%;text-align:center}.btnArancioGrad{border:solid 2px #e48800;background-color:#ffb44d;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#ffb44d),to(#e48800));background-image:-webkit-linear-gradient(#ffb44d,#e48800);background-image:-moz-linear-gradient(#ffb44d,#e48800);background-image:-ms-linear-gradient(#ffb44d,#e48800);background-image:-o-linear-gradient(#ffb44d,#e48800);background-image:linear-gradient(#ffb44d,#e48800)}.btnVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.btnVerdeGrad{border:solid 2px green;background-color:#afa;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#afa),to(green));background-image:-webkit-linear-gradient(#afa,green);background-image:-moz-linear-gradient(#afa,green);background-image:-ms-linear-gradient(#afa,green);background-image:-o-linear-gradient(#afa,green);background-image:linear-gradient(#afa,green)}.btnBlu{border:solid 2px blue;background-color:#aaf;width:100%;text-align:center}.btnPreferred{font-size:3em;border:solid 4px red;background-color:#ffacac;width:100%;min-height:200px;height:100%;text-align:center;white-space:pre}.btnStd{font-size:3em;color:#696969;border:solid 4px #333;background-color:#acacac;width:100%;min-height:200px;height:100%;text-align:center;white-space:pre}.btnDisabled{border:solid 2px #999;background-color:#dedede;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#dedede),to(#999));background-image:-webkit-linear-gradient(#dedede,#999);background-image:-moz-linear-gradient(#dedede,#999);background-image:-ms-linear-gradient(#dedede,#999);background-image:-o-linear-gradient(#dedede,#999);background-image:linear-gradient(#dedede,#999)}.btnGialloGrad{border:solid 2px #a93;background-color:#fe6;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#fe6),to(#a93));background-image:-webkit-linear-gradient(#fe6,#a93);background-image:-moz-linear-gradient(#fe6,#a93);background-image:-ms-linear-gradient(#fe6,#a93);background-image:-o-linear-gradient(#fe6,#a93);background-image:linear-gradient(#fe6,#a93)}.pad26{padding:2px 6px}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.badgeStd{border:solid 2px #333;background-color:#eee;width:100%;text-align:center}.badgeVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.rltUpdate{background-color:#ff3}.ui-autocomplete{max-height:200px;overflow-y:auto;overflow-x:hidden;padding-right:20px}li.static{margin:2px 4px 0 0;border-color:#cdcdcd;border-style:solid;border-width:1px 1px 0 1px;border-top-right-radius:4px;border-top-left-radius:4px}.menuNav{background-color:#e6e6e6;color:#284e98;font-size:1em;border-top-right-radius:4px;border-top-left-radius:4px}.menuNav:hover{background-color:#b5c7de;color:#000}div>ul>li>a.selected.menuNav{background-color:#fff;color:#000}.areaContMenu{background-color:#fff;padding:4px;border-color:#cdcdcd;border-style:solid;border-width:1px 1px 1px 1px}.roundedCorner{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}.padStd{padding:4px}.sfondoGrigio{background-color:#ececec}.bordoGrigio{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #818181}.bordoVerde{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid green}.bordoRosso{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid red}.bordoNero{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #000;background-color:#fff}.bordoAzzurro{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #4da3ff}.placardGrigio{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #818181;background-color:#ececec}.docIcon{background-image:url(../images/download_s.png);background-repeat:no-repeat;background-position:right;padding:2px;padding-right:16px;min-height:16px}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.filtro_2:hover{color:#88f;background-color:#dedeff}.filtro_2 a:link{color:#fff;background-color:transparent}.filtro_3{background-color:#ccf}.filtro_4{background-color:#dedeff}.filtro_5{background-color:#efefff}.tabLabelGreen{background-color:#dfd;border-top:1px solid #393;border-left:1px solid #393;border-right:1px solid #393;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGreen{background-color:#dfd;border-bottom:1px solid green;border-left:1px solid green;border-right:1px solid green}.tabLabelGray{background-color:#dedede;border-top:1px solid #333;border-left:1px solid #333;border-right:1px solid #333;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGray{background-color:#dedede;border-bottom:1px solid #000;border-left:1px solid #000;border-right:1px solid #000}.fontTitolo{font-size:24pt;height:36px}.fontMedio{font-size:16pt}.fontStd{font-size:10pt}.fontPiccolo{font-size:8pt}.fontMini{font-size:7pt}.labelInput{font-size:9pt;color:#555}.watermark{color:gray;font-style:italic}.autocomplete{width:400px;color:gray;background-color:#fff;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteHiglight{width:400px;color:#000;background-color:#ff0;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteElemID{width:400px;background-color:red;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px;border:1px solid #333}.dataBlock{background-color:#fff;font-size:9pt;float:left;border-top:solid 1px gray;border-bottom:solid 1px gray;border-left:solid 1px gray;border-right:solid 1px gray;margin:0;padding:4px;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px gray;border-bottom:solid 1px gray;border-left:solid 2px gray;border-right:solid 2px gray;background-color:#efefef;font-weight:bold;padding:2px}.dataBlockSx{float:left;text-align:left}.dataBlockDx{float:right;text-align:right}.dataBlockLabel{border-top:solid 1px #fefefe;padding-right:2px;padding-left:2px}.dataBlockValue{color:#000;font-weight:bold;padding-right:4px;padding-left:4px;margin-bottom:0}.dataBlockReset{clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetGray{border-bottom:solid 1px #cecece;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetDark{border-bottom:solid 1px #363636;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockBtn{background-color:#fafafa;border:solid 1px gray;padding-top:4px;padding-bottom:4px;vertical-align:text-top;margin:0;text-align:center}.blockSizeSmallest{width:175px}.blockSizeSmaller{width:200px}.blockSizeSmall{width:225px}.blockSizeMed{width:250px}.blockSizeLarge{width:275px}.blockSizeXLarge{width:300px}.blockSizeXXLarge{width:350px}.blockSizeXXXLarge{width:400px}.grView{color:#333;font-size:8pt;padding-left:1px;padding-right:1px;padding-top:1px;padding-bottom:1px}.ctrHeaderPager{background-color:#b8b8b8;font-weight:bold;color:#fff}.ctrHeaderPagerRight{background-color:#b8b8b8;font-weight:bold;color:#fff;text-align:right}.ctrHeaderPagerBlue{background-color:#507cd1;height:1px}.ctrHeaderPagerBlueRight{background-color:#507cd1;height:1px;text-align:right}.ctrFooter{background-color:#507cd1;font-weight:bold;color:#fff}.ctrRowStyle{vertical-align:top;background-color:#eff3fb}.valignMiddle{vertical-align:middle} \ No newline at end of file +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:Verdana,Arial;vertical-align:baseline}:focus{outline:0}body{line-height:1;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal}blockquote:before,blockquote:after,q:before,q:after{content:""}blockquote,q{quotes:"" ""}.fullscreen{display:block;top:0;left:0;width:100%;height:100%}.bottomWrite{vertical-align:bottom;border-top:#0d0083 1px solid;margin-top:2px;padding-top:2px}.smallText{font-size:8pt}.ui-dialog-sw{padding:.2em;overflow:hidden;-moz-box-shadow:0 5px 10px rgba(0,0,0,.8);-webkit-box-shadow:0 5px 10px rgba(0,0,0,.8);box-shadow:0 5px 10px rgba(0,0,0,.8)}.ui-dialog-sw .ui-dialog-sw-titlebar{padding:.5em 1em .3em;position:relative}.ui-dialog-sw .ui-dialog-sw-title{float:left;margin:.1em 16px .2em 0}.ui-dialog-sw .ui-dialog-sw-titlebar-close{position:absolute;right:.3em;top:50%;width:19px;margin:-10px 0 0 0;padding:1px;height:18px;-moz-border-radius:10px}.ui-dialog-sw .ui-dialog-sw-titlebar-close span{display:block;margin:1px}.ui-dialog-sw .ui-dialog-sw-titlebar-close:hover,.ui-dialog-sw .ui-dialog-sw-titlebar-close:focus{padding:0}.ui-dialog-sw .ui-dialog-sw-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto;zoom:1}.ui-dialog-sw .ui-dialog-sw-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin:.5em 0 0 0;padding:.3em 1em .5em .4em}.ui-dialog-sw .ui-dialog-sw-buttonpane .ui-dialog-sw-buttonset{float:right}.ui-dialog-sw .ui-dialog-sw-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog-sw .ui-resizable-se{width:14px;height:14px;right:3px;bottom:3px}.ui-draggable .ui-dialog-sw-titlebar{cursor:move}.ui-dialog-sw{padding:0}.ui-dialog-sw .ui-dialog-sw-titlebar{border-top:none;border-right:none;border-left:none;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0}.ui-widget-sw{font-family:Arial,sans-serif;font-size:1.1em}.ui-widget-sw .ui-widget-sw{font-size:1em}.ui-widget-sw input,.ui-widget-sw select,.ui-widget-sw textarea,.ui-widget-sw button{font-family:Arial,sans-serif;font-size:1em}.ui-widget-sw-content{border:1px solid #a8a8a8;background:#fff;color:#4f4f4f}.ui-widget-sw-header{border:1px solid #a8a8a8;background:silver url('../images/ui-bg_highlight-soft_100_c0c0c0_1x100.png') repeat-x 50% top;color:#333;font-weight:bold;text-shadow:0 1px 0 rgba(255,255,255,.7)}.ui-widget-sw-header a{color:#4f4f4f}.areaTitolo{background-color:#0a64a4;background-image:url('../images/bg-menu-main.png');background-repeat:repeat-x;color:#ececec}.priCol-1{background-color:#00b060}.priCol-2{background-color:#218457}.priCol-3{background-color:#00733e}.priCol-4{background-color:#36d88e}.priCol-5{background-color:#c3ffe4}.secColA-1{background-color:#2d9eff;background-image:-webkit-gradient(linear,left top,left bottom,from(#0a64a4),to(#4481df));background-image:-webkit-linear-gradient(#0a64a4,#4481df);background-image:-moz-linear-gradient(#0a64a4,#4481df);background-image:-ms-linear-gradient(#0a64a4,#4481df);background-image:-o-linear-gradient(#0a64a4,#4481df);background-image:linear-gradient(#0a64a4,#4481df)}.secColA-2{background-color:#24577b}.secColA-3{background-color:#03406a}.secColA-4{background-image:-webkit-gradient(linear,left top,left bottom,from(#4683ff),to(#2461bf));background-image:-webkit-linear-gradient(#4683ff,#2461bf);background-image:-moz-linear-gradient(#4683ff,#2461bf);background-image:-ms-linear-gradient(#4683ff,#2461bf);background-image:-o-linear-gradient(#4683ff,#2461bf);background-image:linear-gradient(#4683ff,#2461bf)}.secColA-5{background-image:-webkit-gradient(linear,left top,left bottom,from(#b8e1fd),to(#2461bf));background-image:-webkit-linear-gradient(#b8e1fd,#2461bf);background-image:-moz-linear-gradient(#b8e1fd,#2461bf);background-image:-ms-linear-gradient(#b8e1fd,#2461bf);background-image:-o-linear-gradient(#b8e1fd,#2461bf);background-image:linear-gradient(#b8e1fd,#2461bf)}.secColB-1{background-color:#ff9000}.secColB-2{background-color:#bf8130}.secColB-3{background-color:#a65e00}.secColB-4{background-color:#ffac40}.secColB-5{background-color:#fdd7a6}.comCol-1{background-color:#ff4500}.comCol-2{background-color:#bf5730}.comCol-3{background-color:#a62d00}.comCol-4{background-color:#ff7340}.comCol-5{background-color:#ffcebc}.lightBlue{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff)}.lightGray{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd}.headerStyle{background-color:#507cd1;font-weight:bold;color:#fff;white-space:nowrap}.footeStyle{background-color:#507cd1;font-weight:bold;color:#fff;white-space:nowrap}.footerRowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#ff7a00),to(#cc3800));background-image:-webkit-linear-gradient(#ff7a00,#cc3800);background-image:-moz-linear-gradient(#ff7a00,#cc3800);background-image:-ms-linear-gradient(#ff7a00,#cc3800);background-image:-o-linear-gradient(#ff7a00,#cc3800);background-image:linear-gradient(#ff7a00,#cc3800)}.pagerStyle{background-color:#2461bf;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff)}.editRowStyle{border:1px solid #5282de;background-image:-webkit-gradient(linear,left top,left bottom,from(#e2ebff),to(#94b4ea));background-image:-webkit-linear-gradient(#e2ebff,#94b4ea);background-image:-moz-linear-gradient(#e2ebff,#94b4ea);background-image:-ms-linear-gradient(#e2ebff,#94b4ea);background-image:-o-linear-gradient(#e2ebff,#94b4ea);background-image:linear-gradient(#e2ebff,#94b4ea)}.selectedRowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#dfd),to(#80ff80));background-image:-webkit-linear-gradient(#dfd,#80ff80);background-image:-moz-linear-gradient(#dfd,#80ff80);background-image:-ms-linear-gradient(#dfd,#80ff80);background-image:-o-linear-gradient(#dfd,#80ff80);background-image:linear-gradient(#dfd,#80ff80);font-weight:bold}.sortAscHead{background-color:#6d95e1}.sortDescHead{background-color:#4870be}.sortAscCell{background-color:#f5f7fb}.sortDescCell{background-color:#e9ebef}.divTitoloAdmin{background-color:#bf8130;padding:5px 0 5px 5px;color:#fff}A:hover{color:red}.float-left{float:left}.float-right{float:right}.divSx{float:left}.divDx{float:right}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}.padSxDx{padding-left:2px;padding-right:2px}.shadowBox{-moz-box-shadow:0 4px 8px rgba(0,0,0,.5);-webkit-box-shadow:0 4px 8px rgba(0,0,0,.5);box-shadow:0 4px 8px rgba(0,0,0,.5)}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.modalBackground{background-color:gray;filter:alpha(opacity=70);opacity:.7}.btnNew{background-image:url(../images/new_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnDelete{background-image:url(../images/elimina_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnUpdate{background-image:url(../images/reload_l.png);background-repeat:no-repeat;background-position:center right;background-color:#dedede;width:160px;height:40px;border:1px solid #333;vertical-align:middle;margin:auto;font-size:10pt;font-family:Arial}.btnMoveBig{background-image:url(../images/InOutArrows_l.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:8px;padding-right:32px}.btnEditBig{background-image:url(../images/edit_l.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnEdit{background-image:url(../images/edit_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnClonaBig{background-image:url(../images/clonaObj_l.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnClona{background-image:url(../images/clonaObj_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.btnRossoGrad{border:solid 2px red;background-color:#faa;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#faa),to(red));background-image:-webkit-linear-gradient(#faa,red);background-image:-moz-linear-gradient(#faa,red);background-image:-ms-linear-gradient(#faa,red);background-image:-o-linear-gradient(#faa,red);background-image:linear-gradient(#faa,red)}.btnArancio{border:solid 2px #e48800;background-color:#ffb44d;width:100%;text-align:center}.btnArancioGrad{border:solid 2px #e48800;background-color:#ffb44d;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#ffb44d),to(#e48800));background-image:-webkit-linear-gradient(#ffb44d,#e48800);background-image:-moz-linear-gradient(#ffb44d,#e48800);background-image:-ms-linear-gradient(#ffb44d,#e48800);background-image:-o-linear-gradient(#ffb44d,#e48800);background-image:linear-gradient(#ffb44d,#e48800)}.btnVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.btnVerdeGrad{border:solid 2px green;background-color:#afa;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#afa),to(green));background-image:-webkit-linear-gradient(#afa,green);background-image:-moz-linear-gradient(#afa,green);background-image:-ms-linear-gradient(#afa,green);background-image:-o-linear-gradient(#afa,green);background-image:linear-gradient(#afa,green)}.btnBlu{border:solid 2px blue;background-color:#aaf;width:100%;text-align:center}.btnPreferred{font-size:3em;border:solid 4px red;background-color:#ffacac;width:100%;min-height:200px;height:100%;text-align:center;white-space:pre}.btnStd{font-size:3em;color:#696969;border:solid 4px #333;background-color:#acacac;width:100%;min-height:200px;height:100%;text-align:center;white-space:pre}.btnDisabled{border:solid 2px #999;background-color:#dedede;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#dedede),to(#999));background-image:-webkit-linear-gradient(#dedede,#999);background-image:-moz-linear-gradient(#dedede,#999);background-image:-ms-linear-gradient(#dedede,#999);background-image:-o-linear-gradient(#dedede,#999);background-image:linear-gradient(#dedede,#999)}.btnGialloGrad{border:solid 2px #a93;background-color:#fe6;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#fe6),to(#a93));background-image:-webkit-linear-gradient(#fe6,#a93);background-image:-moz-linear-gradient(#fe6,#a93);background-image:-ms-linear-gradient(#fe6,#a93);background-image:-o-linear-gradient(#fe6,#a93);background-image:linear-gradient(#fe6,#a93)}.pad26{padding:2px 6px}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px red;background-color:#faa;width:100%;text-align:center}.badgeStd{border:solid 2px #333;background-color:#eee;width:100%;text-align:center}.badgeVerde{border:solid 2px green;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.rltUpdate{background-color:#ff3}.ui-autocomplete{max-height:200px;overflow-y:auto;overflow-x:hidden;padding-right:20px}li.static{margin:2px 4px 0 0;border-color:#cdcdcd;border-style:solid;border-width:1px 1px 0 1px;border-top-right-radius:4px;border-top-left-radius:4px}.menuNav{background-color:#e6e6e6;color:#284e98;font-size:1em;border-top-right-radius:4px;border-top-left-radius:4px}.menuNav:hover{background-color:#b5c7de;color:#000}div>ul>li>a.selected.menuNav{background-color:#fff;color:#000}.areaContMenu{background-color:#fff;padding:4px;border-color:#cdcdcd;border-style:solid;border-width:1px 1px 1px 1px}.roundedCorner{-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}.padStd{padding:4px}.sfondoGrigio{background-color:#ececec}.bordoGrigio{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #818181}.bordoVerde{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid green}.bordoRosso{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid red}.bordoNero{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #000;background-color:#fff}.bordoAzzurro{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #4da3ff}.placardGrigio{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #818181;background-color:#ececec}.docIcon{background-image:url(../images/download_s.png);background-repeat:no-repeat;background-position:right;padding:2px;padding-right:16px;min-height:16px}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.filtro_2:hover{color:#88f;background-color:#dedeff}.filtro_2 a:link{color:#fff;background-color:transparent}.filtro_3{background-color:#ccf}.filtro_4{background-color:#dedeff}.filtro_5{background-color:#efefff}.tabLabelGreen{background-color:#dfd;border-top:1px solid #393;border-left:1px solid #393;border-right:1px solid #393;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGreen{background-color:#dfd;border-bottom:1px solid green;border-left:1px solid green;border-right:1px solid green}.tabLabelGray{background-color:#dedede;border-top:1px solid #333;border-left:1px solid #333;border-right:1px solid #333;height:1.5em;vertical-align:middle;padding-top:.5em;font-size:13pt;font-weight:bold}.tabBodyGray{background-color:#dedede;border-bottom:1px solid #000;border-left:1px solid #000;border-right:1px solid #000}.fontTitolo{font-size:24pt;height:36px}.fontMedio{font-size:16pt}.fontStd{font-size:10pt}.fontPiccolo{font-size:8pt}.fontMini{font-size:7pt}.labelInput{font-size:9pt;color:#555}.watermark{color:gray;font-style:italic}.autocomplete{width:400px;color:gray;background-color:#fff;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteHiglight{width:400px;color:#000;background-color:#ff0;font-size:8pt;padding:4px 1px 4px 1px;border-bottom:1px solid #888}.autocompleteElemID{width:400px;background-color:red;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px;border:1px solid #333}.dataBlock{background-color:#fff;font-size:9pt;float:left;border-top:solid 1px gray;border-bottom:solid 1px gray;border-left:solid 1px gray;border-right:solid 1px gray;margin:0;padding:4px;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px gray;border-bottom:solid 1px gray;border-left:solid 2px gray;border-right:solid 2px gray;background-color:#efefef;font-weight:bold;padding:2px}.dataBlockSx{float:left;text-align:left}.dataBlockDx{float:right;text-align:right}.dataBlockLabel{border-top:solid 1px #fefefe;padding-right:2px;padding-left:2px}.dataBlockValue{color:#000;font-weight:bold;padding-right:4px;padding-left:4px;margin-bottom:0}.dataBlockReset{clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetGray{border-bottom:solid 1px #cecece;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockResetDark{border-bottom:solid 1px #363636;clear:both;padding-bottom:2px;margin-bottom:2px}.dataBlockBtn{background-color:#fafafa;border:solid 1px gray;padding-top:4px;padding-bottom:4px;vertical-align:text-top;margin:0;text-align:center}.blockSizeSmallest{width:175px}.blockSizeSmaller{width:200px}.blockSizeSmall{width:225px}.blockSizeMed{width:250px}.blockSizeLarge{width:275px}.blockSizeXLarge{width:300px}.blockSizeXXLarge{width:350px}.blockSizeXXXLarge{width:400px}.grView{color:#333;font-size:8pt;padding-left:1px;padding-right:1px;padding-top:1px;padding-bottom:1px}.ctrHeaderPager{background-color:#b8b8b8;font-weight:bold;color:#fff}.ctrHeaderPagerRight{background-color:#b8b8b8;font-weight:bold;color:#fff;text-align:right}.ctrHeaderPagerBlue{background-color:#507cd1;height:1px}.ctrHeaderPagerBlueRight{background-color:#507cd1;height:1px;text-align:right}.ctrFooter{background-color:#507cd1;font-weight:bold;color:#fff}.ctrRowStyle{vertical-align:top;background-color:#eff3fb}.valignMiddle{vertical-align:middle}.lblErrore{color:red} \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/Web.config b/PROJ-ETS/PROJ-ETS/Web.config index 3f56b9d..6c2050d 100644 --- a/PROJ-ETS/PROJ-ETS/Web.config +++ b/PROJ-ETS/PROJ-ETS/Web.config @@ -26,7 +26,7 @@ - + @@ -39,6 +39,7 @@ + @@ -46,7 +47,7 @@ - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx index 8894e0f..acc69c9 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx @@ -108,7 +108,7 @@
- +
@@ -116,7 +116,7 @@
- +
@@ -231,12 +231,13 @@
-
+
- + +
@@ -245,15 +246,16 @@
-
+
- + +
- +
@@ -274,7 +276,7 @@
- + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs index b1142b3..bda514f 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using ETS_Data; namespace PROJ_ETS.WebUserControls { @@ -31,9 +32,9 @@ namespace PROJ_ETS.WebUserControls string answ = ""; try { - string urlEtsDip = "http://iis01/DIP"; - string urlPage = "getDocByProto.aspx"; - string param = "nrProto"; + string urlEtsDip = utils.obj.confReadString("urlEtsDip"); + string urlPage = utils.obj.confReadString("urlPage"); + string param = utils.obj.confReadString("param"); answ = string.Format(@"{0}/{1}?{2}={3}", urlEtsDip, urlPage, param, urlDoc); } catch @@ -53,14 +54,57 @@ namespace PROJ_ETS.WebUserControls string answ = ""; try { - string urlEtsDip = "http://iis01/DIP"; - string urlPage = "GestioneDocumenti.aspx"; - answ = string.Format(@"{0}/{1}", urlEtsDip, urlPage); + string urlEtsDip = utils.obj.confReadString("urlEtsDip"); + string urlPageArch = utils.obj.confReadString("urlPageArch"); + answ = string.Format(@"{0}/{1}", urlEtsDip, urlPageArch); } catch { } return answ; } } + /// + /// in fase di update... + /// + /// + /// + protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e) + { + // controllo: se mancano descrizioni x offerta/ordine prendo numero protocollo + if (e.InputParameters["rifOfferta"] == null) + { + e.InputParameters["rifOfferta"] = e.InputParameters["urlOfferta"]; + } + if (e.InputParameters["rifOrdine"] == null) + { + e.InputParameters["rifOrdine"] = e.InputParameters["urlOrdine"]; + } + + // se vuoto num protocollo cancello testo... + if (e.InputParameters["urlOfferta"] == null) + { + e.InputParameters["rifOfferta"] = ""; + } + if (e.InputParameters["urlOrdine"] == null) + { + e.InputParameters["rifOrdine"] = ""; + } + } + /// + /// definisce visibilità da URL (se presente è ok) + /// + /// + /// + public bool urlOk(object url) + { + bool answ = false; + try + { + answ = url.ToString() != ""; + } + catch + { } + return answ; + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs index 229f561..d40052e 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_fasi.ascx.cs @@ -96,7 +96,11 @@ namespace PROJ_ETS.WebUserControls /// protected void btnNewBdgtEmpty_Click(object sender, EventArgs e) { - insertNewOne(); + int idxFase = utils.obj.IntSessionObj("idxFaseDet_sel"); + while (codTipoRisorsaFree(idxFase) != "") + { + insertNewOne(); + } } /// /// inserisce nuovo record e fa refresh @@ -122,7 +126,7 @@ namespace PROJ_ETS.WebUserControls } catch { - answ = utils.obj.confReadString("codTipoRisorsaStd"); + //answ = utils.obj.confReadString("codTipoRisorsaStd"); } return answ; } diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 28aa486..90e11e3 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index c5c9055..bf3879c 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ diff --git a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip index 32a40f6..5aae753 100644 Binary files a/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip and b/PROJ-ETS/ReleaseClienti/ETS/PROJ-ETS.zip differ