Fix visibilità ricerca ADM

This commit is contained in:
Samuele Locatelli
2021-05-12 18:00:20 +02:00
parent ab2e3040bd
commit f788926e9b
24 changed files with 339 additions and 149 deletions
+21 -12
View File
@@ -5,18 +5,7 @@ namespace MP_ADM
{
public partial class BCode : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
}
}
#region Private Methods
private void checkEnabled()
{
@@ -29,5 +18,25 @@ namespace MP_ADM
}
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
((MoonPro)this.Master).showSearch = true;
}
}
#endregion Protected Methods
}
}
+17 -4
View File
@@ -1,10 +1,22 @@
using MapoDb;
using SteamWare;
using System;
namespace MP_ADM
{
public class BasePage : System.Web.UI.Page
{
#region Internal Fields
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
#endregion Internal Fields
#region Protected Properties
/// <summary>
/// Prox pagina da aprire
/// </summary>
@@ -21,10 +33,9 @@ namespace MP_ADM
}
}
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
#endregion Protected Properties
#region Public Methods
/// <summary>
/// effettua traduzione del lemma
@@ -45,5 +56,7 @@ namespace MP_ADM
{
return user_std.UtSn.TraduciEn(lemma);
}
#endregion Public Methods
}
}
+22 -10
View File
@@ -5,16 +5,7 @@ namespace MP_ADM
{
public partial class CTrackBCode : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
((MoonPro)this.Master).headCssClass = "bg-secondary text-warning";
((MoonPro)this.Master).mainCssClass = "table-secondary";
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmCTrack_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptCTrack_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptCTrack_CodGruppo");
}
#region Private Methods
private void checkEnabled()
{
@@ -27,5 +18,26 @@ namespace MP_ADM
}
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
((MoonPro)this.Master).headCssClass = "bg-secondary text-warning";
((MoonPro)this.Master).mainCssClass = "table-secondary";
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmCTrack_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptCTrack_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptCTrack_CodGruppo");
}
#endregion Protected Methods
}
}
+16 -4
View File
@@ -5,10 +5,7 @@ namespace MP_ADM
{
public partial class DataImport : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
}
#region Private Methods
private void checkEnabled()
{
@@ -22,6 +19,10 @@ namespace MP_ADM
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
/// <summary>
/// Esegue import dati
/// </summary>
@@ -37,5 +38,16 @@ namespace MP_ADM
DataLayerObj.taWKS.All_ImportFile_Process(null, null, null, null, 0, 0);
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
checkEnabled();
}
#endregion Protected Methods
}
}
+39 -27
View File
@@ -5,18 +5,7 @@ namespace MP_ADM
{
public partial class GestKIT : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "KIT";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
mod_barcode.eh_comandoRegistrato += Mod_barcode_eh_comandoRegistrato;
mod_barcode.eh_dataRead += Mod_barcode_eh_dataRead;
mod_gestKIT.eh_selKit += Mod_gestKIT_eh_selKit;
}
#region Private Methods
private void checkEnabled()
{
@@ -31,21 +20,6 @@ namespace MP_ADM
}
}
private void Mod_gestKIT_eh_selKit(object sender, EventArgs e)
{
// invio ultimo kit creato a barcode...
mod_barcode.BCodeVal = mod_gestKIT.lastKitMade;
mod_barcode.processInput();
}
private void Mod_barcode_eh_dataRead(object sender, EventArgs e)
{
// verifico input su KIT x lettura "grezza"
string rawInput = mod_barcode.rawInput;
mod_gestKIT.lastInput = rawInput;
mod_gestKIT.doUpdate();
}
private void Mod_barcode_eh_comandoRegistrato(object sender, EventArgs e)
{
// verifico input su KIT x comando completo
@@ -63,5 +37,43 @@ namespace MP_ADM
}
mod_gestKIT.doUpdate();
}
private void Mod_barcode_eh_dataRead(object sender, EventArgs e)
{
// verifico input su KIT x lettura "grezza"
string rawInput = mod_barcode.rawInput;
mod_gestKIT.lastInput = rawInput;
mod_gestKIT.doUpdate();
}
private void Mod_gestKIT_eh_selKit(object sender, EventArgs e)
{
// invio ultimo kit creato a barcode...
mod_barcode.BCodeVal = mod_gestKIT.lastKitMade;
mod_barcode.processInput();
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "KIT";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
mod_barcode.eh_comandoRegistrato += Mod_barcode_eh_comandoRegistrato;
mod_barcode.eh_dataRead += Mod_barcode_eh_dataRead;
mod_gestKIT.eh_selKit += Mod_gestKIT_eh_selKit;
}
#endregion Protected Methods
}
}
+31 -29
View File
@@ -1,59 +1,61 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// 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.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_ADM {
public partial class GestKIT {
namespace MP_ADM
{
public partial class GestKIT
{
/// <summary>
/// Controllo lblDataImportOut.
/// lblDataImportOut control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDataImportOut;
/// <summary>
/// Controllo divContent.
/// divContent control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divContent;
/// <summary>
/// Controllo mod_gestKIT.
/// mod_gestKIT control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_gestKIT mod_gestKIT;
/// <summary>
/// Controllo mod_barcode.
/// mod_barcode control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_barcode mod_barcode;
/// <summary>
/// Controllo mod_gestPromODL.
/// mod_gestPromODL control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_gestPromODL mod_gestPromODL;
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class HwSwInfo : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+8 -1
View File
@@ -9,9 +9,16 @@ namespace MP_ADM
{
public partial class ImageArchive : System.Web.UI.Page
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+1
View File
@@ -84,6 +84,7 @@ namespace MP_ADM
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
checkFixPromIn();
}
checkEnabled();
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class StoricoTC : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+8 -1
View File
@@ -9,9 +9,16 @@ namespace MP_ADM
{
public partial class TechSheetMan : System.Web.UI.Page
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+1
View File
@@ -48,6 +48,7 @@ namespace MP_ADM
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
cmp_righePag.numRowPag = 10;
cmp_vocabolario.pageSize = cmp_righePag.numRowPag;
}
+1 -1
View File
@@ -65,7 +65,7 @@
<uc3:mod_pageTitleAndSearch ID="Mod_pageTitleAndSearch1" runat="server" />
</div>
<div class="col-4 text-right">
<uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" Visible="false" />
<uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" />
</div>
</div>
</div>
+35 -11
View File
@@ -2,12 +2,31 @@ using System;
public partial class MoonPro : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
#region Protected Fields
protected string _headCssClass;
protected string _mainCssClass;
#endregion Protected Fields
#region Public Properties
/// <summary>
/// classe css area HEADER
/// </summary>
public string headCssClass
{
get
{
return _headCssClass;
}
set
{
_headCssClass = value;
}
}
/// <summary>
/// classe css area BODY
/// </summary>
@@ -23,20 +42,25 @@ public partial class MoonPro : System.Web.UI.MasterPage
}
}
protected string _headCssClass;
/// <summary>
/// classe css area HEADER
/// </summary>
public string headCssClass
public bool showSearch
{
get
{
return _headCssClass;
return Mod_ricercaGenerica1.Visible;
}
set
{
_headCssClass = value;
Mod_ricercaGenerica1.Visible = value;
}
}
#endregion Public Properties
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
+38 -38
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// 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.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,101 +13,101 @@ public partial class MoonPro
{
/// <summary>
/// Controllo PlaceHolder1.
/// PlaceHolder1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// Controllo BundleReference2.
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// Controllo BundleReference1.
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// Controllo form1.
/// form1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// Controllo ScriptManager1.
/// ScriptManager1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.ScriptManager ScriptManager1;
/// <summary>
/// Controllo Mod_menuTop1.
/// Mod_menuTop1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_menuTop Mod_menuTop1;
/// <summary>
/// Controllo UpdatePanel1.
/// UpdatePanel1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary>
/// Controllo Mod_pageTitleAndSearch1.
/// Mod_pageTitleAndSearch1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_pageTitleAndSearch Mod_pageTitleAndSearch1;
/// <summary>
/// Controllo Mod_ricercaGenerica1.
/// Mod_ricercaGenerica1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_ricercaGenerica Mod_ricercaGenerica1;
/// <summary>
/// Controllo ContentPlaceHolder1.
/// ContentPlaceHolder1 control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentPlaceHolder1;
/// <summary>
/// Controllo mod_menuBottom.
/// mod_menuBottom control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_menuBottom mod_menuBottom;
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class anagArticoli : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = true;
}
}
#endregion Protected Methods
}
}
-3
View File
@@ -4,8 +4,5 @@ namespace MP_ADM
{
public partial class aperturaImpianti : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+16 -4
View File
@@ -5,10 +5,7 @@ namespace MP_ADM
{
public partial class approvazioneODL : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
}
#region Private Methods
private void checkEnabled()
{
@@ -21,5 +18,20 @@ namespace MP_ADM
}
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
checkEnabled();
}
#endregion Protected Methods
}
}
+16 -4
View File
@@ -5,10 +5,7 @@ namespace MP_ADM
{
public partial class approvazioneProd : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
}
#region Private Methods
private void checkEnabled()
{
@@ -21,5 +18,20 @@ namespace MP_ADM
}
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
checkEnabled();
}
#endregion Protected Methods
}
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class calendChiusura : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class gestPromesseODL : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class gestioneDatiMacchine : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class gestioneODL : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+13
View File
@@ -1,6 +1,19 @@
using System;
namespace MP_ADM
{
public partial class menu : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}