diff --git a/Jenkinsfile b/Jenkinsfile index 21383cac..39e79bad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1407']) { + withEnv(['NEXT_BUILD_NUMBER=1408']) { // env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 97275da3..ae0a1971 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -597,9 +597,11 @@ + + @@ -607,6 +609,8 @@ + + @@ -614,6 +618,7 @@ + @@ -881,6 +886,13 @@ testUtente.aspx + + Vocabolario.aspx + ASPXCodeBehind + + + Vocabolario.aspx + AjaxSimple.master ASPXCodeBehind @@ -930,6 +942,13 @@ cmp_ImageArchive.ascx + + cmp_lemmiVocab.ascx + ASPXCodeBehind + + + cmp_lemmiVocab.ascx + cmp_numRow.ascx ASPXCodeBehind @@ -979,6 +998,20 @@ cmp_PODL_OUT.ascx + + cmp_ricercaGenerica.ascx + ASPXCodeBehind + + + cmp_ricercaGenerica.ascx + + + cmp_righePag.ascx + ASPXCodeBehind + + + cmp_righePag.ascx + cmp_ST_detail.ascx ASPXCodeBehind @@ -1028,6 +1061,13 @@ cmp_TechSheetMan.ascx + + cmp_vocabolario.ascx + ASPXCodeBehind + + + cmp_vocabolario.ascx + mod_anagArticoli.ascx ASPXCodeBehind diff --git a/MP-ADM/Vocabolario.aspx b/MP-ADM/Vocabolario.aspx new file mode 100644 index 00000000..a9eeeb79 --- /dev/null +++ b/MP-ADM/Vocabolario.aspx @@ -0,0 +1,41 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Vocabolario.aspx.cs" Inherits="MP_ADM.Vocabolario" %> + +<%@ Register Src="~/WebUserControls/cmp_lemmiVocab.ascx" TagName="cmp_lemmiVocab" TagPrefix="uc2" %> + +<%@ Register Src="~/WebUserControls/cmp_righePag.ascx" TagName="cmp_righePag" TagPrefix="uc3" %> +<%@ Register Src="~/WebUserControls/cmp_ricercaGenerica.ascx" TagPrefix="uc4" TagName="cmp_ricercaGenerica" %> +<%@ Register Src="~/WebUserControls/cmp_vocabolario.ascx" TagPrefix="uc2" TagName="cmp_vocabolario" %> + + +
+

<%: traduci("Vocabolario") %>

+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ \ No newline at end of file diff --git a/MP-ADM/Vocabolario.aspx.cs b/MP-ADM/Vocabolario.aspx.cs new file mode 100644 index 00000000..4058f43d --- /dev/null +++ b/MP-ADM/Vocabolario.aspx.cs @@ -0,0 +1,68 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_ADM +{ + public partial class Vocabolario : BasePage + { + #region Private Methods + + /// + /// aggiornato numero righe datagrid... aggiorno visualizzazione + /// + /// + /// + private void cmp_righePag_eh_newNum(object sender, EventArgs e) + { + cmp_vocabolario.pageSize = cmp_righePag.numRowPag; + } + + private void cmp_vocabolario_eh_resetSelezione(object sender, EventArgs e) + { + cmp_lemmiVocab.Visible = false; + Session.Remove("lemma_sel"); + } + + private void cmp_vocabolario_eh_selezioneValore(object sender, EventArgs e) + { + cmp_lemmiVocab.Visible = true; + cmp_lemmiVocab.doUpdate(); + } + + #endregion Private Methods + +#endregion Private Methods + + #region Protected Methods + + #region Protected Methods + + protected override void OnUnload(EventArgs e) + { + base.OnUnload(e); + cmp_vocabolario.eh_selezioneValore -= new EventHandler(cmp_vocabolario_eh_selezioneValore); + cmp_vocabolario.eh_resetSelezione -= new EventHandler(cmp_vocabolario_eh_resetSelezione); + } + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + cmp_righePag.numRowPag = 10; + cmp_vocabolario.pageSize = cmp_righePag.numRowPag; + } + // imposto controlli eventi + cmp_vocabolario.eh_selezioneValore += new EventHandler(cmp_vocabolario_eh_selezioneValore); + cmp_vocabolario.eh_resetSelezione += new EventHandler(cmp_vocabolario_eh_resetSelezione); + // setto visibilità dettaglio termini + cmp_lemmiVocab.Visible = false; + cmp_righePag.eh_newNum += cmp_righePag_eh_newNum; + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-ADM/Vocabolario.aspx.designer.cs b/MP-ADM/Vocabolario.aspx.designer.cs new file mode 100644 index 00000000..10badabd --- /dev/null +++ b/MP-ADM/Vocabolario.aspx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM +{ + + + public partial class Vocabolario + { + + /// + /// cmp_ricercaGenerica control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_ADM.WebUserControls.cmp_ricercaGenerica cmp_ricercaGenerica; + + /// + /// cmp_righePag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_ADM.WebUserControls.cmp_righePag cmp_righePag; + + /// + /// cmp_vocabolario control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_ADM.WebUserControls.cmp_vocabolario cmp_vocabolario; + + /// + /// cmp_lemmiVocab control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_ADM.WebUserControls.cmp_lemmiVocab cmp_lemmiVocab; + } +} diff --git a/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx b/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx new file mode 100644 index 00000000..7e285d54 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx @@ -0,0 +1,48 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_lemmiVocab.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_lemmiVocab" %> + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx.cs b/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx.cs new file mode 100644 index 00000000..5b6104fe --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace MP_ADM.WebUserControls +{ + public partial class cmp_lemmiVocab : ApplicationUserControl + { + #region Protected Methods + + protected override void aggiornaControlliDataGL() + { + base.aggiornaControlliDataGL(); + grView.PageSize = _righeDataGridAnagr; + } + + 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 = ""; + } + } + + #endregion Protected Methods + + #region Public Methods + + /// + /// aggiorna i dati mostrati + /// + public void doUpdate() + { + ods.DataBind(); + grView.DataBind(); + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx.designer.cs new file mode 100644 index 00000000..2bd5b9b4 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_lemmiVocab.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM.WebUserControls +{ + + + public partial class cmp_lemmiVocab + { + + /// + /// 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; + + /// + /// 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/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx b/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx new file mode 100644 index 00000000..2b3f947b --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx @@ -0,0 +1,9 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ricercaGenerica.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_ricercaGenerica" %> +<% if (false) + { %> + +<% } %> +
+ + +
\ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx.cs b/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx.cs new file mode 100644 index 00000000..5ef7ea18 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace MP_ADM.WebUserControls +{ + public partial class cmp_ricercaGenerica : ApplicationUserControl + { + #region Public Events + + public event EventHandler eh_nuovaRicerca; + + #endregion Public Events + + #region Protected Properties + + /// + /// testo ricerca trimmato da spazi + /// + protected string testoRicerca + { + get + { + return txtCerca.Text.Trim(); + } + set + { + txtCerca.Text = value; + } + } + + #endregion Protected Properties + + #region Protected Methods + + /// + /// pressione del button di ricerca + /// + /// + /// + protected void btnCerca_Click(object sender, EventArgs e) + { + salvaCerca(); + } + + protected override void Page_Load(object sender, EventArgs e) + { + base.Page_Load(sender, e); + updateText(); + btnCerca.Text = traduci("lblCerca"); + } + + /// + /// effettua salvataggio ricerca + /// + protected void salvaCerca() + { + if (string.IsNullOrEmpty(testoRicerca)) + { + SteamWare.memLayer.ML.emptySessionVal("valoreSearch"); + } + else + { + SteamWare.memLayer.ML.setSessionVal("valoreSearch", testoRicerca); + // raise dell'evento + if (eh_nuovaRicerca != null) + { + eh_nuovaRicerca(this, new EventArgs()); + } + } + } + + /// + /// cambiato valore in ricerca + /// + /// + /// + protected void txtCerca_TextChanged(object sender, EventArgs e) + { + salvaCerca(); + } + + #endregion Protected Methods + + #region Public Methods + + /// + /// aggiorna il testo cercato + /// + public void updateText() + { + if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("valoreSearch")) && !Page.IsPostBack) + { + testoRicerca = SteamWare.memLayer.ML.StringSessionObj("valoreSearch"); + } + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx.designer.cs new file mode 100644 index 00000000..64e73176 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_ricercaGenerica.ascx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM.WebUserControls +{ + + + public partial class cmp_ricercaGenerica + { + + /// + /// txtCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtCerca; + + /// + /// btnCerca control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnCerca; + } +} diff --git a/MP-ADM/WebUserControls/cmp_righePag.ascx b/MP-ADM/WebUserControls/cmp_righePag.ascx new file mode 100644 index 00000000..12b9593b --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_righePag.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_righePag.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_righePag" %> +
+ <%: traduci("righePerPag") %> + +
\ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_righePag.ascx.cs b/MP-ADM/WebUserControls/cmp_righePag.ascx.cs new file mode 100644 index 00000000..032a5f84 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_righePag.ascx.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace MP_ADM.WebUserControls +{ + public partial class cmp_righePag : BaseUserControl + { + #region Public Events + + /// + /// indicato (nuovo) numero righe x pagina + /// + public event EventHandler eh_newNum; + + #endregion Public Events + + #region Protected Properties + + /// + /// numero righe gridview da mostrare legato a controllo textbox + /// + protected int numRowReq + { + get + { + int answ = numRowPag; + try + { + answ = Convert.ToInt32(txtNumRighe.Text.Trim()); + if (answ == 0) + { + answ = numRowPag; + txtNumRighe.Text = answ.ToString(); + } + } + catch + { } + return answ; + } + set + { + txtNumRighe.Text = value.ToString(); + } + } + + #endregion Protected Properties + + #region Public Properties + + /// + /// numero righe per pagina (in sessione) + /// + public int numRowPag + { + get + { + int answ = 10; + try + { + answ = memLayer.ML.IntSessionObj(uid + "_numRowPag"); + } + catch + { + answ = 10; + } + return answ; + } + set + { + memLayer.ML.setSessionVal(uid + "_numRowPag", value); + numRowReq = value; + } + } + + /// + /// stringa UID univoca + /// + public string uid + { + get + { + return this.UniqueID.Replace("$", "_").Replace("-", "_"); + } + } + + #endregion Public Properties + + #region Protected Methods + + /// + /// caricamento pagina + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + numRowReq = numRowPag; + } + } + + /// + /// aggiorno controllo paginazione... + /// + /// + /// + protected void txtNumRighe_TextChanged(object sender, EventArgs e) + { + // salvo num righe... + numRowPag = numRowReq; + // sollevo evento nuovo valore... + if (eh_newNum != null) + { + eh_newNum(this, new EventArgs()); + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_righePag.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_righePag.ascx.designer.cs new file mode 100644 index 00000000..91fd885b --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_righePag.ascx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM.WebUserControls +{ + + + public partial class cmp_righePag + { + + /// + /// lblNumRighe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumRighe; + + /// + /// txtNumRighe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumRighe; + } +} diff --git a/MP-ADM/WebUserControls/cmp_vocabolario.ascx b/MP-ADM/WebUserControls/cmp_vocabolario.ascx new file mode 100644 index 00000000..dc78a762 --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_vocabolario.ascx @@ -0,0 +1,90 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_vocabolario.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_vocabolario" %> +
+
+ + +
+
+ + + + + + + + + + + + + + + + <%: traduci("Reset") %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_vocabolario.ascx.cs b/MP-ADM/WebUserControls/cmp_vocabolario.ascx.cs new file mode 100644 index 00000000..05f430da --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_vocabolario.ascx.cs @@ -0,0 +1,170 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; + +namespace MP_ADM.WebUserControls +{ + public partial class cmp_vocabolario : ApplicationUserControl + { + #region Public Events + + public event EventHandler eh_resetSelezione; + + public event EventHandler eh_selezioneValore; + + #endregion Public Events + + #region Public Properties + + /// + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; + } + } + + #endregion Public Properties + + #region Private Methods + + /// + /// creazione nuovo lemma + /// + private void creaNuovoLemma() + { + if (!string.IsNullOrEmpty(txtNewLemma.Text)) + { + // inserisco + DataWrap.DW.creaNuovoLemmaVoc(txtNewLemma.Text.Trim()); + // metto in campo ricerca... + memLayer.ML.setSessionVal("valoreCercato", txtNewLemma.Text.Trim()); + // svuoto campo text + txtNewLemma.Text = ""; + try + { + // aggiorno vocabolario + DataWrap.DW.resetVocabolario(); + } + catch + { } + // riparto... + Response.Redirect(_paginaCorrente); + } + } + + private void selezionatoValore() + { + SteamWare.memLayer.ML.setSessionVal("lemma_sel", grView.SelectedDataKey.Values[1]); + if (eh_selezioneValore != null) + { + eh_selezioneValore(this, new EventArgs()); + } + } + + #endregion Private Methods + + #region Protected Methods + + protected override void aggiornaControlliDataGL() + { + base.aggiornaControlliDataGL(); + ods.DataBind(); + } + + /// + /// inserisco nel db il nuovo lemma... + /// + /// + /// + protected void btnNewLemma_Click(object sender, EventArgs e) + { + creaNuovoLemma(); + } + + protected void btnReset_Click(object sender, EventArgs e) + { + resetSelezione(); + } + + 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 = ""; + } + } + + protected void grView_RowEditing(object sender, GridViewEditEventArgs e) + { + // seleziono la riga corrente... + grView.SelectedIndex = e.NewEditIndex; + selezionatoValore(); + } + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + selezionatoValore(); + } + + protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + selezionatoValore(); + } + + protected override void traduciObj() + { + base.traduciObj(); + btnNewLemma.Text = user_std.UtSn.Traduci("btnNewLemma"); + txtNewLemma.Text = ""; + } + + #endregion Protected Methods + + #region Public Methods + + /// + /// resetta la selezione dei valori in caso di modifiche su altri controlli + /// + public void resetSelezione() + { + SteamWare.memLayer.ML.emptySessionVal("lemma_sel"); + grView.SelectedIndex = -1; + grView.DataBind(); + if (eh_resetSelezione != null) + { + eh_resetSelezione(this, new EventArgs()); + } + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP-ADM/WebUserControls/cmp_vocabolario.ascx.designer.cs b/MP-ADM/WebUserControls/cmp_vocabolario.ascx.designer.cs new file mode 100644 index 00000000..81de1eab --- /dev/null +++ b/MP-ADM/WebUserControls/cmp_vocabolario.ascx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_ADM.WebUserControls +{ + + + public partial class cmp_vocabolario + { + + /// + /// btnNewLemma control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnNewLemma; + + /// + /// txtNewLemma control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNewLemma; + + /// + /// 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; + + /// + /// 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/MP-ADM/WebUserControls/mod_main_help.ascx b/MP-ADM/WebUserControls/mod_main_help.ascx index 57b1a4e2..383afe70 100644 --- a/MP-ADM/WebUserControls/mod_main_help.ascx +++ b/MP-ADM/WebUserControls/mod_main_help.ascx @@ -51,6 +51,10 @@ <%: traduci("TechSheetMan") %> + + + <%: traduci("Vocabolario") %> + <%-- PEDANE diff --git a/MP-ADM/WebUserControls/mod_main_help.ascx.designer.cs b/MP-ADM/WebUserControls/mod_main_help.ascx.designer.cs index fde9ec57..838dad37 100644 --- a/MP-ADM/WebUserControls/mod_main_help.ascx.designer.cs +++ b/MP-ADM/WebUserControls/mod_main_help.ascx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ diff --git a/MapoDb/MapoDb.csproj b/MapoDb/MapoDb.csproj index a225ee9c..063134ba 100644 --- a/MapoDb/MapoDb.csproj +++ b/MapoDb/MapoDb.csproj @@ -275,6 +275,7 @@ + diff --git a/MapoDb/selDataVoc.cs b/MapoDb/selDataVoc.cs new file mode 100644 index 00000000..a7c9ee85 --- /dev/null +++ b/MapoDb/selDataVoc.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MapoDb +{ + public class selDataVoc + { + #region Public Constructors + + /// + /// classe accesso tabelle selettori + /// + public selDataVoc() + { + } + + #endregion Public Constructors + + #region Public Methods + + /// + /// cancella il lemma indicato + /// + /// + /// + public void deleteLemmaVoc(string Original_Lingua, string Original_Lemma) + { + SteamWare.DataWrap.DW.taVocabolario.DeleteQuery(Original_Lingua, Original_Lemma); + } + + /// + /// tabella lingue + /// + /// + public SteamWare.DataLayer_generic.LingueDataTable getLingue() + { + return SteamWare.DataWrap.DW.taLingue.GetData(); + } + + /// + /// tabella vocabolario + /// + /// + public SteamWare.DataLayer_generic.VocabolarioDataTable getVocabolario() + { + return SteamWare.DataWrap.DW.taVocabolario.GetData(); + } + + /// + /// faccio update del lemma indicato... + /// + /// + /// + /// + public void updateLemmaVoc(string Traduzione, string Original_Lingua, string Original_Lemma) + { + SteamWare.DataWrap.DW.taVocabolario.UpdateQuery(Traduzione, Original_Lingua, Original_Lemma); + } + + #endregion Public Methods + } +} \ No newline at end of file