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

fix parziale elementi ricerca UDC

Browse Source
This commit is contained in:
Samuele Locatelli
2014-03-10 13:26:39 +01:00
parent 3bcc0dc38d
commit 2dbf223adf
27 changed files with 585 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/App_Start/BundleConfig.cs
+2 -2
View File
@@ -48,8 +48,8 @@ namespace GMW
// aggiungo bundle dinamico x coffee --> jscript
//bundles.Add(new DynamicFolderBundle("coffee", "*.coffee"));
// abilito bundle "forzato"!
BundleTable.EnableOptimizations = true;
//// abilito bundle "forzato"!
//BundleTable.EnableOptimizations = true;
}
}
}
GMW/Bootstrap.Master
+3 -4
View File
@@ -9,18 +9,18 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="C2P site">
<meta name="description" content="GMW site">
<meta name="author" content="Steamware">
<link rel="shortcut icon" href="~/favicon.ico">
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - C2P</title>
<title><%: Page.Title %> - GMW</title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jqueryui") %>
</asp:PlaceHolder>
<%--<script src="Scripts/typeahead.bundle.min.js"></script>--%>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
@@ -100,7 +100,6 @@
</form>
<%--<script src="@Url.Content("/Scripts/bootstrap.min.js")" type="text/javascript"></script>--%>
<script src="Scripts/bootstrap.min.js"></script>
</body>
</html>
GMW/Bundle.config
+1
View File
@@ -7,6 +7,7 @@
<include path="~/Content/font-awesome.min.css" />
<include path="~/Content/font.min.css" />
<include path="~/Content/Style.min.css" />
<!--<include path="~/Content/typeahead.css" />-->
</styleBundle>
<styleBundle path="~/Content/themes/base/css">
<!--<include path="~/Content/themes/base/jquery.ui.all.css" />-->
GMW/Content/bootstrap-theme.css
Vendored
+4 -4
View File
@@ -40,18 +40,18 @@
.btn-default {
text-shadow: 0 1px 0 #fff;
background-image: -webkit-linear-gradient(top, #e5e5e5 0%, #767676 100%);
background-image: linear-gradient(to bottom, #e5e5e5 0%, #767676 100%);
background-image: -webkit-linear-gradient(top, #e9e9e9 20%, #878787 100%);
background-image: linear-gradient(to bottom, #e9e9e9 20%, #878787 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cdcdcdfffff', endColorstr='#ffe0e0e0', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #767676;
border-color: #878787;
color: #000;
}
.btn-default:hover,
.btn-default:focus {
background-color: #767676;
background-color: #878787;
background-position: 0 -15px;
text-shadow: 0 1px 0 #000;
color: #fff;
GMW/Content/bootstrap-theme.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
GMW/GMW.csproj
+8 -1
View File
@@ -399,6 +399,7 @@
<Content Include="Bundle.config" />
<Content Include="ContentPage.master" />
<Content Include="MenuSxPage.master" />
<Content Include="WS\DataFeed.asmx" />
<None Include="Scripts\jquery-2.1.0.intellisense.js" />
<Content Include="PostRX.aspx" />
<Content Include="PostRX_DT.aspx" />
@@ -1477,6 +1478,10 @@
<DependentUpon>AutoCompletamento.asmx</DependentUpon>
<SubType>Component</SubType>
</Compile>
<Compile Include="WS\DataFeed.asmx.cs">
<DependentUpon>DataFeed.asmx</DependentUpon>
<SubType>Component</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SteamWareLibrary\SteamWare\SteamWare.csproj">
@@ -1848,7 +1853,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Content\tmp\" />
<Folder Include="Reports\SP\" />
<Folder Include="Reports\Standard\" />
<Folder Include="Reports\TK\" />
</ItemGroup>
@@ -1869,6 +1873,9 @@
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Reports\SP\CartellinoAL.rdlc" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
GMW/Search.Master
+2 -2
View File
@@ -16,11 +16,11 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="C2P site">
<meta name="description" content="GMW site">
<meta name="author" content="Steamware">
<link rel="shortcut icon" href="~/favicon.ico">
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - C2P</title>
<title><%: Page.Title %> - GMW</title>
<asp:PlaceHolder ID="PlaceHolder1" runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
GMW/Web.config
+1 -1
View File
@@ -73,7 +73,7 @@
<add key="_righeDataGridLong" value="40" />
<add key="_righeDataGridMed" value="20" />
<add key="_righeDataGridShort" value="10" />
<add key="MinCharAutocomplete" value="2" />
<add key="MinCharAutocomplete" value="1" />
<add key="_fromEmail" value="GMW@steamware.net" />
<add key="urlWebServer" value="http://SRV-PRODSP01/GMW_Test/" />
<add key="echoLemmi" value="false" />
GMW/WebUserControls/mod_SearchProvUDC.ascx
+1 -1
View File
@@ -13,7 +13,7 @@
<asp:Panel runat="server" ID="pnlSearchProvider" CssClass="panel panel-success panel-sm">
<div class="panel-heading">
<b>
<asp:Label runat="server" ID="lblSearchProvider" txt="---" />
<asp:Label runat="server" ID="lblSearchProvider" txt="---" /></b>
</div>
<div class="panel-body">
<div class="row">
GMW/WebUserControls/mod_combobox.ascx
+105
View File
@@ -0,0 +1,105 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_combobox.ascx.cs" Inherits="GMW.WebUserControls.mod_combobox" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<script>
$(function () {
$("#<%=txtSelezione.ClientID %>").autocomplete({
source: function (request, response) {
$.ajax({
type: "POST",
contentType: "application/json; charset=utf-8",
url: "<%=txtServiceUrl.Text %>",
data: "{'keywordStartsWith':'" + request.term + "'}",
dataType: "json",
async: true,
success: function (data) {
//response(data.d);
response($.map(data.d, function (item) {
return {
label: item.split('#')[0],
val: item.split('#')[1]
}
}))
},
error: function (result) {
alert("Due to unexpected errors we were unable to load data");
}
});
},
select: function (e, i) {
$("#<%=hiddenFieldID.ClientID %>").val(i.item.val);
$("#<%=txtSelezione.ClientID %>").val(i.item.label);
$("#<%=btnPost.ClientID %>").click();
},
//minLength: 2
minLength: <%=txtMinCharAutoCom.Text %>
});
});
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
$(function () {
// chiamate jquery da rieseguire post ajax update x partial page render
$(function () {
$("#<%=txtSelezione.ClientID %>").autocomplete({
source: function (request, response) {
$.ajax({
type: "POST",
contentType: "application/json; charset=utf-8",
url: "<%=txtServiceUrl.Text %>",
data: "{'keywordStartsWith':'" + request.term + "'}",
dataType: "json",
async: true,
success: function (data) {
//response(data.d);
response($.map(data.d, function (item) {
return {
label: item.split('#')[0],
val: item.split('#')[1]
}
}))
},
error: function (result) {
alert("Due to unexpected errors we were unable to load data");
}
});
},
select: function (e, i) {
$("#<%=hiddenFieldID.ClientID %>").val(i.item.val);
$("#<%=txtSelezione.ClientID %>").val(i.item.label);
$("#<%=btnPost.ClientID %>").click();
},
//minLength: 2
minLength: <%=txtMinCharAutoCom.Text %>
});
});
});
});
</script>
<%--controlli "principali"--%>
<div class="input-group">
<span class="input-group-addon">
<asp:Label runat="server" ID="lblField" Text="Cerca:" Font-Size="0.8em" AssociatedControlID="txtSelezione" />
<asp:Button runat="server" ID="btnPost" OnClick="btnPost_Click" Visible="false" Text="+" />
</span>
<asp:TextBox runat="server" ID="txtSelezione" CssClass="searchinput form-control" OnTextChanged="txtSelezione_TextChanged" AutoPostBack="True" TextMode="SingleLine" AutoCompleteType="Search" />
<asp:TextBox runat="server" ID="hiddenFieldID" AutoPostBack="true" OnTextChanged="hiddenFieldID_TextChanged" Visible="true" ViewStateMode="Enabled" Width="0em" Font-Size="6pt" BackColor="Transparent" BorderStyle="None" />
<%--controlli "accessori"--%>
<asp:TextBox runat="server" ID="txtMinCharAutoCom" Text="2" Visible="false" Width="1em" />
<asp:TextBox runat="server" ID="txtServiceUrl" Text="Services/WS_data.asmx/Test" Visible="false" Width="1em" />
<span class="input-group-addon">
<asp:LinkButton runat="server" ID="lnkReset" Text="X" type="button" OnClick="lnkReset_Click" Font-Size="0.8em" />
</span>
</div>
<style>
.ui-autocomplete-category {
font-weight: bold;
padding: .2em .4em;
margin: .8em 0 .2em;
line-height: 1.5;
}
</style>
GMW/WebUserControls/mod_combobox.ascx.cs
+270
View File
@@ -0,0 +1,270 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
namespace GMW.WebUserControls
{
public partial class mod_combobox : System.Web.UI.UserControl
{
/// <summary>
/// evento valore selezionato
/// </summary>
public event EventHandler eh_valSelezionato;
/// <summary>
/// evento valore selezionato
/// </summary>
public event EventHandler eh_reset;
/// <summary>
/// segnaposto x casella testuale autocomplete
/// </summary>
public string placeholder { get; set; }
/// <summary>
/// UID formattato con "_"
/// </summary>
public string uid
{
get
{
// fix brutale: nelle pagine master c'è un ctl00_ iniziale di troppo...
return this.UniqueID.Replace("$", "_").Replace("ctl00_", "").Replace("ctl01_", "");
}
}
/// <summary>
/// caricamento pagina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
defaultVal = "";
txtSelezione.Attributes["placeholder"] = placeholder;
}
}
protected void txtSelezione_TextChanged(object sender, EventArgs e)
{
if (txtSelezione.Text.Trim() == "")
{
hiddenFieldID.Text = defaultVal;
_valore = defaultVal;
if (eh_valSelezionato != null)
{
eh_valSelezionato(this, new EventArgs());
}
}
}
/// <summary>
/// salvo valore selezionato!
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void hiddenFieldID_TextChanged(object sender, EventArgs e)
{
_valore = hiddenFieldID.Text;
if (eh_valSelezionato != null)
{
eh_valSelezionato(this, new EventArgs());
}
}
/// <summary>
/// valore selezionato dal controllo (RW local)
/// </summary>
protected string _valore
{
get
{
return memLayer.ML.StringSessionObj(uid + "_sel");
}
set
{
memLayer.ML.setSessionVal(uid + "_sel", value);
}
}
/// <summary>
/// salva evento selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPost_Click(object sender, EventArgs e)
{
_valore = hiddenFieldID.Text;
if (eh_valSelezionato != null)
{
eh_valSelezionato(this, new EventArgs());
}
}
/// <summary>
/// valore (chiave) selezionato dal controllo (R public)
/// </summary>
public string valore
{
get
{
return hiddenFieldID.Text;
}
set
{
hiddenFieldID.Text = value;
}
}
/// <summary>
/// label selezionato dal controllo (R public)
/// </summary>
public string selezione
{
get
{
return txtSelezione.Text;
}
set
{
txtSelezione.Text = value;
}
}
/// <summary>
/// label dell'etichetta di ricerca
/// </summary>
public string labelRicerca
{
set
{
lblField.Text = value;
}
}
/// <summary>
/// num minimo caratteri x autocomplete
/// </summary>
public Int32 minCharAutocomplete
{
get
{
return Convert.ToInt32(txtMinCharAutoCom.Text);
}
set
{
txtMinCharAutoCom.Text = value.ToString();
}
}
/// <summary>
/// path del webservice (compreso metodo)
/// nb: DI NORMA fornisce risultati nel formato label#valore
/// </summary>
public string ServicePath
{
get
{
return txtServiceUrl.Text;
}
set
{
txtServiceUrl.Text = value;
}
}
/// <summary>
/// imposta visibilità della textBox delle chiavi
/// </summary>
public bool showKey
{
set
{
if (!value)
{
hiddenFieldID.Width = Unit.Pixel(0);
}
}
}
/// <summary>
/// imposta la stringa tooltip
/// </summary>
public string toolTip
{
set
{
txtSelezione.ToolTip = value;
}
}
/// <summary>
/// larghezza textbox in unità EM
/// </summary>
public int textEmWidht
{
set
{
txtSelezione.Width = Unit.Parse(string.Format("{0}em", value));
}
}
/// <summary>
/// larghezza textbox in unità %
/// </summary>
public int textEmPerc
{
set
{
txtSelezione.Width = Unit.Parse(string.Format("{0}%", value));
}
}
/// <summary>
/// imposta il focus sulla textBox
/// </summary>
public void setFocus()
{
txtSelezione.Focus();
}
/// <summary>
/// permette di passare altri parametri di contesto al metodo invocato x autocomplete
/// </summary>
public string contextKey
{
get
{
return txtSelezione.AccessKey;
}
set
{
txtSelezione.AccessKey = value;
}
}
/// <summary>
/// tabIndex del controllo
/// </summary>
public short TabIndex
{
set
{
txtSelezione.TabIndex = value;
}
}
/// <summary>
/// valore di default (x reset)
/// </summary>
public string defaultVal { get; set; }
/// <summary>
/// effettuato reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkReset_Click(object sender, EventArgs e)
{
// resetto selezione e ricerca!
txtSelezione.Text = "";
hiddenFieldID.Text = defaultVal;
_valore = defaultVal;
if (eh_reset != null)
{
eh_reset(this, new EventArgs());
}
}
}
}
GMW/WebUserControls/mod_combobox.ascx.designer.cs
Generated
+96
View File
@@ -0,0 +1,96 @@
//------------------------------------------------------------------------------
// <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_combobox {
/// <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>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblField;
/// <summary>
/// btnPost 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.Button btnPost;
/// <summary>
/// txtSelezione 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.TextBox txtSelezione;
/// <summary>
/// hiddenFieldID 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.TextBox hiddenFieldID;
/// <summary>
/// txtMinCharAutoCom 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.TextBox txtMinCharAutoCom;
/// <summary>
/// txtServiceUrl 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.TextBox txtServiceUrl;
/// <summary>
/// lnkReset 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 lnkReset;
}
}
GMW/WebUserControls/mod_execUDC.ascx
+46 -25
View File
@@ -1,39 +1,62 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_execUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_execUDC" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<% if (false)
{ %>
<link href="../Style.css" rel="stylesheet" type="text/css" />
<% } %>
<%--<%@ 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" />
<%} %>
<div class="clearDiv">
<div class="divCenter" style="padding: 2px; border: 1px solid #3A3; margin: 4px; height: 24px; background-color: #99CC99;">
<div class="divSx">
<asp:Button ID="btnGo2Mag" runat="server" Width="16em" OnClick="btnGo2Mag_Click" />
<div class="row" style="padding: 2px; border: 1px solid #3A3; margin: 4px; background-color: #99CC99;">
<div class="col-sm-5">
<asp:Button ID="btnGo2Mag" runat="server" OnClick="btnGo2Mag_Click" CssClass="btn btn-default btn-sm" Width="12em" />
</div>
<div class="divDx">
<asp:Button ID="btnCreaListaPrelievo" runat="server" Width="16em" OnClick="btnCreaListaPrelievo_Click" />
<div class="col-sm-2">
</div>
<div class="col-sm-5">
<asp:Button ID="btnCreaListaPrelievo" runat="server" OnClick="btnCreaListaPrelievo_Click" CssClass="btn btn-default btn-sm" Width="12em" />
</div>
</div>
<div class="divCenter" style="padding: 2px; border: 1px solid #3A3; margin: 4px; height: 80px; background-color: #AADDAA;">
<div class="divSx">
<asp:Label ID="lblQta" runat="server" />
<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" />
<br />
<asp:TextBox runat="server" ID="txtQta" Width="15em" />
<br />
[ALT-U]<br />
<asp:Button runat="server" ID="btnQta" OnClick="btnQta_Click" AccessKey="U" />
<asp:ConfirmButtonExtender ID="cbeQta" runat="server" TargetControlID="btnQta" />
<asp:Button runat="server" ID="btnQta" OnClick="btnQta_Click" AccessKey="U" OnClientClick="return confirm('Confermi modifica?')" />
</div>
<div class="divDx">
<div class="col-sm-2">
</div>
<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" />
<%--<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" />
<br />
[ALT-W]<br />
<asp:Button runat="server" ID="btnSposta" OnClick="btnSposta_Click1" AccessKey="W" />
<asp:ConfirmButtonExtender ID="cbeSposta" runat="server" TargetControlID="btnSposta">
</asp:ConfirmButtonExtender>
<asp:Button runat="server" ID="btnSposta" OnClick="btnSposta_Click1" AccessKey="W" OnClientClick="return confirm('Confermi postamento?')" />
</div>
</div>
<div class="row" style="padding: 2px; border: 1px solid #3A3; margin: 4px; background-color: #AADDAA;">
<div class="col-sm-5">
</div>
<div class="col-sm-2">
</div>
<div class="col-sm-5">
</div>
</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>
</div>
<div class="divCenter" style="padding: 2px;">
@@ -45,8 +68,6 @@
<asp:TextBox runat="server" ID="txtNote" TextMode="MultiLine" Height="4em" Width="30em" />
<br />
[ALT-N]<br />
<asp:Button runat="server" ID="btnEditNote" AccessKey="N" onclick="btnEditNote_Click" />
<asp:ConfirmButtonExtender ID="cbeEditNote" runat="server" TargetControlID="btnEditNote">
</asp:ConfirmButtonExtender>
<asp:Button runat="server" ID="btnEditNote" AccessKey="N" OnClick="btnEditNote_Click" OnClientClick="return confirm('Confermi modifica Note?')" />
</div>
</div>
GMW/WebUserControls/mod_execUDC.ascx.cs
+5 -3
View File
@@ -38,9 +38,11 @@ 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");
cbeEditNote.ConfirmText = traduci("confermaEditNote");
#endif
}
/// <summary>
/// evento btnGoToMag
@@ -105,7 +107,7 @@ namespace GMW.WebUserControls
bool cellaToOk = false;
try
{
DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.Text)[0];
DS_magazzino.CelleRow rowCella = MagClass.magazzino.taCelle.getByCodCella(txtNewCella.valore)[0];
IdxCellaTo = rowCella.IdxCella;
// controllo che la cella di destinazione NON sia bloccata
cellaToOk = rowCella.Attiva;
@@ -161,7 +163,7 @@ namespace GMW.WebUserControls
private void azzeraPostUpdate()
{
lblErrore.Visible = false;
txtNewCella.Text = "";
txtNewCella.valore = "";
txtQta.Text = "";
}
/// <summary>
GMW/WebUserControls/mod_execUDC.ascx.designer.cs
Generated
+19 -37
View File
@@ -12,6 +12,24 @@ 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>
@@ -57,15 +75,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnQta;
/// <summary>
/// cbeQta control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.ConfirmButtonExtender cbeQta;
/// <summary>
/// lblNewPos control.
/// </summary>
@@ -82,16 +91,7 @@ namespace GMW.WebUserControls {
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtNewCella;
/// <summary>
/// aceParticolare control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
protected global::GMW.WebUserControls.mod_autocomplete txtNewCella;
/// <summary>
/// btnSposta control.
@@ -102,15 +102,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSposta;
/// <summary>
/// cbeSposta control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.ConfirmButtonExtender cbeSposta;
/// <summary>
/// lblErrore control.
/// </summary>
@@ -146,14 +137,5 @@ namespace GMW.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnEditNote;
/// <summary>
/// cbeEditNote control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.ConfirmButtonExtender cbeEditNote;
}
}
GMW/WebUserControls/mod_listUDC.ascx
+2 -2
View File
@@ -19,8 +19,8 @@
<Columns>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
Visible="true" />
<asp:LinkButton ID="btnReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default btn-xs"
Visible="true"><i class="glyphicon glyphicon-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
GMW/WebUserControls/mod_searchMag.ascx
+3 -3
View File
@@ -15,8 +15,8 @@
<%} %>
<div class="row" style="font-size: 48pt; font-family: 'times New Roman', Times, serif; float: none; text-align: center; margin: auto;">
<span style="color: Blue;">G</span><span style="color: red;">M</span><span style="color: #FFD700;">W</span><span
style="color: Blue;">m</span><span style="color: green;">a</span><span style="color: Red;">g</span>
<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;">
@@ -35,7 +35,7 @@
</div>
<div style="float: left">
<asp:TextBox runat="server" ID="txtSearch" Width="280px" OnTextChanged="txtSearch_TextChanged" />&nbsp;
<asp:Button runat="server" ID="btnSearch" OnClick="btnSearch_Click" Width="60px" />
<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 />
GMW/WebUserControls/mod_searchMag.ascx.cs
-1
View File
@@ -73,7 +73,6 @@ namespace GMW.WebUserControls
{
chkLikeType.Text = traduci("AbilitaRicercaLike");
chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl");
btnSearch.Text = traduci("btnSearch");
TBWE_search.WatermarkText = traduci("insertCod4search");
}
protected void txtSearch_TextChanged(object sender, EventArgs e)
GMW/WebUserControls/mod_searchMag.ascx.designer.cs
Generated
+2 -2
View File
@@ -49,13 +49,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtSearch;
/// <summary>
/// btnSearch 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.WebControls.Button btnSearch;
protected global::System.Web.UI.WebControls.LinkButton lbnSearch;
/// <summary>
/// TBWE_search control.
GMW/WebUserControls/mod_testata.ascx.cs
+10 -3
View File
@@ -42,9 +42,16 @@ namespace GMW.WebUserControls
/// </summary>
private void setPageName()
{
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);
try
{
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);
}
catch
{
lblTitolo.Text = "PAGINA";
}
}
/// <summary>
/// wrapper traduzione
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.
ReleaseClienti/SP_test/GMW.zip
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.612.1527")]
[assembly: AssemblyFileVersion("2.5.612.1527")]
[assembly: AssemblyVersion("2.5.613.1529")]
[assembly: AssemblyFileVersion("2.5.613.1529")]
//[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.612.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.612.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.5.613.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.613.<#= this.RevisionNumber #>")]
//[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
//[assembly: AssemblyCompany("Steamware")]
<#+