From 87439f2897a7327903dd067d715b80eb8f780497 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 3 Apr 2020 09:28:19 +0200 Subject: [PATCH 1/3] Modifica x gestione visual. condiz. TagCloud --- GPW_Admin/Content/BuildBlocks.css | 2 +- GPW_Commesse/Content/BuildBlocks.css | 6 +- GPW_Commesse/Content/BuildBlocks.less | 6 +- GPW_Commesse/Content/BuildBlocks.min.css | 2 +- .../WebUserControls/mod_TagCloudProgetti.ascx | 67 ++++++++++--------- .../mod_TagCloudProgetti.ascx.cs | 48 +++++++++++++ .../mod_TagCloudProgetti.ascx.designer.cs | 27 ++++++++ .../WebUserControls/mod_commAttivitaDesk.ascx | 6 +- .../WebUserControls/mod_commUtLog.ascx | 2 +- 9 files changed, 121 insertions(+), 45 deletions(-) diff --git a/GPW_Admin/Content/BuildBlocks.css b/GPW_Admin/Content/BuildBlocks.css index 35abb5b..42a47b5 100644 --- a/GPW_Admin/Content/BuildBlocks.css +++ b/GPW_Admin/Content/BuildBlocks.css @@ -1038,7 +1038,7 @@ /* Tag Cloud */ #tagCloud { border: solid 1px #ccc; - padding: 0.4rem; + /*padding: 0.4rem;*/ margin-bottom: 1rem; text-align: justify; line-height: 1.2rem; diff --git a/GPW_Commesse/Content/BuildBlocks.css b/GPW_Commesse/Content/BuildBlocks.css index aa29372..4371fce 100644 --- a/GPW_Commesse/Content/BuildBlocks.css +++ b/GPW_Commesse/Content/BuildBlocks.css @@ -626,8 +626,6 @@ background-color: #FFFFFF; font-size: 9pt; border: solid 1px gray; - margin: 0; - padding: 0.3em; vertical-align: text-top; text-align: left; } @@ -808,8 +806,8 @@ /* end gestione barcode full page */ /* Tag Cloud */ #tagCloud { - border: solid 1px #ccc; - padding: 0.2rem; + /*border: solid 1px #ccc;*/ + /*padding: 0.2rem;*/ margin-bottom: 0.4rem; text-align: justify; line-height: 1.1rem; diff --git a/GPW_Commesse/Content/BuildBlocks.less b/GPW_Commesse/Content/BuildBlocks.less index 6245335..5d1fe77 100644 --- a/GPW_Commesse/Content/BuildBlocks.less +++ b/GPW_Commesse/Content/BuildBlocks.less @@ -746,8 +746,6 @@ background-color: #FFFFFF; font-size: 9pt; border: solid 1px gray; - margin: 0; - padding: 0.3em; vertical-align: text-top; text-align: left; } @@ -969,8 +967,8 @@ /* Tag Cloud */ #tagCloud { - border: solid 1px #ccc; - padding: 0.2rem; + /*border: solid 1px #ccc;*/ + /*padding: 0.2rem;*/ margin-bottom: 0.4rem; text-align: justify; line-height: 1.1rem; diff --git a/GPW_Commesse/Content/BuildBlocks.min.css b/GPW_Commesse/Content/BuildBlocks.min.css index 828dbee..92af87c 100644 --- a/GPW_Commesse/Content/BuildBlocks.min.css +++ b/GPW_Commesse/Content/BuildBlocks.min.css @@ -1 +1 @@ -.divSx{float:left;padding:0;margin:0}.divDx{float:right;padding:0;margin:0}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}#accordion .ui-accordion-content{padding:.5em .5em}.sv{text-align:center;height:20px;background-image:url(../images/verde_20.png)}.sb{text-align:center;height:20px;background-image:url(../images/blu_20.png)}.sa{text-align:center;height:20px;background-image:url(../images/arancio_20.png)}.sg{text-align:center;height:20px;background-image:url(../images/giallo_20.png)}.sr{text-align:center;height:20px;background-image:url(../images/rosso_20.png);color:#fff}.ss{text-align:center;height:20px;background-image:url(../images/grigio_20.png);color:#fff}.sv80{text-align:center;height:80px;background-image:url(../images/verde_80.png)}.sb80{text-align:center;height:80px;background-image:url(../images/blu_80.png)}.sa80{text-align:center;height:80px;background-image:url(../images/arancio_80.png)}.sg80{text-align:center;height:80px;background-image:url(../images/giallo_80.png)}.sr80{text-align:center;height:80px;background-image:url(../images/rosso_80.png);color:#fff}.ss80{text-align:center;height:80px;background-image:url(../images/grigio_80.png);color:#fff}.twoThird{width:67%}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.noLink{text-decoration:none !important}.headerStyle{background-color:#507cd1;font-weight:bold;color:#fff;white-space:nowrap}.pagerStyle{background-color:#2461bf;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.editRowStyle{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)}.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}.headerStyleRed{background-color:#d17c50;font-weight:bold;color:#fff;white-space:nowrap}.footerStyleRed{background-color:#d17c50;font-weight:bold;color:#fff;white-space:nowrap}.pagerStyleRed{background-color:#bf6124;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.rowStyleRed{background-color:#eae2de}.alternatingRowStyleRed{background-color:#fff}.editRowStyleRed{background-color:#bf6124}.selectedRowStyleRed{background-color:#f1ddd1;font-weight:bold}.sortAscHeadRed{background-color:#e1956d}.sortDescHeadRed{background-color:#be7048}.sortAscCellRed{background-color:#fbf7f5}.sortDescCellRed{background-color:#efebe9}.headerStyleGreen{background-color:#7cd150;font-weight:bold;color:#fff;white-space:nowrap}.footerStyleGreen{background-color:#7cd150;font-weight:bold;color:#fff;white-space:nowrap}.pagerStyleGreen{background-color:#61bf24;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.rowStyleGreen{background-color:#e2eade}.alternatingRowStyleGreen{background-color:#fff}.editRowStyleGreen{background-color:#61bf24}.selectedRowStyleGreen{background-color:#ddf1d1;font-weight:bold}.sortAscHeadGreen{background-color:#95e16d}.sortDescHeadGreen{background-color:#70be48}.sortAscCellGreen{background-color:#f7fbf5}.sortDescCellGreen{background-color:#ebefe9}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px #f00;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 #008000;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.modalBackground{background-color:#808080;filter:alpha(opacity=70);opacity:.7}.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)}.placardSteamware{background-image:url(../images/logo_sw.png);background-repeat:no-repeat;background-position:top left;padding-bottom:128px;min-height:200px}.btnHomeLogo{background-image:url(../images/time.png);background-repeat:no-repeat;background-position:top;padding-bottom:128px;margin-top:10px}.btnHomeBarcode{background-image:url(../images/barcode.png);background-repeat:no-repeat;background-position:bottom;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnHomeAdmin{background-image:url(../images/adminRed.png);background-repeat:no-repeat;background-position:top;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnHomeSmart{background-image:url(../images/smart.png);background-repeat:no-repeat;background-position:bottom;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnHomeUser{background-image:url(../images/user.png);background-repeat:no-repeat;background-position:top;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnChiudi{background-image:url(../images/cancel_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.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}.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}.btnNaviga{background-image:url(../images/naviga_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnExportCSV{background-color:#dedede;background-image:url(../images/download_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:24px;font-size:10pt}.btnRosso{border:solid 2px #f00;background-color:#faa;width:100%;text-align:center}.btnRossoGrad{border:solid 2px #f00;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 #008000;background-color:#afa;width:100%;text-align:center}.btnVerdeGrad{border:solid 2px #008000;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 #00f;background-color:#aaf;width:100%;text-align:center}.btnPreferred{font-size:3em;border:solid 4px #f00;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}.bottomWrite{font-size:8pt}.lblWarning{color:#f00}.menuNav{background-color:#b5c7de;color:#284e98;font-size:1.2em}.menuNavSel{background-color:#507cd1}.menuItem{width:200px}.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 #008000;border-left:1px solid #008000;border-right:1px solid #008000}.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:44pt;height:36px}.fontMedio{font-size:16pt}.fontNormale{font-size:10pt}.fontPiccolo{font-size:8pt}.labelInput{font-size:9pt;color:#555}.watermark{color:#808080;font-style:italic}.autocomplete{width:400px;color:#808080;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{background-color:#f00;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px}.dataBlock{background-color:#fff;font-size:9pt;border:solid 1px #808080;margin:0;padding:.3em;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px #808080;border-bottom:solid 1px #808080;border-left:solid 2px #808080;border-right:solid 2px #808080;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;font-weight:normal}.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 #808080;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}.blockSpac{padding:.3em;margin-bottom:.5em;width:100%}.grView{color:#333;font-size:8pt;padding: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}.stileAttesa{background:#aaa;text-align:center}.stileComandoOk{background:#afa;text-align:center}.stileComandoKo{background:#faa;text-align:center}.stileComandoAdd{background:#aaf;text-align:center}.stileComandoND{background:#ffa;text-align:center}.clockBar{color:#9cc0ff;background-image:-webkit-gradient(linear,left top,left bottom,from(#999),to(#000));background-image:-webkit-linear-gradient(#999,#000);background-image:-moz-linear-gradient(#999,#000);background-image:-ms-linear-gradient(#999,#000);background-image:-o-linear-gradient(#999,#000);background-image:linear-gradient(#999,#000)}.fullPageHeader{border-bottom:solid 2px #000;background-color:#6c90ff;font-weight:bold}.msgBoxBarcode{border-top:solid 2px #000;border-bottom:solid 2px #000;background-color:#e5e5e5}.stileErr01{background:#f63;text-align:center}.stileErr02{background:#fa7;text-align:center}.stileErr03{background:#f30;text-align:center}#tagCloud{border:solid 1px #ccc;padding:.2rem;margin-bottom:.4rem;text-align:justify;line-height:1.1rem;font-size:.9em}#tagCloud A{text-decoration:none;margin-left:.2rem;margin-right:.2rem;border:1px solid #fff}#tagCloud A:hover{border:1px solid #4683ff;background-color:#c8ddff}#tagCloud A.w1{color:#f90;font-size:1.9em;font-weight:bolder}#tagCloud A.w2{color:#4169e1;font-size:1.5em;font-weight:bolder}#tagCloud A.w3{color:#009eff;font-size:1.4em;font-weight:bolder}#tagCloud A.w4{color:#4188cf;font-size:1.2em}#tagCloud A.w5{color:#83bcd8;font-size:1em}#tagCloud A.e1{color:#d88100}#tagCloud A.e2{color:#7d4b00}#tagCloud A.e3{color:#0b2055}#tagCloud A.e4{color:#4188cf}#tagCloud A.e5{color:#83bcd8}#tagCloud A.p1{color:#f90;font-size:1.9em;font-weight:bolder;min-width:100%;text-align:center;text-wrap:none;background-color:#ffe5c3;margin:2px 0;min-height:3em}#tagCloud A.p2{color:#4169e1;font-size:1.5em;font-weight:bolder;width:48%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#e6ecfc;min-height:3em}#tagCloud A.p3{color:#009eff;font-size:1.4em;font-weight:bolder;width:32%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#c3e9ff;min-height:3em}#tagCloud A.p4{color:#4188cf;font-size:1.2em;width:23%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#d7e6f5;min-height:2em}#tagCloud A.p5{color:#83bcd8;font-size:1em;width:18%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#f8fbfc;min-height:2em}#tagCloud A.p6{color:#83bcd8;font-size:1em;width:16.6%}#tagCloud A.p7{color:#83bcd8;font-size:.9em;width:10%} \ No newline at end of file +.divSx{float:left;padding:0;margin:0}.divDx{float:right;padding:0;margin:0}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto}.clearDiv{clear:both}#accordion .ui-accordion-content{padding:.5em .5em}.sv{text-align:center;height:20px;background-image:url(../images/verde_20.png)}.sb{text-align:center;height:20px;background-image:url(../images/blu_20.png)}.sa{text-align:center;height:20px;background-image:url(../images/arancio_20.png)}.sg{text-align:center;height:20px;background-image:url(../images/giallo_20.png)}.sr{text-align:center;height:20px;background-image:url(../images/rosso_20.png);color:#fff}.ss{text-align:center;height:20px;background-image:url(../images/grigio_20.png);color:#fff}.sv80{text-align:center;height:80px;background-image:url(../images/verde_80.png)}.sb80{text-align:center;height:80px;background-image:url(../images/blu_80.png)}.sa80{text-align:center;height:80px;background-image:url(../images/arancio_80.png)}.sg80{text-align:center;height:80px;background-image:url(../images/giallo_80.png)}.sr80{text-align:center;height:80px;background-image:url(../images/rosso_80.png);color:#fff}.ss80{text-align:center;height:80px;background-image:url(../images/grigio_80.png);color:#fff}.twoThird{width:67%}.half{width:50%}.third{width:33%}.quarter{width:25%}.fifth{width:20%}.noLink{text-decoration:none !important}.headerStyle{background-color:#507cd1;font-weight:bold;color:#fff;white-space:nowrap}.pagerStyle{background-color:#2461bf;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.editRowStyle{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)}.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}.headerStyleRed{background-color:#d17c50;font-weight:bold;color:#fff;white-space:nowrap}.footerStyleRed{background-color:#d17c50;font-weight:bold;color:#fff;white-space:nowrap}.pagerStyleRed{background-color:#bf6124;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.rowStyleRed{background-color:#eae2de}.alternatingRowStyleRed{background-color:#fff}.editRowStyleRed{background-color:#bf6124}.selectedRowStyleRed{background-color:#f1ddd1;font-weight:bold}.sortAscHeadRed{background-color:#e1956d}.sortDescHeadRed{background-color:#be7048}.sortAscCellRed{background-color:#fbf7f5}.sortDescCellRed{background-color:#efebe9}.headerStyleGreen{background-color:#7cd150;font-weight:bold;color:#fff;white-space:nowrap}.footerStyleGreen{background-color:#7cd150;font-weight:bold;color:#fff;white-space:nowrap}.pagerStyleGreen{background-color:#61bf24;color:#fff;white-space:nowrap;text-align:center;margin:auto;font-size:medium}.rowStyleGreen{background-color:#e2eade}.alternatingRowStyleGreen{background-color:#fff}.editRowStyleGreen{background-color:#61bf24}.selectedRowStyleGreen{background-color:#ddf1d1;font-weight:bold}.sortAscHeadGreen{background-color:#95e16d}.sortDescHeadGreen{background-color:#70be48}.sortAscCellGreen{background-color:#f7fbf5}.sortDescCellGreen{background-color:#ebefe9}.textArancio{color:#fa3}.textAzzurro{color:#36f}.textNero{color:#000}.textGrigio{color:#888}.badgeRosso{border:solid 2px #f00;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 #008000;background-color:#afa;width:100%;text-align:center}.badgeArancio{border:solid 2px #980;background-color:#fe6;width:100%;text-align:center}.modalBackground{background-color:#808080;filter:alpha(opacity=70);opacity:.7}.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)}.placardSteamware{background-image:url(../images/logo_sw.png);background-repeat:no-repeat;background-position:top left;padding-bottom:128px;min-height:200px}.btnHomeLogo{background-image:url(../images/time.png);background-repeat:no-repeat;background-position:top;padding-bottom:128px;margin-top:10px}.btnHomeBarcode{background-image:url(../images/barcode.png);background-repeat:no-repeat;background-position:bottom;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnHomeAdmin{background-image:url(../images/adminRed.png);background-repeat:no-repeat;background-position:top;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnHomeSmart{background-image:url(../images/smart.png);background-repeat:no-repeat;background-position:bottom;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnHomeUser{background-image:url(../images/user.png);background-repeat:no-repeat;background-position:top;padding-bottom:128px;min-height:200px;height:100%;width:100%}.btnChiudi{background-image:url(../images/cancel_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.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}.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}.btnNaviga{background-image:url(../images/naviga_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:28px}.btnExportCSV{background-color:#dedede;background-image:url(../images/download_m.png);background-repeat:no-repeat;background-position:right;border:1px solid #333;padding:4px;padding-right:24px;font-size:10pt}.btnRosso{border:solid 2px #f00;background-color:#faa;width:100%;text-align:center}.btnRossoGrad{border:solid 2px #f00;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 #008000;background-color:#afa;width:100%;text-align:center}.btnVerdeGrad{border:solid 2px #008000;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 #00f;background-color:#aaf;width:100%;text-align:center}.btnPreferred{font-size:3em;border:solid 4px #f00;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}.bottomWrite{font-size:8pt}.lblWarning{color:#f00}.menuNav{background-color:#b5c7de;color:#284e98;font-size:1.2em}.menuNavSel{background-color:#507cd1}.menuItem{width:200px}.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 #008000;border-left:1px solid #008000;border-right:1px solid #008000}.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:44pt;height:36px}.fontMedio{font-size:16pt}.fontNormale{font-size:10pt}.fontPiccolo{font-size:8pt}.labelInput{font-size:9pt;color:#555}.watermark{color:#808080;font-style:italic}.autocomplete{width:400px;color:#808080;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{background-color:#f00;font-weight:bold}.autocompleteListCssClass{width:400px;font-size:8pt;background-color:#fff;padding:2px 2px 2px 2px}.dataBlock{background-color:#fff;font-size:9pt;border:solid 1px #808080;vertical-align:text-top;text-align:left}.dataBlockHeader{border-top:solid 2px #808080;border-bottom:solid 1px #808080;border-left:solid 2px #808080;border-right:solid 2px #808080;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;font-weight:normal}.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 #808080;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}.blockSpac{padding:.3em;margin-bottom:.5em;width:100%}.grView{color:#333;font-size:8pt;padding: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}.stileAttesa{background:#aaa;text-align:center}.stileComandoOk{background:#afa;text-align:center}.stileComandoKo{background:#faa;text-align:center}.stileComandoAdd{background:#aaf;text-align:center}.stileComandoND{background:#ffa;text-align:center}.clockBar{color:#9cc0ff;background-image:-webkit-gradient(linear,left top,left bottom,from(#999),to(#000));background-image:-webkit-linear-gradient(#999,#000);background-image:-moz-linear-gradient(#999,#000);background-image:-ms-linear-gradient(#999,#000);background-image:-o-linear-gradient(#999,#000);background-image:linear-gradient(#999,#000)}.fullPageHeader{border-bottom:solid 2px #000;background-color:#6c90ff;font-weight:bold}.msgBoxBarcode{border-top:solid 2px #000;border-bottom:solid 2px #000;background-color:#e5e5e5}.stileErr01{background:#f63;text-align:center}.stileErr02{background:#fa7;text-align:center}.stileErr03{background:#f30;text-align:center}#tagCloud{margin-bottom:.4rem;text-align:justify;line-height:1.1rem;font-size:.9em}#tagCloud A{text-decoration:none;margin-left:.2rem;margin-right:.2rem;border:1px solid #fff}#tagCloud A:hover{border:1px solid #4683ff;background-color:#c8ddff}#tagCloud A.w1{color:#f90;font-size:1.9em;font-weight:bolder}#tagCloud A.w2{color:#4169e1;font-size:1.5em;font-weight:bolder}#tagCloud A.w3{color:#009eff;font-size:1.4em;font-weight:bolder}#tagCloud A.w4{color:#4188cf;font-size:1.2em}#tagCloud A.w5{color:#83bcd8;font-size:1em}#tagCloud A.e1{color:#d88100}#tagCloud A.e2{color:#7d4b00}#tagCloud A.e3{color:#0b2055}#tagCloud A.e4{color:#4188cf}#tagCloud A.e5{color:#83bcd8}#tagCloud A.p1{color:#f90;font-size:1.9em;font-weight:bolder;min-width:100%;text-align:center;text-wrap:none;background-color:#ffe5c3;margin:2px 0;min-height:3em}#tagCloud A.p2{color:#4169e1;font-size:1.5em;font-weight:bolder;width:48%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#e6ecfc;min-height:3em}#tagCloud A.p3{color:#009eff;font-size:1.4em;font-weight:bolder;width:32%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#c3e9ff;min-height:3em}#tagCloud A.p4{color:#4188cf;font-size:1.2em;width:23%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#d7e6f5;min-height:2em}#tagCloud A.p5{color:#83bcd8;font-size:1em;width:18%;text-align:center;float:left;margin:2px 2px;text-wrap:none;background-color:#f8fbfc;min-height:2em}#tagCloud A.p6{color:#83bcd8;font-size:1em;width:16.6%}#tagCloud A.p7{color:#83bcd8;font-size:.9em;width:10%} \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx index 824878c..4785b79 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx @@ -1,6 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_TagCloudProgetti.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_TagCloudProgetti" %> -
+
+
@@ -12,8 +13,12 @@ + +
-
+
+
+
<%--Modo standard: tag cloud--%> @@ -43,33 +48,33 @@
-
-
- - elenco - elencoCPF - piramide - standard - -
-
- - 5 - 10 - 15 - 20 - 25 - 30 - -
+
+
+
+ + elenco + elencoCPF + piramide + standard +
-
- - - - - - <%----%> - - - +
+ + 5 + 10 + 15 + 20 + 25 + 30 + +
+
+ + + + + + <%----%> + + + diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs index fc1ce5d..0af484b 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs @@ -34,6 +34,32 @@ namespace GPW_Commesse.WebUserControls } } /// + /// valore in sessione dello show add new + /// + public bool showAdd + { + get + { + bool answ = memLayer.ML.BoolSessionObj("showAddNewRec"); + return answ; + } + set + { + memLayer.ML.setSessionVal("showAddNewRec", value); + setShowAdd(); + } + } + /// + /// sistema visualizzazione + /// + protected void setShowAdd() + { + // sistemo buttons & display... + lbtToggleOn.Visible = showAdd; + lbtToggleOff.Visible = !showAdd; + tagBlock.Visible = showAdd; + } + /// /// load pagina /// /// @@ -47,6 +73,18 @@ namespace GPW_Commesse.WebUserControls { modo = TagCloudMode.standard; } + setShowAdd(); +#if false + // verifico se mostrare addnew... + if (!memLayer.ML.isInSessionObject("showAddNewRec")) + { + showAdd = memLayer.ML.BoolSessionObj("showAddNewRec"); + } + else + { + showAdd = true; + } +#endif } } @@ -259,6 +297,16 @@ namespace GPW_Commesse.WebUserControls eh_refresh(this, new EventArgs()); } } + + protected void lbtToggleOn_Click(object sender, EventArgs e) + { + showAdd = !showAdd; + } + + protected void lbtToggleOff_Click(object sender, EventArgs e) + { + showAdd = !showAdd; + } } public enum TagCloudMode diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs index dac39d3..8c9b7b6 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs @@ -23,6 +23,33 @@ namespace GPW_Commesse.WebUserControls /// protected global::System.Web.UI.WebControls.RadioButtonList rblOre; + /// + /// Controllo lbtToggleOn. + /// + /// + /// 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.LinkButton lbtToggleOn; + + /// + /// Controllo lbtToggleOff. + /// + /// + /// 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.LinkButton lbtToggleOff; + + /// + /// Controllo tagBlock. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl tagBlock; + /// /// Controllo repTagCloud. /// diff --git a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx index 8930aa3..49d83e7 100644 --- a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx +++ b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx @@ -3,10 +3,10 @@ <%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc1" %> <%@ Register Src="mod_autocomplete.ascx" TagPrefix="uc2" TagName="mod_autocomplete" %> - - + +
- +
diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx index 707b698..7b73e8d 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx @@ -121,7 +121,7 @@
-
+
From d51ecd60019708eb86be9abc5074fa8307582f31 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 3 Apr 2020 09:48:36 +0200 Subject: [PATCH 2/3] Inserito componente toggle x selezione generico --- GPW_Commesse/GPW_Commesse.csproj | 8 ++ GPW_Commesse/WebUserControls/cmp_toggle.ascx | 5 + .../WebUserControls/cmp_toggle.ascx.cs | 130 ++++++++++++++++++ .../cmp_toggle.ascx.designer.cs | 44 ++++++ .../WebUserControls/mod_TagCloudProgetti.ascx | 5 +- .../mod_TagCloudProgetti.ascx.cs | 25 ++-- .../mod_TagCloudProgetti.ascx.designer.cs | 13 +- 7 files changed, 203 insertions(+), 27 deletions(-) create mode 100644 GPW_Commesse/WebUserControls/cmp_toggle.ascx create mode 100644 GPW_Commesse/WebUserControls/cmp_toggle.ascx.cs create mode 100644 GPW_Commesse/WebUserControls/cmp_toggle.ascx.designer.cs diff --git a/GPW_Commesse/GPW_Commesse.csproj b/GPW_Commesse/GPW_Commesse.csproj index c77a12e..0bb4a4b 100644 --- a/GPW_Commesse/GPW_Commesse.csproj +++ b/GPW_Commesse/GPW_Commesse.csproj @@ -441,6 +441,7 @@ + @@ -606,6 +607,13 @@ AjaxSimpleFull.Master + + cmp_toggle.ascx + ASPXCodeBehind + + + cmp_toggle.ascx + mod_autocomplete.ascx ASPXCodeBehind diff --git a/GPW_Commesse/WebUserControls/cmp_toggle.ascx b/GPW_Commesse/WebUserControls/cmp_toggle.ascx new file mode 100644 index 0000000..c60b13d --- /dev/null +++ b/GPW_Commesse/WebUserControls/cmp_toggle.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_toggle.ascx.cs" Inherits="GPW_Commesse.WebUserControls.cmp_toggle" %> + + + + \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/cmp_toggle.ascx.cs b/GPW_Commesse/WebUserControls/cmp_toggle.ascx.cs new file mode 100644 index 0000000..90a0549 --- /dev/null +++ b/GPW_Commesse/WebUserControls/cmp_toggle.ascx.cs @@ -0,0 +1,130 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GPW_Commesse.WebUserControls +{ + public partial class cmp_toggle : System.Web.UI.UserControl + { + /// + /// Evento toggle + /// + public event EventHandler ehToggle; + /// + /// Tooltip x toggle ON + /// + public string tooltipOn + { + get + { + return lbtToggleOn.ToolTip; + } + set + { + lbtToggleOn.ToolTip = value; + } + } + /// + /// Tooltip x toggle OFF + /// + public string tooltipOff + { + get + { + return lbtToggleOff.ToolTip; + } + set + { + lbtToggleOff.ToolTip = value; + } + } + + /// + /// Classe x toggle ON + /// + public string classOn + { + get + { + return lbtToggleOn.CssClass; + } + set + { + lbtToggleOn.CssClass = value; + } + } + /// + /// Classe x toggle OFF + /// + public string classOff + { + get + { + return lbtToggleOff.CssClass; + } + set + { + lbtToggleOff.CssClass = value; + } + } + + + /// + /// caricamento apgina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + fixDisplay(); + } + } + + /// + /// valore toggle + /// + public bool toggleValue + { + get + { + bool answ = false; + bool.TryParse(hfValue.Value, out answ); + return answ; + } + set + { + hfValue.Value = value.ToString(); + fixDisplay(); + if (ehToggle != null) + { + ehToggle(this, new EventArgs()); + } + } + } + /// + /// sistema visualizzazione + /// + private void fixDisplay() + { + // sistemo buttons & display... + bool doShow = toggleValue; + lbtToggleOn.Visible = doShow; + lbtToggleOff.Visible = !doShow; + } + + protected void lbtToggleOn_Click(object sender, EventArgs e) + { + toggleValue = !toggleValue; + } + + protected void lbtToggleOff_Click(object sender, EventArgs e) + { + toggleValue = !toggleValue; + } + } +} \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/cmp_toggle.ascx.designer.cs b/GPW_Commesse/WebUserControls/cmp_toggle.ascx.designer.cs new file mode 100644 index 0000000..b50ca5c --- /dev/null +++ b/GPW_Commesse/WebUserControls/cmp_toggle.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace GPW_Commesse.WebUserControls +{ + + + public partial class cmp_toggle + { + + /// + /// Controllo hfValue. + /// + /// + /// 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.HiddenField hfValue; + + /// + /// Controllo lbtToggleOn. + /// + /// + /// 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.LinkButton lbtToggleOn; + + /// + /// Controllo lbtToggleOff. + /// + /// + /// 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.LinkButton lbtToggleOff; + } +} diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx index 4785b79..8e78fb4 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx @@ -1,4 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_TagCloudProgetti.ascx.cs" Inherits="GPW_Commesse.WebUserControls.mod_TagCloudProgetti" %> +<%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc1" TagName="cmp_toggle" %> +
@@ -13,8 +15,7 @@ - - +
diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs index 0af484b..6bc308e 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.cs @@ -54,9 +54,6 @@ namespace GPW_Commesse.WebUserControls /// protected void setShowAdd() { - // sistemo buttons & display... - lbtToggleOn.Visible = showAdd; - lbtToggleOff.Visible = !showAdd; tagBlock.Visible = showAdd; } /// @@ -73,19 +70,19 @@ namespace GPW_Commesse.WebUserControls { modo = TagCloudMode.standard; } + cmp_toggle.toggleValue = showAdd; setShowAdd(); -#if false - // verifico se mostrare addnew... - if (!memLayer.ML.isInSessionObject("showAddNewRec")) - { - showAdd = memLayer.ML.BoolSessionObj("showAddNewRec"); - } - else - { - showAdd = true; - } -#endif } + cmp_toggle.ehToggle += Cmp_toggle_ehToggle; + } + /// + /// Gestione evento toggle + /// + /// + /// + private void Cmp_toggle_ehToggle(object sender, EventArgs e) + { + showAdd = cmp_toggle.toggleValue; } /// diff --git a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs index 8c9b7b6..6534da4 100644 --- a/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_TagCloudProgetti.ascx.designer.cs @@ -24,22 +24,13 @@ namespace GPW_Commesse.WebUserControls protected global::System.Web.UI.WebControls.RadioButtonList rblOre; /// - /// Controllo lbtToggleOn. + /// Controllo cmp_toggle. /// /// /// 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.LinkButton lbtToggleOn; - - /// - /// Controllo lbtToggleOff. - /// - /// - /// 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.LinkButton lbtToggleOff; + protected global::GPW_Commesse.WebUserControls.cmp_toggle cmp_toggle; /// /// Controllo tagBlock. From 8648ffc132a319ead84ab871c6bb007bbf45226d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 3 Apr 2020 09:52:48 +0200 Subject: [PATCH 3/3] Update vers number + pulizia if false vari --- .../mod_commAttivitaDesk.ascx.cs | 1223 ++++++++--------- GPW_Data/utils.cs | 36 - GPW_Smart/Site.Master.cs | 24 - GPW_Smart/WebUserControls/cmp_menuTop.ascx.cs | 21 - .../WebUserControls/mod_timbrature.ascx.cs | 9 - Jenkinsfile | 2 +- 6 files changed, 607 insertions(+), 708 deletions(-) diff --git a/GPW_Admin/WebUserControls/mod_commAttivitaDesk.ascx.cs b/GPW_Admin/WebUserControls/mod_commAttivitaDesk.ascx.cs index 274cde6..5babab4 100644 --- a/GPW_Admin/WebUserControls/mod_commAttivitaDesk.ascx.cs +++ b/GPW_Admin/WebUserControls/mod_commAttivitaDesk.ascx.cs @@ -10,626 +10,615 @@ using System.Data; namespace GPW_Admin.WebUserControls { - public partial class mod_commAttivitaDesk : System.Web.UI.UserControl + public partial class mod_commAttivitaDesk : System.Web.UI.UserControl + { + + #region area protected / private + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + refreshControlli(); + pnlHeader.Visible = enableFull; + lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", valoreDateTime); + } + } + /// + /// minuti selezionati nel controllo radio in testa + /// + protected int minutiSel + { + get + { + return memLayer.ML.IntSessionObj("stdMinDurata"); + } + set + { + memLayer.ML.setSessionVal("stdMinDurata", value); + } + } + /// + /// refresh dei controlli + /// + private void refreshControlli() + { + bool doDataBound = true; + switch (stato) + { + case statoControllo.edit: + doDataBound = true; + //grView.ShowFooter = false; + //grView.SelectedIndex = grView.EditIndex; + //int idxRASel = Convert.ToInt32(grView.SelectedDataKey["idxRA"]); + //// pre-seleziono idx progetto x ods fase... + //idxFaseSel = DataProxy.DP.taRA.getByKey(idxRASel)[0].idxFase; + //idxProjSel = idxPrjByFase(idxFaseSel); + break; + case statoControllo.insert: + grView.ShowFooter = true; + grView.DataBind(); + // imposto arrotondato ad ora... + DateTime inizio = valoreDateTime.Date.AddHours(DateTime.Now.Hour); + // imposto durate standard! + int minuti = minutiSel; + if (minuti < 0) + { + minuti = 60; + } + // cerco ultimo valore inserito odierno (se c'è) + try + { + DS_Applicazione.RegAttivitaDataTable tabRA = DataProxy.DP.taRA.getByDipData(idxDipCurr, inizio.Date, inizio.Date.AddDays(1)); + inizio = tabRA[tabRA.Rows.Count - 1].fine; + } + catch + { + } + // cerco di impostare inizio/fine + try + { + ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime = inizio; + ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime = inizio.AddMinutes(minuti); + } + catch + { } + doDataBound = false; + break; + case statoControllo.item: + grView.ShowFooter = false; + // cerco di impostare inizio/fine + if (grView.EditIndex >= 0) + { + if (minutiSel > 0) + { + try + { + //salvo valori selezionati + string descrizione = ((TextBox)grView.Rows[grView.EditIndex].FindControl("txtDescrizione")).Text; + DateTime inizioEdit = ((mod_dateTime)grView.Rows[grView.EditIndex].FindControl("dtInizio")).valoreDateTime; + grView.DataBind(); + // reimposto! con durata calcolata + ((mod_dateTime)grView.Rows[grView.EditIndex].FindControl("dtInizio")).valoreDateTime = inizioEdit; + ((mod_dateTime)grView.Rows[grView.EditIndex].FindControl("dtFine")).valoreDateTime = inizioEdit.AddMinutes(minutiSel); + ((TextBox)grView.Rows[grView.EditIndex].FindControl("txtDescrizione")).Text = descrizione; + // DISATTIVO COLLEGAMENTO A DATI... + doDataBound = false; + } + catch + { } + } + } + break; + default: + break; + } + if (doDataBound) + { + grView.DataBind(); + } + } + /// + /// salvo in session che il prox comando è clonare... + /// + /// + /// + protected void imgClona_Click(object sender, ImageClickEventArgs e) + { + ImageButton lbtn = (ImageButton)sender; + int idxRa = 0; + try + { + idxRa = Convert.ToInt32(lbtn.CommandArgument); + } + catch + { } + // chiamo clona! + DataProxy.DP.taRA.clonaRecord(idxRa); + updateControl(); + } + /// + /// fa update del controllo e chiama evento update esterno + /// + private void updateControl() + { + grView.SelectedIndex = -1; + refreshControlli(); + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } + /// + /// completato insert! aggiorno! + /// + /// + /// + protected void odsRA_Inserted(object sender, ObjectDataSourceStatusEventArgs e) + { + stato = statoControllo.item; + refreshControlli(); + } + /// + /// effettuato update + /// + /// + /// + protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) + { + updateControl(); + } + /// + /// riga eliminata + /// + /// + /// + protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e) + { + updateControl(); + } + /// + /// recupera i dati di un nuovo record contenuti nel footer di un gridView; + /// questi devono esses opportunamente nominati (es: txt{0}, dl{0}, ...) + /// + /// + /// + protected void doInsert() + { + //recupero la riga footer... + int idxDip = DataProxy.idxDipendente; + int idxFase = 0; + DateTime inizio = DateTime.Now; + DateTime fine = DateTime.Now; + string descr = ""; + try + { + idxFase = Convert.ToInt32(((DropDownList)grView.FooterRow.FindControl("ddlFase")).SelectedValue); + inizio = ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime; + fine = ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime; + descr = ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text; + } + catch + { } + DataProxy.DP.taRA.Insert(idxDip, idxFase, inizio, fine, descr, 0); + } + /// + /// riga in edit + /// + /// + /// + protected void grView_RowEditing(object sender, GridViewEditEventArgs e) + { + grView.SelectedIndex = e.NewEditIndex; + int idxRASel = Convert.ToInt32(grView.SelectedDataKey["idxRA"]); + // salvo in sessione valori selezionati + idxFaseSel = DataProxy.DP.taRA.getByKey(idxRASel)[0].idxFase; + idxProjSel = idxPrjByFase(idxFaseSel); + } + /// + /// riga popolata + /// + /// + /// + protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) + { + // controllo la riga + GridViewRow riga = e.Row; + if (grView.EditIndex >= 0 || grView.ShowFooter) + { + try + { + //pre-seleziono idx progetto x ods fase... + DropDownList ddlProj_int = (DropDownList)riga.FindControl("ddlProgetto"); + if (idxProjSel >= 0 && (ddlProj_int != null)) + { + ddlProj_int.SelectedValue = idxProjSel.ToString(); + } + DropDownList ddlFase_int = (DropDownList)riga.FindControl("ddlFase"); + if (idxFaseSel >= 0 && (ddlFase_int != null)) + { + ddlFase_int.SelectedValue = idxFaseSel.ToString(); + } + } + catch + { } + } + } + /// + /// intercetto update! + /// + /// + /// + protected void odsRA_Updating(object sender, ObjectDataSourceMethodEventArgs e) + { + DropDownList ddlfase_int = (DropDownList)grView.Rows[grView.EditIndex].FindControl("ddlFase"); + e.InputParameters["idxFase"] = ddlfase_int.SelectedValue; + } + /// + /// aggiorno ods fasi... + /// + /// + /// + protected void ddlProgetto_SelectedIndexChanged(object sender, EventArgs e) + { + // salvo in session idxProjSel! + DropDownList ddlProj_int = (DropDownList)sender; + idxProjSel = Convert.ToInt32(ddlProj_int.SelectedValue); + // ricarico dati fasi + odsFase.DataBind(); + // se in insert salvo orari e testo... + DateTime inizio = DateTime.Now; + DateTime fine = DateTime.Now; + string descr = ""; + if (stato == statoControllo.insert) + { + inizio = ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime; + fine = ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime; + descr = ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text; + } + else + { + // se è edit... + int idx = grView.EditIndex; + inizio = ((mod_dateTime)grView.Rows[idx].FindControl("dtInizio")).valoreDateTime; + fine = ((mod_dateTime)grView.Rows[idx].FindControl("dtFine")).valoreDateTime; + descr = ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text; + } + refreshControlli(); + // se in insert riporto orari e testo... + if (stato == statoControllo.insert) + { + ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime = inizio; + ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime = fine; + ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text = descr; + try + { + DropDownList ddlFase_int = (DropDownList)grView.FooterRow.FindControl("ddlFase"); + ddlFase_int.SelectedIndex = 1; + } + catch + { } + } + else + { + // se è edit... + int idx = grView.EditIndex; + ((mod_dateTime)grView.Rows[idx].FindControl("dtInizio")).valoreDateTime = inizio; + ((mod_dateTime)grView.Rows[idx].FindControl("dtFine")).valoreDateTime = fine; + ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text = descr; + try + { + DropDownList ddlFase_int = (DropDownList)grView.Rows[idx].FindControl("ddlFase"); + ddlFase_int.SelectedIndex = 1; + } + catch + { } + } + } + /// + /// progetto selezionato + /// + protected int idxProjSel + { + get + { + return memLayer.ML.IntSessionObj("idxProjSel"); + } + set + { + memLayer.ML.setSessionVal("idxProjSel", value); + } + } + /// + /// fase selezionata + /// + protected int idxFaseSel + { + get + { + return memLayer.ML.IntSessionObj("idxFaseSel"); + } + set + { + memLayer.ML.setSessionVal("idxFaseSel", value); + } + } + /// + /// generico comando riga + /// + /// + /// + protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) + { + switch (e.CommandName) + { + case "Cancel": + stato = statoControllo.item; + updateControl(); + break; + case "Insert": + doInsert(); + stato = statoControllo.item; + updateControl(); + break; + default: + break; + } + } + + #endregion + + #region area public + + /// + /// idxDipendente selezionato (0=tutti) + /// + public int idxDipCurr + { + get + { + return memLayer.ML.IntSessionObj("idxDipCurr"); + } + set + { + memLayer.ML.setSessionVal("idxDipCurr", value); + } + } + /// + /// progetto selezionato.. + /// + public string idxProgetto + { + get + { + return idxProjSel.ToString(); + } + } + /// + /// abilitato editing + nuovo + delete + clona + /// + public bool enableFull + { + get + { + bool answ = false; + try + { + answ = memLayer.ML.BoolSessionObj("enableEditComm"); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("enableEditComm", value); + } + } + /// + /// stato attuale del controllo + /// + public statoControllo stato + { + get + { + statoControllo answ = statoControllo.item; + try + { + answ = (statoControllo)memLayer.ML.objSessionObj("statoControlloRA"); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("statoControlloRA", value); + } + } + /// + /// valore datetime selezionato! + /// + public DateTime valoreDateTime + { + get + { + DateTime answ = DateTime.Now; + try + { + answ = Convert.ToDateTime(memLayer.ML.objSessionObj("dataRif")); + } + catch + { } + return answ; + } + set + { + memLayer.ML.setSessionVal("dataRif", value); + lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", value); + } + } + /// + /// evento update valori + /// + public event EventHandler eh_nuovoValore; + /// + /// effettua traduzione del lemma + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + /// + /// aggiorna + /// + public void doUpdate() + { + refreshControlli(); + } + + /// + /// calcola idxProgetto da idxFase + /// + /// + /// + public int idxPrjByFase(object idxFase) + { + int answ = 0; + try + { + answ = DataProxy.DP.taAF.getByIdx(Convert.ToInt32(idxFase))[0].idxProgetto; + } + catch + { } + return answ; + } + /// + /// sistemo eventuali "headers" + /// + /// + /// + protected void ddlFase_DataBound(object sender, EventArgs e) + { + // cerco eventuali controlli tipo "ancestor" e li disattivo! + DropDownList ddlFase_int = (DropDownList)sender; + ListItem li = new ListItem(); + while (li != null) + { + li = ddlFase_int.Items.FindByValue("0"); + try + { + li.Attributes.Add("style", "color:gray;"); + li.Attributes.Add("disabled", "true"); + li.Value = "-1"; + li.Text = string.Format("[ {0} ]", li.Text); + } + catch + { } + } + try + { + ddlFase_int.SelectedIndex = 1; + } + catch + { } + } + /// + /// richiesta creazioen nuovo record + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + // controllo: se ho righe mostro il footer... + stato = statoControllo.insert; + refreshControlli(); + } + else + { + // default: inizia ora la dichiarazione + double oraStart = DateTime.Now.Hour; + int durataMinuti = memLayer.ML.IntSessionObj("stdMinDurata"); + // se c'è timbratura ingresso prendo quella come ora inizio... + try + { + DS_Applicazione.TimbratureRow riga = DataProxy.DP.taTimb.getByIdxDipPeriodo(DataProxy.idxDipendente, valoreDateTime, valoreDateTime.AddDays(1))[0]; + oraStart = Convert.ToDouble(riga.dataOra.Hour + riga.dataOra.Minute / 60); + } + catch + { } + // altrimenti duplico ultima entry utente.. + DataProxy.DP.taRA.clonaLastRA_Utente(DataProxy.idxDipendente, valoreDateTime.AddHours(oraStart), durataMinuti); + updateControl(); + } + } + + /// + /// esegue ricerca progetto/fase x sovrascrivere + /// + /// + /// + protected void txtSearchFase_TextChanged(object sender, EventArgs e) { - #region area protected / private - - protected void Page_Load(object sender, EventArgs e) + // recupero testo... + string search = ""; + try + { + search = ((TextBox)sender).Text.Trim(); + } + catch + { } + if (search != "") + { + // faccio ricerca x progetto e fase... + GPW_data.DS_Utility.stp_VSProjFasi_searchDataTable tabRes = DataProxy.DP.taVSProjFasiSearch.GetData(search); + if (tabRes.Rows.Count > 0) { - if (!Page.IsPostBack) - { - refreshControlli(); - pnlHeader.Visible = enableFull; - lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", valoreDateTime); - } + idxFaseSel = tabRes[0].idxFase; + idxProjSel = tabRes[0].idxProgetto; } - /// - /// minuti selezionati nel controllo radio in testa - /// - protected int minutiSel - { - get - { - return memLayer.ML.IntSessionObj("stdMinDurata"); - } - set - { - memLayer.ML.setSessionVal("stdMinDurata", value); - } - } - /// - /// refresh dei controlli - /// - private void refreshControlli() - { - bool doDataBound = true; - switch (stato) - { - case statoControllo.edit: - doDataBound = true; - //grView.ShowFooter = false; - //grView.SelectedIndex = grView.EditIndex; - //int idxRASel = Convert.ToInt32(grView.SelectedDataKey["idxRA"]); - //// pre-seleziono idx progetto x ods fase... - //idxFaseSel = DataProxy.DP.taRA.getByKey(idxRASel)[0].idxFase; - //idxProjSel = idxPrjByFase(idxFaseSel); - break; - case statoControllo.insert: - grView.ShowFooter = true; - grView.DataBind(); - // imposto arrotondato ad ora... - DateTime inizio = valoreDateTime.Date.AddHours(DateTime.Now.Hour); - // imposto durate standard! - int minuti = minutiSel; - if (minuti < 0) - { - minuti = 60; - } - // cerco ultimo valore inserito odierno (se c'è) - try - { - DS_Applicazione.RegAttivitaDataTable tabRA = DataProxy.DP.taRA.getByDipData(idxDipCurr, inizio.Date, inizio.Date.AddDays(1)); - inizio = tabRA[tabRA.Rows.Count - 1].fine; - } - catch - { - } -#if false - // provo a leggere valore editato (se c'è...) - try - { - DateTime inizioSel = ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime; - if (inizioSel != inizio && inizio != valoreDateTime.Date.AddHours(DateTime.Now.Hour)) inizio = inizioSel; - } - catch - { - } -#endif - // cerco di impostare inizio/fine - try - { - ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime = inizio; - ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime = inizio.AddMinutes(minuti); - } - catch - { } - doDataBound = false; - break; - case statoControllo.item: - grView.ShowFooter = false; - // cerco di impostare inizio/fine - if (grView.EditIndex >= 0) - { - if (minutiSel > 0) - { - try - { - //salvo valori selezionati - string descrizione = ((TextBox)grView.Rows[grView.EditIndex].FindControl("txtDescrizione")).Text; - DateTime inizioEdit = ((mod_dateTime)grView.Rows[grView.EditIndex].FindControl("dtInizio")).valoreDateTime; - grView.DataBind(); - // reimposto! con durata calcolata - ((mod_dateTime)grView.Rows[grView.EditIndex].FindControl("dtInizio")).valoreDateTime = inizioEdit; - ((mod_dateTime)grView.Rows[grView.EditIndex].FindControl("dtFine")).valoreDateTime = inizioEdit.AddMinutes(minutiSel); - ((TextBox)grView.Rows[grView.EditIndex].FindControl("txtDescrizione")).Text = descrizione; - // DISATTIVO COLLEGAMENTO A DATI... - doDataBound = false; - } - catch - { } - } - } - break; - default: - break; - } - if (doDataBound) - { - grView.DataBind(); - } - } - /// - /// salvo in session che il prox comando è clonare... - /// - /// - /// - protected void imgClona_Click(object sender, ImageClickEventArgs e) - { - ImageButton lbtn = (ImageButton)sender; - int idxRa = 0; - try - { - idxRa = Convert.ToInt32(lbtn.CommandArgument); - } - catch - { } - // chiamo clona! - DataProxy.DP.taRA.clonaRecord(idxRa); - updateControl(); - } - /// - /// fa update del controllo e chiama evento update esterno - /// - private void updateControl() - { - grView.SelectedIndex = -1; - refreshControlli(); - // sollevo evento nuovo valore... - if (eh_nuovoValore != null) - { - eh_nuovoValore(this, new EventArgs()); - } - } - /// - /// completato insert! aggiorno! - /// - /// - /// - protected void odsRA_Inserted(object sender, ObjectDataSourceStatusEventArgs e) - { - stato = statoControllo.item; - refreshControlli(); - } - /// - /// effettuato update - /// - /// - /// - protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) - { - updateControl(); - } - /// - /// riga eliminata - /// - /// - /// - protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e) - { - updateControl(); - } - /// - /// recupera i dati di un nuovo record contenuti nel footer di un gridView; - /// questi devono esses opportunamente nominati (es: txt{0}, dl{0}, ...) - /// - /// - /// - protected void doInsert() - { - //recupero la riga footer... - int idxDip = DataProxy.idxDipendente; - int idxFase = 0; - DateTime inizio = DateTime.Now; - DateTime fine = DateTime.Now; - string descr = ""; - try - { - idxFase = Convert.ToInt32(((DropDownList)grView.FooterRow.FindControl("ddlFase")).SelectedValue); - inizio = ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime; - fine = ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime; - descr = ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text; - } - catch - { } - DataProxy.DP.taRA.Insert(idxDip, idxFase, inizio, fine, descr, 0); - } - /// - /// riga in edit - /// - /// - /// - protected void grView_RowEditing(object sender, GridViewEditEventArgs e) - { - grView.SelectedIndex = e.NewEditIndex; - int idxRASel = Convert.ToInt32(grView.SelectedDataKey["idxRA"]); - // salvo in sessione valori selezionati - idxFaseSel = DataProxy.DP.taRA.getByKey(idxRASel)[0].idxFase; - idxProjSel = idxPrjByFase(idxFaseSel); - } - /// - /// riga popolata - /// - /// - /// - protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) - { - // controllo la riga - GridViewRow riga = e.Row; - if (grView.EditIndex >= 0 || grView.ShowFooter) - { - try - { - //pre-seleziono idx progetto x ods fase... - DropDownList ddlProj_int = (DropDownList)riga.FindControl("ddlProgetto"); - if (idxProjSel >= 0 && (ddlProj_int != null)) - { - ddlProj_int.SelectedValue = idxProjSel.ToString(); - } - DropDownList ddlFase_int = (DropDownList)riga.FindControl("ddlFase"); - if (idxFaseSel >= 0 && (ddlFase_int != null)) - { - ddlFase_int.SelectedValue = idxFaseSel.ToString(); - } - } - catch - { } - } - } - /// - /// intercetto update! - /// - /// - /// - protected void odsRA_Updating(object sender, ObjectDataSourceMethodEventArgs e) - { - DropDownList ddlfase_int = (DropDownList)grView.Rows[grView.EditIndex].FindControl("ddlFase"); - e.InputParameters["idxFase"] = ddlfase_int.SelectedValue; - } - /// - /// aggiorno ods fasi... - /// - /// - /// - protected void ddlProgetto_SelectedIndexChanged(object sender, EventArgs e) - { - // salvo in session idxProjSel! - DropDownList ddlProj_int = (DropDownList)sender; - idxProjSel = Convert.ToInt32(ddlProj_int.SelectedValue); - // ricarico dati fasi - odsFase.DataBind(); - // se in insert salvo orari e testo... - DateTime inizio = DateTime.Now; - DateTime fine = DateTime.Now; - string descr = ""; - if (stato == statoControllo.insert) - { - inizio = ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime; - fine = ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime; - descr = ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text; - } - else - { - // se è edit... - int idx = grView.EditIndex; - inizio = ((mod_dateTime)grView.Rows[idx].FindControl("dtInizio")).valoreDateTime; - fine = ((mod_dateTime)grView.Rows[idx].FindControl("dtFine")).valoreDateTime; - descr = ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text; - } - refreshControlli(); - // se in insert riporto orari e testo... - if (stato == statoControllo.insert) - { - ((mod_dateTime)grView.FooterRow.FindControl("dtInizio")).valoreDateTime = inizio; - ((mod_dateTime)grView.FooterRow.FindControl("dtFine")).valoreDateTime = fine; - ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text = descr; - try - { - DropDownList ddlFase_int = (DropDownList)grView.FooterRow.FindControl("ddlFase"); - ddlFase_int.SelectedIndex = 1; - } - catch - { } - } - else - { - // se è edit... - int idx = grView.EditIndex; - ((mod_dateTime)grView.Rows[idx].FindControl("dtInizio")).valoreDateTime = inizio; - ((mod_dateTime)grView.Rows[idx].FindControl("dtFine")).valoreDateTime = fine; - ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text = descr; - try - { - DropDownList ddlFase_int = (DropDownList)grView.Rows[idx].FindControl("ddlFase"); - ddlFase_int.SelectedIndex = 1; - } - catch - { } - } - } - /// - /// progetto selezionato - /// - protected int idxProjSel - { - get - { - return memLayer.ML.IntSessionObj("idxProjSel"); - } - set - { - memLayer.ML.setSessionVal("idxProjSel", value); - } - } - /// - /// fase selezionata - /// - protected int idxFaseSel - { - get - { - return memLayer.ML.IntSessionObj("idxFaseSel"); - } - set - { - memLayer.ML.setSessionVal("idxFaseSel", value); - } - } - /// - /// generico comando riga - /// - /// - /// - protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) - { - switch (e.CommandName) - { - case "Cancel": - stato = statoControllo.item; - updateControl(); - break; - case "Insert": - doInsert(); - stato = statoControllo.item; - updateControl(); - break; - default: - break; - } - } - - #endregion - - #region area public - - /// - /// idxDipendente selezionato (0=tutti) - /// - public int idxDipCurr - { - get - { - return memLayer.ML.IntSessionObj("idxDipCurr"); - } - set - { - memLayer.ML.setSessionVal("idxDipCurr", value); - } - } - /// - /// progetto selezionato.. - /// - public string idxProgetto - { - get - { - return idxProjSel.ToString(); - } - } - /// - /// abilitato editing + nuovo + delete + clona - /// - public bool enableFull - { - get - { - bool answ = false; - try - { - answ = memLayer.ML.BoolSessionObj("enableEditComm"); - } - catch - { } - return answ; - } - set - { - memLayer.ML.setSessionVal("enableEditComm", value); - } - } - /// - /// stato attuale del controllo - /// - public statoControllo stato - { - get - { - statoControllo answ = statoControllo.item; - try - { - answ = (statoControllo)memLayer.ML.objSessionObj("statoControlloRA"); - } - catch - { } - return answ; - } - set - { - memLayer.ML.setSessionVal("statoControlloRA", value); - } - } - /// - /// valore datetime selezionato! - /// - public DateTime valoreDateTime - { - get - { - DateTime answ = DateTime.Now; - try - { - answ = Convert.ToDateTime(memLayer.ML.objSessionObj("dataRif")); - } - catch - { } - return answ; - } - set - { - memLayer.ML.setSessionVal("dataRif", value); - lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", value); - } - } - /// - /// evento update valori - /// - public event EventHandler eh_nuovoValore; - /// - /// effettua traduzione del lemma - /// - /// - /// - public string traduci(string lemma) - { - return user_std.UtSn.Traduci(lemma); - } - /// - /// aggiorna - /// - public void doUpdate() - { - refreshControlli(); - } - - /// - /// calcola idxProgetto da idxFase - /// - /// - /// - public int idxPrjByFase(object idxFase) - { - int answ = 0; - try - { - answ = DataProxy.DP.taAF.getByIdx(Convert.ToInt32(idxFase))[0].idxProgetto; - } - catch - { } - return answ; - } - /// - /// sistemo eventuali "headers" - /// - /// - /// - protected void ddlFase_DataBound(object sender, EventArgs e) - { - // cerco eventuali controlli tipo "ancestor" e li disattivo! - DropDownList ddlFase_int = (DropDownList)sender; - ListItem li = new ListItem(); - while (li != null) - { - li = ddlFase_int.Items.FindByValue("0"); - try - { - li.Attributes.Add("style", "color:gray;"); - li.Attributes.Add("disabled", "true"); - li.Value = "-1"; - li.Text = string.Format("[ {0} ]", li.Text); - } - catch - { } - } - try - { - ddlFase_int.SelectedIndex = 1; - } - catch - { } - } - /// - /// richiesta creazioen nuovo record - /// - /// - /// - protected void btnNew_Click(object sender, EventArgs e) - { - if (grView.Rows.Count > 0) - { - // controllo: se ho righe mostro il footer... - stato = statoControllo.insert; - refreshControlli(); - } - else - { - // default: inizia ora la dichiarazione - double oraStart = DateTime.Now.Hour; - int durataMinuti = memLayer.ML.IntSessionObj("stdMinDurata"); - // se c'è timbratura ingresso prendo quella come ora inizio... - try - { - DS_Applicazione.TimbratureRow riga = DataProxy.DP.taTimb.getByIdxDipPeriodo(DataProxy.idxDipendente, valoreDateTime, valoreDateTime.AddDays(1))[0]; - oraStart = Convert.ToDouble(riga.dataOra.Hour + riga.dataOra.Minute / 60); - } - catch - { } - // altrimenti duplico ultima entry utente.. - DataProxy.DP.taRA.clonaLastRA_Utente(DataProxy.idxDipendente, valoreDateTime.AddHours(oraStart), durataMinuti); - updateControl(); - } - } - - /// - /// esegue ricerca progetto/fase x sovrascrivere - /// - /// - /// - protected void txtSearchFase_TextChanged(object sender, EventArgs e) - { - - // recupero testo... - string search = ""; - try - { - search = ((TextBox)sender).Text.Trim(); - } - catch - { } - if (search != "") - { - // faccio ricerca x progetto e fase... - GPW_data.DS_Utility.stp_VSProjFasi_searchDataTable tabRes = DataProxy.DP.taVSProjFasiSearch.GetData(search); - if (tabRes.Rows.Count > 0) - { - idxFaseSel = tabRes[0].idxFase; - idxProjSel = tabRes[0].idxProgetto; - } - } - //stato = statoControllo.edit; - //refreshControlli(); - //stato = statoControllo.item; - //minutiSel = -1; - refreshControlli(); - } - - - /// - /// formatta la durata in ore secondo web.config (centesimale/ore:min) - /// - /// - /// - public string formatDurata(object oreCent) - { - decimal ore = 0; - try - { - ore = Convert.ToDecimal(oreCent); - } - catch - { } - string answ = ""; - if (memLayer.ML.confReadBool("reviewShowOreMin")) - { - answ = utils.formOreMin(ore); - } - else - { - answ = ore.ToString("0.00"); - } - return answ; - } - - #endregion - + } + //stato = statoControllo.edit; + //refreshControlli(); + //stato = statoControllo.item; + //minutiSel = -1; + refreshControlli(); } + + + /// + /// formatta la durata in ore secondo web.config (centesimale/ore:min) + /// + /// + /// + public string formatDurata(object oreCent) + { + decimal ore = 0; + try + { + ore = Convert.ToDecimal(oreCent); + } + catch + { } + string answ = ""; + if (memLayer.ML.confReadBool("reviewShowOreMin")) + { + answ = utils.formOreMin(ore); + } + else + { + answ = ore.ToString("0.00"); + } + return answ; + } + + #endregion + + } } \ No newline at end of file diff --git a/GPW_Data/utils.cs b/GPW_Data/utils.cs index e6e4601..fa14475 100644 --- a/GPW_Data/utils.cs +++ b/GPW_Data/utils.cs @@ -14,43 +14,7 @@ namespace GPW_data /// protected utils() { -#if false - setupElencoClienti(); -#endif } -#if false - /// - /// setup delle tabella elencoClienti - /// - protected void setupElencoClienti() - { - string redKey = memLayer.ML.redHash("elencoClienti"); - try - { - string rawData = memLayer.ML.getRSV(redKey); - if (string.IsNullOrEmpty(rawData)) - { - - } - else - { - elencoClienti = ricaricaElencoClienti(); - - } - if (memLayer.ML.isInCacheObject("elencoClienti")) - { - elencoClienti = (Dictionary)memLayer.ML.objCacheObj("elencoClienti"); - } - else - { - elencoClienti = ricaricaElencoClienti(); - memLayer.ML.setCacheVal("elencoClienti", elencoClienti, false); - } - } - catch - { } - } -#endif /// /// restituisce elenco clienti trasformato in dictionary /// diff --git a/GPW_Smart/Site.Master.cs b/GPW_Smart/Site.Master.cs index 2aa5376..bc4ed13 100644 --- a/GPW_Smart/Site.Master.cs +++ b/GPW_Smart/Site.Master.cs @@ -42,29 +42,5 @@ namespace GPW_Smart cmp_menuTop.disableCheckCookie = value; } } - -#if false - public bool showSettings { get; set; } - public bool showLeftPnl { get; set; } - - public string hideSettings - { - get - { - string answ = ""; - if (!showSettings) answ = "hidden"; - return answ; - } - } - public string hideLeftPnl - { - get - { - string answ = ""; - if (!showLeftPnl) answ = "hidden"; - return answ; - } - } -#endif } } \ No newline at end of file diff --git a/GPW_Smart/WebUserControls/cmp_menuTop.ascx.cs b/GPW_Smart/WebUserControls/cmp_menuTop.ascx.cs index f921601..8b8f24a 100644 --- a/GPW_Smart/WebUserControls/cmp_menuTop.ascx.cs +++ b/GPW_Smart/WebUserControls/cmp_menuTop.ascx.cs @@ -232,26 +232,5 @@ namespace GPW_Smart.WebUserControls } return answ; } -#if false - /// - /// salva in variabile pagina il nome della pagina corrente - /// - protected string PagCorrente() - { - string answ = ""; - try - { - Uri MyUrl = Request.Url; - string delimStr = "/"; - char[] delimiter = delimStr.ToCharArray(); - string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); - int n = finalUrl.Length; - answ = finalUrl[n - 1].ToString(); - } - catch - { } - return answ; - } -#endif } } \ No newline at end of file diff --git a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs index 6c3e73e..80218c3 100644 --- a/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_timbrature.ascx.cs @@ -145,15 +145,6 @@ namespace GPW.WebUserControls bool isEntrata = false; registraTimbratura(isEntrata); } -#if false - /// - /// Abilita tutti i buttons - /// - public void abilitaAll() - { - forceButtons = false; - } -#endif /// /// Aggiorno visualizzazione /// diff --git a/Jenkinsfile b/Jenkinsfile index 318053a..0ebb01d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=4104']) { + withEnv(['NEXT_BUILD_NUMBER=4105']) { // env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '2.6.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'GPW'