diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 6ee38fd..60c23ff 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.css b/PROJ-ETS/PROJ-ETS/Content/Style.css index 5a4a464..569fd16 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.css @@ -287,6 +287,24 @@ div > ul > li > a.selected.menuNav { border-width: 1px 1px 1px 1px; } /* end zona menu */ +/* zona placard valori */ +.roundedCorner { + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} +.padStd { + padding: 4px; +} +.bordoGrigio { + padding: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + border: 2px solid #696969; + background-color: #ECECEC; +} +/* end zona placard*/ /* zona colorazione filtri */ .filtro_1 { background-color: #8888ff; diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less index 6b72db6..b588918 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.less +++ b/PROJ-ETS/PROJ-ETS/Content/Style.less @@ -109,8 +109,8 @@ A:hover { font-size: 10pt; font-family: Arial; } -.btnMoveBig -{ + +.btnMoveBig { background-image: url(../images/InOutArrows_l.png); background-repeat: no-repeat; background-position: right; @@ -118,8 +118,8 @@ A:hover { padding: 8px; padding-right: 32px; } -.btnEditBig -{ + +.btnEditBig { background-image: url(../images/edit_l.png); background-repeat: no-repeat; background-position: right; @@ -127,8 +127,8 @@ A:hover { padding: 4px; padding-right: 28px; } -.btnEdit -{ + +.btnEdit { background-image: url(../images/edit_m.png); background-repeat: no-repeat; background-position: right; @@ -136,8 +136,8 @@ A:hover { padding: 4px; padding-right: 28px; } -.btnClonaBig -{ + +.btnClonaBig { background-image: url(../images/clonaObj_l.png); background-repeat: no-repeat; background-position: right; @@ -145,8 +145,8 @@ A:hover { padding: 4px; padding-right: 28px; } -.btnClona -{ + +.btnClona { background-image: url(../images/clonaObj_m.png); background-repeat: no-repeat; background-position: right; @@ -154,20 +154,19 @@ A:hover { padding: 4px; padding-right: 28px; } -.btnRosso -{ + +.btnRosso { border: solid 2px red; background-color: #FFAAAA; width: 100%; text-align: center; } -.btnRossoGrad -{ + +.btnRossoGrad { border: solid 2px red; background-color: #FFAAAA; width: 100%; text-align: center; - background-image: -webkit-gradient(linear,left top,left bottom,from( #FFAAAA ),to( #994444 )); background-image: -webkit-linear-gradient( #FFAAAA,#994444 ); background-image: -moz-linear-gradient( #FFAAAA,#994444 ); @@ -175,44 +174,41 @@ A:hover { background-image: -o-linear-gradient( #FFAAAA,#994444 ); background-image: linear-gradient( #FFAAAA,#994444 ); } -.btnArancio -{ + +.btnArancio { border: solid 2px #998800; background-color: #FFEE66; width: 100%; text-align: center; } -.btnVerde -{ + +.btnVerde { border: solid 2px green; background-color: #AAFFAA; width: 100%; text-align: center; - } -.btnVerdeGrad -{ + +.btnVerdeGrad { border: solid 2px green; background-color: #AAFFAA; text-align: center; - background-image: -webkit-gradient(linear,left top,left bottom,from( #AAFFAA ),to( #449944 )); background-image: -webkit-linear-gradient( #AAFFAA,#449944 ); background-image: -moz-linear-gradient( #AAFFAA,#449944 ); background-image: -ms-linear-gradient( #AAFFAA,#449944 ); background-image: -o-linear-gradient( #AAFFAA,#449944 ); background-image: linear-gradient( #AAFFAA,#449944 ); - } -.btnBlu -{ + +.btnBlu { border: solid 2px blue; background-color: #AAAAFF; width: 100%; text-align: center; } -.btnPreferred -{ + +.btnPreferred { font-size: 3em; border: solid 4px red; background-color: #FFACAC; @@ -222,8 +218,8 @@ A:hover { text-align: center; white-space: pre; } -.btnStd -{ + +.btnStd { font-size: 3em; color: #696969; border: solid 4px #333; @@ -335,13 +331,14 @@ li.static { } } -div > ul > li > a.selected.menuNav{ +div > ul > li > a.selected.menuNav { background-color: white; color: black; } + .areaContMenu { background-color: white; - padding:4px; + padding: 4px; border-color: #CDCDCD; border-style: solid; border-width: 1px 1px 1px 1px; @@ -350,6 +347,27 @@ div > ul > li > a.selected.menuNav{ /* end zona menu */ +/* zona placard valori */ +@roundCorner: 4px; +@padStd: 4px; + +.roundedCorner { + -moz-border-radius: @roundCorner; + -webkit-border-radius: @roundCorner; + border-radius: @roundCorner; +} + +.padStd { + padding: @padStd; +} +.bordoGrigio { + .padStd; + .roundedCorner; + border: 2px solid #696969; + background-color:#ECECEC; +} + +/* end zona placard*/ /* zona colorazione filtri */ .filtro_1 { diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css index 105b3bf..36fac27 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.min.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.min.css @@ -1 +1 @@ -@import url("MasterPage.css");@import url("ExtraComp.css");@import url("ETS.css");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;width:100%;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#faa),to(#944));background-image:-webkit-linear-gradient(#faa,#944);background-image:-moz-linear-gradient(#faa,#944);background-image:-ms-linear-gradient(#faa,#944);background-image:-o-linear-gradient(#faa,#944);background-image:linear-gradient(#faa,#944)}.btnArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.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(#494));background-image:-webkit-linear-gradient(#afa,#494);background-image:-moz-linear-gradient(#afa,#494);background-image:-ms-linear-gradient(#afa,#494);background-image:-o-linear-gradient(#afa,#494);background-image:linear-gradient(#afa,#494)}.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}.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}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.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}.fontPiccolo{font-size:8pt}.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 +@import url("MasterPage.css");@import url("ExtraComp.css");@import url("ETS.css");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;width:100%;text-align:center;background-image:-webkit-gradient(linear,left top,left bottom,from(#faa),to(#944));background-image:-webkit-linear-gradient(#faa,#944);background-image:-moz-linear-gradient(#faa,#944);background-image:-ms-linear-gradient(#faa,#944);background-image:-o-linear-gradient(#faa,#944);background-image:linear-gradient(#faa,#944)}.btnArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.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(#494));background-image:-webkit-linear-gradient(#afa,#494);background-image:-moz-linear-gradient(#afa,#494);background-image:-ms-linear-gradient(#afa,#494);background-image:-o-linear-gradient(#afa,#494);background-image:linear-gradient(#afa,#494)}.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}.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}.bordoGrigio{padding:4px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:2px solid #696969;background-color:#ececec}.filtro_1{background-color:#88f}.filtro_2{background-color:#aaf}.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}.fontPiccolo{font-size:8pt}.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 diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index db3923b..0174bd6 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -59,7 +59,7 @@
- +
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs index 4cdb8bb..bd67974 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx.cs @@ -271,6 +271,7 @@ namespace PROJ_ETS.WebUserControls protected void btnNewEmpty_Click(object sender, EventArgs e) { utils.obj.setSessionVal("idxFaseAncest", "0"); + // !!!FARE!!! gestioen insert con calcolo num commessa, ... #if false DataProxy.DP.taAF.insertQuery(idxProgetto, 0, "NuovaFase", "DescrizioneFase", false, false, 0, 0, true); #endif diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx index 9bf9dc4..1940332 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_datiComm.ascx @@ -8,22 +8,22 @@
-
+
-
+
- +
-
+
- +
-
+
due
-
+
tre
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 6ee38fd..60c23ff 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 caa1f8f..b5561bc 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/PROJ-ETS/logs/2013-05-24.log b/PROJ-ETS/PROJ-ETS/logs/2013-05-24.log new file mode 100644 index 0000000..ea1787d --- /dev/null +++ b/PROJ-ETS/PROJ-ETS/logs/2013-05-24.log @@ -0,0 +1,8 @@ +2013-05-24 08:11:25.0961 [INFO] User login: Locatelli Samuele (STEAMWAREWIN\samuele) +2013-05-24 08:11:25.3561 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente +2013-05-24 09:10:31.3009 [INFO] User login: Locatelli Samuele (STEAMWAREWIN\samuele) +2013-05-24 09:10:31.5189 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente +2013-05-24 09:13:08.7282 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente +2013-05-24 09:14:20.8933 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente +2013-05-24 09:16:10.9352 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente +2013-05-24 09:18:16.3997 [INFO] L'utente Locatelli Samuele (STEAMWAREWIN\samuele) ha effettuato il login correttamente diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache index a85040f..4f9e1c7 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll index caa1f8f..b5561bc 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ