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

completata gestione "jumper" x ricerca in pagina SearchMag

Browse Source 
inseriti segnaposto x ricerca AL e Dtx
fix grafico altezza mod_execUDC
This commit is contained in:
Samuele Locatelli
2014-03-27 10:41:06 +01:00
parent 9466f12c98
commit 3a4a0d12a2
19 changed files with 294 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW.csproj
+16
View File
@@ -422,6 +422,8 @@
<Content Include="WebUserControls\mod_PostTT_Pre_DT.ascx" />
<Content Include="WebUserControls\mod_PostTT_Pre_NT.ascx" />
<Content Include="WebUserControls\mod_recAttributiDtx.ascx" />
<Content Include="WebUserControls\mod_SearchProvAL.ascx" />
<Content Include="WebUserControls\mod_SearchProvDtx.ascx" />
<Content Include="WebUserControls\mod_selLineaNtDt.ascx" />
<Content Include="WebUserControls\mod_selPeriodo.ascx" />
<Content Include="WS\DataFeed.asmx" />
@@ -1472,6 +1474,13 @@
<Compile Include="WebUserControls\mod_listOperatori.ascx.designer.cs">
<DependentUpon>mod_listOperatori.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_SearchProvAL.ascx.cs">
<DependentUpon>mod_SearchProvAL.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_SearchProvAL.ascx.designer.cs">
<DependentUpon>mod_SearchProvAL.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_SearchProvCelle.ascx.cs">
<DependentUpon>mod_SearchProvCelle.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1479,6 +1488,13 @@
<Compile Include="WebUserControls\mod_SearchProvCelle.ascx.designer.cs">
<DependentUpon>mod_SearchProvCelle.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_SearchProvDtx.ascx.cs">
<DependentUpon>mod_SearchProvDtx.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_SearchProvDtx.ascx.designer.cs">
<DependentUpon>mod_SearchProvDtx.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\Mod_SearchProvImballi.ascx.cs">
<DependentUpon>Mod_SearchProvImballi.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
GMW/SearchMag.aspx
+9
View File
@@ -7,6 +7,9 @@
<%@ Register Src="WebUserControls/mod_SearchProvParticolari.ascx" TagName="mod_SearchProvParticolari" TagPrefix="uc5" %>
<%@ Register Src="WebUserControls/Mod_SearchProvImballi.ascx" TagName="Mod_SearchProvImballi" TagPrefix="uc6" %>
<%@ Register Src="WebUserControls/mod_SearchProvAL.ascx" TagName="mod_SearchProvAL" TagPrefix="uc7" %>
<%@ Register Src="WebUserControls/mod_SearchProvDtx.ascx" TagName="mod_SearchProvDtx" TagPrefix="uc8" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
@@ -59,6 +62,12 @@
<div class="content">
<uc1:mod_SearchProvUDC ID="mod_SearchProvUDC1" runat="server" />
</div>
<div class="content">
<uc7:mod_SearchProvAL ID="mod_SearchProvAL1" runat="server" />
</div>
<div class="content">
<uc8:mod_SearchProvDtx ID="mod_SearchProvDtx1" runat="server" />
</div>
<%--<br />
<uc4:mod_SearchProvCelle ID="mod_SearchProvCelle1" runat="server" />
<br />
GMW/SearchMag.aspx.cs
+92 -26
View File
@@ -18,6 +18,19 @@ namespace GMW
doTraduci();
pnlEmpty.Visible = true;
pnlResults.Visible = true; //false;
// se ho in URL la chiave "search" lo riporto come search...
if (ricercaUrl != "")
{
ricerca = ricercaUrl;
//string request = Request.Url;
Response.Redirect("SearchMag");
}
// se ho in sessione ricerca la mostro...
if (ricerca != "")
{
txtRicerca = ricerca;
doSearch();
}
}
mod_SearchProvUDC1.eh_selValore += new EventHandler(mod_SearchProvUDC1_eh_selValore);
mod_SearchProvParticolari1.eh_selValore += new EventHandler(mod_SearchProvParticolari1_eh_selValore);
@@ -25,6 +38,54 @@ namespace GMW
mod_SearchProvParticolari1.eh_reset += new EventHandler(mod_SearchProvParticolari1_eh_reset);
txtSearch.Focus();
}
/// <summary>
/// ricerca corrente
/// </summary>
protected string ricerca
{
get
{
return memLayer.ML.StringSessionObj("FullSearchValue");
}
set
{
memLayer.ML.setSessionVal("FullSearchValue", value, false);
}
}
/// <summary>
/// ricerca corrente
/// </summary>
protected string txtRicerca
{
get
{
return txtSearch.Text.Trim();
}
set
{
txtSearch.Text = value;
}
}
/// <summary>
/// restituisce termine ricerca contenuto in URL (se disponibile)
/// </summary>
protected string ricercaUrl
{
get
{
string answ = "";
try
{
answ = Request.QueryString["search"].ToString();
}
catch
{
answ = "";
}
return answ;
}
}
void mod_SearchProvParticolari1_eh_reset(object sender, EventArgs e)
{
@@ -90,22 +151,25 @@ namespace GMW
/// </summary>
private void doSearch()
{
string testoCercato = txtSearch.Text.Trim();
memLayer.ML.setSessionVal("FullSearchValue", testoCercato, false);
memLayer.ML.setSessionVal("FullSearchValue", txtRicerca, false);
memLayer.ML.setSessionVal("SearchIsLikeBased", chkLikeType.Checked, false);
if (testoCercato != "")
if (txtRicerca != "")
{
pnlEmpty.Visible = false;
pnlResults.Visible = true;
if (chkLikeType.Checked)
{
// è generica, mostro tutto!
mod_SearchProvAL1.Visible = true;
mod_SearchProvAL1.doSearch();
// NON faccio ricerca LIKE x Dtx !!!
mod_SearchProvDtx1.Visible = false;
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
//mod_SearchProvCelle1.Visible = true;
//mod_SearchProvCelle1.doSearch();
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
//Mod_SearchProvImballi1.Visible = true;
//Mod_SearchProvImballi1.doSearch();
@@ -113,32 +177,30 @@ namespace GMW
else
{
// in base al tipo di richiesta determino che risultati visualizzare...
switch (testoCercato.Substring(0, 1))
switch (txtRicerca.Substring(0, 1))
{
case "I":
mod_SearchProvUDC1.Visible = false;
//mod_SearchProvCelle1.Visible = false;
//case "I":
// mod_SearchProvAL1.Visible = false;
// mod_SearchProvDtx1.Visible = false;
// mod_SearchProvParticolari1.Visible = false;
// mod_SearchProvUDC1.Visible = false;
// //mod_SearchProvCelle1.Visible = false;
// //Mod_SearchProvImballi1.Visible = true;
// //Mod_SearchProvImballi1.doSearch();
// break;
case "A":
mod_SearchProvAL1.Visible = true;
mod_SearchProvAL1.doSearch();
mod_SearchProvDtx1.Visible = false;
mod_SearchProvParticolari1.Visible = false;
//Mod_SearchProvImballi1.Visible = true;
//Mod_SearchProvImballi1.doSearch();
break;
#if false
case "C":
mod_SearchProvUDC1.Visible = false;
//mod_SearchProvCelle1.Visible = true;
//mod_SearchProvCelle1.doSearch();
mod_SearchProvParticolari1.Visible = false;
//Mod_SearchProvImballi1.Visible = false;
break;
case "P":
mod_SearchProvUDC1.Visible = false;
//mod_SearchProvCelle1.Visible = false;
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
//Mod_SearchProvImballi1.Visible = false;
break;
#endif
break;
case "U":
mod_SearchProvAL1.Visible = false;
mod_SearchProvDtx1.Visible = false;
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
//mod_SearchProvCelle1.Visible = false;
@@ -146,12 +208,16 @@ namespace GMW
//Mod_SearchProvImballi1.Visible = false;
break;
default:
mod_SearchProvAL1.Visible = true;
mod_SearchProvAL1.doSearch();
mod_SearchProvDtx1.Visible = true;
mod_SearchProvDtx1.doSearch();
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
//mod_SearchProvCelle1.Visible = true;
//mod_SearchProvCelle1.doSearch();
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
//Mod_SearchProvImballi1.Visible = true;
//Mod_SearchProvImballi1.doSearch();
break;
GMW/SearchMag.aspx.designer.cs
Generated
+18
View File
@@ -84,6 +84,24 @@ namespace GMW {
/// </remarks>
protected global::GMW.WebUserControls.mod_SearchProvUDC mod_SearchProvUDC1;
/// <summary>
/// mod_SearchProvAL1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_SearchProvAL mod_SearchProvAL1;
/// <summary>
/// mod_SearchProvDtx1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_SearchProvDtx mod_SearchProvDtx1;
/// <summary>
/// pnlEmpty control.
/// </summary>
GMW/WebUserControls/mod_SearchProvAL.ascx
+21
View File
@@ -0,0 +1,21 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvAL.ascx.cs" Inherits="GMW.WebUserControls.mod_SearchProvAL" %>
<asp:Panel runat="server" ID="pnlSearchProvider" CssClass="panel panel-info panel-sm">
<div class="panel-heading">
<b>
<asp:Label runat="server" ID="lblSearchProvider" txt="---" /></b>
</div>
<div class="panel-body" style="background-color: #f1f1fa;">
<div class="row">
<div class="col-sm-6">
elenco AL
<%-- <uc1:mod_listParticolari ID="mod_listParticolari1" runat="server" />--%>
</div>
<div class="col-sm-6">
dettaglio UDC compresi in AL
<%--<uc3:mod_detailParticolari ID="mod_detailParticolari1" runat="server" />
<uc2:mod_execParticolari ID="mod_execParticolari1" runat="server" />--%>
</div>
</div>
</div>
</asp:Panel>
GMW/WebUserControls/mod_SearchProvAL.ascx.cs
+19
View File
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace GMW.WebUserControls
{
public partial class mod_SearchProvAL : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
public void doSearch()
{}
}
}
GMW/WebUserControls/mod_SearchProvAL.ascx.designer.cs
Generated
+33
View File
@@ -0,0 +1,33 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace GMW.WebUserControls {
public partial class mod_SearchProvAL {
/// <summary>
/// pnlSearchProvider control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlSearchProvider;
/// <summary>
/// lblSearchProvider control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblSearchProvider;
}
}
GMW/WebUserControls/mod_SearchProvDtx.ascx
+26
View File
@@ -0,0 +1,26 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvDtx.ascx.cs" Inherits="GMW.WebUserControls.mod_SearchProvDtx" %>
<asp:Panel runat="server" ID="pnlSearchProvider" CssClass="panel panel-info panel-sm">
<div class="panel-heading">
<b>
<asp:Label runat="server" ID="lblSearchProvider" txt="---" /></b>
</div>
<div class="panel-body" style="background-color: #f1f1fa;">
<div class="row">
<div class="col-sm-6">
dettaglio DTX (UDC, particolare)
<%-- <uc1:mod_listParticolari ID="mod_listParticolari1" runat="server" />--%>
</div>
<div class="col-sm-6">
dettaglio UDC del DTX
<br />
dettaglio attributi DTX
<br />
dettaglio attributi UDC
<br />
dettaglio trattamento AL/UDC
<%--<uc3:mod_detailParticolari ID="mod_detailParticolari1" runat="server" />
<uc2:mod_execParticolari ID="mod_execParticolari1" runat="server" />--%>
</div>
</div>
</div>
</asp:Panel>
GMW/WebUserControls/mod_SearchProvDtx.ascx.cs
+19
View File
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace GMW.WebUserControls
{
public partial class mod_SearchProvDtx : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
public void doSearch()
{ }
}
}
GMW/WebUserControls/mod_SearchProvDtx.ascx.designer.cs
Generated
+33
View File
@@ -0,0 +1,33 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace GMW.WebUserControls {
public partial class mod_SearchProvDtx {
/// <summary>
/// pnlSearchProvider control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Panel pnlSearchProvider;
/// <summary>
/// lblSearchProvider control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblSearchProvider;
}
}
GMW/WebUserControls/mod_elencoListePrelievo.ascx
+1 -1
View File
@@ -259,7 +259,7 @@
</asp:ObjectDataSource>
</div>
<div class="col-sm-4">
<asp:LinkButton ID="lbtForzaDL" runat="server" CssClass="btn btn-primary btn-xs" Visible="false" OnClick="lbtForzaDL_Click"><i class="glyphicon glyphicon-ok-sign"></i> <%: traduci("ForzaDL") %></asp:LinkButton>
<asp:LinkButton ID="lbtForzaDL" runat="server" CssClass="btn btn-primary btn-sm" Visible="false" OnClick="lbtForzaDL_Click"><i class="glyphicon glyphicon-ok-sign"></i> <%: traduci("ForzaDL") %></asp:LinkButton>
<uc1:mod_viewRigheListaPrelievo ID="mod_viewRigheListaPrelievo1" runat="server" />
</div>
</div>
GMW/WebUserControls/mod_execUDC.ascx
+2 -2
View File
@@ -32,10 +32,10 @@
<asp:Button runat="server" ID="btnSposta" OnClick="btnSposta_Click1" AccessKey="W" OnClientClick="return confirm('Confermi postamento?')" />
</div>
</div>
<div class="divCenter" style="padding: 2px;">
<div class="row text-center" style="padding: 2px;">
<asp:Label ID="lblErrore" runat="server" CssClass="erroreMid" />
</div>
<div class="divCenter" style="padding: 2px; border: 1px solid #3A3; margin: 4px; min-height: 120px; background-color: #CCFFCC;">
<div class="row text-center" style="padding: 2px; border: 1px solid #3A3; margin: 4px; background-color: #CCFFCC;">
<div class="col-sm-10 col-sm-offset-1">
<asp:Label runat="server" ID="lblEditNote" />
<br />
GMW/WebUserControls/mod_execUDC.ascx.cs
+1
View File
@@ -206,6 +206,7 @@ namespace GMW.WebUserControls
{
dMain.Attributes.Remove("style");
}
dMain.Visible = value;
}
}
}
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/GMW.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.639.1545")]
[assembly: AssemblyFileVersion("2.5.639.1545")]
[assembly: AssemblyVersion("2.5.640.1546")]
[assembly: AssemblyFileVersion("2.5.640.1546")]
//[assembly: AssemblyCopyright("© Steamware 2007-2014")]
//[assembly: AssemblyCompany("Steamware")]
VersGen/GMW.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.639.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.639.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.5.640.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.640.<#= this.RevisionNumber #>")]
//[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
//[assembly: AssemblyCompany("Steamware")]
<#+