diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx index 4635f790..eb15134e 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx @@ -66,36 +66,35 @@
- - + Legenda
- + Piena - + Occupata - + Libera - + Bloccata   - + Selezionata (modifica)   - + Selezione SX - + Selezione DX
diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs index b9898f45..52cbaf8b 100644 --- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs @@ -194,11 +194,20 @@ namespace GMW.WebUserControls updateControlli(); } + /// + /// ritorno ad elenco magazzini + /// + /// + /// protected void lnkReturn_Click(object sender, EventArgs e) { // svuoto dati in memoria... memLayer.ML.emptySessionVal("CodMag_sel"); memLayer.ML.emptySessionVal("IdxBlocco_sel"); + memLayer.ML.emptySessionVal("IdxCellaMag"); + memLayer.ML.emptySessionVal("Particolare_sel"); + memLayer.ML.emptySessionVal("DescStato_sel"); + memLayer.ML.emptySessionVal("Esponente_sel"); Response.Redirect("~/StatoMag.aspx"); } diff --git a/GMW/GMW/WebUserControls/mod_login.ascx.cs b/GMW/GMW/WebUserControls/mod_login.ascx.cs index 3dee72b0..e2e3d450 100644 --- a/GMW/GMW/WebUserControls/mod_login.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_login.ascx.cs @@ -240,5 +240,4 @@ public partial class mod_login : ApplicationUserControl } #endregion - } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index e9c65ba9..032f80a3 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 8a6c02c7..fb45bff4 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/bin/SteamWare.dll b/GMW/GMW/bin/SteamWare.dll index 1a2b6945..9c3c4166 100644 Binary files a/GMW/GMW/bin/SteamWare.dll and b/GMW/GMW/bin/SteamWare.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index e9c65ba9..032f80a3 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 642e7610..3b7e03a5 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 7cd5b799..e410e7c4 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 1e4c8e58..0db27b52 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/Cella.aspx b/GMW/GMW_Term/Cella.aspx index ac028c3d..b2fd43b6 100644 --- a/GMW/GMW_Term/Cella.aspx +++ b/GMW/GMW_Term/Cella.aspx @@ -1,11 +1,10 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Compact.Master" AutoEventWireup="true" CodeBehind="Cella.aspx.cs" Inherits="GMW_Term.Cella" %> +<%@ Register src="WebUserControls/mod_execCella.ascx" tagname="mod_execCella" tagprefix="uc1" %> + -
- W.I.P. -
- + diff --git a/GMW/GMW_Term/Cella.aspx.designer.cs b/GMW/GMW_Term/Cella.aspx.designer.cs index 0a2a565d..ec3c7470 100644 --- a/GMW/GMW_Term/Cella.aspx.designer.cs +++ b/GMW/GMW_Term/Cella.aspx.designer.cs @@ -14,12 +14,12 @@ namespace GMW_Term { public partial class Cella { /// - /// Image1 control. + /// mod_execCella1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Image Image1; + protected global::GMW_Term.WebUserControls.mod_execCella mod_execCella1; } } diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index 990631f5..7d151b4a 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -117,6 +117,20 @@ mod_currentTask.ascx + + mod_execCella.ascx + ASPXCodeBehind + + + mod_execCella.ascx + + + mod_execParticolare.ascx + ASPXCodeBehind + + + mod_execParticolare.ascx + mod_execUdc.ascx ASPXCodeBehind @@ -285,6 +299,8 @@ + + diff --git a/GMW/GMW_Term/Particolare.aspx b/GMW/GMW_Term/Particolare.aspx index 9a7623f7..d75b0d3b 100644 --- a/GMW/GMW_Term/Particolare.aspx +++ b/GMW/GMW_Term/Particolare.aspx @@ -1,12 +1,10 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Compact.Master" AutoEventWireup="true" CodeBehind="Particolare.aspx.cs" Inherits="GMW_Term.Particolare" %> +<%@ Register Src="WebUserControls/mod_execParticolare.ascx" TagName="mod_execParticolare" + TagPrefix="uc1" %> - -
- W.I.P. -
- + diff --git a/GMW/GMW_Term/Particolare.aspx.designer.cs b/GMW/GMW_Term/Particolare.aspx.designer.cs index b3387348..e285e7af 100644 --- a/GMW/GMW_Term/Particolare.aspx.designer.cs +++ b/GMW/GMW_Term/Particolare.aspx.designer.cs @@ -12,5 +12,14 @@ namespace GMW_Term { public partial class Particolare { + + /// + /// mod_execParticolare1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW_Term.WebUserControls.mod_execParticolare mod_execParticolare1; } } diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index a4b26654..cb66ee41 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -57,7 +57,7 @@ - + @@ -111,17 +111,17 @@ - + + + + + + --> - + diff --git a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx new file mode 100644 index 00000000..08244060 --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx @@ -0,0 +1,6 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execCella.ascx.cs" + Inherits="GMW_Term.WebUserControls.mod_execCella" %> +
+ W.I.P. +
+ \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.cs new file mode 100644 index 00000000..9f9d43db --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW_Term.WebUserControls +{ + public partial class mod_execCella : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs new file mode 100644 index 00000000..79847f6d --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_execCella.ascx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW_Term.WebUserControls { + + + public partial class mod_execCella { + + /// + /// Image1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image Image1; + } +} diff --git a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx new file mode 100644 index 00000000..1616fafa --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx @@ -0,0 +1,52 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execParticolare.ascx.cs" + Inherits="GMW_Term.WebUserControls.mod_execParticolare" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + +    + + + + + + +
diff --git a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.cs new file mode 100644 index 00000000..1f2fd2e4 --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.cs @@ -0,0 +1,469 @@ +using System; +using System.Data; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; + +namespace GMW_Term.WebUserControls +{ + public partial class mod_execParticolare : System.Web.UI.UserControl + { + #region area da NON modificare + + #region area protected + + protected string _idxGridView; + protected string _idxGridViewExt; + protected string _tabCache; + protected bool _showNewBtn = false; + + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + + /// + /// recupera i dati di un nuovo record contenuti nel footer di un gridView; + /// questi devono esses opportunamente nominati (es: txt{0}, dl{0}, ...) + /// + /// + /// + protected void recuperaFooter(object sender, ObjectDataSourceMethodEventArgs e) + { + //recupero la riga footer... + DataColumnCollection colonne = colonneObj(); + string nomeCol; + string tipoColonna = ""; + foreach (DataColumn colonna in colonne) + { + nomeCol = colonna.ColumnName; + // cerco un textbox o quello che sia... + if (grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol)) != null) + { + tipoColonna = "textBox"; + } + else if (grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol)) != null) + { + tipoColonna = "dropDownList"; + } + else if (grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol)) != null) + { + tipoColonna = "checkBox"; + } + else if (grView.FooterRow.FindControl(string.Format("selAjax_{0}", nomeCol)) != null) + { + tipoColonna = "selAjax"; + } + // in base al tipo salvo negli inputparameters dell'ODS + switch (tipoColonna) + { + case "textBox": + e.InputParameters[nomeCol] = ((TextBox)grView.FooterRow.FindControl(string.Format("txt{0}", nomeCol))).Text; + break; + case "dropDownList": + e.InputParameters[nomeCol] = ((DropDownList)grView.FooterRow.FindControl(string.Format("dl{0}", nomeCol))).SelectedValue; + break; + case "checkBox": + e.InputParameters[nomeCol] = ((CheckBox)grView.FooterRow.FindControl(string.Format("chk{0}", nomeCol))).Checked; + break; + default: + break; + } + tipoColonna = ""; + } + } + /// + /// inserisce nuovo valore da footer + /// + /// + /// + protected void lblIns_click(object sender, EventArgs e) + { + // click su inserimento, chiamo il metodo insert dell'ObjectDataSource + ods.Insert(); + SteamWare.memLayer.ML.emptyCacheVal(_tabCache); + } + /// + /// annulla inserimento nuovo valore da footer + /// + /// + /// + protected void lblCanc_click(object sender, EventArgs e) + { + // annullo inserimento: nascondo footer, bind controlli... + grView.FooterRow.Visible = false; + } + + + /// + /// traduce gli header delle colonne + /// + /// + /// + protected void grView_DataBound(object sender, EventArgs e) + { + if (grView.Rows.Count > 0) + { + LinkButton lb; + // aggiorno gli headers + foreach (TableCell cella in grView.HeaderRow.Cells) + { + try + { + lb = (LinkButton)cella.Controls[0]; + lb.Text = traduci(lb.Text); + } + catch + { } + } + int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1); + lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord); + } + else + { + lblNumRec.Text = ""; + } + } + /// + /// gestione evento richeista nuovo valore (mostra footer, ...) + /// + /// + /// + protected void btnNew_Click(object sender, EventArgs e) + { + // reset selezione... + resetSelezione(); + // mostro il footer oppure la riga dei dettagli x nuovo... + if (grView.FooterRow != null) + { + grView.FooterRow.Visible = true; + } + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } + /// + /// reset della selezione + /// + /// + /// + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + + #endregion + + #region gestione eventi + + public event EventHandler eh_resetSelezione; + public event EventHandler eh_nuovoValore; + public event EventHandler eh_selValore; + + #endregion + + #region public + + /// + /// definisce visibilità btnNew + /// + public bool showNewBtn + { + get + { + return _showNewBtn; + } + set + { + _showNewBtn = value; + } + } + /// + /// effettua update del modulo + /// + public void doUpdate() + { + resetSelezione(); + } + + #endregion + + #endregion + + /// + /// metodi al caricamento della pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + // scrive label e text bottoni + btnLoginPage.Text = "[7]-LogOut"; + btnLoginPage.AccessKey = "7"; + btnButtonsHome.Text = "[9]-Home"; + btnButtonsHome.AccessKey = "9"; + } + + /// + /// effettua logout... + /// + /// + /// + protected void btnLoginPage_Click(object sender, EventArgs e) + { + TermUtils.TU.forceLogOut(); + Response.Redirect("~/Barcode.aspx"); + } + /// + /// va alla pagina dei buttons principale + /// + /// + /// + protected void btnButtonsHome_Click(object sender, EventArgs e) + { + Response.Redirect("~/Home.aspx"); + } + + /// + /// elenco colonne del datagrid + /// + /// + protected DataColumnCollection colonneObj() + { + DS_Utility.stp_ricercaFullTerminalinoDataTable tabella = new DS_Utility.stp_ricercaFullTerminalinoDataTable(); + DataColumnCollection colonne = tabella.Columns; + return colonne; + } + /// + /// inizializzazione valori di default + /// + /// + protected override void OnInit(EventArgs e) + { + base.OnInit(e); + _idxGridView = "TipoSearch"; + + aggiornaControlliDataGL(); + } + /// + /// aggiorna controlli datagrid e numero righe in pagina + /// + protected void aggiornaControlliDataGL() + { + grView.PageSize = 4; + } + + /// + /// gestione cambio selezione valore + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + } + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + SteamWare.memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); + grView.SelectedIndex = -1; + grView.DataBind(); + lblWarning.Visible = false; + } + + /// + /// salvo in session che il prox comando è iniziare lista prelievo... + /// + /// + /// + protected void imgAzioneLista_Click(object sender, ImageClickEventArgs e) + { + ImageButton imgb = (ImageButton)sender; + SteamWare.memLayer.ML.setSessionVal("nextObjCommand", imgb.CommandArgument); + } + /// + /// in caso di aggiornamento verifico se sia salvato un comando inizia o completa lista prelievo... + /// + /// + /// + protected void grView_RowUpdating(object sender, GridViewUpdateEventArgs e) + { + // carico l'idx dell'oggetto + string tipo = e.Keys["tipo"].ToString(); + string valore = e.Keys["valore"].ToString(); + // quale comando? + string _comando = ""; + if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand")) + { + _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand"); + SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); + } + string CodSoggetto = MagClass.magazzino.CodSoggCurrUser; + switch (_comando) + { + case "UDC": + // salvo in sessione + memLayer.ML.setSessionVal("UDC_sel", valore); + // blocco update! + e.Cancel = true; + // faccio redirect + Response.Redirect("~/UDC.aspx"); + break; + case "Particolare": + // salvo in sessione + memLayer.ML.setSessionVal("Particolare_sel", valore); + // blocco update! + e.Cancel = true; + // faccio redirect + Response.Redirect("~/Particolare.aspx"); + break; + case "Cella": + // salvo in sessione + memLayer.ML.setSessionVal("IdxCella_sel", valore); + // blocco update! + e.Cancel = true; + // faccio redirect + Response.Redirect("~/Cella.aspx"); + break; + default: + // faccio update! + break; + } + } + + /// + /// chiamato post modifica valore check/selezione nel selettore filtro stato + /// + /// + /// + public void eh_selectedStato(object sender, EventArgs e) + { + checkFixOds(); + } + /// + /// ssitema visualizzazione dal filtraggi + /// + private void checkFixOds() + { + // chiamo procedura che aggiorna ods principale + grView.SelectedIndex = -1; + updateOds(); + } + /// + /// aggiorno il gridview + /// + protected void updateOds() + { + grView.DataBind(); + } + /// + /// chiamato post modifica valore check/selezione nel selettore filtro tipo + /// + /// + /// + public void eh_selectedTipo(object sender, EventArgs e) + { + checkFixOds(); + } + + /// + /// restituisce URL immagine del codice da mostrare x TIPO lista + /// + /// + /// + public string pathImgTipo(object codice) + { + string answ = ""; + string tipo = codice.ToString(); + switch (tipo) + { + case "UDC": + answ = string.Format("~/images/UDC.png", codice); + break; + case "Particolare": + answ = string.Format("~/images/Part.png", codice); + break; + case "Cella": + answ = string.Format("~/images/Cella.png", codice); + break; + default: + break; + } + return answ; + } + /// + /// restituisce tooltip da mostrare x TIPO lista + /// + /// + /// + public string tooltipTipo(object codice) + { + return traduci(codice.ToString()); + } + + /// + /// formatta una stringa di descrizione a aprtire dal tipo oggetto + /// + /// + /// + /// + public string descOggetto(object _tipo, object _valore) + { + string tipo = _tipo.ToString(); + string valore = _valore.ToString(); + string answ = ""; + switch (tipo) + { + case "UDC": + try + { + DS_magazzino.v_UdcDetailRow rigaUdc = MagClass.magazzino.taDettUDC.getByFullUdc(valore, memLayer.ML.StringSessionObj("CodCS"))[0]; + answ = string.Format("{0} {1:##} pz M:{2} C:{3}", rigaUdc.Particolare, rigaUdc.Qta, rigaUdc.CodMag, rigaUdc.CodCella); + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Eccezione {0}", e), tipoLog.EXCEPTION); + answ = string.Format("{0} - {1}", tipo, valore); + } + break; + case "Particolare": + try + { + DS_magazzino.V_ParticolariOverviewRow rigaPart = MagClass.magazzino.taVParticolariOverwiew.getByParticolareFull(valore, memLayer.ML.StringSessionObj("CodCS"))[0]; + answ = string.Format("UDC: {0} ({2} a mag.) - {1:##} pz", rigaPart.NumUDC, rigaPart.TotQta, rigaPart.NumInMag); + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Eccezione {0}", e), tipoLog.EXCEPTION); + answ = string.Format("{0} - {1}", tipo, valore); + } + break; + case "Cella": + try + { + DS_magazzino.V_statoCelleCapienzaAssegnatiRow rigaCelle = MagClass.magazzino.taStatoCelle.getByIdxCella(Convert.ToInt32(valore))[0]; + answ = string.Format("{0} / {1}", rigaCelle.UdcAssegnati, rigaCelle.Capienza); + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Eccezione {0}", e), tipoLog.EXCEPTION); + answ = string.Format("{0} - {1}", tipo, valore); + } + break; + default: + break; + } + return answ; + } + + } +} \ No newline at end of file diff --git a/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs new file mode 100644 index 00000000..472948da --- /dev/null +++ b/GMW/GMW_Term/WebUserControls/mod_execParticolare.ascx.designer.cs @@ -0,0 +1,70 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW_Term.WebUserControls { + + + public partial class mod_execParticolare { + + /// + /// btnLoginPage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnLoginPage; + + /// + /// btnButtonsHome control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnButtonsHome; + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// lblNumRec control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRec; + + /// + /// lblWarning control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarning; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs index e9cb5fa1..9ae2e317 100644 --- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs @@ -198,8 +198,6 @@ namespace GMW_Term.WebUserControls #endregion - - /// /// metodi al caricamento della pagina /// @@ -246,8 +244,6 @@ namespace GMW_Term.WebUserControls grView.PageSize = 4; } - - /// /// gestione cambio selezione valore /// diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index ff7a1278..71b79134 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 4b468abc..371f4903 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 97a2e4ec..607440f2 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 7cad7573..71b79134 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index da3e62fb..e394c80b 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index 37a87b04..11451645 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" - "ProductCode" = "8:{33C2AAC6-677B-4389-9102-38DFC930C7A1}" - "PackageCode" = "8:{D4EF3D63-B3B1-46E9-BD11-1D62288B7732}" + "ProductCode" = "8:{7BFDEF48-8EA1-48D5-8EA7-5271A37E55B2}" + "PackageCode" = "8:{95F5A680-7B4C-4484-9B43-1442B90D595C}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.225" + "ProductVersion" = "8:1.0.230" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 69d74ab4..8ca64674 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -15,9 +15,9 @@ - + - + diff --git a/GMW/GMW_data/Properties/Settings.Designer.cs b/GMW/GMW_data/Properties/Settings.Designer.cs index c7f0eac4..5bc94b6a 100644 --- a/GMW/GMW_data/Properties/Settings.Designer.cs +++ b/GMW/GMW_data/Properties/Settings.Designer.cs @@ -26,8 +26,8 @@ namespace GMW_data.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)] - [global::System.Configuration.DefaultSettingValueAttribute("Data Source=T110-WIN2008R2\\SQL2008R2;Initial Catalog=GMW;Persist Security Info=Tr" + - "ue;User ID=sa;Password=keyhammer")] + [global::System.Configuration.DefaultSettingValueAttribute("Data Source=10.74.82.217\\SQL2008R2;Initial Catalog=GMW;Persist Security Info=True" + + ";User ID=sa;Password=keyhammer")] public string GMWConnectionString { get { return ((string)(this["GMWConnectionString"])); diff --git a/GMW/GMW_data/Properties/Settings.settings b/GMW/GMW_data/Properties/Settings.settings index bdfdecc4..a635ebcb 100644 --- a/GMW/GMW_data/Properties/Settings.settings +++ b/GMW/GMW_data/Properties/Settings.settings @@ -5,10 +5,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=T110-WIN2008R2\SQL2008R2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer</ConnectionString> + <ConnectionString>Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=T110-WIN2008R2\SQL2008R2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer + Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GMW;Persist Security Info=True;User ID=sa;Password=keyhammer \ No newline at end of file diff --git a/GMW/GMW_data/SqlScripts/GMW_00225.sql b/GMW/GMW_data/SqlScripts/GMW_00225.sql new file mode 100644 index 00000000..ebfce33f --- /dev/null +++ b/GMW/GMW_data/SqlScripts/GMW_00225.sql @@ -0,0 +1,207 @@ +-- struttura + +alter table Celle add + constraint FK_Celle_TipoCella foreign key(IdxTipoCella) references TipoCella(IdxTipoCella) on update cascade +go + + +-- + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +alter VIEW V_statoCelleCapienzaAssegnati +AS +SELECT dbo.Celle.IdxCella, dbo.Celle.CodCella, dbo.TipoCella.Capienza, ISNULL(COUNT(dbo.PosizioneUdcCorrente.UDC), 0) AS UdcAssegnati, dbo.Celle.Piena +FROM dbo.TipoCella INNER JOIN + dbo.Celle ON dbo.TipoCella.IdxTipoCella = dbo.Celle.IdxTipoCella LEFT OUTER JOIN + dbo.PosizioneUdcCorrente ON dbo.Celle.IdxCella = dbo.PosizioneUdcCorrente.IdxCella +GROUP BY dbo.TipoCella.Capienza, dbo.Celle.IdxCella, dbo.Celle.Piena, dbo.Celle.CodCella +go + +commit +go + +-- + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_celleCreaMancantiBlocco +* +* crea il numero di celle richeiste e le assegna al blocco con valori default +* +* Steamware, S.E.L. +* mod: 2010.05.18 +* +****************************************/ +alter PROCEDURE stp_celleCreaMancantiBlocco +( + @CodCS VARCHAR(2), + @CodMag VARCHAR(50), + @IdxBlocco INT, + @IdxTipoCellaNew INT +) +AS + +--------------------------------------------------------------------- +-- setup iniziale valori XYZ del blocco +--------------------------------------------------------------------- +DECLARE @CodBlocco VARCHAR(3); +SET @CodBlocco = (SELECT CodBlocco FROM Blocchi WHERE IdxBlocco = @IdxBlocco) +DECLARE @NumX INT; +DECLARE @NumY INT; +DECLARE @NumZ INT; +SET @NumX = (SELECT NumX FROM Blocchi WHERE IdxBlocco = @IdxBlocco) ; +SET @NumY = (SELECT NumY FROM Blocchi WHERE IdxBlocco = @IdxBlocco) ; +SET @NumZ = (SELECT NumZ FROM Blocchi WHERE IdxBlocco = @IdxBlocco) ; + +DECLARE @Index INT ; +DECLARE @IdxTipoCella INT; + + +--------------------------------------------------------------------- +-- creazione temp table x numeri delle dimensioni XYZ del blocco +--------------------------------------------------------------------- +DECLARE @DimTable TABLE +( + dimensione VARCHAR(1), + valore INT +) + +-- inserisco X +SET @Index = 1 ; +WHILE @Index <= @NumX + BEGIN + INSERT @DimTable(dimensione, valore) + VALUES ('X', @Index) + SET @Index = @Index + 1 ; + END +-- inserisco Y +SET @Index = 1 ; +WHILE @Index <= @NumY + BEGIN + INSERT @DimTable(dimensione, valore) + VALUES ('Y', @Index) + SET @Index = @Index + 1 ; + END +-- inserisco Z +SET @Index = 1 ; +WHILE @Index <= @NumZ + BEGIN + INSERT @DimTable(dimensione, valore) + VALUES ('Z', @Index) + SET @Index = @Index + 1 ; + END + + +--------------------------------------------------------------------- +-- creazione temp table x schema COMPLETO posizioni blocco +--------------------------------------------------------------------- +DECLARE @SchemaBlocco TABLE +( + X INT, + Y INT, + Z INT +) +INSERT INTO @SchemaBlocco +SELECT X_val.valore, Y_val.valore, Z_val.valore +FROM (SELECT * FROM @DimTable WHERE dimensione='X') AS X_val, + (SELECT * FROM @DimTable WHERE dimensione='Y') AS Y_val, + (SELECT * FROM @DimTable WHERE dimensione='Z') AS Z_val + +---------------------------------------------------------------------------------- +-- cerco primo tipo di celle per il mag indicato SE non ce ne è una specificata +---------------------------------------------------------------------------------- +IF @IdxTipoCellaNew > 0 + BEGIN + SET @IdxTipoCella = @IdxTipoCellaNew + END +ELSE + BEGIN + SET @IdxTipoCella = (SELECT TOP (1) ISNULL(IdxTipoCella, 0) AS IdxTipoCella + FROM TipoCella + WHERE (CodCS = @CodCS) AND (CodMag = @CodMag)) + END +--------------------------------------------------------------------- +-- inserisco le celle nelle posizioni LIBERE del blocco +--------------------------------------------------------------------- +INSERT INTO Celle(CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxBlocco,X,Y,Z) +SELECT @CodCS, @CodBlocco + dbo.f_padLeft(CAST(sb.X AS VARCHAR),2,'0') + dbo.f_padLeft(CAST(sb.Y AS VARCHAR),2,'0') + dbo.f_padLeft(CAST(sb.Z AS VARCHAR),2,'0'), @IdxTipoCella, '-', 1, 0, @IdxBlocco, sb.X, sb.Y, sb.Z +FROM @SchemaBlocco sb LEFT OUTER JOIN (SELECT * +FROM Celle +WHERE IdxBlocco = @IdxBlocco) c +ON sb.X = c.X AND sb.Y = c.Y AND sb.Z = c.Z +WHERE c.IdxCella IS NULL +ORDER BY sb.X,sb.Y,sb.Z ASC + + +RETURN +go + +commit +go + +-- + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_ricercaFullTerminalino +* +* effettua una ricerca full text da terminalino x codice UDC (su cartellini), x nome particolare (AnagParticolari) o posizione (Celle) +* +* Steamware, S.E.L. +* mod: 2010.09.10 +* +****************************************/ +create PROCEDURE stp_ricercaFullTerminalino +( + @txtSearch VARCHAR(50) +) +AS + +SELECT 'UDC' AS Tipo, UDC AS label, UDC AS valore +FROM dbo.ElencoCartellini +WHERE UDC LIKE '%'+@txtSearch+'%' + +UNION + +SELECT 'Particolare' AS Tipo, Particolare AS label, Particolare AS valore +FROM RilPro.AnagParticolari +WHERE Particolare LIKE '%'+@txtSearch+'%' + +UNION + +SELECT 'Cella' AS Tipo, CodCella AS label, CAST(IdxCella AS NVARCHAR)AS valore +FROM dbo.Celle +WHERE CodCella LIKE '%'+@txtSearch+'%' + +RETURN +go + +commit +go + +-- DATI + diff --git a/GMW/GMW_data/app.config b/GMW/GMW_data/app.config index 450b760e..a6f63976 100644 --- a/GMW/GMW_data/app.config +++ b/GMW/GMW_data/app.config @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 79266c24..fb45bff4 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/Debug/GMW_data.dll.config b/GMW/GMW_data/bin/Debug/GMW_data.dll.config index 450b760e..a6f63976 100644 --- a/GMW/GMW_data/bin/Debug/GMW_data.dll.config +++ b/GMW/GMW_data/bin/Debug/GMW_data.dll.config @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index 482ad6d9..dc0c9bd2 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 79266c24..fb45bff4 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/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index e6822cb5..7b8d4621 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 482ad6d9..dc0c9bd2 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_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index 49970111..07738904 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:{02CAA3F5-7937-48CF-A056-69AECDC9CB46}" - "PackageCode" = "8:{2660B702-C0BD-4C22-8130-D16550B26B69}" + "PackageCode" = "8:{6E7AC9FC-9342-43E6-86C9-64838131A2D9}" "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" diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi index b98c223f..38b68076 100644 Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ