avanzamento ricerca estesa: ok x UDC (da controlalre particolari...)

This commit is contained in:
Samuele Locatelli
2014-03-10 17:25:16 +01:00
parent 336cc5db1a
commit 7255bd19fc
25 changed files with 103 additions and 172 deletions
+1
View File
@@ -339,6 +339,7 @@
<Content Include="images\creaAL_l.png" />
<Content Include="images\creaAL_m.png" />
<Content Include="images\creaAL_s.png" />
<Content Include="images\fbloader.gif" />
<Content Include="images\flag-tk.png" />
<Content Include="images\flag-sp.png" />
<Content Include="images\createChildObj.png" />
+2 -19
View File
@@ -36,12 +36,12 @@ namespace GMW.WS
[WebMethod]
[ScriptMethod(ResponseFormat = ResponseFormat.Json)]
public string[] celle(string prefixText, int count)
public string[] celle(string prefixText)
{
// inizializzo risposta
List<string> suggerimenti = new List<string>();
// proseguo SOLO SE min "MinCharAutocomplete" char...
if (count >= memLayer.ML.confReadInt("MinCharAutocomplete"))
if (prefixText.Length >= memLayer.ML.confReadInt("MinCharAutocomplete"))
{
// elenco candidati
DS_magazzino.CelleDataTable tabCelle = MagClass.magazzino.taCelle.getByCodCellaLike(prefixText, memLayer.ML.confReadString("CodCS"));
@@ -54,22 +54,5 @@ namespace GMW.WS
return suggerimenti.ToArray();
}
//[WebMethod]
//[ScriptMethod(ResponseFormat = ResponseFormat.Json)]
//public string[] Fornitori(string keywordStartsWith)
//{
// // inizializzo risposta
// List<string> suggerimenti = new List<string>();
// // elenco candidati
// DS_utilsProjEts.v_selFornitoriClaDataTable tabella = DataProxy_ProjEts.DP.taSelForn.getBySearchLike(keywordStartsWith);
// // aggiungo ogni riga...
// foreach (DS_utilsProjEts.v_selFornitoriClaRow riga in tabella)
// {
// //suggerimenti.Add(riga.label);
// suggerimenti.Add(string.Format("{0}#{1}", riga.label, riga.value));
// }
// return suggerimenti.ToArray();
//}
}
}
@@ -11,7 +11,7 @@
<asp:Label runat="server" ID="lblSearchProvider" txt="---" /></b>
<%--<b><%: traduci("Particolari") %></b>--%>
</div>
<div class="panel-body">
<div class="panel-body" style="background-color: #f1f1fa;">
<div class="row">
<div class="col-sm-6">
<uc1:mod_listParticolari ID="mod_listParticolari1" runat="server" />
+6 -5
View File
@@ -6,16 +6,17 @@
<%@ Register Src="mod_detailUDC_storico.ascx" TagName="mod_detailUDC_storico" TagPrefix="uc4" %>
<%@ Register Src="mod_detLDP.ascx" TagName="mod_detLDP" TagPrefix="uc5" %>
<%@ Register Src="mod_detAttr.ascx" TagName="mod_detAttr" TagPrefix="uc6" %>
<% if (false)
{ %>
<link href="../Style.css" rel="stylesheet" type="text/css" />
<% } %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<asp:Panel runat="server" ID="pnlSearchProvider" CssClass="panel panel-success panel-sm">
<div class="panel-heading">
<b>
<asp:Label runat="server" ID="lblSearchProvider" txt="---" /></b>
</div>
<div class="panel-body">
<div class="panel-body" style="background-color: #f1faf1;">
<div class="row">
<div class="col-sm-3">
<uc1:mod_listUDC ID="mod_listUDC1" runat="server" />
+18
View File
@@ -12,6 +12,24 @@ namespace GMW.WebUserControls {
public partial class mod_SearchProvUDC {
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// 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>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// 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>
/// pnlSearchProvider control.
/// </summary>
@@ -1,9 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_autocomplete.ascx.cs" Inherits="GMW.WebUserControls.mod_autocomplete" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<script>
$(function () {
-18
View File
@@ -12,24 +12,6 @@ namespace GMW.WebUserControls {
public partial class mod_autocomplete {
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// 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>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// 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>
/// lblField control.
/// </summary>
+3 -16
View File
@@ -1,13 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_execUDC" %>
<%--<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>--%>
<%@ Register src="mod_autocomplete.ascx" tagname="mod_autocomplete" tagprefix="uc1" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<%@ Register Src="mod_autocomplete.ascx" TagName="mod_autocomplete" TagPrefix="uc1" %>
<div class="clearDiv">
<div class="row" style="padding: 2px; border: 1px solid #3A3; margin: 4px; background-color: #99CC99;">
@@ -22,7 +14,7 @@
</div>
<div class="row" style="padding: 2px; border: 1px solid #3A3; margin: 4px; background-color: #AADDAA;">
<div class="col-sm-5">
<asp:Label ID="lblQta" runat="server" />
<asp:Label ID="lblQta" runat="server" />
<br />
<asp:TextBox runat="server" ID="txtQta" Width="15em" />
<br />
@@ -34,11 +26,7 @@
<div class="col-sm-5">
<asp:Label runat="server" ID="lblNewPos" />
<br />
<%--<asp:TextBox runat="server" ID="txtNewCella" Width="15em" />--%>
<%--<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtNewCella" MinimumPrefixLength="2" CompletionInterval="50"
ServicePath="~/WS/AutoCompletamento.asmx" ServiceMethod="elencoCelle" />--%>
<uc1:mod_autocomplete ID="txtNewCella" runat="server" minCharAutocomplete="1" contextKey="c" labelRicerca="[C]ella" showKey="false" ServicePath="WS/AutoCompletamento.asmx/celle" />
<uc1:mod_autocomplete ID="acCella" runat="server" minCharAutocomplete="1" contextKey="c" labelRicerca="[C]elle" showKey="false" ServicePath="../WS/DataFeed.asmx/celle" />
<br />
[ALT-W]<br />
<asp:Button runat="server" ID="btnSposta" OnClick="btnSposta_Click1" AccessKey="W" OnClientClick="return confirm('Confermi postamento?')" />
@@ -54,7 +42,6 @@
</div>
<div class="divCenter" style="padding: 2px; border: 1px solid #3A3; margin: 4px; height: 80px; background-color: #AADDAA;">
<div class="divSx">
</div>
<div class="divDx">
</div>
+2 -7
View File
@@ -38,11 +38,6 @@ namespace GMW.WebUserControls
btnQta.Text = traduci("btnQta");
btnSposta.Text = traduci("btnSposta");
btnEditNote.Text = traduci("btnEditNote");
#if false
cbeQta.ConfirmText = traduci("confermaRettificaQta");
cbeSposta.ConfirmText = traduci("confermaSpostamentoUDC");
cbeEditNote.ConfirmText = traduci("confermaEditNote");
#endif
}
/// <summary>
/// evento btnGoToMag
@@ -107,7 +102,7 @@ namespace GMW.WebUserControls
bool cellaToOk = false;
try
{
DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.valore)[0];
DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(acCella.valore)[0];
IdxCellaTo = rowCella.IdxCella;
// controllo che la cella di destinazione NON sia bloccata
cellaToOk = rowCella.Attiva;
@@ -163,7 +158,7 @@ namespace GMW.WebUserControls
private void azzeraPostUpdate()
{
lblErrore.Visible = false;
txtNewCella.valore = "";
acCella.valore = "";
txtQta.Text = "";
}
/// <summary>
+2 -20
View File
@@ -12,24 +12,6 @@ namespace GMW.WebUserControls {
public partial class mod_execUDC {
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// 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>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// 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>
/// btnGo2Mag control.
/// </summary>
@@ -85,13 +67,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.Label lblNewPos;
/// <summary>
/// txtNewCella control.
/// acCella control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_autocomplete txtNewCella;
protected global::GMW.WebUserControls.mod_autocomplete acCella;
/// <summary>
/// btnSposta control.
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_listUDC.ascx.cs"
Inherits="GMW.WebUserControls.mod_listUDC" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
+34 -38
View File
@@ -1,6 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_searchMag.ascx.cs"
Inherits="GMW.WebUserControls.mod_searchMag" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc2" %>
<%@ Register Src="mod_metodiNoSearch.ascx" TagName="mod_metodiNoSearch" TagPrefix="uc3" %>
<%@ Register Src="mod_SearchProvUDC.ascx" TagName="mod_SearchProvUDC" TagPrefix="uc1" %>
@@ -13,50 +12,47 @@
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<%--<script>
$(function () {
$('#lbnSearch').button();
<div class="row" style="font-size: 48pt; font-family: 'times New Roman', Times, serif; float: none; text-align: center; margin: auto;">
$('#lbnSearch').click(function () {
$(this).html('<img src="http://www.bba-reman.com/images/fbloader.gif" />');
});
});
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
$(function () {
$('#lbnSearch').button();
$('#lbnSearch').click(function () {
$(this).html('<img src="http://www.bba-reman.com/images/fbloader.gif" />');
});
});
</script>--%>
<div class="row" style="font-size: 48pt; font-family: 'times New Roman', Times, serif; float: none; text-align: center; margin: auto;">
<span style="color: #6688ff;">G</span><span style="color: #ff8866;">M</span><span style="color: #FFD700;">W</span><span
style="color: #6688ff;">m</span><span style="color: #44ff66;">a</span><span style="color: #ff8866;">g</span>
</div>
<div class="row" style="text-align: center; margin: auto;">
<div style="text-align: center; margin: auto; width: 400px; float: none;">
<div style="float: left">
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="false">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top">
<asp:Image ID="ProgressBar" ImageUrl="~/images/ProgressBar.gif" runat="server" Height="20px"
Width="20px" />
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
<div style="float: left">
<asp:TextBox runat="server" ID="txtSearch" Width="280px" OnTextChanged="txtSearch_TextChanged" />&nbsp;
<asp:LinkButton runat="server" ID="lbnSearch" OnClick="btnSearch_Click" CssClass="btn btn-default"><i class="glyphicon glyphicon-search"></i> <%: traduci("btnSearch") %></asp:LinkButton>
<asp:TextBoxWatermarkExtender ID="TBWE_search" runat="server" TargetControlID="txtSearch"
WatermarkCssClass="watermarked" />
<br />
<asp:CheckBox runat="server" ID="chkLikeType" OnCheckedChanged="chkLikeType_CheckedChanged"
AutoPostBack="True" />
</div>
<div style="float: left">
<asp:UpdateProgress ID="updtRicerca2" runat="server" DisplayAfter="10" DynamicLayout="false">
<ProgressTemplate>
<div id="progress_back2">
</div>
<div id="progress_top2">
<asp:Image ID="ProgressBar2" ImageUrl="~/images/ProgressBar.gif" runat="server" Height="20px"
Width="20px" />
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
<div class="row" style="text-align: center; margin: auto;">
<div class="column-sm-8 columns-sm-offset-2">
<asp:LinkButton runat="server" ID="lbnSearch" OnClick="btnSearch_Click" CssClass="btn btn-default" TabIndex="1"><i class="glyphicon glyphicon-search"></i> <%: traduci("btnSearch") %></asp:LinkButton>&nbsp;
<asp:TextBox runat="server" ID="txtSearch" Width="240px" OnTextChanged="txtSearch_TextChanged" placeholder="..." AutoPostBack="True" />&nbsp;
&nbsp;
<asp:CheckBox runat="server" ID="chkLikeType" OnCheckedChanged="chkLikeType_CheckedChanged" AutoPostBack="True" />
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="10" DynamicLayout="false">
<ProgressTemplate>
<div id="progress_back">
</div>
<div id="progress_top">
<asp:Image ID="ProgressBar" ImageUrl="~/images/fbloader.gif" runat="server" />
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
</div>
<div class="row" style="text-align: center; margin: auto; font-size: 8pt;">
<div class="row" style="text-align: center; margin: auto; font-size: 8pt;">
<div style="text-align: center; margin: auto; float: none;">
<asp:Panel runat="server" ID="pnlResults">
<div class="content">
+2 -1
View File
@@ -73,7 +73,8 @@ namespace GMW.WebUserControls
{
chkLikeType.Text = traduci("AbilitaRicercaLike");
chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl");
TBWE_search.WatermarkText = traduci("insertCod4search");
txtSearch.Attributes.Remove("placeholder");
txtSearch.Attributes.Add("placeholder", traduci("insertCod4search"));
}
protected void txtSearch_TextChanged(object sender, EventArgs e)
{
+4 -22
View File
@@ -31,13 +31,13 @@ namespace GMW.WebUserControls {
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// updtRicerca control.
/// lbnSearch control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdateProgress updtRicerca;
protected global::System.Web.UI.WebControls.LinkButton lbnSearch;
/// <summary>
/// txtSearch control.
@@ -48,24 +48,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtSearch;
/// <summary>
/// lbnSearch 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.LinkButton lbnSearch;
/// <summary>
/// TBWE_search control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.TextBoxWatermarkExtender TBWE_search;
/// <summary>
/// chkLikeType control.
/// </summary>
@@ -76,13 +58,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.CheckBox chkLikeType;
/// <summary>
/// updtRicerca2 control.
/// updtRicerca control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdateProgress updtRicerca2;
protected global::System.Web.UI.UpdateProgress updtRicerca;
/// <summary>
/// pnlResults control.
+2 -3
View File
@@ -24,9 +24,8 @@
</span>
</a>
</li>
<li class='<%: liClass("PostRX") %>'>
<a id="A8" runat="server" class="navbar-brand" href="~/PostRX">
<%--<i class="glyphicon glyphicon-warning-sign"></i>--%>
<li class="active">
<a id="lnkPagCorr" runat="server" class="navbar-brand">
<asp:Label runat="server" ID="lblIconTitolo" />
<asp:Label runat="server" ID="lblTitolo" />
</a>
+18 -9
View File
@@ -47,6 +47,7 @@ namespace GMW.WebUserControls
DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", _paginaCorrente))[0];
lblTitolo.Text = traduci(riga.NOME);
lblIconTitolo.CssClass = traduci(riga.DESCRIZIONE);
lnkPagCorr.HRef = string.Format("~/{0}", _paginaCorrente);
}
catch
{
@@ -67,9 +68,16 @@ namespace GMW.WebUserControls
/// </summary>
private void updateTreeMenu()
{
XmlDataSource1.Data = user_std.UtSn.mappaSito;
XmlDataSource1.XPath = "mainMenu/menu";
XmlDataSource1.DataBind();
try
{
XmlDataSource1.Data = user_std.UtSn.mappaSito;
XmlDataSource1.XPath = "mainMenu/menu";
XmlDataSource1.DataBind();
}
catch
{
Response.Redirect(_paginaCorrente);
}
}
/// <summary>
/// forza l'update del menù sx
@@ -95,12 +103,13 @@ namespace GMW.WebUserControls
/// </summary>
protected void PagCorrente()
{
Uri MyUrl = Request.Url;
string delimStr = "/";
char[] delimiter = delimStr.ToCharArray();
string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter);
int n = finalUrl.Length;
_paginaCorrente = finalUrl[n - 1].ToString();
//Uri MyUrl = Request.Url;
//string delimStr = "/";
//char[] delimiter = delimStr.ToCharArray();
//string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter);
//int n = finalUrl.Length;
//_paginaCorrente = finalUrl[n - 1].ToString();
_paginaCorrente = Request.Url.LocalPath.Replace("/", "");
if (_paginaPrecedente == "")
{
_paginaPrecedente = _paginaCorrente;
+2 -2
View File
@@ -40,13 +40,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.HtmlControls.HtmlAnchor A1;
/// <summary>
/// A8 control.
/// lnkPagCorr control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlAnchor A8;
protected global::System.Web.UI.HtmlControls.HtmlAnchor lnkPagCorr;
/// <summary>
/// lblIconTitolo control.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 522 B

+1 -1
View File
@@ -12,7 +12,7 @@
<div class="row">
<div class="col-sm-6 col-sm-offset-3">
Autocomplete!
<uc1:mod_autocomplete ID="mod_autocomplete1" runat="server" minCharAutocomplete="1" contextKey="c" labelRicerca="[C]liente" showKey="false" ServicePath="WS/DataFeed.asmx/test" />
<uc1:mod_autocomplete ID="mod_autocomplete1" runat="server" minCharAutocomplete="1" contextKey="C" labelRicerca="[C]elle" showKey="false" ServicePath="../WS/DataFeed.asmx/celle" />
</div>
</div>
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.613.1529")]
[assembly: AssemblyFileVersion("2.5.613.1529")]
[assembly: AssemblyVersion("2.5.614.1529")]
[assembly: AssemblyFileVersion("2.5.614.1529")]
//[assembly: AssemblyCopyright("© Steamware 2007-2014")]
//[assembly: AssemblyCompany("Steamware")]
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.613.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.613.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.5.614.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.614.<#= this.RevisionNumber #>")]
//[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
//[assembly: AssemblyCompany("Steamware")]
<#+