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

vers 2.3.171

Browse Source 
fix autocomplete x Q ed S in editing...
This commit is contained in:
Samuele E. Locatelli
2015-05-25 18:59:34 +02:00
parent d0ee7726fc
commit 243e29ae2a
11 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/WebUserControls/mod_Q_Header.ascx
+11 -19
View File
@@ -10,7 +10,7 @@
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' valore='<%# Eval("CodItem") %>' />
</div>
<div class="col-xs-2 text-left">
@@ -19,13 +19,13 @@
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Eval("UnitWeight","{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' toolTipVal='<%# Eval("CodClient") %>' valore='<%# Eval("ClientName") %>' />
<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Ricerca Cliente" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("ClientName") %>' show="false" />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' valore='<%# Eval("RawMat") %>' />
</div>
<div class="col-xs-2 text-left">
@@ -34,7 +34,7 @@
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' valore='<%# Eval("RawMatExtraCost","{0:C3}") %>' />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' valore='<%# Eval("BatchQty") %>' />
</div>
</div>
@@ -63,11 +63,8 @@
</ItemTemplate>
<EditItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display12" runat="server" etichetta='<%# traduci("ProductCode") %>' valore='<%# Bind("CodItem") %>' />
<%-- <uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' />
<asp:DropDownList ID="DropDownList2" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" SelectedValue='<%# Bind("CodItem") %>' />--%>
<%--<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("CodItem") %>' />--%>
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("CodItemGroup") %>' valore='<%# Eval("CodItemGroup") %>' />
@@ -75,14 +72,13 @@
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Eval("UnitWeight") %>' />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' />
<%--<asp:DropDownList ID="DropDownList3" runat="server" DataSourceID="odsCustomers" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodClient") %>' CssClass="text-right" />--%>
<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Ricerca Cliente" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("ClientName") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display16" runat="server" etichetta='<%# traduci("Alloy") %>' valore='<%# Bind("RawMat") %>' />
<%--<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' />
<asp:DropDownList ID="ddlRawMat" runat="server" DataSourceID="odsRawMat" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("RawMat") %>' OnSelectedIndexChanged="ddlRawMat_SelectedIndexChanged" AutoPostBack="true" />--%>
@@ -96,7 +92,7 @@
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' Width="10em" />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("BatchQty") %>' CssClass="text-right" Width="10em" />
</div>
@@ -150,20 +146,16 @@
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' valore='<%# Request.QueryString["CodItem"] %>' />
<%--<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' />
<asp:DropDownList ID="ddlProducts" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" SelectedValue='<%# Bind("CodItem") %>' OnDataBound="ddlProducts_DataBound" />--%>
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' />
<asp:DropDownList ID="DropDownList3" runat="server" DataSourceID="odsCustomers" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodClient") %>' CssClass="text-right" />
<%--<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("CodClient") %>' CssClass="text-right" />--%>
<%--<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Ricerca Cliente" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("CodClient") %>' />--%>
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' valore='<%# Request.QueryString["RawMat"] %>' />
<%--<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' />
<asp:DropDownList ID="ddlRawMat" runat="server" DataSourceID="odsRawMat" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("RawMat") %>' OnDataBound="ddlRawMat_DataBound" OnSelectedIndexChanged="ddlRawMat_SelectedIndexChanged" AutoPostBack="true" />--%>
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
@@ -176,7 +168,7 @@
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' OnDataBinding="txtRawMatExtraCost_DataBinding" />
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage='<%# traduci("ErrExtraAlloy") %>' CssClass="text-danger" ControlToValidate="txtRawMatExtraCost" Display="Dynamic" />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' />
<asp:TextBox Font-Bold="true" ID="txtBatchQty" runat="server" Text='<%# Bind("BatchQty") %>' CssClass="text-right" />
<asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ErrorMessage='<%# traduci("ErrBatchQty") %>' CssClass="text-danger" ControlToValidate="txtBatchQty" Display="Dynamic" />
C2P/WebUserControls/mod_S_Header.ascx
+16 -14
View File
@@ -5,12 +5,14 @@
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<%@ Register Src="mod_autocompleteShort.ascx" TagPrefix="uc1" TagName="mod_autocompleteShort" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%" OnModeChanged="frmView_ModeChanged">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' valore='<%# Eval("CodItem") %>' />
<uc1:mod_autocompleteShort runat="server" ID="acItem" contextKey="a" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Items" placeholder="Search Items" valore='<%# Bind("CodItem") %>' selezione='<%# Eval("CodItem") %>' show="false" />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("CodItemGroup") %>' valore='<%# Eval("CodItemGroup") %>' />
@@ -18,12 +20,13 @@
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("UnitWeight") %>' valore='<%# Eval("UnitWeight","{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' toolTipVal='<%# Eval("CodClient") %>' valore='<%# Eval("ClientName") %>' />
<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Search Customer" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("ClientName") %>' show="false" />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' valore='<%# Eval("RawMat") %>' />
</div>
<div class="col-xs-2 text-left">
@@ -32,7 +35,7 @@
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' valore='<%# Eval("RawMatExtraCost","{0:C3}") %>' />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' valore='<%# Eval("BatchQty") %>' />
</div>
</div>
@@ -61,9 +64,9 @@
</ItemTemplate>
<EditItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display12" runat="server" etichetta='<%# traduci("ProductCode") %>' />
<asp:DropDownList ID="ddlCodItem" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" SelectedValue='<%# Bind("CodItem") %>' />
<uc1:mod_autocompleteShort runat="server" ID="acItem" contextKey="a" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Items" placeholder="Search Items" valore='<%# Bind("CodItem") %>' selezione='<%# Eval("CodItem") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("CodItemGroup") %>' />
@@ -74,13 +77,14 @@
<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("UnitWeight","{0:N3}") %>' Width="10em" />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' />
<asp:DropDownList ID="DropDownList3" runat="server" DataSourceID="odsCustomers" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodClient") %>' CssClass="text-right" />
<%--<asp:DropDownList ID="DropDownList3" runat="server" DataSourceID="odsCustomers" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodClient") %>' CssClass="text-right" />--%>
<uc1:mod_autocompleteShort runat="server" ID="acCliente" contextKey="c" minCharAutocomplete="2" showKey="false" ServicePath="../Services/WS_data.asmx/Clients" placeholder="Search Customer" valore='<%# Bind("CodClient") %>' selezione='<%# Eval("ClientName") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' />
<asp:DropDownList ID="ddlRawMat" runat="server" DataSourceID="odsRawMat" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("RawMat") %>' OnSelectedIndexChanged="ddlRawMat_SelectedIndexChanged" AutoPostBack="true" />
<%--<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("RawMat") %>' />--%>
@@ -93,7 +97,7 @@
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' Width="10em" />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox4" runat="server" Text='<%# Bind("BatchQty") %>' CssClass="text-right" Width="10em" />
</div>
@@ -143,16 +147,14 @@
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("ProductCode") %>' />
<asp:DropDownList ID="ddlProducts" runat="server" DataSourceID="odsProducts" DataValueField="value" DataTextField="value" SelectedValue='<%# Bind("CodItem") %>' OnDataBound="ddlProducts_DataBound" />
<%--<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("CodItem") %>' />--%>
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("Customer") %>' />
<asp:DropDownList ID="DropDownList3" runat="server" DataSourceID="odsCustomers" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodClient") %>' CssClass="text-right" />
<%--<asp:TextBox Font-Bold="true" ID="TextBox2" runat="server" Text='<%# Bind("CodClient") %>' CssClass="text-right" />--%>
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<div class="col-xs-3 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' />
<asp:DropDownList ID="ddlRawMat" runat="server" DataSourceID="odsRawMat" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("RawMat") %>' OnDataBound="ddlRawMat_DataBound" OnSelectedIndexChanged="ddlRawMat_SelectedIndexChanged" AutoPostBack="true" />
<%--<asp:TextBox Font-Bold="true" ID="TextBox3" runat="server" Text='<%# Bind("RawMat") %>' />--%>
@@ -167,7 +169,7 @@
<asp:TextBox Font-Bold="true" ID="txtRawMatExtraCost" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N3}") %>' OnDataBinding="txtRawMatExtraCost_DataBinding" Width="10em" />
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" runat="server" ErrorMessage='<%# traduci("ErrExtraAlloy") %>' CssClass="text-danger" ControlToValidate="txtRawMatExtraCost" Display="Dynamic" />
</div>
<div class="col-xs-6 text-right">
<div class="col-xs-5 text-right">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("OrderBatch") %>' Width="10em" />
<asp:TextBox Font-Bold="true" ID="txtBatchQty" runat="server" Text='<%# Bind("BatchQty") %>' CssClass="text-right" />
<asp:RequiredFieldValidator ID="RequiredFieldValidator3" runat="server" ErrorMessage='<%# traduci("ErrBatchQty") %>' CssClass="text-danger" ControlToValidate="txtBatchQty" Display="Dynamic" />
C2P/WebUserControls/mod_autocompleteShort.ascx
+3 -5
View File
@@ -20,12 +20,11 @@
}
</style>
<script>
//$("input[class$='<%=txtSel.ClientID %>']").autocomplete({
//$("#<%=txtSel.ClientID %>").autocomplete({
// funzione autocomplete
function set<%=txtSel.ClientID %>()
{
$("input").autocomplete({
//$("input").autocomplete({
$("#<%=txtSel.ClientID %>").autocomplete({
source: function (request, response) {
$.ajax({
type: "POST",
@@ -58,8 +57,7 @@
// funzione x intercettare focusout...
function fcsOut<%=txtSel.ClientID %>()
{
//$("#<%=txtSel.ClientID %>").focusout(function() {
$("input").focusout(function() {
$("#<%=txtSel.ClientID %>").focusout(function() {
// controllo se hidden diverso da txtsel...
var str =$("#<%=txtSel.ClientID %>").val()
if(str.search($("#<%=hiddenFieldID.ClientID %>").val())<0)
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P/bin/SteamWare.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Data.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.3.170.540")]
[assembly: AssemblyFileVersion("2.3.170.540")]
[assembly: AssemblyVersion("2.3.171.540")]
[assembly: AssemblyFileVersion("2.3.171.540")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.3.170.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.3.170.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.3.171.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.3.171.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+