From f01de1a3899d205c2eba4a1937e7999ecaaef050 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 11 Jan 2021 17:43:12 +0100 Subject: [PATCH] Completata review commesse UT --- GPW_Commesse/Content/Style.css | 18 +- GPW_Commesse/Content/Style.less | 106 +-- GPW_Commesse/Content/Style.min.css | 2 +- .../WebUserControls/mod_commAttivitaDesk.ascx | 392 +++++------ .../mod_commAttivitaDesk.ascx.cs | 82 ++- .../mod_commAttivitaDesk.ascx.designer.cs | 36 +- .../WebUserControls/mod_commUtLog.ascx | 4 +- .../mod_periodoAnalisi.ascx.cs | 659 ++++++++++-------- GPW_Data/DS_Applicazione.Designer.cs | 139 +++- GPW_Data/DS_Applicazione.xsd | 15 + GPW_Data/DS_Applicazione.xss | 8 +- GPW_Data/DS_Utility.Designer.cs | 76 +- GPW_Data/DS_Utility.xsd | 26 +- GPW_Data/DS_Utility.xss | 34 +- 14 files changed, 950 insertions(+), 647 deletions(-) diff --git a/GPW_Commesse/Content/Style.css b/GPW_Commesse/Content/Style.css index 93f0d4e..c51d93f 100644 --- a/GPW_Commesse/Content/Style.css +++ b/GPW_Commesse/Content/Style.css @@ -7,20 +7,26 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { /*font-family: 'Open Sans Condensed', sans-serif;*/ + font-family: 'Roboto', sans-serif; /*font-family: 'Roboto Condensed', sans-serif;*/ } -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -/*.body-content { - padding-left: 15px; - padding-right: 15px; -}*/ /* Set widths on the form inputs since otherwise they're 100% wide */ input, select, textarea { max-width: 280px; } +.textCondens { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ +} +.textNormal { + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ +} +.textBig { + font-size: 1.5em; +} /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { .jumbotron { diff --git a/GPW_Commesse/Content/Style.less b/GPW_Commesse/Content/Style.less index d938a78..bc652af 100644 --- a/GPW_Commesse/Content/Style.less +++ b/GPW_Commesse/Content/Style.less @@ -7,69 +7,74 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { - /*font-family: 'Open Sans Condensed', sans-serif;*/ - /*font-family: 'Roboto Condensed', sans-serif;*/ + /*font-family: 'Open Sans Condensed', sans-serif;*/ + font-family: 'Roboto', sans-serif; + /*font-family: 'Roboto Condensed', sans-serif;*/ } -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -/*.body-content { - padding-left: 15px; - padding-right: 15px; -}*/ - /* Set widths on the form inputs since otherwise they're 100% wide */ input, select, textarea { - max-width: 280px; + max-width: 280px; } +.textCondens { + font-family: 'Roboto Condensed', sans-serif; + /*font-family: 'Open Sans Condensed', sans-serif;*/ +} + +.textNormal { + font-family: 'Roboto', sans-serif; + /*font-family: 'Open Sans', sans-serif;*/ +} + +.textBig { + font-size: 1.5em; +} /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { - .jumbotron { - margin-top: 20px; - } + .jumbotron { + margin-top: 20px; + } - .body-content { - padding: 0; - } + .body-content { + padding: 0; + } - /* Set widths on the form inputs since otherwise they're 100% wide */ - input, - select, - textarea { - max-width: 100%; - } + /* Set widths on the form inputs since otherwise they're 100% wide */ + input, + select, + textarea { + max-width: 100%; + } } - .elTimbSmart { - padding: 0.2em; - font-size: 1.1em; - line-height: 1.3em; + padding: 0.2em; + font-size: 1.1em; + line-height: 1.3em; } .ui-input-btn input { - opacity: .5; + opacity: .5; } - * { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -*:before, -*:after { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } -.logo -{ +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.logo { background-image: url(../images/logo_sw.png); -khtml-opacity: .50; -moz-opacity: .50; @@ -80,11 +85,11 @@ textarea { width: 800px; height: 300px; margin: 50px auto 50px auto; - vertical-align:middle; + vertical-align: middle; background-repeat: no-repeat; } -.logo:hover -{ + +.logo:hover { background-image: url(../images/logo_sw.png); -khtml-opacity: 1.0; -moz-opacity: 1.0; @@ -95,26 +100,25 @@ textarea { width: 800px; height: 300px; margin: 50px auto 50px auto; - vertical-align:middle; + vertical-align: middle; background-repeat: no-repeat; } -.bodyCenter -{ + +.bodyCenter { vertical-align: middle; text-align: center; height: 100%; width: 100%; } -.centerMenu -{ + +.centerMenu { background-color: White; text-align: center; border-width: thin; border-style: groove; border-color: Blue; } -A:hover -{ - color: red; -} +A:hover { + color: red; +} \ No newline at end of file diff --git a/GPW_Commesse/Content/Style.min.css b/GPW_Commesse/Content/Style.min.css index 3d653cf..cfab48c 100644 --- a/GPW_Commesse/Content/Style.min.css +++ b/GPW_Commesse/Content/Style.min.css @@ -1 +1 @@ -input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;} \ No newline at end of file +body{font-family:'Roboto',sans-serif;}input,select,textarea{max-width:280px;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;} \ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx index dedcdfc..a23fa48 100644 --- a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx +++ b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx @@ -3,39 +3,49 @@ <%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc1" %> <%@ Register Src="mod_autocomplete.ascx" TagPrefix="uc2" TagName="mod_autocomplete" %> - - -
- + +
+ + +
+
+ <%: valoreDateTime.ToString("dddd dd") %> +
+ <%: valoreDateTime.ToString("MMMM yyyy") %> +
+
+
-
- - - - - -
- Nessun record COMMESSA -
- - - - - - - - - - - - - - - - +
+
+ + + + + +
+ Nessun record COMMESSA +
+ + + + + + + + + + + + + + + +
@@ -56,184 +66,178 @@
-
+
<%# Eval("descrizione").ToString().Replace(Environment.NewLine,"
").Replace("\n","
") %>
- - - -
-
- - -
-
+ + + +
+
+
+
-
- - - +
+ + + +
+
+ + + +
-
- - - +
+ +
+
-
- -
- -
-
-
-
- Periodo -
-
- -
-
- -
-
-
-
- - -
-
-
-
- -
-
- -
-
- - -
-
-
- - - +
+
+ Periodo
-
- - - +
+ +
+
+
-
- -
- +
+
+ + +
-
-
-
- Periodo +
+
+ +
+
+ +
-
- + + +
+
+
+ + + +
+
+ + + +
+
+
+ +
+ +
-
- +
+
+ Periodo +
+
+ +
+
+ +
-
-
-
- - +
+
+ + +
-
-
-
- +
+
+ +
+
+ +
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + +
\ No newline at end of file diff --git a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs index d7d6de2..80339d1 100644 --- a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs @@ -176,7 +176,8 @@ namespace GPW_Commesse.WebUserControls set { memLayer.ML.setSessionVal("dataRif", value); - lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", value); + lblTitle.Text = string.Format("{0:dd/MM/yyyy}", value); + lblSubtitle.Text = string.Format("{0:dddd}", value); } } @@ -329,15 +330,18 @@ namespace GPW_Commesse.WebUserControls while (li != null) { li = ddlFase_int.Items.FindByValue("0"); - try + if (li != null) { - li.Attributes.Add("style", "color:gray;"); - li.Attributes.Add("disabled", "true"); - li.Value = "-1"; - li.Text = string.Format("[ {0} ]", li.Text); + try + { + li.Attributes.Add("style", "color:gray;"); + li.Attributes.Add("disabled", "true"); + li.Value = "-1"; + li.Text = string.Format("[ {0} ]", li.Text); + } + catch + { } } - catch - { } } try { @@ -356,8 +360,6 @@ namespace GPW_Commesse.WebUserControls // salvo in session idxProjSel! DropDownList ddlGrp_int = (DropDownList)sender; gruppoSel = ddlGrp_int.SelectedValue; - // ricarico dati progetto - odsProgetto.DataBind(); // se in insert salvo orari e testo... DateTime inizio = DateTime.Now; DateTime fine = DateTime.Now; @@ -376,7 +378,6 @@ namespace GPW_Commesse.WebUserControls 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) { @@ -385,8 +386,13 @@ namespace GPW_Commesse.WebUserControls ((TextBox)grView.FooterRow.FindControl("txtDescrizione")).Text = descr; try { + DropDownList ddlProj_int = (DropDownList)grView.FooterRow.FindControl("ddlProgetto"); + ddlProj_int.SelectedIndex = 0; + ddlProj_int.DataBind(); + idxProjSel = Convert.ToInt32(ddlProj_int.SelectedValue); DropDownList ddlFase_int = (DropDownList)grView.FooterRow.FindControl("ddlFase"); ddlFase_int.SelectedIndex = 1; + ddlFase_int.DataBind(); } catch { } @@ -400,10 +406,15 @@ namespace GPW_Commesse.WebUserControls ((TextBox)grView.Rows[idx].FindControl("txtDescrizione")).Text = descr; try { + DropDownList ddlProj_int = (DropDownList)grView.Rows[idx].FindControl("ddlProgetto"); + ddlProj_int.SelectedIndex = 0; + ddlProj_int.DataBind(); + idxProjSel = Convert.ToInt32(ddlProj_int.SelectedValue); DropDownList ddlFase_int = (DropDownList)grView.Rows[idx].FindControl("ddlFase"); ddlFase_int.SelectedIndex = 1; + ddlFase_int.DataBind(); } - catch + catch (Exception exc) { } } } @@ -496,6 +507,11 @@ namespace GPW_Commesse.WebUserControls DataProxy.DP.taRA.Insert(idxDip, idxFase, inizio, fine, descr, 0); } + protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e) + { + ddlGruppo.Visible = false; + } + /// /// generico comando riga /// @@ -530,24 +546,29 @@ namespace GPW_Commesse.WebUserControls { // controllo la riga GridViewRow riga = e.Row; - if (grView.EditIndex >= 0 || grView.ShowFooter) + if ((grView.EditIndex >= 0 && riga.RowIndex == grView.EditIndex) || grView.ShowFooter) { - try + //pre-seleziono idx progetto x ods fase... + DropDownList ddlProj_int = (DropDownList)riga.FindControl("ddlProgetto"); + if (idxProjSel >= 0 && (ddlProj_int != null)) { - //pre-seleziono idx progetto x ods fase... - DropDownList ddlProj_int = (DropDownList)riga.FindControl("ddlProgetto"); - if (idxProjSel >= 0 && (ddlProj_int != null)) + try { ddlProj_int.SelectedValue = idxProjSel.ToString(); } - DropDownList ddlFase_int = (DropDownList)riga.FindControl("ddlFase"); - if (idxFaseSel >= 0 && (ddlFase_int != null)) + catch + { } + } + DropDownList ddlFase_int = (DropDownList)riga.FindControl("ddlFase"); + if (idxFaseSel >= 0 && (ddlFase_int != null)) + { + try { ddlFase_int.SelectedValue = idxFaseSel.ToString(); } + catch + { } } - catch - { } } } @@ -559,6 +580,7 @@ namespace GPW_Commesse.WebUserControls protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e) { updateControl(); + ddlGruppo.Visible = false; } /// @@ -571,8 +593,16 @@ namespace GPW_Commesse.WebUserControls 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); + var tabRAD = DataProxy.DP.taRAExpl.getByKey(idxRASel); + if (tabRAD.Rows.Count > 0) + { + idxFaseSel = tabRAD[0].idxFase; + idxProjSel = tabRAD[0].idxProgetto; + // imposto gruppo + ddlGruppo.Visible = true; + ddlGruppo.SelectedValue = tabRAD[0].gruppo; + gruppoSel = tabRAD[0].gruppo; + } } /// @@ -583,6 +613,7 @@ namespace GPW_Commesse.WebUserControls protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e) { updateControl(); + ddlGruppo.Visible = false; } protected void lnkClona_Click(object sender, EventArgs e) @@ -607,6 +638,7 @@ namespace GPW_Commesse.WebUserControls /// protected void lnkNew_Click(object sender, EventArgs e) { + ddlGruppo.Visible = true; createNew(); } @@ -638,7 +670,9 @@ namespace GPW_Commesse.WebUserControls { refreshControlli(); pnlHeader.Visible = enableFull; - lblTitle.Text = string.Format("{0:dddd dd/MM/yyyy}", valoreDateTime); + lblTitle.Text = string.Format("{0:dd/MM/yyyy}", valoreDateTime); + lblSubtitle.Text = string.Format("{0:dddd}", valoreDateTime); + ddlGruppo.Visible = false; } } diff --git a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.designer.cs b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.designer.cs index b9e5073..1575f1f 100644 --- a/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.designer.cs +++ b/GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.designer.cs @@ -23,6 +23,33 @@ namespace GPW_Commesse.WebUserControls /// protected global::System.Web.UI.WebControls.Panel pnlHeader; + /// + /// Controllo ddlGruppo. + /// + /// + /// 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 ddlGruppo; + + /// + /// Controllo odsGruppi. + /// + /// + /// 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 odsGruppi; + + /// + /// Controllo lblSubtitle. + /// + /// + /// 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.Label lblSubtitle; + /// /// Controllo lblTitle. /// @@ -76,14 +103,5 @@ namespace GPW_Commesse.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsFase; - - /// - /// Controllo odsGruppi. - /// - /// - /// 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 odsGruppi; } } diff --git a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx index 2455c36..9bf636b 100644 --- a/GPW_Commesse/WebUserControls/mod_commUtLog.ascx +++ b/GPW_Commesse/WebUserControls/mod_commUtLog.ascx @@ -115,8 +115,8 @@
-
- +
+
diff --git a/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs b/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs index 8f75b50..a3a0d9e 100644 --- a/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs +++ b/GPW_Commesse/WebUserControls/mod_periodoAnalisi.ascx.cs @@ -10,348 +10,395 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using SteamWare; - public partial class mod_periodoAnalisi : System.Web.UI.UserControl { - #region area protected + #region Protected Fields - protected intervalloDate _intervallo; + protected intervalloDate _intervallo; - public string uid - { - get + #endregion Protected Fields + + #region Public Events + + public event EventHandler eh_doUpdate; + + #endregion Public Events + + #region Protected Properties + + /// + /// definisce se sia da mostrare il selettore delle ore nel controllo + /// + protected bool mostraSelOra { - return this.UniqueID.Replace("$", "_").Replace("-", "_"); + 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; + } } - } - /// - /// avvio componente - /// - /// - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - setIntervallo(); - setDurataMin(); - } - /// - /// definisce se sia da mostrare il selettore delle ore nel controllo - /// - protected bool mostraSelOra - { - get + #endregion Protected Properties + + #region Public Properties + + public intervalloDate intervalloAnalisi { - bool answ = false; - if (memLayer.ML.isInSessionObject("mostraSelOra")) - { - answ = memLayer.ML.BoolSessionObj("mostraSelOra"); - } - else - { - // leggo da sessione e salvo... + get + { + intervalloDate answ = new intervalloDate(); + if (memLayer.ML.isInSessionObject("_intervallo")) + { + answ = (intervalloDate)Session["_intervallo"]; + } + return answ; + } + set + { + intervalloDate interv = value; + Session["_intervallo"] = interv; + Session["_inizio"] = interv.inizio; + Session["_fine"] = interv.fine; + aggiornaDateMostrate(false); + } + } + + /// + /// imposta realtime update (non mostra button am fa subito update) + /// + public bool realtimeUpdate + { + get + { + return memLayer.ML.BoolSessionObj("rltUpdatePeriodo"); + } + set + { + memLayer.ML.setSessionVal("rltUpdatePeriodo", value); + } + } + + public string uid + { + get + { + return this.UniqueID.Replace("$", "_").Replace("-", "_"); + } + } + + #endregion Public Properties + + #region Private Methods + + /// + /// effettua update delle date mostrate da intervallo analisi (ed eventualmente riporta update...) + /// + /// + private void aggiornaDateMostrate(bool doReportUpdate) + { + scriviDate(); + if (doReportUpdate) + { + reportUpdate(); + } + } + + private void aggiornaPeriodo() + { + _intervallo = new intervalloDate(); + // calcolo tempi arrotondati + int oraInizio = 0; + int oraFine = 0; + if (mostraSelOra) + { + oraInizio = Convert.ToInt32(ddlOraInizio.SelectedValue); + oraFine = Convert.ToInt32(ddlOraFine.SelectedValue); + } + _intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio); + _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine); + verificaCoerenzaDate(); + int _durataMin; + _durataMin = Convert.ToInt32(txtDurataMin.Text); + Session["_durataMin"] = _durataMin; + reportUpdate(); + } + + /// + /// controlla se aggiornare subito o mostrare update (a seconda del valore di realtime update...) + /// + private void checkIfUpdate() + { + // se richiesto realtime + if (realtimeUpdate) + { + aggiornaPeriodo(); + // nascondo btn update + btnUpdate.Visible = false; + } + else + { + // altrimenti mostro btn update + btnUpdate.Visible = true; + } + } + + /// + /// scrive nuove date in controllo + /// + private void scriviDate() + { + // se intervallo non è valorizzato leggo da sessione... + if (!_intervallo.isValid) + { + _intervallo = intervalloAnalisi; + } + txtInizio.Text = _intervallo.inizio.ToShortDateString(); + ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00"); + txtFine.Text = _intervallo.fine.ToShortDateString(); + ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00"); + if (mostraSelOra) + { + ddlOraInizio.Visible = true; + ddlOraFine.Visible = true; + } + else + { + ddlOraInizio.Visible = false; + ddlOraFine.Visible = false; + } + } + + /// + /// imposta durata minima + /// + private void setDurataMin() + { + int _durataMin = 0; try { - answ = memLayer.ML.confReadBool("mostraSelOra"); + if (memLayer.ML.isInSessionObject("_intervallo")) + { + _durataMin = memLayer.ML.IntSessionObj("_durataMin"); + } } catch - { } - memLayer.ML.setSessionVal("mostraSelOra", answ); - } - return answ; + { + _durataMin = 0; + Session["_durataMin"] = _durataMin; + } + txtDurataMin.Text = _durataMin.ToString(); } - } - /// - /// gestione del selettore rapido dell'intervallo temporale... - /// - /// - /// - protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e) - { - // verifico cosa sia cambiato ed imposto date... - datario _datario = new datario(); - switch (DropDownList1.SelectedValue) + /// + /// imposta intervallo da sessione o di default + /// + private void setIntervallo() { - case "oggi": - _intervallo = _datario.giornata(DateTime.Now); - break; - case "ieri": - _intervallo = _datario.giornata(DateTime.Now.AddDays(-1)); - break; - case "ultimi 7gg": - _intervallo = _datario.ultimiGiorni(DateTime.Now, 7); - break; - case "questa settimana": - _intervallo = _datario.questaSett(DateTime.Now); - break; - case "ultimi 30gg": - _intervallo = _datario.ultimiGiorni(DateTime.Now, 30); - break; - case "questo mese": - _intervallo = _datario.questoMese(DateTime.Now); - break; - case "mese precedente": - _intervallo = _datario.mesePrecedente(DateTime.Now); - break; - case "questo anno": - _intervallo = _datario.estremiAnno(DateTime.Now); - break; - case "1 anno": - _intervallo = _datario.ultimiGiorni(DateTime.Now, 366); - break; - default: - break; + intervalloDate _intervallo; + try + { + if (memLayer.ML.isInSessionObject("_intervallo")) + { + _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(); } - if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine)) - { - verificaCoerenzaDate(); - aggiornaDateMostrate(realtimeUpdate); - // mostro btn update - btnUpdate.Visible = !realtimeUpdate; - } - } - /// - /// 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.ToShortDateString(); - ddlOraInizio.SelectedValue = _intervallo.inizio.Hour.ToString("00"); - txtFine.Text = _intervallo.fine.ToShortDateString(); - ddlOraFine.SelectedValue = _intervallo.fine.Hour.ToString("00"); - if (mostraSelOra) - { - ddlOraInizio.Visible = true; - ddlOraFine.Visible = true; - } - else - { - ddlOraInizio.Visible = false; - ddlOraFine.Visible = false; - } - } - /// - /// 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(); - } - /// - /// imposta durata minima - /// - private void setDurataMin() - { - int _durataMin; - try - { - _durataMin = (int)Session["_durataMin"]; - } - catch - { - _durataMin = 0; - Session["_durataMin"] = _durataMin; - } - txtDurataMin.Text = _durataMin.ToString(); - } - protected void Page_Load(object sender, EventArgs e) - { - lblPeriodo.Text = "Periodo"; - txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati"; - txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati"; - lblDurataMin.Text = "Visualizza eventi con durata superiore a"; - } - - private void aggiornaPeriodo() - { - _intervallo = new intervalloDate(); - // calcolo tempi arrotondati - int oraInizio = 0; - int oraFine = 0; - if (mostraSelOra) + /// + /// verifica che le date dell'intervallo siano coerenti (inizio < fine) + /// + private void verificaCoerenzaDate() { - oraInizio = Convert.ToInt32(ddlOraInizio.SelectedValue); - oraFine = Convert.ToInt32(ddlOraFine.SelectedValue); + // 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.fine = _intervallo.inizio.AddDays(1); + } + //intervalloAnalisi = _intervallo; + aggiornaDateMostrate(false); } - _intervallo.inizio = Convert.ToDateTime(txtInizio.Text).AddHours(oraInizio); - _intervallo.fine = Convert.ToDateTime(txtFine.Text).AddHours(oraFine); - verificaCoerenzaDate(); - int _durataMin; - _durataMin = Convert.ToInt32(txtDurataMin.Text); - Session["_durataMin"] = _durataMin; - 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) + #endregion Private Methods + + #region Protected Methods + + /// + /// in questo caso faccio udpate periodo mostrato + /// + /// + /// + protected void btnUpdate_Click(object sender, EventArgs e) { - // controllo non siano date successive ad oggi... - if (_intervallo.fine > DateTime.Now) - { - _intervallo.fine = DateTime.Now; - } - _intervallo.fine = _intervallo.inizio.AddDays(1); + aggiornaPeriodo(); + // nascondo btn update + btnUpdate.Visible = false; } - //intervalloAnalisi = _intervallo; - aggiornaDateMostrate(false); - } - /// - /// evento cambio testo data inizio - /// - /// - /// - protected void txtInizio_TextChanged(object sender, EventArgs e) - { - // imposto il selettore a discesa... - setPeriodoFree(); - checkIfUpdate(); - } - /// - /// evento cambio testo data fine - /// - /// - /// - protected void txtFine_TextChanged(object sender, EventArgs e) - { - // imposto il selettore a discesa... - setPeriodoFree(); - checkIfUpdate(); - } - /// - /// controlla se aggiornare subito o mostrare update (a seconda del valore di realtime update...) - /// - private void checkIfUpdate() - { - // se richiesto realtime - if (realtimeUpdate) + + /// + /// gestione del selettore rapido dell'intervallo temporale... + /// + /// + /// + protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e) { - aggiornaPeriodo(); - // nascondo btn update - btnUpdate.Visible = false; + // verifico cosa sia cambiato ed imposto date... + datario _datario = new datario(); + switch (DropDownList1.SelectedValue) + { + case "oggi": + _intervallo = _datario.giornata(DateTime.Now); + break; + + case "ieri": + _intervallo = _datario.giornata(DateTime.Now.AddDays(-1)); + break; + + case "ultimi 7gg": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 7); + break; + + case "questa settimana": + _intervallo = _datario.questaSett(DateTime.Now); + break; + + case "ultimi 30gg": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 30); + break; + + case "questo mese": + _intervallo = _datario.questoMese(DateTime.Now); + break; + + case "mese precedente": + _intervallo = _datario.mesePrecedente(DateTime.Now); + break; + + case "questo anno": + _intervallo = _datario.estremiAnno(DateTime.Now); + break; + + case "1 anno": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 366); + break; + + default: + break; + } + if ((intervalloAnalisi.inizio != _intervallo.inizio) || (intervalloAnalisi.fine != _intervallo.fine)) + { + verificaCoerenzaDate(); + aggiornaDateMostrate(realtimeUpdate); + // mostro btn update + btnUpdate.Visible = !realtimeUpdate; + } } - else + + /// + /// avvio componente + /// + /// + protected override void OnInit(EventArgs e) { - // altrimenti mostro btn update - btnUpdate.Visible = true; + base.OnInit(e); + setIntervallo(); + setDurataMin(); } - } - /// - /// in questo caso faccio udpate periodo mostrato - /// - /// - /// - protected void btnUpdate_Click(object sender, EventArgs e) - { - 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) + + protected void Page_Load(object sender, EventArgs e) { - eh_doUpdate(this, new EventArgs()); + lblPeriodo.Text = "Periodo"; + txtInizio.ToolTip = "inizio periodo di riferimento per i dati mostrati"; + txtFine.ToolTip = "fine periodo di riferimento per i dati mostrati"; + lblDurataMin.Text = "Visualizza eventi con durata superiore a"; } - } - #endregion - - #region area public - - public intervalloDate intervalloAnalisi - { - get + /// + /// riporta aggiornamento a controller + /// + protected void reportUpdate() { - return (intervalloDate)Session["_intervallo"]; + intervalloAnalisi = _intervallo; + // alzo l'evento d update/inserimento e ricarico cache... + if (eh_doUpdate != null) + { + eh_doUpdate(this, new EventArgs()); + } } - set + + /// + /// evento cambio testo data fine + /// + /// + /// + protected void txtFine_TextChanged(object sender, EventArgs e) { - intervalloDate interv = value; - Session["_intervallo"] = interv; - Session["_inizio"] = interv.inizio; - Session["_fine"] = interv.fine; - aggiornaDateMostrate(false); + // imposto il selettore a discesa... + setPeriodoFree(); + checkIfUpdate(); } - } - /// - /// effettua update - /// - /// - public void doUpdate(bool doReportUpdate) - { - aggiornaDateMostrate(doReportUpdate); - } - /// - /// imposta periodo libero di selezione - /// - public void setPeriodoFree() - { - DropDownList1.SelectedIndex = 0; - } - /// - /// imposta realtime update (non mostra button am fa subito update) - /// - public bool realtimeUpdate - { - get + + /// + /// evento cambio testo data inizio + /// + /// + /// + protected void txtInizio_TextChanged(object sender, EventArgs e) { - return memLayer.ML.BoolSessionObj("rltUpdatePeriodo"); + // imposto il selettore a discesa... + setPeriodoFree(); + checkIfUpdate(); } - set + + #endregion Protected Methods + + #region Public Methods + + /// + /// effettua update + /// + /// + public void doUpdate(bool doReportUpdate) { - memLayer.ML.setSessionVal("rltUpdatePeriodo", value); + aggiornaDateMostrate(doReportUpdate); } - } - #region gestione eventi + /// + /// imposta periodo libero di selezione + /// + public void setPeriodoFree() + { + DropDownList1.SelectedIndex = 0; + } - public event EventHandler eh_doUpdate; - - #endregion - - - #endregion -} + #endregion Public Methods +} \ No newline at end of file diff --git a/GPW_Data/DS_Applicazione.Designer.cs b/GPW_Data/DS_Applicazione.Designer.cs index 796fc80..5209844 100644 --- a/GPW_Data/DS_Applicazione.Designer.cs +++ b/GPW_Data/DS_Applicazione.Designer.cs @@ -8422,6 +8422,10 @@ namespace GPW_data { private global::System.Data.DataColumn columngruppo; + private global::System.Data.DataColumn columnidxFase; + + private global::System.Data.DataColumn columnidxProgetto; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public regAttDayExplDataTable() { @@ -8559,6 +8563,22 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn idxFaseColumn { + get { + return this.columnidxFase; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn idxProgettoColumn { + get { + return this.columnidxProgetto; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -8596,7 +8616,7 @@ namespace GPW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome, string gruppo) { + public regAttDayExplRow AddregAttDayExplRow(int idxDipendente, System.DateTime inizio, System.DateTime fine, string descrizione, decimal oreTot, decimal importo, string RagSociale, string nomeProj, string nomeFase, decimal minTot, string CognomeNome, string gruppo, int idxProgetto) { regAttDayExplRow rowregAttDayExplRow = ((regAttDayExplRow)(this.NewRow())); object[] columnValuesArray = new object[] { idxDipendente, @@ -8611,7 +8631,9 @@ namespace GPW_data { minTot, null, CognomeNome, - gruppo}; + gruppo, + null, + idxProgetto}; rowregAttDayExplRow.ItemArray = columnValuesArray; this.Rows.Add(rowregAttDayExplRow); return rowregAttDayExplRow; @@ -8654,6 +8676,8 @@ namespace GPW_data { this.columnidxRA = base.Columns["idxRA"]; this.columnCognomeNome = base.Columns["CognomeNome"]; this.columngruppo = base.Columns["gruppo"]; + this.columnidxFase = base.Columns["idxFase"]; + this.columnidxProgetto = base.Columns["idxProgetto"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8685,6 +8709,10 @@ namespace GPW_data { base.Columns.Add(this.columnCognomeNome); this.columngruppo = new global::System.Data.DataColumn("gruppo", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngruppo); + this.columnidxFase = new global::System.Data.DataColumn("idxFase", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxFase); + this.columnidxProgetto = new global::System.Data.DataColumn("idxProgetto", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnidxProgetto); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidxRA}, true)); this.columnidxDipendente.AllowDBNull = false; @@ -8708,6 +8736,11 @@ namespace GPW_data { this.columnCognomeNome.MaxLength = 101; this.columngruppo.AllowDBNull = false; this.columngruppo.MaxLength = 50; + this.columnidxFase.AutoIncrement = true; + this.columnidxFase.AutoIncrementSeed = -1; + this.columnidxFase.AutoIncrementStep = -1; + this.columnidxFase.AllowDBNull = false; + this.columnidxFase.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16153,6 +16186,33 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int idxFase { + get { + return ((int)(this[this.tableregAttDayExpl.idxFaseColumn])); + } + set { + this[this.tableregAttDayExpl.idxFaseColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int idxProgetto { + get { + try { + return ((int)(this[this.tableregAttDayExpl.idxProgettoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'idxProgetto\' nella tabella \'regAttDayExpl\' è DBNull.", e); + } + } + set { + this[this.tableregAttDayExpl.idxProgettoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsdescrizioneNull() { @@ -16236,6 +16296,18 @@ namespace GPW_data { public void SetCognomeNomeNull() { this[this.tableregAttDayExpl.CognomeNomeColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsidxProgettoNull() { + return this.IsNull(this.tableregAttDayExpl.idxProgettoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetidxProgettoNull() { + this[this.tableregAttDayExpl.idxProgettoColumn] = global::System.Convert.DBNull; + } } /// @@ -30269,6 +30341,8 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi tableMapping.ColumnMappings.Add("idxRA", "idxRA"); tableMapping.ColumnMappings.Add("CognomeNome", "CognomeNome"); tableMapping.ColumnMappings.Add("gruppo", "gruppo"); + tableMapping.ColumnMappings.Add("idxFase", "idxFase"); + tableMapping.ColumnMappings.Add("idxProgetto", "idxProgetto"); this._adapter.TableMappings.Add(tableMapping); } @@ -30282,7 +30356,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "dbo.stp_RAD_Expl_getByIdxDipData"; @@ -30310,34 +30384,40 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAncest", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = "dbo.stp_RA_InsertQuery"; + this._commandCollection[3].CommandText = "dbo.stp_RAD_Expl_getByKey"; this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxRa", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "dbo.stp_RA_updateFase"; + this._commandCollection[4].CommandText = "dbo.stp_RA_InsertQuery"; this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxRA", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_RA_updateQuery"; + this._commandCollection[5].CommandText = "dbo.stp_RA_updateFase"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxRA", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "dbo.stp_RA_updateQuery"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxDipendente", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFase", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@inizio", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fine", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@descrizione", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@importo", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 19, 4, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idxRA", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -30441,6 +30521,23 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi return dataTable; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Applicazione.regAttDayExplDataTable getByKey(global::System.Nullable idxRa) { + this.Adapter.SelectCommand = this.CommandCollection[3]; + if ((idxRa.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxRa.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + DS_Applicazione.regAttDayExplDataTable dataTable = new DS_Applicazione.regAttDayExplDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -30474,7 +30571,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, false)] public virtual int insertQuery(global::System.Nullable idxDipendente, global::System.Nullable idxFase, global::System.Nullable inizio, global::System.Nullable fine, string descrizione, global::System.Nullable importo) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((idxDipendente.HasValue == true)) { command.Parameters[1].Value = ((int)(idxDipendente.Value)); } @@ -30532,7 +30629,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateFase(global::System.Nullable idxFase, global::System.Nullable Original_idxRA) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((idxFase.HasValue == true)) { command.Parameters[1].Value = ((int)(idxFase.Value)); } @@ -30566,7 +30663,7 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int updateQuery(global::System.Nullable idxDipendente, global::System.Nullable idxFase, global::System.Nullable inizio, global::System.Nullable fine, string descrizione, global::System.Nullable importo, global::System.Nullable Original_idxRA) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((idxDipendente.HasValue == true)) { command.Parameters[1].Value = ((int)(idxDipendente.Value)); } diff --git a/GPW_Data/DS_Applicazione.xsd b/GPW_Data/DS_Applicazione.xsd index f451ffe..8a546a6 100644 --- a/GPW_Data/DS_Applicazione.xsd +++ b/GPW_Data/DS_Applicazione.xsd @@ -2618,6 +2618,8 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi + + @@ -2648,6 +2650,17 @@ SELECT dataLav, idxDipendente, codGiust, minuti FROM Giustificativi WHERE (codGi + + + + dbo.stp_RAD_Expl_getByKey + + + + + + + @@ -3673,6 +3686,8 @@ SELECT idxDipendente, dtRilievo, tempRil FROM RilievoTemp WHERE (dtRilievo = @dt + + diff --git a/GPW_Data/DS_Applicazione.xss b/GPW_Data/DS_Applicazione.xss index 666fb58..2214656 100644 --- a/GPW_Data/DS_Applicazione.xss +++ b/GPW_Data/DS_Applicazione.xss @@ -4,12 +4,12 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + @@ -21,8 +21,8 @@ - - + + diff --git a/GPW_Data/DS_Utility.Designer.cs b/GPW_Data/DS_Utility.Designer.cs index 45d8efb..ebefadf 100644 --- a/GPW_Data/DS_Utility.Designer.cs +++ b/GPW_Data/DS_Utility.Designer.cs @@ -1954,6 +1954,8 @@ namespace GPW_data { private global::System.Data.DataColumn columnAttivo; + private global::System.Data.DataColumn columngruppo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public v_selProgettiDataTable() { @@ -2019,6 +2021,14 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn gruppoColumn { + get { + return this.columngruppo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2056,13 +2066,14 @@ namespace GPW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public v_selProgettiRow Addv_selProgettiRow(int value, string label, long conditio, bool Attivo) { + public v_selProgettiRow Addv_selProgettiRow(int value, string label, int conditio, bool Attivo, string gruppo) { v_selProgettiRow rowv_selProgettiRow = ((v_selProgettiRow)(this.NewRow())); object[] columnValuesArray = new object[] { value, label, conditio, - Attivo}; + Attivo, + gruppo}; rowv_selProgettiRow.ItemArray = columnValuesArray; this.Rows.Add(rowv_selProgettiRow); return rowv_selProgettiRow; @@ -2096,6 +2107,7 @@ namespace GPW_data { this.columnlabel = base.Columns["label"]; this.columnconditio = base.Columns["conditio"]; this.columnAttivo = base.Columns["Attivo"]; + this.columngruppo = base.Columns["gruppo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2105,18 +2117,22 @@ namespace GPW_data { base.Columns.Add(this.columnvalue); this.columnlabel = new global::System.Data.DataColumn("label", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnlabel); - this.columnconditio = new global::System.Data.DataColumn("conditio", typeof(long), null, global::System.Data.MappingType.Element); + this.columnconditio = new global::System.Data.DataColumn("conditio", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnconditio); this.columnAttivo = new global::System.Data.DataColumn("Attivo", typeof(bool), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnAttivo); + this.columngruppo = new global::System.Data.DataColumn("gruppo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngruppo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnvalue}, true)); this.columnvalue.AllowDBNull = false; this.columnvalue.Unique = true; this.columnlabel.ReadOnly = true; - this.columnlabel.MaxLength = 130; + this.columnlabel.MaxLength = 303; this.columnconditio.AllowDBNull = false; this.columnAttivo.AllowDBNull = false; + this.columngruppo.AllowDBNull = false; + this.columngruppo.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6566,9 +6582,9 @@ namespace GPW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public long conditio { + public int conditio { get { - return ((long)(this[this.tablev_selProgetti.conditioColumn])); + return ((int)(this[this.tablev_selProgetti.conditioColumn])); } set { this[this.tablev_selProgetti.conditioColumn] = value; @@ -6586,6 +6602,17 @@ namespace GPW_data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string gruppo { + get { + return ((string)(this[this.tablev_selProgetti.gruppoColumn])); + } + set { + this[this.tablev_selProgetti.gruppoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IslabelNull() { @@ -9443,6 +9470,7 @@ namespace GPW_data.DS_UtilityTableAdapters { tableMapping.ColumnMappings.Add("label", "label"); tableMapping.ColumnMappings.Add("conditio", "conditio"); tableMapping.ColumnMappings.Add("Attivo", "Attivo"); + tableMapping.ColumnMappings.Add("gruppo", "gruppo"); this._adapter.TableMappings.Add(tableMapping); } @@ -9456,7 +9484,7 @@ namespace GPW_data.DS_UtilityTableAdapters { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT * FROM v_selProgetti"; @@ -9470,10 +9498,17 @@ namespace GPW_data.DS_UtilityTableAdapters { this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAttivi", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "dbo.stp_VSPrj"; + this._commandCollection[2].CommandText = "dbo.stp_VSPrj_byGruppo"; this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gruppo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAttivi", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "dbo.stp_VSPrj"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@soloAttivi", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9527,8 +9562,31 @@ namespace GPW_data.DS_UtilityTableAdapters { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_Utility.v_selProgettiDataTable getGrouped(global::System.Nullable soloAttivi) { + public virtual DS_Utility.v_selProgettiDataTable getByGruppo(string gruppo, global::System.Nullable soloAttivi) { this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((gruppo == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gruppo)); + } + if ((soloAttivi.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((bool)(soloAttivi.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + DS_Utility.v_selProgettiDataTable dataTable = new DS_Utility.v_selProgettiDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Utility.v_selProgettiDataTable getGrouped(global::System.Nullable soloAttivi) { + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((soloAttivi.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((bool)(soloAttivi.Value)); } diff --git a/GPW_Data/DS_Utility.xsd b/GPW_Data/DS_Utility.xsd index 8777031..e6c8a9c 100644 --- a/GPW_Data/DS_Utility.xsd +++ b/GPW_Data/DS_Utility.xsd @@ -100,7 +100,7 @@ ORDER BY label - + SELECT * FROM v_selProgetti @@ -112,6 +112,7 @@ ORDER BY label + @@ -126,6 +127,18 @@ ORDER BY label + + + + dbo.stp_VSPrj_byGruppo + + + + + + + + @@ -592,12 +605,19 @@ ORDER BY ordinal - + - + + + + + + + + diff --git a/GPW_Data/DS_Utility.xss b/GPW_Data/DS_Utility.xss index 26f2411..4830e64 100644 --- a/GPW_Data/DS_Utility.xss +++ b/GPW_Data/DS_Utility.xss @@ -4,27 +4,27 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file