diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt index 7c7f2b9..fbd032c 100644 --- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt @@ -17,3 +17,4 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..9b27ce9 Binary files /dev/null and b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 41e438c..0ef28cc 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 575222d..5a4a464 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.css +++ b/PROJ-ETS/PROJ-ETS/Content/Style.css @@ -90,6 +90,14 @@ A:hover { font-size: 10pt; font-family: Arial; } +.btnMoveBig { + background-image: url(../images/InOutArrows_l.png); + background-repeat: no-repeat; + background-position: right; + border: 1px solid #333333; + padding: 8px; + padding-right: 32px; +} .btnEditBig { background-image: url(../images/edit_l.png); background-repeat: no-repeat; diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.less b/PROJ-ETS/PROJ-ETS/Content/Style.less index d9a6a4b..6b72db6 100644 --- a/PROJ-ETS/PROJ-ETS/Content/Style.less +++ b/PROJ-ETS/PROJ-ETS/Content/Style.less @@ -109,6 +109,15 @@ A:hover { font-size: 10pt; font-family: Arial; } +.btnMoveBig +{ + background-image: url(../images/InOutArrows_l.png); + background-repeat: no-repeat; + background-position: right; + border: 1px solid #333333; + padding: 8px; + padding-right: 32px; +} .btnEditBig { background-image: url(../images/edit_l.png); diff --git a/PROJ-ETS/PROJ-ETS/Content/Style.min.css b/PROJ-ETS/PROJ-ETS/Content/Style.min.css index 9f87442..105b3bf 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}.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}.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/Images/InOutArrows_l.png b/PROJ-ETS/PROJ-ETS/Images/InOutArrows_l.png new file mode 100644 index 0000000..7bec847 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/InOutArrows_l.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/InOutArrows_m.png b/PROJ-ETS/PROJ-ETS/Images/InOutArrows_m.png new file mode 100644 index 0000000..f28b1b7 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/InOutArrows_m.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/InOutArrows_s.png b/PROJ-ETS/PROJ-ETS/Images/InOutArrows_s.png new file mode 100644 index 0000000..28cddb3 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/InOutArrows_s.png differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 29b49c5..cc2674e 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -207,6 +207,9 @@ + + + diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx b/PROJ-ETS/PROJ-ETS/Progetti.aspx index 88d430a..143e899 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx @@ -12,7 +12,9 @@
- +
+ +
diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs b/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs index d325b91..e09bb93 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx.cs +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx.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 { @@ -42,5 +43,32 @@ namespace PROJ_ETS mod_commesse1.idxProgetto = mod_progetti1.idxProgetto; showDetail(true); } + /// + /// click x andare a spostamento commesse! + /// + /// + /// + protected void btnSposta_Click(object sender, EventArgs e) + { + // salvo idxCli... + int idxCli = 0; + string nomeCli = ""; + try + { + idxCli = DataProxy_ProjEts.DP.taAP.getByIdxPrj(mod_progetti1.idxProgetto)[0].idxCliente; + } + catch + { } + // cerco di recuperare nome cliente... + try + { + nomeCli = DataProxy_ProjEts.DP.taSelCli.getByValue(idxCli)[0].label; + } + catch + { } + utils.obj.setSessionVal("idxCli_sel", idxCli); + utils.obj.setSessionVal("nomeCli_sel", nomeCli); + Response.Redirect("SpostaCommesse"); + } } } \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx index e2cedef..280bb94 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx @@ -2,7 +2,7 @@ Inherits="PROJ_ETS.WebUserControls.mod_menuBottomFullpage" %> <% if (false) { %> - +<%----%> <% } %>
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs index cab5a34..1135e97 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_menuBottomFullpage.ascx.designer.cs @@ -12,15 +12,6 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_menuBottomFullpage { - /// - /// BundleReference1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - /// /// lblDateTime control. /// diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx index 1113793..ab26961 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx @@ -34,7 +34,7 @@ - + ToolTip="Spostamento Commesse e Fasi" ImageUrl="../images/naviga_m.png" OnClick="imgDettFasi_Click" /> -<% if (false) - { %> - -<% } %> +
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs index cb17c7e..c5eb485 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs @@ -12,15 +12,6 @@ namespace PROJ_ETS.WebUserControls { public partial class mod_testata { - /// - /// BundleReference1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - /// /// lblUser control. /// diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 41e438c..0ef28cc 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 2428d9c..0a7670f 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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 71350de..0f592af 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ 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 fd5e6a9..f22baed 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 2428d9c..0a7670f 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