diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 1c48d557..bc091fa8 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -91,6 +91,13 @@ anime.aspx + + animeMult.aspx + ASPXCodeBehind + + + animeMult.aspx + chLang.aspx ASPXCodeBehind @@ -344,6 +351,13 @@ mod_anime.ascx + + mod_animeMult.ascx + ASPXCodeBehind + + + mod_animeMult.ascx + mod_barPlot.ascx ASPXCodeBehind @@ -1111,6 +1125,7 @@ + @@ -1121,6 +1136,7 @@ + diff --git a/GMW/GMW/WS/AutoCompletamento.asmx.cs b/GMW/GMW/WS/AutoCompletamento.asmx.cs index 7243aa67..f3c82eb1 100644 --- a/GMW/GMW/WS/AutoCompletamento.asmx.cs +++ b/GMW/GMW/WS/AutoCompletamento.asmx.cs @@ -55,6 +55,25 @@ namespace GMW.WS } return suggerimenti.ToArray(); } + + [System.Web.Services.WebMethod] + public string[] elencoParticolariAnime(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_Utility.v_selParticolariDataTable tabParticolari = utils.obj.taSelPart.getByConditioPref("", prefixText); + // aggiungo ogni riga... + foreach (DS_Utility.v_selParticolariRow riga in tabParticolari) + { + suggerimenti.Add(riga.value); + } + } + return suggerimenti.ToArray(); + } [System.Web.Services.WebMethod] public string[] elencoCelle(string prefixText, int count) { diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 6eb3eac7..6249e666 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -221,7 +221,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_anime.ascx b/GMW/GMW/WebUserControls/mod_anime.ascx index 9b16d8b2..2b02a037 100644 --- a/GMW/GMW/WebUserControls/mod_anime.ascx +++ b/GMW/GMW/WebUserControls/mod_anime.ascx @@ -21,7 +21,11 @@
- + +   +
diff --git a/GMW/GMW/WebUserControls/mod_anime.ascx.cs b/GMW/GMW/WebUserControls/mod_anime.ascx.cs index ad914be6..c1123b22 100644 --- a/GMW/GMW/WebUserControls/mod_anime.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_anime.ascx.cs @@ -30,18 +30,23 @@ namespace GMW.WebUserControls lblParticolareAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare); // aggiungo descrizione del particolare string descr = ""; + string disegno = ""; try { - descr = utils.obj.taSelPart.getByConditioPref("", currParticolare)[0].label; + DS_magazzino.AnagParticolariRow riga = MagClass.magazzino.taAnagPart.likeSearch(currParticolare, memLayer.ML.StringSessionObj("CodCS"))[0]; + descr = riga.DescParticolare; + disegno = string.Format("( {0} )", riga.DisegnoGrezzo); } catch { } lblDescrAttivo.Text = descr; + lblDisegno.Text = disegno; } else { lblParticolareAttivo.Text = "..."; lblDescrAttivo.Text = ""; + lblDisegno.Text = ""; } } /// diff --git a/GMW/GMW/WebUserControls/mod_anime.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_anime.ascx.designer.cs index 44320610..a96a5c11 100644 --- a/GMW/GMW/WebUserControls/mod_anime.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_anime.ascx.designer.cs @@ -76,6 +76,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblDescrAttivo; + /// + /// lblDisegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDisegno; + /// /// lblMessaggi control. /// diff --git a/GMW/GMW/WebUserControls/mod_animeMult.ascx b/GMW/GMW/WebUserControls/mod_animeMult.ascx new file mode 100644 index 00000000..2dbee205 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_animeMult.ascx @@ -0,0 +1,85 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_animeMult.ascx.cs" + Inherits="GMW.WebUserControls.mod_animeMult" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> + +
+
+
+
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+
+ +   + +
+
+ +
+
+
+
+
+ +
+ +
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+ + +
+
+ +
+ +
+
+ +
+
+
+
+
diff --git a/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs b/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs new file mode 100644 index 00000000..8db6447c --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_animeMult.ascx.cs @@ -0,0 +1,481 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Net; +using SteamWare; +using GMW_data; + +namespace GMW.WebUserControls +{ + public partial class mod_animeMult : System.Web.UI.UserControl + { + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + calcolaPostazione(); + traduciObj(); + } + doChecks(); + } + /// + /// controlla particolare selezionato + /// + private void checkParticolare() + { + if (currParticolare != "") + { + lblParticolareAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare); + // aggiungo descrizione del particolare + string descr = ""; + string disegno = ""; + try + { + DS_magazzino.AnagParticolariRow riga = MagClass.magazzino.taAnagPart.likeSearch(currParticolare, memLayer.ML.StringSessionObj("CodCS"))[0]; + descr = riga.DescParticolare; + disegno = string.Format("( {0} )", riga.DisegnoGrezzo); + } + catch + { } + lblDescrAttivo.Text = descr; + lblDisegno.Text = disegno; + } + else + { + lblParticolareAttivo.Text = "..."; + lblDescrAttivo.Text = ""; + lblDisegno.Text = ""; + } + } + /// + /// effettua controlli visibilità + /// + private void doChecks() + { + checkBarcode(); + checkStampa(); + checkParticolare(); + } + /// + /// sistemo labels oggetti + /// + private void traduciObj() + { + // labels + lblPostazione.Text = string.Format("{2}: {0} ({1})", postazione_name, postazione_IP, traduci("postazione")); + lblPrinter.Text = string.Format("{1}: {0}", postazione_printer, traduci("stampante")); + lblQtaUDC.Text = traduci("lblQtaUDC"); + lblNumUDC.Text = traduci("lblNumUDC"); + lblQta.Text = traduci("lblQuantitaTotale"); + lblNote.Text = traduci("lblNote"); + lblCurrentPage.Text = traduci(PagCorrente); + //txtBox + txtQta.Text = memLayer.ML.confReadString("QtaImballoAnime"); + // buttons + btnStampa.Text = traduci("btnStampa"); + btnEmptyNote.Text = traduci("btnEmptyNote"); + } + /// + /// restituisce il nome della pagina corrente + /// + protected string PagCorrente + { + get + { + string answ = ""; + Uri MyUrl = Request.Url; + string delimStr = "/"; + char[] delimiter = delimStr.ToCharArray(); + string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter); + int n = finalUrl.Length; + answ = finalUrl[n - 1].ToString(); + DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", answ))[0]; + answ = riga.NOME; + return answ; + } + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + /// + /// calcola postazione corrente (ip, name, printer) + /// + private void calcolaPostazione() + { + postazione_IP = Request.UserHostName; + postazione_name = dnsUtils.DetermineCompName(postazione_IP); + // cerco stampante x postazione + postazione_printer = "n.d."; + try + { + DS_Applicazione.ElencoPostazioniDataTable tabPost = DataProxy.obj.taElPost.getByCod(postazione_name); + if (tabPost.Rows.Count > 0) + { + postazione_printer = tabPost[0].stampante; + } + else + { + tabPost = DataProxy.obj.taElPost.getByCod("default"); + postazione_printer = tabPost[0].stampante; + } + } + catch + { } + } + /// + /// indica name della postazione corrente + /// + protected string postazione_name + { + get + { + return memLayer.ML.StringSessionObj("postazione_name"); + } + set + { + memLayer.ML.setSessionVal("postazione_name", value); + } + } + /// + /// indica ip della postazione corrente + /// + protected string postazione_IP + { + get + { + return memLayer.ML.StringSessionObj("postazione_IP"); + } + set + { + memLayer.ML.setSessionVal("postazione_IP", value); + } + } + /// + /// indica stampante associata alla postazione corrente + /// + protected string postazione_printer + { + get + { + return memLayer.ML.StringSessionObj("postazione_printer"); + } + set + { + memLayer.ML.setSessionVal("postazione_printer", value); + } + } + /// + /// indica il codice articolo correntemente selezionato + /// + protected string currParticolare + { + get + { + return memLayer.ML.StringSessionObj("currParticolare"); + } + set + { + memLayer.ML.setSessionVal("currParticolare", value, memLayer.ML.confReadBool("keepParticolareSel")); + } + } + /// + /// indica se i caratteri vadano forzati a maiuscoli + /// + public bool forceUppercase + { + get + { + return memLayer.ML.confReadBool("forceUppercase"); + } + } + /// + /// num pezzi dell'ultimo UDC del particolare generato + /// + public int pezziUdc + { + get + { + int answ = 0; + try + { + answ = (int)MagClass.magazzino.taCartellini.getLastByParticolare(memLayer.ML.StringSessionObj("CodCS"), currParticolare)[0].Qta; + } + catch + { } + return answ; + } + } + /// + /// decodifica il tipo barcode acquisito + /// + public tipoCodiceBarcode tipoBCode + { + get + { + tipoCodiceBarcode answ = tipoCodiceBarcode.ND; + int trovati = 0; + // controllo non si tratti di un comando... + string preCmd = memLayer.ML.confReadString("prefComandi"); + if (barcodeIn.StartsWith(preCmd)) + { + answ = tipoCodiceBarcode.Comando; + } + // controllo se sia un anima "A" + else if (barcodeIn.StartsWith("A")) // !!! CONTROLLARE!!! + { + answ = tipoCodiceBarcode.Particolare; + } + else + { + try + { + // cerco tra gitterbox (UDC)... + trovati = MagClass.magazzino.taCartellini.getByUdc(barcodeIn).Rows.Count; + if (trovati > 0) + { + answ = tipoCodiceBarcode.UDC; + } + } + catch + { + } + } + return answ; + } + } + /// + /// valore barcode + /// + public string barcodeIn + { + get + { + return txtBarcode.Text.Trim(); + } + set + { + txtBarcode.Text = value; + } + } + /// + /// qta pezzi TOTALE + /// + public int qta + { + get + { + int qta = 0; + try + { + qta = Convert.ToInt32(txtQta.Text.Trim()); + } + catch + { } + return qta; + } + set + { + txtQta.Text = value.ToString(); + } + } + /// + /// qta pezzi x UDC + /// + public int qtaUDC + { + get + { + int qtaUDC = 0; + try + { + qtaUDC = Convert.ToInt32(txtQtaUDC.Text.Trim()); + } + catch + { } + return qtaUDC; + } + set + { + txtQtaUDC.Text = value.ToString(); + } + } + /// + /// num UDC + /// + public int numUDC + { + get + { + int numUDC = 0; + try + { + numUDC = Convert.ToInt32(txtNumUDC.Text.Trim()); + } + catch + { } + return numUDC; + } + set + { + txtNumUDC.Text = value.ToString(); + } + } + /// + /// controlla se ci sia un barcode + /// + private void checkBarcode() + { + if (barcodeIn != "") + { + lblMessaggi.Text = string.Format("Barcode digitato: {0}", barcodeIn); + switch (tipoBCode) + { + case tipoCodiceBarcode.Particolare: + // imposto il particolare corrente + currParticolare = barcodeIn; + // controllo esista il particolare scansionato + if (DataProxy.obj.taAnagParticolari.getByParticolare(currParticolare).Rows.Count == 0) + { + currParticolare = ""; + lblMessaggi.Text += " - codice particolare non valido / non trovato in RILPRO."; + pnlAll.CssClass = "stileComandoKo"; + } + else + { + lblMessaggi.Text += " - impostato particolare!"; + pnlAll.CssClass = "stileComandoOk"; + } + break; + case tipoCodiceBarcode.UDC: + // procedo solo se UDC esistente + if (MagClass.magazzino.checkUDC(barcodeIn)) + { + // recupero il particolare dai dati del cartellino preesistente + currParticolare = DataProxy.obj.taCartellini.stp_getByUdc(barcodeIn)[0].Particolare; + // controllo esista il particolare + if (DataProxy.obj.taAnagParticolari.getByParticolare(currParticolare).Rows.Count == 0) + { + currParticolare = ""; + lblMessaggi.Text += " - codice particolare da UDC non valido / non trovato in RILPRO."; + pnlAll.CssClass = "stileComandoKo"; + } + else + { + lblMessaggi.Text += " - impostato particolare!"; + pnlAll.CssClass = "stileComandoOk"; + } + } + + break; + default: + lblMessaggi.Text += " - codice non riconosciuto!"; + pnlAll.CssClass = "stileComandoND"; + break; + } + barcodeIn = ""; + } + else + { + lblMessaggi.Text = "...attesa barcode..."; + } + //grView.DataBind(); + txtBarcode.Focus(); + } + /// + /// controllo l'abilitazioen alla stampa UDC: + /// - particolare ok + /// - qta > 0 + /// - almeno 1 trattamento + /// altrimenti disabilito btn stampa + /// + private void checkStampa() + { + bool stampaOk = false; + //controllo siano inseriti valori qta + if (qta > 0 && qtaUDC > 0 && numUDC > 0) + { + // controllo ci siano particolare e qta tornino (numUdc x qtaUdc = qtaTOT) + if (currParticolare != "" && ((numUDC * qtaUDC) == qta)) + { + stampaOk = true; + } + } + btnStampa.Enabled = stampaOk; + } + /// + /// genera i barcode di + /// - trattamenti + /// - nuovo x pezzi liquidi + /// e lancia la relativa stampa + /// + /// + /// + protected void btnStampa_Click(object sender, EventArgs e) + { + string newUdcChild = ""; + int qta = memLayer.ML.confReadInt("QtaImballoAnime"); + string noteTrim = txtNote.Text.Trim(); + try + { + qta = Convert.ToInt32(txtQtaUDC.Text); + } + catch + { } + for (int i = 0; i < numUDC; i++) + { + // genero cartellino liquidi + try + { + // creo nuovo UDC del trattamento liquidi + newUdcChild = MagClass.magazzino.creaUdc("AN", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoAnime"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneAnime"), true, "IdxPosizioneAnime", "UDC_ANIMA", noteTrim, "", DateTime.Now.Year); // !!! "AN" HARD CODED x indicare flusso ANIME + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Errore creazione UDC: {0}", exc), tipoLog.EXCEPTION); + } + // se ho cart liquidi genero (se non ci sono) cart trattamenti + if (newUdcChild != "") + { + // ora stampo il nuovo cartellino!!! + MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartAnime); + } + } + // resetto + doResetData(); + } + /// + /// effettua reset dati + /// + private void doResetData() + { + // resetto i dati QtaTot e particolare... + qta = 0; + currParticolare = ""; + txtQta.Text = ""; + doChecks(); + } + /// + /// svuoto le note + /// + /// + /// + protected void btnEmptyNote_Click(object sender, EventArgs e) + { + txtNote.Text = ""; + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_animeMult.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_animeMult.ascx.designer.cs new file mode 100644 index 00000000..f533266f --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_animeMult.ascx.designer.cs @@ -0,0 +1,214 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4963 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_animeMult { + + /// + /// pnlAll control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlAll; + + /// + /// lblPostazione control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPostazione; + + /// + /// lblPrinter control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPrinter; + + /// + /// lblCurrentPage control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCurrentPage; + + /// + /// hlMenu control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlMenu; + + /// + /// lblParticolareAttivo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblParticolareAttivo; + + /// + /// lblDescrAttivo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDescrAttivo; + + /// + /// lblDisegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDisegno; + + /// + /// lblMessaggi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblMessaggi; + + /// + /// lblQtaUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblQtaUDC; + + /// + /// txtQtaUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtQtaUDC; + + /// + /// lblNumUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumUDC; + + /// + /// txtNumUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumUDC; + + /// + /// lblQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblQta; + + /// + /// txtQta control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtQta; + + /// + /// btnStampa control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnStampa; + + /// + /// lblBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblBarcode; + + /// + /// txtBarcode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtBarcode; + + /// + /// aceParticolare control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare; + + /// + /// lblNote control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNote; + + /// + /// txtNote control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNote; + + /// + /// btnEmptyNote control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnEmptyNote; + } +} diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx index 713db4cc..bb61cacb 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx @@ -47,8 +47,7 @@ - +
@@ -185,8 +184,8 @@ + Visible='<%# ScaricaEnabled(Eval("CodStatoLista"), Eval("CodTipoLista")) %>' + ImageUrl="~/images/apply_s.png" OnClick="img_Click" /> @@ -219,7 +218,7 @@ + OnClick="img_Click" Enabled='<%# ResetEnabled(Eval("CodLista"), Eval("CodStatoLista"), Eval("CodTipoLista")) %>' /> diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs index 1c399a9c..9dcd44c0 100644 --- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs @@ -596,6 +596,7 @@ namespace GMW.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { aggiornaElencoRighe(); + grView.DataBind(); } /// /// aggiorna visualizzazione @@ -939,8 +940,7 @@ namespace GMW.WebUserControls { GMW_data.MagClass.magazzino.taElencoListePrelievo.stp_LP_updateDestTipo(CodLista, ddlTipoLista.SelectedValue, ddlDestinatario.SelectedValue, ddlDestinatario.SelectedItem.Text); } - + #endregion - } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_filtro.ascx.cs b/GMW/GMW/WebUserControls/mod_filtro.ascx.cs index 84132a7d..f459edc9 100644 --- a/GMW/GMW/WebUserControls/mod_filtro.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_filtro.ascx.cs @@ -33,22 +33,24 @@ public partial class mod_filtro : ApplicationUserControl { get { - return memLayer.ML.StringSessionObj("_showFiltered"); + return memLayer.ML.StringSessionObj(string.Format("_showFiltered_{0}", this.ID)); } set { - memLayer.ML.setSessionVal("_showFiltered", value); + memLayer.ML.setSessionVal(string.Format("_showFiltered_{0}", this.ID), value); + traduciObj(); } } protected string _showAll { get { - return memLayer.ML.StringSessionObj("_showAll"); + return memLayer.ML.StringSessionObj(string.Format("_showAll_{0}", this.ID)); } set { - memLayer.ML.setSessionVal("_showAll", value); + memLayer.ML.setSessionVal(string.Format("_showAll_{0}", this.ID), value); + traduciObj(); } } @@ -57,8 +59,8 @@ public partial class mod_filtro : ApplicationUserControl base.OnInit(e); if (!Page.IsPostBack) { - _showFiltered = "mostraSoloSelez"; - _showAll = "mostraTutti"; + if (_showFiltered == "") _showFiltered = "mostraSoloSelez"; + if (_showAll == "") _showAll = "mostraTutti"; } } @@ -350,7 +352,7 @@ public partial class mod_filtro : ApplicationUserControl updateChkLbl(); } } - + /// /// oggetto ODS con cui popolare il selettore, VINCOLO abbia campi value(key) / label /// diff --git a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx index dcfefdb9..5e2ff838 100644 --- a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx +++ b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx @@ -80,6 +80,7 @@ ultimi 7gg questo mese ultimi 30gg + 1 anno     diff --git a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs index 1ba27027..6e8726ec 100644 --- a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.cs @@ -79,6 +79,9 @@ public partial class mod_periodoAnalisi : System.Web.UI.UserControl case "questo mese": _intervallo = _datario.questoMese(DateTime.Now); break; + case "1 anno": + _intervallo = _datario.ultimiGiorni(DateTime.Now, 366); + break; default: break; } diff --git a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.designer.cs index 37042629..9bfacaf2 100644 --- a/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_periodoAnalisi.ascx.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:2.0.50727.4963 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,9 +9,9 @@ //------------------------------------------------------------------------------ -public partial class mod_periodoAnalisi -{ +public partial class mod_periodoAnalisi { + /// /// lblPeriodo control. /// @@ -20,7 +20,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblPeriodo; - + /// /// txtInizio control. /// @@ -29,7 +29,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtInizio; - + /// /// ddlOraInizio control. /// @@ -38,7 +38,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlOraInizio; - + /// /// CalendarExtender1 control. /// @@ -47,7 +47,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::AjaxControlToolkit.CalendarExtender CalendarExtender1; - + /// /// txtFine control. /// @@ -56,7 +56,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtFine; - + /// /// ddlOraFine control. /// @@ -65,7 +65,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlOraFine; - + /// /// CalendarExtender2 control. /// @@ -74,7 +74,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::AjaxControlToolkit.CalendarExtender CalendarExtender2; - + /// /// DropDownList1 control. /// @@ -83,7 +83,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList DropDownList1; - + /// /// btnUpdate control. /// @@ -92,7 +92,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnUpdate; - + /// /// lblDurataMin control. /// @@ -101,7 +101,7 @@ public partial class mod_periodoAnalisi /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblDurataMin; - + /// /// txtDurataMin control. /// diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx index 8d6f71a7..b1f50655 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx @@ -22,7 +22,11 @@
- + +   +
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs index 17aaa492..844d3756 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs @@ -30,18 +30,23 @@ namespace GMW.WebUserControls lblGitterBoxAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare); // aggiungo descrizione del particolare string descr = ""; + string disegno = ""; try { - descr = utils.obj.taSelPart.getByConditioPref("", currParticolare)[0].label; + DS_magazzino.AnagParticolariRow riga = MagClass.magazzino.taAnagPart.likeSearch(currParticolare, memLayer.ML.StringSessionObj("CodCS"))[0]; + descr = riga.DescParticolare; + disegno = string.Format("( {0} )", riga.DisegnoGrezzo); } catch { } lblDescrAttivo.Text = descr; + lblDisegno.Text = disegno; } else { lblGitterBoxAttivo.Text = "..."; lblDescrAttivo.Text = ""; + lblDisegno.Text = ""; } } /// diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs index 1eb29a78..08f86522 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs @@ -76,6 +76,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblDescrAttivo; + /// + /// lblDisegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDisegno; + /// /// lblMessaggi control. /// diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx index 38410122..d27ae9ed 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx @@ -22,7 +22,11 @@
- + +   +
@@ -40,8 +44,7 @@ + ValidationExpression="[uU](SPLI)[0-9]{8,8}" ControlToValidate="txtUDC" Display="Dynamic" />
 
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs index dae63f4f..ac678a6f 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs @@ -29,18 +29,23 @@ namespace GMW.WebUserControls lblGitterBoxAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare); // aggiungo descrizione del particolare string descr = ""; + string disegno = ""; try { - descr = utils.obj.taSelPart.getByConditioPref("", currParticolare)[0].label; + DS_magazzino.AnagParticolariRow riga = MagClass.magazzino.taAnagPart.likeSearch(currParticolare, memLayer.ML.StringSessionObj("CodCS"))[0]; + descr = riga.DescParticolare; + disegno = string.Format("( {0} )", riga.DisegnoGrezzo); } catch { } lblDescrAttivo.Text = descr; + lblDisegno.Text = disegno; } else { lblGitterBoxAttivo.Text = "..."; lblDescrAttivo.Text = ""; + lblDisegno.Text = ""; } } /// diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs index b04dd86d..d4fb9f56 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs @@ -76,6 +76,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblDescrAttivo; + /// + /// lblDisegno control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDisegno; + /// /// lblMessaggi control. /// diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx b/GMW/GMW/WebUserControls/mod_statoMag.ascx index dbaf0e4a..11d28016 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx @@ -1,104 +1,122 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_statoMag.ascx.cs" Inherits="GMW.WebUserControls.mod_statoMag" %> -<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +<% if (false) + { %> + +<% } %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Src="mod_barPlot.ascx" TagName="mod_barPlot" TagPrefix="uc2" %> -
- - +
+
+ + + + + + +
+
+ + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ + + + + + + + +
+ + / + +
+
+
+ + + +
+ + / + +
+
+
+ + +
+ + --> + +
+
+
+
+
+ - + + + + +    + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- - - - - - - - -
- - / - -
-
-
- - - -
- - / - -
-
-
- - -
- - --> - -
-
-
-
-
- - - - - -   - - - - - - - diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs b/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs index 71fa32ad..97f61c59 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx.cs @@ -170,7 +170,11 @@ namespace GMW.WebUserControls checkFixOds(); } } - + protected override void traduciObj() + { + lblCercaPart.Text = traduci("lblCercaPart"); + btnCercaPart.Text = traduci("btnCerca"); + } void mod_filtroMag_eh_selValore(object sender, EventArgs e) { // chiamo procedura che aggiorna ods principale @@ -307,7 +311,22 @@ namespace GMW.WebUserControls memLayer.ML.emptySessionVal("CodMagLogico_sel"); memLayer.ML.emptySessionVal("CodMag_sel"); } - + /// + /// cambiato valore in ricerca + /// + /// + /// + protected void txtCercaPart_TextChanged(object sender, EventArgs e) + { + } + /// + /// pressione del button di ricerca + /// + /// + /// + protected void btnCercaPart_Click(object sender, EventArgs e) + { + } #endregion } diff --git a/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs index b7b2c294..9d0b6f2b 100644 --- a/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_statoMag.ascx.designer.cs @@ -31,6 +31,42 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.ObjectDataSource odsFiltroMag; + /// + /// lblCercaPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblCercaPart; + + /// + /// txtCercaPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtCercaPart; + + /// + /// aceParticolare control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare; + + /// + /// btnCercaPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnCercaPart; + /// /// grView control. /// diff --git a/GMW/GMW/animeMult.aspx b/GMW/GMW/animeMult.aspx new file mode 100644 index 00000000..ef98c564 --- /dev/null +++ b/GMW/GMW/animeMult.aspx @@ -0,0 +1,6 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.master" AutoEventWireup="true" CodeBehind="animeMult.aspx.cs" Inherits="GMW.animeMult" %> +<%@ Register src="WebUserControls/mod_animeMult.ascx" tagname="mod_animeMult" tagprefix="uc1" %> + + + + diff --git a/GMW/GMW/animeMult.aspx.cs b/GMW/GMW/animeMult.aspx.cs new file mode 100644 index 00000000..491f82e6 --- /dev/null +++ b/GMW/GMW/animeMult.aspx.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 +{ + public partial class animeMult : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW/animeMult.aspx.designer.cs b/GMW/GMW/animeMult.aspx.designer.cs new file mode 100644 index 00000000..75acfdf3 --- /dev/null +++ b/GMW/GMW/animeMult.aspx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4963 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW { + + + public partial class animeMult { + + /// + /// mod_animeMult1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_animeMult mod_animeMult1; + } +} diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index c1f5dd07..4cd38f0f 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 75b19adb..6c0aa6d4 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/images/circle_l_5.png b/GMW/GMW/images/circle_l_5.png new file mode 100644 index 00000000..6f81c3e3 Binary files /dev/null and b/GMW/GMW/images/circle_l_5.png differ diff --git a/GMW/GMW/images/circle_l_6.png b/GMW/GMW/images/circle_l_6.png new file mode 100644 index 00000000..7ae358fc Binary files /dev/null and b/GMW/GMW/images/circle_l_6.png differ diff --git a/GMW/GMW/images/circle_l_99.png b/GMW/GMW/images/circle_l_99.png new file mode 100644 index 00000000..2133d7bf Binary files /dev/null and b/GMW/GMW/images/circle_l_99.png differ diff --git a/GMW/GMW/images/circle_s_5.png b/GMW/GMW/images/circle_s_5.png new file mode 100644 index 00000000..04c26c11 Binary files /dev/null and b/GMW/GMW/images/circle_s_5.png differ diff --git a/GMW/GMW/images/circle_s_6.png b/GMW/GMW/images/circle_s_6.png new file mode 100644 index 00000000..f92db707 Binary files /dev/null and b/GMW/GMW/images/circle_s_6.png differ diff --git a/GMW/GMW/images/circle_s_99.png b/GMW/GMW/images/circle_s_99.png new file mode 100644 index 00000000..434411e6 Binary files /dev/null and b/GMW/GMW/images/circle_s_99.png differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index c66e8faa..4cd38f0f 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 56f63b2f..f1ef378e 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 6af9d026..9f9e81ea 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -22099,6 +22099,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 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_magazzinoOverview_maxCelle"; @@ -22139,7 +22140,7 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.V_MagazziniOverviewDataTable getByCodCS(string CodCS) { + public virtual DS_magazzino.V_MagazziniOverviewDataTable getByCodCS_particolare(string CodCS, string particolare) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -22147,6 +22148,12 @@ SELECT CodImballo, ClasseArticolo, DescImballo FROM RilPro.AnagImballi WHERE (Co else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodCS)); } + if ((particolare == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(particolare)); + } DS_magazzino.V_MagazziniOverviewDataTable dataTable = new DS_magazzino.V_MagazziniOverviewDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 9452739e..5a5e9342 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -1553,13 +1553,14 @@ FROM dbo.V_MagazziniOverview - + dbo.stp_magazzinoOverview + @@ -2813,122 +2814,122 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + @@ -2941,153 +2942,6 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3102,18 +2956,18 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - + + + + + + + + - + @@ -3123,7 +2977,154 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3137,79 +3138,79 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - - - + + + - - + + - - + + - + - + - - - - - - + + + + + + @@ -3222,21 +3223,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + @@ -3247,6 +3248,350 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3263,365 +3608,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3634,131 +3635,131 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - + + - + - - + + - - - + + + - + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - + @@ -3778,8 +3779,8 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - + + @@ -3792,33 +3793,33 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - - - + + + - + - - + + - - - + + + @@ -3831,42 +3832,42 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + - + - + - + @@ -3879,21 +3880,21 @@ SELECT CodLega, DescLega, DescLega2 FROM RilPro.AnagLeghe WHERE (CodLega = @CodL - + - + - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 7615b698..13231399 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. --> - + diff --git a/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql index a0dc6ac4..90b3c67f 100644 --- a/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql +++ b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql @@ -1,3 +1,80 @@ +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/************************************* +* STORED PROCEDURE stp_insNewLemma +* +* elimina record anagrafica classe prodotto +* +* mod : 14/05/2012 +* aut : S.E. Locatelli +**************************************/ +create PROCEDURE stp_insNewLemma +( + @lemma NVARCHAR(50), + @traduzione NVARCHAR(500) +) +AS + +-- elimino se c'era già... +DELETE +FROM Vocabolario +WHERE lemma = @lemma + +-- inserisco x tutte le lingue attive... +INSERT INTO Vocabolario +SELECT lingua, @lemma, @traduzione +FROM Lingue + +SELECT * +FROM Vocabolario +WHERE lemma = @lemma + +RETURN +go + +commit; +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'lblNumUDC', N'Numero UDC') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'lblQtaUDC', N'Pezzi x UDC') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'lblQuantitaTotale', N'Quantità totale') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'PostAnimeMult', N'Cart. anime ext.') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'PostAnimeMultExpl', N'Gestione Stampa Cartellini per anime esterne') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'lblNumUDC', N'Numero UDC') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'lblQtaUDC', N'Pezzi x UDC') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'lblQuantitaTotale', N'Quantità totale') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'PostAnimeMult', N'Cart. anime ext.') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'PostAnimeMultExpl', N'Gestione Stampa Cartellini per anime esterne') +go + +commit transaction +go + + diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 0984de2c..6c0aa6d4 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/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 0984de2c..6c0aa6d4 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 81e841bb..ce16120d 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