diff --git a/MP-Tablet/Content/baseStyle.min.css b/MP-Tablet/Content/baseStyle.min.css index dbc121a3..f6ecfca3 100644 --- a/MP-Tablet/Content/baseStyle.min.css +++ b/MP-Tablet/Content/baseStyle.min.css @@ -1 +1 @@ -body{font-family:'Open Sans',sans-serif;color:#fff;background-image:linear-gradient(#444,#222);}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.bodyDark{color:#fff;background-image:linear-gradient(#444,#222);}.bg-black{color:#fff;background-image:linear-gradient(#111,#000);}.titleBlock{font-family:'Open Sans Condensed',sans-serif;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);box-shadow:15px 15px 20px 0 rgba(150,150,150,.2),10px 10px 20px 0 rgba(200,200,200,.39);min-width:8em;}.rCAll{border-radius:10px;}.rCTop{border-radius:10px 10px 0 0;}.rCBot{border-radius:0 0 10px 10px;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.8);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}@media(max-width:576px){.modal-dialog.modal-dialog-slideout{width:80%;}}.modal-dialog-slideout{min-height:100%;margin:0 auto 0 0;background:#fff;}.modal.fade .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(-100%,0);transform:translate(-100%,0);}.modal.fade.show .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(0,0);transform:translate(0,0);flex-flow:column;}.modal-dialog-slideout .modal-content{border:0;}.switch{position:relative;display:inline-block;width:60px;height:34px;}.switch input{display:none;}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s;}input:checked+.slider{background-color:#2196f3;}input:focus+.slider{box-shadow:0 0 1px #2196f3;}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px);}.slider.round{border-radius:34px;}.slider.round:before{border-radius:50%;}.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;}.stdFont{color:#000;text-shadow:0 0 0 #111;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd;}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff);}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);} \ No newline at end of file +body{font-family:'Open Sans',sans-serif;color:#fff;background-image:linear-gradient(#444,#222);}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.bodyDark{color:#fff;background-image:linear-gradient(#444,#222);}.bg-black{color:#fff;background-image:linear-gradient(#111,#000);}.titleBlock{font-family:'Open Sans Condensed',sans-serif;}.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);box-shadow:15px 15px 20px 0 rgba(150,150,150,.2),10px 10px 20px 0 rgba(200,200,200,.39);min-width:8em;}.rCAll{border-radius:10px;}.rCTop{border-radius:10px 10px 0 0;}.rCBot{border-radius:0 0 10px 10px;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.8);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}@media(max-width:576px){.modal-dialog.modal-dialog-slideout{width:80%;}}.modal-dialog-slideout{min-height:100%;margin:0 auto 0 0;background:#fff;}.modal.fade .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(-100%,0);transform:translate(-100%,0);}.modal.fade.show .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(0,0);transform:translate(0,0);flex-flow:column;}.modal-dialog-slideout .modal-content{border:0;}#main{transition:margin-left .5s;padding:20px;}@media screen and (max-height:450px){.sidenav{padding-top:15px;}.sidenav a{font-size:18px;}}.switch{position:relative;display:inline-block;width:60px;height:34px;}.switch input{display:none;}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s;}input:checked+.slider{background-color:#2196f3;}input:focus+.slider{box-shadow:0 0 1px #2196f3;}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px);}.slider.round{border-radius:34px;}.slider.round:before{border-radius:50%;}.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;}.stdFont{color:#000;text-shadow:0 0 0 #111;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd;}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff);}.my-page{background:#222;}.my-page .ui-title,.my-page .ui-li-aside{font-family:'Open Sans',sans-serif;font-weight:400;}.my-page .ui-header{color:#909;}.my-page .ui-footer{color:#666;}.my-page .ui-li-desc{color:#c0c0c0;}.my-page .ui-li-aside{color:#909;}.my-page .ui-listview .ui-li.ui-btn{background-image:none;border-color:#222;}@media all and (min-width:768px){.my-page .ui-content{padding:9px;}.my-page .ui-listview .ui-li.ui-btn{float:left;width:30.9333%;height:232px;margin:9px 1.2%;border-width:0;}.my-page .ui-listview .ui-li.ui-btn-inner{border:inherit;border-width:1px;margin:-1px;}.my-page .ui-listview .ui-btn-inner,.my-page .ui-listview .ui-btn-text,.my-page .ui-listview .ui-link-inherit,.my-page .ui-listview .ui-li-thumb{width:100%;height:100%;display:block;overflow:hidden;}.my-page .ui-listview .ui-link-inherit{padding:0 !important;position:relative;}.my-page .ui-listview .ui-li,.my-page .ui-listview .ui-btn-text,.my-page .ui-listview .ui-link-inherit,.my-page .ui-listview .ui-li-thumb{-webkit-border-radius:inherit;border-radius:inherit;}.my-page .ui-listview .ui-li-thumb{height:auto;max-width:100%;max-height:none;margin:0;left:0;z-index:-1;}.my-page .ui-listview .ui-icon{display:none;}.my-page .ui-listview .ui-li-heading,.my-page .ui-listview .ui-li-desc{font-family:'Open Sans Condensed',sans-serif;white-space:normal;overflow:visible;position:absolute;left:0;right:0;}.my-page .ui-listview .ui-li-heading{margin:0;padding:20px;bottom:50%;}.my-page .ui-listview .ui-li-desc{font-family:'Open Sans',sans-serif;margin:0;padding:0 20px;min-height:50%;bottom:0;line-height:1.5;}.ui-listview .ui-li-has-thumb .ui-li-heading,.ui-listview .ui-li-has-thumb .ui-li-desc{background:#111;background:rgba(0,0,0,.8);-webkit-background-clip:padding;background-clip:padding-box;}.ui-listview .ui-li-has-thumb .ui-li-heading{padding:10px;bottom:20%;}.ui-listview .ui-li-has-thumb .ui-li-desc{padding:0 10px;min-height:20%;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;}.my-page .ui-listview .ui-li-desc.ui-li-aside{padding:2px 10px;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.85);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.my-page .ui-listview .ui-btn:not(.ui-focus){-moz-box-shadow:0 0 9px #111;-webkit-box-shadow:0 0 9px #111;box-shadow:0 0 9px #111;}.my-page .ui-listview .ui-btn:hover{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe;}.my-page .ui-listview .ui-btn{-webkit-transition:all 500ms ease;-moz-transition:all 500ms ease;-o-transition:all 500ms ease;-ms-transition:all 500ms ease;transition:all 500ms ease;}}@media all and (min-width:1020px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1000px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:23%;height:230px;margin:10px 1%;}}@media all and (min-width:1270px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1250px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:18%;height:230px;margin:10px 1%;}}@media all and (min-width:1520px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1500px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:14%;height:230px;margin:10px 1%;}}@media all and (min-width:1770px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1750px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:12%;height:230px;margin:10px 1%;}}@media all and (min-width:1900px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1900px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:10%;height:230px;margin:10px 1%;}}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}#demo-page #left-panel.ui-panel{width:15em;}#demo-page #left-panel.ui-panel-closed{width:0;}#demo-page .ui-panel-position-left.ui-panel-display-reveal{left:0;}#demo-page .ui-panel-content-wrap-position-left.ui-panel-content-wrap-open,.ui-panel-dismiss-position-left.ui-panel-dismiss-open{left:15em;right:-15em;}#demo-page .ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal{left:0;right:0;-webkit-transform:translate3d(15em,0,0);-moz-transform:translate3d(15em,0,0);transform:translate3d(15em,0,0);}#left-panel .ui-panel-inner>.ui-listview{margin-bottom:0;}#left-panel .ui-collapsible-set{margin:0;}#left-panel .ui-panel-inner>.ui-collapsible>.ui-collapsible-content{padding-top:0;padding-bottom:0;border-bottom:none;}#left-panel .ui-panel-inner>.ui-collapsible>.ui-collapsible-heading .ui-btn,#left-panel .ui-collapsible.ui-first-child .ui-collapsible-heading .ui-btn{border-top:none;}#left-panel .ui-collapsible-heading .ui-btn-inner{padding:.7em 40px .7em 15px;}#left-panel .ui-collapsible-set .ui-collapsible-heading .ui-btn-inner{padding:.5em 40px .5em 15px;font-size:14px;}#demo-page .ui-panel-inner>.ui-listview .ui-first-child{background:#eee;}#demo-page .ui-panel-display-reveal{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}#demo-page .ui-panel-content-wrap-position-left{-webkit-box-shadow:-5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:-5px 0 5px rgba(0,0,0,.15);box-shadow:-5px 0 5px rgba(0,0,0,.15);}#demo-page .ui-body-d{background-image:url(../../_assets/img/bg-pattern.png);background-repeat:repeat-x;background-position:left bottom;}.article p{margin:0 0 1em;line-height:1.5;}.article p img{max-width:100%;}.article p:first-child{text-align:center;}.article small{display:block;font-size:75%;color:#c0c0c0;}.article p:last-child{text-align:right;}.article a.ui-btn{margin-right:2em;-webkit-border-radius:.4em;border-radius:.4em;}@media all and (min-width:769px){.article{max-width:994px;margin:0 auto;padding-top:4em;-webkit-column-count:2;-moz-column-count:2;column-count:2;-webkit-column-gap:2em;-moz-column-gap:2em;column-gap:2em;}.article a.ui-btn{-webkit-transform:translate3d(0,0,0);}} \ No newline at end of file diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 25abf33f..2cdd8901 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -464,6 +464,7 @@ + @@ -769,6 +770,13 @@ mod_RepProd_GG.ascx + + mod_selPeriodo.ascx + ASPXCodeBehind + + + mod_selPeriodo.ascx + mod_slideMenu.ascx ASPXCodeBehind diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx index 2281f7dc..808a7ddd 100644 --- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx +++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx @@ -1 +1,77 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoControlli.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoControlli" %> +<%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %> + + +<%----%> + +<%--
+
+
+ + +
+
+
+
+ + +
+
+
--%> +
+
+ + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs index 57217adc..4aebbb66 100644 --- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -11,7 +12,14 @@ namespace MoonProTablet.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - +#if false + if (!Page.IsPostBack) + { + intervalloDate periodo = datario.mngr.ultimiMesi(DateTime.Now, 12); + txtDataFrom.Text = periodo.inizio.ToShortDateString(); + txtDataTo.Text = periodo.fine.ToShortDateString(); + } +#endif } } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.designer.cs index 915252f6..3afa25d2 100644 --- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx.designer.cs @@ -1,17 +1,42 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // // Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls -{ - - - public partial class mod_elencoControlli - { - } +namespace MoonProTablet.WebUserControls { + + + public partial class mod_elencoControlli { + + /// + /// Controllo mod_selPeriodo. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MoonProTablet.WebUserControls.mod_selPeriodo mod_selPeriodo; + + /// + /// Controllo grView. + /// + /// + /// 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.GridView grView; + + /// + /// Controllo ods. + /// + /// + /// 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.ObjectDataSource ods; + } } diff --git a/MP-Tablet/WebUserControls/mod_selPeriodo.ascx b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx new file mode 100644 index 00000000..916dd0c3 --- /dev/null +++ b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx @@ -0,0 +1,57 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_selPeriodo.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_selPeriodo" %> +<%if (false) + { %> + +<%} %> + +
+
+ + + + + + + + + +
+ + +
+ +
+
+ diff --git a/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs new file mode 100644 index 00000000..cc016701 --- /dev/null +++ b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.cs @@ -0,0 +1,328 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + + +namespace MoonProTablet.WebUserControls +{ + public partial class mod_selPeriodo : System.Web.UI.UserControl + { + protected intervalloDate _intervallo; + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati"; + txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati"; + } + } + /// + /// avvio componente + /// + /// + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati"; + txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati"; + setIntervallo(); + } + /// + /// definisce se sia da mostrare il selettore delle ore nel controllo + /// + protected bool mostraSelOra + { + get + { + bool answ = false; + if (memLayer.ML.isInSessionObject("mostraSelOra")) + { + answ = memLayer.ML.BoolSessionObj("mostraSelOra"); + } + else + { + // leggo da sessione e salvo... + try + { + answ = memLayer.ML.confReadBool("mostraSelOra"); + } + catch + { } + memLayer.ML.setSessionVal("mostraSelOra", answ); + } + return answ; + } + } + + /// + /// gestione del selettore rapido dell'intervallo temporale... + /// + /// + /// + protected void ddlSelPeriodo_SelectedIndexChanged(object sender, EventArgs e) + { + // verifico cosa sia cambiato ed imposto date... + datario _datario = new datario(); + switch (ddlSelPeriodo.SelectedValue) + { + case "1": // selezione libera + break; + case "2": // oggi + _intervallo = _datario.giornata(DateTime.Now); + break; + case "3": // ieri + _intervallo = _datario.giornata(DateTime.Now.AddDays(-1)); + break; + case "4": + _intervallo = _datario.questaSett(DateTime.Now); + break; + case "5": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 7); + break; + case "6": + _intervallo = _datario.questoMese(DateTime.Now); + break; + case "7": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 30); + break; + case "8": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 366); + break; + case "9": + _intervallo = _datario.estremiAnno(DateTime.Now); + break; + case "10": + _intervallo = _datario.estremiAnno(DateTime.Now.AddYears(-1)); + break; + case "11": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 36600); + break; + default: + break; + } + if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine)) + { + verificaCoerenzaDate(); + aggiornaDateMostrate(false); + // mostro btn update + btnUpdate.Visible = true; + if (autoUpdate) + { + forceUpdate(); + } + } + } + /// + /// effettua update delle date mostrate da intervallo analisi (ed eventualmente riporta update...) + /// + /// + private void aggiornaDateMostrate(bool doReportUpdate) + { + scriviDate(); + if (doReportUpdate) + { + reportUpdate(); + } + } + /// + /// scrive nuove date in controllo + /// + private void scriviDate() + { + // se intervallo non è valorizzato leggo da sessione... + if (!_intervallo.isValid) + { + _intervallo = intervalloAnalisi; + } + txtInizio.Text = _intervallo.inizio.ToString("yyyy-MM-dd"); + txtFine.Text = _intervallo.fine.ToString("yyyy-MM-dd"); + } + /// + /// imposta intervallo da sessione o di default + /// + private void setIntervallo() + { + intervalloDate _intervallo; + try + { + _intervallo = (intervalloDate)Session["_intervallo"]; + } + catch + { + _intervallo = new intervalloDate(); + _intervallo.inizio = DateTime.Now.AddDays(memLayer.ML.confReadInt("defDayFrom")); + _intervallo.fine = DateTime.Now.AddDays(1); + Session["_intervallo"] = _intervallo; + Session["_inizio"] = _intervallo.inizio; + Session["_fine"] = _intervallo.fine; + } + scriviDate(); + } + /// + /// update periodo + /// + private void aggiornaPeriodo() + { + _intervallo = new intervalloDate(); + // calcolo tempi arrotondati + _intervallo.inizio = Convert.ToDateTime(txtInizio.Text); + _intervallo.fine = Convert.ToDateTime(txtFine.Text); + verificaCoerenzaDate(); + reportUpdate(); + } + /// + /// verifica che le date dell'intervallo siano coerenti (inizio < fine) + /// + private void verificaCoerenzaDate() + { + // controllo date siano coerenti (fine > inizio)... + if (_intervallo.inizio >= _intervallo.fine) + { + // controllo non siano date successive ad oggi... + if (_intervallo.fine > DateTime.Now) + { + _intervallo.fine = DateTime.Now; + } + _intervallo.inizio = _intervallo.fine.AddDays(-1); + } + //intervalloAnalisi = _intervallo; + aggiornaDateMostrate(false); + } + /// + /// evento cambio testo data inizio + /// + /// + /// + protected void txtInizio_TextChanged(object sender, EventArgs e) + { + procDateMod(); + } + /// + /// verifica la modifica delle date.. + /// + private void procDateMod() + { + // imposto il selettore a discesa... + setPeriodoFree(); + // mostro btn update + btnUpdate.Visible = true; + if (autoUpdate) + { + forceUpdate(); + } + } + /// + /// evento cambio testo data fine + /// + /// + /// + protected void txtFine_TextChanged(object sender, EventArgs e) + { + procDateMod(); + } + /// + /// in questo caso faccio udpate periodo mostrato + /// + /// + /// + protected void btnUpdate_Click(object sender, EventArgs e) + { + forceUpdate(); + } + /// + /// forza update + /// + private void forceUpdate() + { + aggiornaPeriodo(); + // nascondo btn update + btnUpdate.Visible = false; + } + /// + /// riporta aggiornamento a controller + /// + protected void reportUpdate() + { + intervalloAnalisi = _intervallo; + // alzo l'evento d update/inserimento e ricarico cache... + if (eh_doUpdate != null) + { + eh_doUpdate(this, new EventArgs()); + } + } + public intervalloDate intervalloAnalisi + { + get + { + return (intervalloDate)Session["_intervallo"]; + } + set + { + intervalloDate interv = value; + Session["_intervallo"] = interv; + Session["_inizio"] = interv.inizio; + Session["_fine"] = interv.fine; + _intervallo = interv; + aggiornaDateMostrate(false); + } + } + public DateTime inizio + { + get + { + return intervalloAnalisi.inizio; + } + } + public DateTime fine + { + get + { + return intervalloAnalisi.fine; + } + } + /// + /// effettua update + /// + /// + public void doUpdate(bool doReportUpdate) + { + aggiornaDateMostrate(doReportUpdate); + } + /// + /// imposta periodo libero di selezione + /// + public void setPeriodoFree() + { + ddlSelPeriodo.SelectedIndex = 0; + } + /// + /// indica se il controllo debba fare update in automatico o attendere pressione button update da utente + /// + public bool autoUpdate { get; set; } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + + #region gestione eventi + + public event EventHandler eh_doUpdate; + + #endregion + + } +} \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.designer.cs new file mode 100644 index 00000000..6048b052 --- /dev/null +++ b/MP-Tablet/WebUserControls/mod_selPeriodo.ascx.designer.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// 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 MoonProTablet.WebUserControls { + + + public partial class mod_selPeriodo { + + /// + /// Controllo BundleReference1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + + /// + /// Controllo ddlSelPeriodo. + /// + /// + /// 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.DropDownList ddlSelPeriodo; + + /// + /// Controllo ods_ddlSelPeriodo. + /// + /// + /// 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.ObjectDataSource ods_ddlSelPeriodo; + + /// + /// Controllo txtInizio. + /// + /// + /// 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.TextBox txtInizio; + + /// + /// Controllo txtFine. + /// + /// + /// 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.TextBox txtFine; + + /// + /// Controllo btnUpdate. + /// + /// + /// 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.Button btnUpdate; + } +} diff --git a/MapoDb/DS_ProdTempi.xsd b/MapoDb/DS_ProdTempi.xsd index cc51e0e0..d46d140b 100644 --- a/MapoDb/DS_ProdTempi.xsd +++ b/MapoDb/DS_ProdTempi.xsd @@ -1793,67 +1793,14 @@ FROM export.v_AS400_BufferProdAs400 - - - - DELETE FROM [dbo].[RegistroControlli] WHERE (([IdxControllo] = @Original_IdxControllo) AND ([DataOra] = @Original_DataOra) AND ([IdxMacchina] = @Original_IdxMacchina) AND ([IdxODL] = @Original_IdxODL) AND ([CodArticolo] = @Original_CodArticolo) AND ([MatrOpr] = @Original_MatrOpr) AND ([EsitoOK] = @Original_EsitoOK) AND ([Note] = @Original_Note)) - - - - - - - - - - - - - - - INSERT INTO [dbo].[RegistroControlli] ([DataOra], [IdxMacchina], [IdxODL], [CodArticolo], [MatrOpr], [EsitoOK], [Note]) VALUES (@DataOra, @IdxMacchina, @IdxODL, @CodArticolo, @MatrOpr, @EsitoOK, @Note); -SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK, Note FROM RegistroControlli WHERE (IdxControllo = SCOPE_IDENTITY()) - - - - - - - - - - - + - - SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK, Note FROM dbo.RegistroControlli + + SELECT * +FROM v_RegistroControlli - - - UPDATE [dbo].[RegistroControlli] SET [DataOra] = @DataOra, [IdxMacchina] = @IdxMacchina, [IdxODL] = @IdxODL, [CodArticolo] = @CodArticolo, [MatrOpr] = @MatrOpr, [EsitoOK] = @EsitoOK, [Note] = @Note WHERE (([IdxControllo] = @Original_IdxControllo) AND ([DataOra] = @Original_DataOra) AND ([IdxMacchina] = @Original_IdxMacchina) AND ([IdxODL] = @Original_IdxODL) AND ([CodArticolo] = @Original_CodArticolo) AND ([MatrOpr] = @Original_MatrOpr) AND ([EsitoOK] = @Original_EsitoOK) AND ([Note] = @Original_Note)); -SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK, Note FROM RegistroControlli WHERE (IdxControllo = @IdxControllo) - - - - - - - - - - - - - - - - - - - - @@ -1865,6 +1812,7 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK + @@ -2504,6 +2452,13 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK + + + + + + + diff --git a/MapoDb/DS_ProdTempi.xss b/MapoDb/DS_ProdTempi.xss index 175bfbbc..41a53585 100644 --- a/MapoDb/DS_ProdTempi.xss +++ b/MapoDb/DS_ProdTempi.xss @@ -20,12 +20,12 @@ - + - + \ No newline at end of file diff --git a/MapoDb/DS_ProdTempi1.Designer.cs b/MapoDb/DS_ProdTempi1.Designer.cs index 8e3787d2..507921dd 100644 --- a/MapoDb/DS_ProdTempi1.Designer.cs +++ b/MapoDb/DS_ProdTempi1.Designer.cs @@ -8093,6 +8093,8 @@ namespace MapoDb { private global::System.Data.DataColumn columnNote; + private global::System.Data.DataColumn columnOperatore; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public RegistroControlliDataTable() { @@ -8190,6 +8192,14 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn OperatoreColumn { + get { + return this.columnOperatore; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8227,7 +8237,7 @@ namespace MapoDb { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public RegistroControlliRow AddRegistroControlliRow(System.DateTime DataOra, string IdxMacchina, int IdxODL, string CodArticolo, int MatrOpr, bool EsitoOK, string Note) { + public RegistroControlliRow AddRegistroControlliRow(System.DateTime DataOra, string IdxMacchina, int IdxODL, string CodArticolo, int MatrOpr, bool EsitoOK, string Note, string Operatore) { RegistroControlliRow rowRegistroControlliRow = ((RegistroControlliRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -8237,7 +8247,8 @@ namespace MapoDb { CodArticolo, MatrOpr, EsitoOK, - Note}; + Note, + Operatore}; rowRegistroControlliRow.ItemArray = columnValuesArray; this.Rows.Add(rowRegistroControlliRow); return rowRegistroControlliRow; @@ -8275,6 +8286,7 @@ namespace MapoDb { this.columnMatrOpr = base.Columns["MatrOpr"]; this.columnEsitoOK = base.Columns["EsitoOK"]; this.columnNote = base.Columns["Note"]; + this.columnOperatore = base.Columns["Operatore"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8296,6 +8308,8 @@ namespace MapoDb { base.Columns.Add(this.columnEsitoOK); this.columnNote = new global::System.Data.DataColumn("Note", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnNote); + this.columnOperatore = new global::System.Data.DataColumn("Operatore", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOperatore); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxControllo}, true)); this.columnIdxControllo.AutoIncrement = true; @@ -8314,6 +8328,8 @@ namespace MapoDb { this.columnEsitoOK.AllowDBNull = false; this.columnNote.AllowDBNull = false; this.columnNote.MaxLength = 250; + this.columnOperatore.ReadOnly = true; + this.columnOperatore.MaxLength = 101; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12779,6 +12795,34 @@ namespace MapoDb { this[this.tableRegistroControlli.NoteColumn] = value; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public string Operatore { + get { + try { + return ((string)(this[this.tableRegistroControlli.OperatoreColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'Operatore\' nella tabella \'RegistroControlli\' è DBNull.", e); + } + } + set { + this[this.tableRegistroControlli.OperatoreColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsOperatoreNull() { + return this.IsNull(this.tableRegistroControlli.OperatoreColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetOperatoreNull() { + this[this.tableRegistroControlli.OperatoreColumn] = global::System.Convert.DBNull; + } } /// @@ -23303,52 +23347,8 @@ SELECT RowNum, lastUpdate, IdxMacchina, CodMacchina, Nome, url, idxODL, CodArtic tableMapping.ColumnMappings.Add("MatrOpr", "MatrOpr"); tableMapping.ColumnMappings.Add("EsitoOK", "EsitoOK"); tableMapping.ColumnMappings.Add("Note", "Note"); + tableMapping.ColumnMappings.Add("Operatore", "Operatore"); this._adapter.TableMappings.Add(tableMapping); - this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [dbo].[RegistroControlli] WHERE (([IdxControllo] = @Original_IdxControllo) AND ([DataOra] = @Original_DataOra) AND ([IdxMacchina] = @Original_IdxMacchina) AND ([IdxODL] = @Original_IdxODL) AND ([CodArticolo] = @Original_CodArticolo) AND ([MatrOpr] = @Original_MatrOpr) AND ([EsitoOK] = @Original_EsitoOK) AND ([Note] = @Original_Note))"; - this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxControllo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxControllo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataOra", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataOra", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MatrOpr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatrOpr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EsitoOK", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EsitoOK", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[RegistroControlli] ([DataOra], [IdxMacchina], [IdxODL], [CodArticolo], [MatrOpr], [EsitoOK], [Note]) VALUES (@DataOra, @IdxMacchina, @IdxODL, @CodArticolo, @MatrOpr, @EsitoOK, @Note); -SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK, Note FROM RegistroControlli WHERE (IdxControllo = SCOPE_IDENTITY())"; - this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOra", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataOra", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatrOpr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EsitoOK", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EsitoOK", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); - this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[RegistroControlli] SET [DataOra] = @DataOra, [IdxMacchina] = @IdxMacchina, [IdxODL] = @IdxODL, [CodArticolo] = @CodArticolo, [MatrOpr] = @MatrOpr, [EsitoOK] = @EsitoOK, [Note] = @Note WHERE (([IdxControllo] = @Original_IdxControllo) AND ([DataOra] = @Original_DataOra) AND ([IdxMacchina] = @Original_IdxMacchina) AND ([IdxODL] = @Original_IdxODL) AND ([CodArticolo] = @Original_CodArticolo) AND ([MatrOpr] = @Original_MatrOpr) AND ([EsitoOK] = @Original_EsitoOK) AND ([Note] = @Original_Note)); -SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK, Note FROM RegistroControlli WHERE (IdxControllo = @IdxControllo)"; - this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOra", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataOra", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatrOpr", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EsitoOK", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EsitoOK", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxControllo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxControllo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_DataOra", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "DataOra", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxMacchina", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxMacchina", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_IdxODL", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "IdxODL", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodArticolo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CodArticolo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_MatrOpr", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MatrOpr", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_EsitoOK", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "EsitoOK", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Note", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Note", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxControllo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "IdxControllo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -23364,8 +23364,7 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK," + - " Note FROM dbo.RegistroControlli"; + this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_RegistroControlli"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; @@ -23440,213 +23439,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK return dataTable; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_ProdTempi.RegistroControlliDataTable dataTable) { - return this.Adapter.Update(dataTable); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(DS_ProdTempi dataSet) { - return this.Adapter.Update(dataSet, "RegistroControlli"); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow dataRow) { - return this.Adapter.Update(new global::System.Data.DataRow[] { - dataRow}); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int Update(global::System.Data.DataRow[] dataRows) { - return this.Adapter.Update(dataRows); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_IdxControllo, System.DateTime Original_DataOra, string Original_IdxMacchina, int Original_IdxODL, string Original_CodArticolo, int Original_MatrOpr, bool Original_EsitoOK, string Original_Note) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_IdxControllo)); - this.Adapter.DeleteCommand.Parameters[1].Value = ((System.DateTime)(Original_DataOra)); - if ((Original_IdxMacchina == null)) { - throw new global::System.ArgumentNullException("Original_IdxMacchina"); - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_IdxMacchina)); - } - this.Adapter.DeleteCommand.Parameters[3].Value = ((int)(Original_IdxODL)); - if ((Original_CodArticolo == null)) { - throw new global::System.ArgumentNullException("Original_CodArticolo"); - } - else { - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_CodArticolo)); - } - this.Adapter.DeleteCommand.Parameters[5].Value = ((int)(Original_MatrOpr)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((bool)(Original_EsitoOK)); - if ((Original_Note == null)) { - throw new global::System.ArgumentNullException("Original_Note"); - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((string)(Original_Note)); - } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; - if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.DeleteCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.DeleteCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(System.DateTime DataOra, string IdxMacchina, int IdxODL, string CodArticolo, int MatrOpr, bool EsitoOK, string Note) { - this.Adapter.InsertCommand.Parameters[0].Value = ((System.DateTime)(DataOra)); - if ((IdxMacchina == null)) { - throw new global::System.ArgumentNullException("IdxMacchina"); - } - else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(IdxMacchina)); - } - this.Adapter.InsertCommand.Parameters[2].Value = ((int)(IdxODL)); - if ((CodArticolo == null)) { - throw new global::System.ArgumentNullException("CodArticolo"); - } - else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(CodArticolo)); - } - this.Adapter.InsertCommand.Parameters[4].Value = ((int)(MatrOpr)); - this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(EsitoOK)); - if ((Note == null)) { - throw new global::System.ArgumentNullException("Note"); - } - else { - this.Adapter.InsertCommand.Parameters[6].Value = ((string)(Note)); - } - global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; - if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.InsertCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.InsertCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update( - System.DateTime DataOra, - string IdxMacchina, - int IdxODL, - string CodArticolo, - int MatrOpr, - bool EsitoOK, - string Note, - int Original_IdxControllo, - System.DateTime Original_DataOra, - string Original_IdxMacchina, - int Original_IdxODL, - string Original_CodArticolo, - int Original_MatrOpr, - bool Original_EsitoOK, - string Original_Note, - int IdxControllo) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((System.DateTime)(DataOra)); - if ((IdxMacchina == null)) { - throw new global::System.ArgumentNullException("IdxMacchina"); - } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(IdxMacchina)); - } - this.Adapter.UpdateCommand.Parameters[2].Value = ((int)(IdxODL)); - if ((CodArticolo == null)) { - throw new global::System.ArgumentNullException("CodArticolo"); - } - else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(CodArticolo)); - } - this.Adapter.UpdateCommand.Parameters[4].Value = ((int)(MatrOpr)); - this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(EsitoOK)); - if ((Note == null)) { - throw new global::System.ArgumentNullException("Note"); - } - else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(Note)); - } - this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(Original_IdxControllo)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(Original_DataOra)); - if ((Original_IdxMacchina == null)) { - throw new global::System.ArgumentNullException("Original_IdxMacchina"); - } - else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_IdxMacchina)); - } - this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_IdxODL)); - if ((Original_CodArticolo == null)) { - throw new global::System.ArgumentNullException("Original_CodArticolo"); - } - else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_CodArticolo)); - } - this.Adapter.UpdateCommand.Parameters[12].Value = ((int)(Original_MatrOpr)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((bool)(Original_EsitoOK)); - if ((Original_Note == null)) { - throw new global::System.ArgumentNullException("Original_Note"); - } - else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_Note)); - } - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(IdxControllo)); - global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; - if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) - != global::System.Data.ConnectionState.Open)) { - this.Adapter.UpdateCommand.Connection.Open(); - } - try { - int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); - return returnValue; - } - finally { - if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { - this.Adapter.UpdateCommand.Connection.Close(); - } - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(System.DateTime DataOra, string IdxMacchina, int IdxODL, string CodArticolo, int MatrOpr, bool EsitoOK, string Note, int Original_IdxControllo, System.DateTime Original_DataOra, string Original_IdxMacchina, int Original_IdxODL, string Original_CodArticolo, int Original_MatrOpr, bool Original_EsitoOK, string Original_Note) { - return this.Update(DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK, Note, Original_IdxControllo, Original_DataOra, Original_IdxMacchina, Original_IdxODL, Original_CodArticolo, Original_MatrOpr, Original_EsitoOK, Original_Note, Original_IdxControllo); - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -23728,8 +23520,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK private MappaStatoExplTableAdapter _mappaStatoExplTableAdapter; - private RegistroControlliTableAdapter _registroControlliTableAdapter; - private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -23857,20 +23647,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + - "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + - "a", "System.Drawing.Design.UITypeEditor")] - public RegistroControlliTableAdapter RegistroControlliTableAdapter { - get { - return this._registroControlliTableAdapter; - } - set { - this._registroControlliTableAdapter = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -23922,10 +23698,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK && (this._mappaStatoExplTableAdapter.Connection != null))) { return this._mappaStatoExplTableAdapter.Connection; } - if (((this._registroControlliTableAdapter != null) - && (this._registroControlliTableAdapter.Connection != null))) { - return this._registroControlliTableAdapter.Connection; - } return null; } set { @@ -23963,9 +23735,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK if ((this._mappaStatoExplTableAdapter != null)) { count = (count + 1); } - if ((this._registroControlliTableAdapter != null)) { - count = (count + 1); - } return count; } } @@ -24049,15 +23818,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK allChangedRows.AddRange(updatedRows); } } - if ((this._registroControlliTableAdapter != null)) { - global::System.Data.DataRow[] updatedRows = dataSet.RegistroControlli.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); - updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); - if (((updatedRows != null) - && (0 < updatedRows.Length))) { - result = (result + this._registroControlliTableAdapter.Update(updatedRows)); - allChangedRows.AddRange(updatedRows); - } - } return result; } @@ -24132,14 +23892,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK allAddedRows.AddRange(addedRows); } } - if ((this._registroControlliTableAdapter != null)) { - global::System.Data.DataRow[] addedRows = dataSet.RegistroControlli.Select(null, null, global::System.Data.DataViewRowState.Added); - if (((addedRows != null) - && (0 < addedRows.Length))) { - result = (result + this._registroControlliTableAdapter.Update(addedRows)); - allAddedRows.AddRange(addedRows); - } - } return result; } @@ -24150,14 +23902,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] private int UpdateDeletedRows(DS_ProdTempi dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; - if ((this._registroControlliTableAdapter != null)) { - global::System.Data.DataRow[] deletedRows = dataSet.RegistroControlli.Select(null, null, global::System.Data.DataViewRowState.Deleted); - if (((deletedRows != null) - && (0 < deletedRows.Length))) { - result = (result + this._registroControlliTableAdapter.Update(deletedRows)); - allChangedRows.AddRange(deletedRows); - } - } if ((this._anagArticoliTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.AnagArticoli.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -24301,11 +24045,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + "a stessa stringa di connessione."); } - if (((this._registroControlliTableAdapter != null) - && (this.MatchTableAdapterConnection(this._registroControlliTableAdapter.Connection) == false))) { - throw new global::System.ArgumentException("Tutti gli oggetti TableAdapter gestiti da TableAdapterManager devono utilizzare l" + - "a stessa stringa di connessione."); - } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager non contiene informazioni di connessione. Impostare la propri" + @@ -24411,15 +24150,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK adaptersWithAcceptChangesDuringUpdate.Add(this._mappaStatoExplTableAdapter.Adapter); } } - if ((this._registroControlliTableAdapter != null)) { - revertConnections.Add(this._registroControlliTableAdapter, this._registroControlliTableAdapter.Connection); - this._registroControlliTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); - this._registroControlliTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); - if (this._registroControlliTableAdapter.Adapter.AcceptChangesDuringUpdate) { - this._registroControlliTableAdapter.Adapter.AcceptChangesDuringUpdate = false; - adaptersWithAcceptChangesDuringUpdate.Add(this._registroControlliTableAdapter.Adapter); - } - } // //---- Perform updates ----------- // @@ -24510,10 +24240,6 @@ SELECT IdxControllo, DataOra, IdxMacchina, IdxODL, CodArticolo, MatrOpr, EsitoOK this._mappaStatoExplTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._mappaStatoExplTableAdapter])); this._mappaStatoExplTableAdapter.Transaction = null; } - if ((this._registroControlliTableAdapter != null)) { - this._registroControlliTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._registroControlliTableAdapter])); - this._registroControlliTableAdapter.Transaction = null; - } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters);