Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix diplasy come cards

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-15 18:36:30 +02:00
parent 2ef64aa75a
commit b1d97e3545
5 changed files with 85 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/site/DevUtils.aspx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="DevUtils.aspx.cs" Inherits="NKC_WF.DevUtils" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="DevUtils.aspx.cs" Inherits="NKC_WF.DevUtils" %>
<%@ Register Src="~/WebUserControls/cmp_devUtils.ascx" TagPrefix="uc1" TagName="cmp_devUtils" %>
NKC_WF/site/GlobalSearch.aspx
+10 -5
View File
@@ -6,9 +6,14 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="display-4 text-center border border-info rounded mb-2">Advanced <span class="text-info">SEARCH</span></div>
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
<asp:HiddenField runat="server" ID="hfLastBCode" />
<asp:HiddenField runat="server" ID="hfLastValidBCode" />
<uc1:cmp_searchItems runat="server" ID="cmp_searchItems" />
<div class="card text-center" style="width: 100%;">
<h3 class="card-header"><%: traduci("Advanced") %> <span class="text-info text-uppercase"><%: traduci("Search") %></span></h3>
<div class="card-body py-1">
<div class="display-4 text-center border border-info rounded mb-2"></div>
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
<asp:HiddenField runat="server" ID="hfLastBCode" />
<asp:HiddenField runat="server" ID="hfLastValidBCode" />
<uc1:cmp_searchItems runat="server" ID="cmp_searchItems" />
</div>
</div>
</asp:Content>
NKC_WF/site/GlobalSearch.aspx.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class GlobalSearch : System.Web.UI.Page
public partial class GlobalSearch : BasePage
{
/// <summary>
/// Comando barcode letto
NKC_WF/site/vocabolario.aspx
+31 -29
View File
@@ -1,5 +1,5 @@
<%@ Page Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true"
Inherits="NKC_WF.vocabolario" Title="Vocabolario" CodeBehind="vocabolario.aspx.cs" %>
<%@ Page Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true"
Inherits="NKC_WF.vocabolario" Title="Vocabolario" CodeBehind="vocabolario.aspx.cs" %>
<%@ Register Src="~/WebUserControls/mod_lemmiVocab.ascx" TagName="mod_lemmiVocab" TagPrefix="uc2" %>
@@ -7,34 +7,36 @@
<%@ Register Src="~/WebUserControls/mod_ricercaGenerica.ascx" TagPrefix="uc4" TagName="mod_ricercaGenerica" %>
<%@ Register Src="~/WebUserControls/mod_vocabolario.ascx" TagPrefix="uc2" TagName="mod_vocabolario" %>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-fluid" style="background-color: #cdcdcd; padding-top: 2px; padding-bottom: 2px;">
<div class="container">
<div class="row">
<div class="col-2">
<div class="card text-center" style="width: 100%;">
<h3 class="card-header"><%: traduci("Vocabolario") %></h3>
<div class="card-body py-1">
<div class="container-fluid" style="background-color: #cdcdcd; padding-top: 2px; padding-bottom: 2px;">
<div class="container">
<div class="row">
<div class="col-2">
</div>
<div class="col-8 text-center">
<uc4:mod_ricercaGenerica runat="server" ID="mod_ricercaGenerica" />
</div>
<div class="col-2 text-right">
<uc3:mod_righePag runat="server" ID="mod_righePag" />
</div>
</div>
</div>
</div>
<div class="container-fluid" style="padding-top: 2px; padding-bottom: 2px;">
<div class="container">
<div class="row">
<div class="col-8">
<uc2:mod_vocabolario runat="server" ID="mod_vocabolario" />
</div>
<div class="col-4 pt-4">
<uc2:mod_lemmiVocab runat="server" ID="mod_lemmiVocab" />
</div>
</div>
</div>
</div>
</div>
<div class="col-8 text-center">
<uc4:mod_ricercaGenerica runat="server" ID="mod_ricercaGenerica" />
</div>
<div class="col-2 text-right">
<uc3:mod_righePag runat="server" ID="mod_righePag" />
</div>
</div>
</div>
</div>
<div class="container-fluid" style="padding-top: 2px; padding-bottom: 2px;">
<div class="container">
<div class="row">
<div class="col-8">
<uc2:mod_vocabolario runat="server" id="mod_vocabolario" />
</div>
<div class="col-4 pt-4">
<uc2:mod_lemmiVocab runat="server" id="mod_lemmiVocab" />
</div>
</div>
</div>
</div>
</asp:Content>
NKC_WF/site/vocabolario.aspx.cs
+42 -42
View File
@@ -3,51 +3,51 @@ using System.Web.UI;
namespace NKC_WF
{
public partial class vocabolario : System.Web.UI.Page
{
protected override void OnInit(EventArgs e)
public partial class vocabolario : BasePage
{
base.OnInit(e);
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
mod_righePag.numRowPag = 10;
mod_vocabolario.pageSize = mod_righePag.numRowPag;
}
// imposto controlli eventi
mod_vocabolario.eh_selezioneValore += new EventHandler(mod_vocabolario_eh_selezioneValore);
mod_vocabolario.eh_resetSelezione += new EventHandler(mod_vocabolario_eh_resetSelezione);
// setto visibilità dettaglio termini
mod_lemmiVocab.Visible = false;
mod_righePag.eh_newNum += mod_righePag_eh_newNum;
}
/// <summary>
/// aggiornato numero righe datagrid... aggiorno visualizzazione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_righePag_eh_newNum(object sender, EventArgs e)
{
mod_vocabolario.pageSize = mod_righePag.numRowPag;
}
void mod_vocabolario_eh_resetSelezione(object sender, EventArgs e)
{
mod_lemmiVocab.Visible = false;
Session.Remove("lemma_sel");
}
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
mod_righePag.numRowPag = 10;
mod_vocabolario.pageSize = mod_righePag.numRowPag;
}
// imposto controlli eventi
mod_vocabolario.eh_selezioneValore += new EventHandler(mod_vocabolario_eh_selezioneValore);
mod_vocabolario.eh_resetSelezione += new EventHandler(mod_vocabolario_eh_resetSelezione);
// setto visibilità dettaglio termini
mod_lemmiVocab.Visible = false;
mod_righePag.eh_newNum += mod_righePag_eh_newNum;
}
/// <summary>
/// aggiornato numero righe datagrid... aggiorno visualizzazione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_righePag_eh_newNum(object sender, EventArgs e)
{
mod_vocabolario.pageSize = mod_righePag.numRowPag;
}
void mod_vocabolario_eh_resetSelezione(object sender, EventArgs e)
{
mod_lemmiVocab.Visible = false;
Session.Remove("lemma_sel");
}
void mod_vocabolario_eh_selezioneValore(object sender, EventArgs e)
{
mod_lemmiVocab.Visible = true;
mod_lemmiVocab.doUpdate();
}
void mod_vocabolario_eh_selezioneValore(object sender, EventArgs e)
{
mod_lemmiVocab.Visible = true;
mod_lemmiVocab.doUpdate();
}
protected override void OnUnload(EventArgs e)
{
base.OnUnload(e);
mod_vocabolario.eh_selezioneValore -= new EventHandler(mod_vocabolario_eh_selezioneValore);
mod_vocabolario.eh_resetSelezione -= new EventHandler(mod_vocabolario_eh_resetSelezione);
protected override void OnUnload(EventArgs e)
{
base.OnUnload(e);
mod_vocabolario.eh_selezioneValore -= new EventHandler(mod_vocabolario_eh_selezioneValore);
mod_vocabolario.eh_resetSelezione -= new EventHandler(mod_vocabolario_eh_resetSelezione);
}
}
}
}