diff --git a/GMW/GMW.suo b/GMW/GMW.suo index f611b6e4..ef538653 100644 Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ diff --git a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx index 2885dfc2..9fe5902c 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx +++ b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx @@ -11,10 +11,10 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs index d132a61c..4bf22b4b 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.cs @@ -20,6 +20,27 @@ namespace GMW.WebUserControls } mod_listParticolari1.eh_selValore += new EventHandler(mod_listParticolari1_eh_selValore); mod_listParticolari1.eh_resetSelezione += new EventHandler(mod_listParticolari1_eh_resetSelezione); + mod_execParticolari1.eh_btnGoToMagPressed += new EventHandler(mod_execParticolari1_eh_btnGoToMagPressed); + mod_execParticolari1.eh_btnListaPrelievoPressed += new EventHandler(mod_execParticolari1_eh_btnListaPrelievoPressed); + } + /// + /// evento crea lista di prelievo chiamato + /// + /// + /// + void mod_execParticolari1_eh_btnListaPrelievoPressed(object sender, EventArgs e) + { + memLayer.ML.setSessionVal("PrecompilaListaPrelievo", true); + Response.Redirect("~/ElencoListePrelievo.aspx"); + } + /// + /// evento vai a magazzino chiamato + /// + /// + /// + void mod_execParticolari1_eh_btnGoToMagPressed(object sender, EventArgs e) + { + Response.Redirect("~/DettaglioBlocco.aspx"); } void mod_listParticolari1_eh_resetSelezione(object sender, EventArgs e) @@ -59,5 +80,6 @@ namespace GMW.WebUserControls { return user_std.UtSn.Traduci(lemma); } + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.designer.cs index 1af21522..eff428d4 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_SearchProvParticolari.ascx.designer.cs @@ -40,15 +40,6 @@ namespace GMW.WebUserControls { /// protected global::GMW.WebUserControls.mod_listParticolari mod_listParticolari1; - /// - /// mod_execParticolari1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.mod_execParticolari mod_execParticolari1; - /// /// mod_detailParticolari1 control. /// @@ -57,5 +48,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::GMW.WebUserControls.mod_detailParticolari mod_detailParticolari1; + + /// + /// mod_execParticolari1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_execParticolari mod_execParticolari1; } } diff --git a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx index d3532025..3d833402 100644 --- a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx +++ b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx @@ -1,8 +1,9 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detailParticolari.ascx.cs" Inherits="GMW.WebUserControls.mod_detailParticolari" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_detailParticolari.ascx.cs" + Inherits="GMW.WebUserControls.mod_detailParticolari" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> @@ -20,7 +21,7 @@ + CommandArgument='<%# Eval("CodMag") %>' ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' /> @@ -63,8 +64,7 @@ + SelectMethod="getParetoByParticolare" TypeName="GMW_data.DS_magazzinoTableAdapters.V_DettMagPartTableAdapter"> protected void grView_SelectedIndexChanged(object sender, EventArgs e) { - //// salvo in session il lo stato scelto... - //SteamWare.memLayer.ML.setSessionVal("DescStato_sel", grView.SelectedDataKey["DescStato"], false); - //// salvo anche l'esponente scelto... - //SteamWare.memLayer.ML.setSessionVal("Esponente_sel", grView.SelectedDataKey["Esponente"], false); + // leggo chiave + string DescStato = grView.SelectedDataKey["DescStato"].ToString(); + string Esponente = grView.SelectedDataKey["Esponente"].ToString(); + string CodMag = grView.SelectedDataKey["CodMag"].ToString(); + int IdxBlocco = Convert.ToInt32(grView.SelectedDataKey["IdxBlocco"]); + // salvo in session + SteamWare.memLayer.ML.setSessionVal("CodMag_sel", CodMag, false); + SteamWare.memLayer.ML.setSessionVal("IdxBlocco_sel", IdxBlocco, false); // sollevo evento nuovo valore... if (eh_selValore != null) { diff --git a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx index 34ead920..bcd8e988 100644 --- a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx +++ b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx @@ -2,5 +2,6 @@ Inherits="GMW.WebUserControls.mod_dettCelleBlocco" %> - \ No newline at end of file +
+ +
diff --git a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs index d3e98495..5c8b68ee 100644 --- a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx.cs @@ -201,6 +201,7 @@ namespace GMW.WebUserControls if (BloccoCelle[pos_x, pos_y].KeyVal == IdxCella) { cell.CssClass = "selectedCell"; + btnReset.Visible = true; } cell.Controls.Add(lnkb); // carico in cella di tabella il linkButton diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs index b4faad91..b9898f45 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs @@ -10,7 +10,6 @@ namespace GMW.WebUserControls { public partial class mod_dettaglioBlocco : SteamWare.ApplicationUserControl { - #region area codice variabile /// @@ -70,6 +69,11 @@ namespace GMW.WebUserControls { mostraOperazioniUdc(); } + if (memLayer.ML.isInSessionObject("Particolare_sel")) + { + pnlDetail.Visible = true; + mod_paretoPartByFullSpec1.doUpdate(); + } } /// /// nascondo dettagli UDC @@ -78,9 +82,6 @@ namespace GMW.WebUserControls /// void mod_operazioniUdc1_eh_hidden(object sender, EventArgs e) { - //mod_operazioniUdc1.Visible = false; - //mod_dettCelleBlocco1.doUpdate(); - //updateControlli(); memLayer.ML.emptySessionVal("IdxCellaMag"); Response.Redirect("~/DettaglioBlocco.aspx"); } @@ -116,23 +117,19 @@ namespace GMW.WebUserControls void mod_paretoPartByFullSpec1_eh_resetSelezione(object sender, EventArgs e) { // aggiorno la visualizzazione del magazzino! - mod_dettCelleBlocco1.doUpdate(); + Response.Redirect("~/DettaglioBlocco.aspx"); } void mod_paretoPartByFullSpec1_eh_selValore(object sender, EventArgs e) { // aggiorno la visualizzazione del magazzino! - mod_dettCelleBlocco1.doUpdate(); + Response.Redirect("~/DettaglioBlocco.aspx"); } void mod_paretoUdcBlocco1_eh_resetSelezione(object sender, EventArgs e) { // aggiorno la visualizzazione del magazzino! - mod_dettCelleBlocco1.reset(); - mod_dettCelleBlocco1.doUpdate(); - mod_paretoPartByFullSpec1.resetSelezione(); - pnlDetail.Visible = false; - mod_operazioniUdc1.Visible = false; + Response.Redirect("~/DettaglioBlocco.aspx"); } /// /// aggiorna in caso di selezione valore x un dato Particolare @@ -142,9 +139,7 @@ namespace GMW.WebUserControls void mod_paretoUdcBlocco1_eh_selValore(object sender, EventArgs e) { // aggiorno la visualizzazione del magazzino! - mod_dettCelleBlocco1.doUpdate(); - mod_paretoPartByFullSpec1.resetSelezione(); - pnlDetail.Visible = true; + Response.Redirect("~/DettaglioBlocco.aspx"); } void mod_filtroBlock_eh_selValore(object sender, EventArgs e) { diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index e282c740..f1bdb68a 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -291,9 +291,19 @@ namespace GMW.WebUserControls { btnNewLista.Text = traduci("NuovaListaPrelievo"); mod_viewRigheListaPrelievo1.Visible = false; - mod_nuovaListaPrelievo1.Visible = false; mod_periodoAnalisi1.setPeriodoFree(); mod_filtroStato.ods = odsFiltroStati; + // controllo se ci sia richiesta x creare nuova lista, nel caso precompilo valori... + if (memLayer.ML.BoolSessionObj("PrecompilaListaPrelievo")) + { + mod_nuovaListaPrelievo1.Visible = true; + mod_nuovaListaPrelievo1.ParticolareRichiesto = memLayer.ML.StringSessionObj("Particolare_sel"); + memLayer.ML.emptySessionVal("PrecompilaListaPrelievo"); + } + else + { + mod_nuovaListaPrelievo1.Visible = false; + } } // registro evento update mod_viewRigheListaPrelievo1.eh_nuovoValore += new EventHandler(mod_viewRigheListaPrelievo1_eh_nuovoValore); diff --git a/GMW/GMW/WebUserControls/mod_execParticolari.ascx b/GMW/GMW/WebUserControls/mod_execParticolari.ascx index 800b01d0..04775a5d 100644 --- a/GMW/GMW/WebUserControls/mod_execParticolari.ascx +++ b/GMW/GMW/WebUserControls/mod_execParticolari.ascx @@ -1,24 +1,23 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execParticolari.ascx.cs" Inherits="GMW.WebUserControls.mod_execParticolari" %> -modulo operazioni consentite su Particolari +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execParticolari.ascx.cs" + Inherits="GMW.WebUserControls.mod_execParticolari" %> + + <%-- + - - - - - + --%>
- + + +
- +
- -
- +
diff --git a/GMW/GMW/WebUserControls/mod_execParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_execParticolari.ascx.cs index 1f45813d..5da9de85 100644 --- a/GMW/GMW/WebUserControls/mod_execParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_execParticolari.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW.WebUserControls { @@ -11,7 +12,58 @@ namespace GMW.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - + traduciObj(); + } + /// + /// traduzione oggetti + /// + private void traduciObj() + { + btnGo2Mag.Text = traduci("btnGo2Mag"); + btnCreaListaPrelievo.Text = traduci("btnCreaListaPrelievo"); + } + /// + /// evento btnGoToMag + /// + public event EventHandler eh_btnGoToMagPressed; + /// + /// evento btn1 + /// + public event EventHandler eh_btnListaPrelievoPressed; + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + /// + /// va a dettaglio magazzino... + /// + /// + /// + protected void btnGo2Mag_Click(object sender, EventArgs e) + { + // sollevo evento nuovo valore... + if (eh_btnGoToMagPressed != null) + { + eh_btnGoToMagPressed(this, new EventArgs()); + } + } + /// + /// crea listsa di prelievo x il particolare indicato (precompila...) + /// + /// + /// + protected void btnCreaListaPrelievo_Click(object sender, EventArgs e) + { + // sollevo evento nuovo valore... + if (eh_btnListaPrelievoPressed != null) + { + eh_btnListaPrelievoPressed(this, new EventArgs()); + } } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_execParticolari.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_execParticolari.ascx.designer.cs index 6fbb1541..ee1e33a6 100644 --- a/GMW/GMW/WebUserControls/mod_execParticolari.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_execParticolari.ascx.designer.cs @@ -14,39 +14,21 @@ namespace GMW.WebUserControls { public partial class mod_execParticolari { /// - /// Button1 control. + /// btnGo2Mag control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button Button1; + protected global::System.Web.UI.WebControls.Button btnGo2Mag; /// - /// Button2 control. + /// btnCreaListaPrelievo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button Button2; - - /// - /// Button3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button Button3; - - /// - /// Button4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button Button4; + protected global::System.Web.UI.WebControls.Button btnCreaListaPrelievo; } } diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx b/GMW/GMW/WebUserControls/mod_listParticolari.ascx index beb62328..ea4285e5 100644 --- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx +++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx @@ -1,9 +1,10 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_listParticolari.ascx.cs" Inherits="GMW.WebUserControls.mod_listParticolari" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_listParticolari.ascx.cs" + Inherits="GMW.WebUserControls.mod_listParticolari" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> + DataKeyNames="Particolare" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged" + OnSorting="grView_Sorting"> @@ -54,11 +55,11 @@ + SelectMethod="getByParticolareFull" TypeName="GMW_data.DS_magazzinoTableAdapters.V_ParticolariOverviewTableAdapter" + OnDataBinding="ods_DataBinding"> - + diff --git a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs index 5e01495a..ae730190 100644 --- a/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs @@ -211,7 +211,6 @@ namespace GMW.WebUserControls // fix dell'ODS checkFixOds(); } - #endregion } diff --git a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx index 817c5141..0ef76968 100644 --- a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx +++ b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx @@ -3,16 +3,18 @@ + <%-- - + + --%>
- + - + + + - - - -
diff --git a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.cs b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.cs index da8af9eb..f5c856ca 100644 --- a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW.WebUserControls { @@ -11,7 +12,42 @@ namespace GMW.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - + traduciObj(); + } + /// + /// traduzione oggetti + /// + private void traduciObj() + { + btnListePrelievo.Text = traduci("btnListePrelievo"); + btnStatoMag.Text = traduci("btnStatoMag"); + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + /// + /// + /// + /// + /// + protected void btnListePrelievo_Click(object sender, EventArgs e) + { + Response.Redirect("~/ElencoListePrelievo.aspx"); + } + /// + /// + /// + /// + /// + protected void btnStatoMag_Click(object sender, EventArgs e) + { + Response.Redirect("~/StatoMag.aspx"); } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs index b08e6ba5..7e1b6949 100644 --- a/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_metodiNoSearch.ascx.designer.cs @@ -14,39 +14,21 @@ namespace GMW.WebUserControls { public partial class mod_metodiNoSearch { /// - /// Button1 control. + /// btnListePrelievo control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button Button1; + protected global::System.Web.UI.WebControls.Button btnListePrelievo; /// - /// Button2 control. + /// btnStatoMag control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Button Button2; - - /// - /// Button3 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button Button3; - - /// - /// Button4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button Button4; + protected global::System.Web.UI.WebControls.Button btnStatoMag; } } diff --git a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs index 5cc08600..52a9ebe5 100644 --- a/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_nuovaListaPrelievo.ascx.cs @@ -23,6 +23,7 @@ namespace GMW.WebUserControls btnCreaNuova.Visible = false; btnCreaNuova.Text = traduci("CreaNuovaListaPrelievo"); } + checkParticolare(); } /// /// wrapper traduzione @@ -51,6 +52,11 @@ namespace GMW.WebUserControls /// /// protected void txtParticolare_TextChanged(object sender, EventArgs e) + { + checkParticolare(); + } + + private void checkParticolare() { // controllo se cod particoalre è valido... if (particolareOk(txtParticolare.Text.Trim())) @@ -101,5 +107,21 @@ namespace GMW.WebUserControls /// evento nuovo valore /// public event EventHandler eh_nuovoValore; + /// + /// valore del aprticolare della lsita prelievo get/set + /// + public string ParticolareRichiesto + { + get + { + return txtParticolare.Text; + } + set + { + txtParticolare.Text = value; + checkParticolare(); + } + } + } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx index 160bfcad..b79810a7 100644 --- a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx +++ b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx @@ -3,7 +3,7 @@ + OnSorted="grView_Sorted" onrowdatabound="grView_RowDataBound"> diff --git a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs index e07133f8..086fb06c 100644 --- a/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_paretoPartByFullSpec.ascx.cs @@ -112,7 +112,6 @@ namespace GMW.WebUserControls { base.OnInit(e); } - /// /// segnalo nuovo valore filtro attivo... /// @@ -164,7 +163,6 @@ namespace GMW.WebUserControls eh_selValore(this, new EventArgs()); } } - /// /// resetta la selezione dei valori in caso di modifiche su altri controlli /// @@ -187,7 +185,27 @@ namespace GMW.WebUserControls { checkFixOds(); } - + /// + /// controllo se è da selezionare la riga... + /// + /// + /// + protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) + { + // se riga di dati... + if (e.Row.RowType == DataControlRowType.DataRow) + { + // ottengo la riga tipizzata... + System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem; + DS_magazzino.V_DettMagPartRow riga = (DS_magazzino.V_DettMagPartRow)_drv.Row; + bool cond1 = SteamWare.memLayer.ML.StringSessionObj("DescStato_sel") == riga.DescStato.ToString(); + bool cond2 = SteamWare.memLayer.ML.StringSessionObj("Esponente_sel") == riga.Esponente.ToString(); + if (cond1 && cond2) + { + grView.SelectedIndex = e.Row.RowIndex; + } + } + } #endregion } diff --git a/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx b/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx index 64338ad6..54845f93 100644 --- a/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx +++ b/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx @@ -5,7 +5,7 @@ + OnSorted="grView_Sorted" onrowdatabound="grView_RowDataBound"> diff --git a/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs index b73fe6e5..abf7fb99 100644 --- a/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_paretoUdcBlocco.ascx.cs @@ -63,7 +63,7 @@ namespace GMW.WebUserControls { resetSelezione(); } - + /// /// collega i controlli @@ -87,7 +87,7 @@ namespace GMW.WebUserControls #endregion #region area codice variabile - + /// /// carico le tabelle /// @@ -178,7 +178,7 @@ namespace GMW.WebUserControls /// public void resetSelezione() { - memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); + memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); grView.SelectedIndex = -1; grView.DataBind(); lblWarning.Visible = false; @@ -194,6 +194,25 @@ namespace GMW.WebUserControls { checkFixOds(); } + /// + /// controllo se è da selezionare la riga... + /// + /// + /// + protected void grView_RowDataBound(object sender, GridViewRowEventArgs e) + { + // se riga di dati... + if (e.Row.RowType == DataControlRowType.DataRow) + { + // ottengo la riga tipizzata... + System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem; + DS_magazzino.V_DettMagPartRow riga = (DS_magazzino.V_DettMagPartRow)_drv.Row; + if (SteamWare.memLayer.ML.StringSessionObj("Particolare_sel") == riga.Particolare.ToString()) + { + grView.SelectedIndex = e.Row.RowIndex; + } + } + } #endregion } diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx b/GMW/GMW/WebUserControls/mod_searchMag.ascx index 42c77fb3..e033fd17 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx @@ -4,9 +4,10 @@ <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %> <%@ Register Src="mod_metodiNoSearch.ascx" TagName="mod_metodiNoSearch" TagPrefix="uc3" %> <%@ Register Src="mod_SearchProvUDC.ascx" TagName="mod_SearchProvUDC" TagPrefix="uc1" %> -<%@ Register src="mod_SearchProvCelle.ascx" tagname="mod_SearchProvCelle" tagprefix="uc4" %> -<%@ Register src="mod_SearchProvParticolari.ascx" tagname="mod_SearchProvParticolari" tagprefix="uc5" %> -<%@ Register src="Mod_SearchProvImballi.ascx" tagname="Mod_SearchProvImballi" tagprefix="uc6" %> +<%@ Register Src="mod_SearchProvCelle.ascx" TagName="mod_SearchProvCelle" TagPrefix="uc4" %> +<%@ Register Src="mod_SearchProvParticolari.ascx" TagName="mod_SearchProvParticolari" + TagPrefix="uc5" %> +<%@ Register Src="Mod_SearchProvImballi.ascx" TagName="Mod_SearchProvImballi" TagPrefix="uc6" %>
@@ -41,19 +42,20 @@
- +
- -
- -
- -
- + +
+ +
+ + <%--
+ --%> diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs index 3dc9880c..297c023f 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -57,8 +57,8 @@ namespace GMW.WebUserControls mod_SearchProvCelle1.doSearch(); mod_SearchProvParticolari1.Visible = true; mod_SearchProvParticolari1.doSearch(); - Mod_SearchProvImballi1.Visible = true; - Mod_SearchProvImballi1.doSearch(); + //Mod_SearchProvImballi1.Visible = true; + //Mod_SearchProvImballi1.doSearch(); } else @@ -70,29 +70,29 @@ namespace GMW.WebUserControls mod_SearchProvUDC1.Visible = false; mod_SearchProvCelle1.Visible = false; mod_SearchProvParticolari1.Visible = false; - Mod_SearchProvImballi1.Visible = true; - Mod_SearchProvImballi1.doSearch(); + //Mod_SearchProvImballi1.Visible = true; + //Mod_SearchProvImballi1.doSearch(); break; case "C": mod_SearchProvUDC1.Visible = false; mod_SearchProvCelle1.Visible = true; mod_SearchProvCelle1.doSearch(); mod_SearchProvParticolari1.Visible = false; - Mod_SearchProvImballi1.Visible = false; + //Mod_SearchProvImballi1.Visible = false; break; case "P": mod_SearchProvUDC1.Visible = false; mod_SearchProvCelle1.Visible = false; mod_SearchProvParticolari1.Visible = true; mod_SearchProvParticolari1.doSearch(); - Mod_SearchProvImballi1.Visible = false; + //Mod_SearchProvImballi1.Visible = false; break; case "U": mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); mod_SearchProvCelle1.Visible = false; mod_SearchProvParticolari1.Visible = false; - Mod_SearchProvImballi1.Visible = false; + //Mod_SearchProvImballi1.Visible = false; break; default: mod_SearchProvUDC1.Visible = true; @@ -101,8 +101,8 @@ namespace GMW.WebUserControls mod_SearchProvCelle1.doSearch(); mod_SearchProvParticolari1.Visible = true; mod_SearchProvParticolari1.doSearch(); - Mod_SearchProvImballi1.Visible = true; - Mod_SearchProvImballi1.doSearch(); + //Mod_SearchProvImballi1.Visible = true; + //Mod_SearchProvImballi1.doSearch(); break; } } diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index 707f26d5..1e484191 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -67,6 +67,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Panel pnlResults; + /// + /// mod_SearchProvParticolari1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_SearchProvParticolari mod_SearchProvParticolari1; + /// /// mod_SearchProvUDC1 control. /// @@ -85,24 +94,6 @@ namespace GMW.WebUserControls { /// protected global::GMW.WebUserControls.mod_SearchProvCelle mod_SearchProvCelle1; - /// - /// mod_SearchProvParticolari1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.mod_SearchProvParticolari mod_SearchProvParticolari1; - - /// - /// Mod_SearchProvImballi1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::GMW.WebUserControls.Mod_SearchProvImballi Mod_SearchProvImballi1; - /// /// pnlEmpty control. /// diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index f3b54f5e..57b09222 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 9cb68d36..7b0131cc 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index f3b54f5e..57b09222 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 06ed9167..24c7fce8 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index 049f950b..0264f00d 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index cf4bdec7..0b439b94 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 9cb68d36..7b0131cc 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index f213ad3c..3baadd8e 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 9cb68d36..7b0131cc 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index 83726586..6a068976 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index 8f85adf7..c9bd4e9d 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index f213ad3c..3baadd8e 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs b/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs index b7fc874e..c0346ae0 100644 --- a/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW_deploy/Source/WS/AutoCompletamento.asmx.cs @@ -38,5 +38,23 @@ namespace GMW.WS return suggerimenti.ToArray(); } + [System.Web.Services.WebMethod] + public string[] elencoCelle(string prefixText, int count) + { + // inizializzo risposta + List suggerimenti = new List(); + // proseguo SOLO SE min "MinCharAutocomplete" char... + if (count > memLayer.ML.confReadInt("MinCharAutocomplete")) + { + // elenco candidati + DS_magazzino.CelleDataTable tabCelle = MagClass.magazzino.taCelle.getByCodCellaLike(prefixText, memLayer.ML.confReadString("CodCS")); + // aggiungo ogni riga... + foreach (DS_magazzino.CelleRow riga in tabCelle) + { + suggerimenti.Add(riga.CodCella); + } + } + return suggerimenti.ToArray(); + } } } diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 96eb3768..905b7633 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -350,7 +350,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" "ProductCode" = "8:{44EF12AC-C76E-4C7D-BED1-43F08AB636E4}" - "PackageCode" = "8:{5BE1C147-CEA9-4F17-94DB-6B37027E316C}" + "PackageCode" = "8:{94CD7F4C-97FF-4212-A4E1-E600A5C7858B}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -801,7 +801,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264" @@ -829,7 +829,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"