fix gestione filtraggio dati (da URL come parametro selezione)

avanzamento dettaglio dati estruzione Quote
This commit is contained in:
Samuele E. Locatelli
2014-04-15 11:57:15 +02:00
parent 904ee8443f
commit 0d3ad932af
16 changed files with 275 additions and 136 deletions
+7
View File
@@ -55,6 +55,13 @@ a:focus {
/*------------------------------------------------------------------
[ navbar / .navbar ]
*/
.navbar {
min-height: 15px;
}
.navbar-text {
margin-top: 1px;
margin-bottom: 1px;
}
.navbar.navbar-inverse .navbar-form .search-query {
width: 225px;
margin-top: 2px;
+27 -18
View File
@@ -73,29 +73,38 @@ a {
/*------------------------------------------------------------------
[ navbar / .navbar ]
*/
.navbar.navbar-inverse .navbar-form .search-query {
width: 225px;
margin-top: 2px;
background-color: #333;
font-size: 11px;
font-weight: bold;
line-height: 20px;
border-color: #000;
border-radius: 20px;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
.navbar {
min-height: 15px;
}
.navbar-text{
margin-top: 1px;
margin-bottom: 1px;
}
.navbar.navbar-inverse .navbar-form .search-query:focus {
background-color: #FFF;
.navbar.navbar-inverse .navbar-form .search-query {
width: 225px;
margin-top: 2px;
background-color: #333;
font-size: 11px;
font-weight: bold;
line-height: 20px;
border-color: #000;
border-radius: 20px;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
}
.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder {
color: #666;
}
.navbar.navbar-inverse .navbar-form .search-query:focus {
background-color: #FFF;
}
.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder {
color: #666;
}
.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder {
color: #666;
}
.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder {
color: #666;
}
/*------------------------------------------------------------------
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -15,7 +15,7 @@ namespace C2P
// aggiorno vocabolario
DataWrap.DW.resetVocabolario();
// torno a menu...
Response.Redirect("Default");
Response.Redirect(user_std.pagPrecedente);
}
}
}
+143 -1
View File
@@ -1,2 +1,144 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Q_ExtrPar.ascx.cs" Inherits="C2P.WebUserControls.mod_Q_ExtrPar" %>
extrusion param
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<ItemTemplate>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display1" runat="server" etichetta='<%# traduci("TipoDies") %>' valore='<%# Bind("TipoDies") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display10" runat="server" etichetta='<%# traduci("DiamDies") %>' valore='<%# Bind("DiamDies", "{0:N2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display11" runat="server" etichetta='<%# traduci("HoleNumDies") %>' valore='<%# Bind("HoleNumDies") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display4" runat="server" etichetta='<%# traduci("NumDiesInList") %>' valore='<%# Bind("NumDiesInList", "{0:N0}") %>' />
</div>
<div class="col-xs-4 text-right">
<uc1:mod_display ID="mod_display2" runat="server" etichetta='<%# traduci("CodDiesGroup") %>' valore='<%# Bind("CodDiesGroup") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("DiesEOLife") %>' valore='<%# Bind("DiesEOLife", "{0:N2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("DiesExpLife") %>' valore='<%# Bind("DiesExpLife", "{0:N2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("NumDiesExaust") %>' valore='<%# Bind("NumDiesExaust", "{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("DiesPrice") %>' valore='<%# Bind("DiesPrice", "{0:C3}") %>' />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display9" runat="server" etichetta='<%# traduci("CodPlant") %>' valore='<%# Bind("CodPlant") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("KgTeo") %>' valore='<%# Bind("KgTeo", "{0:N2}") %>' />
</div>
<div class="col-xs-2 text-left">
<uc1:mod_display ID="mod_display12" runat="server" etichetta='<%# traduci("NumSMED") %>' valore='<%# Bind("NumSMED", "{0:N0}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display13" runat="server" etichetta='<%# traduci("KeyAMIL") %>' valore='<%# Bind("KeyAMIL") %>' />
</div>
</div>
<%--
<div class="row">
<div class="col-xs-12">
<uc1:mod_display ID="mod_display9" runat="server" etichetta='<%# traduci("Note") %>' valore='<%# Bind("Note") %>' />
</div>
</div>--%>
</ItemTemplate>
<%--<EditItemTemplate>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<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") %>' />
</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" />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display3" runat="server" etichetta='<%# traduci("Alloy") %>' />
<asp:DropDownList ID="DropDownList4" runat="server" DataSourceID="odsRawMat" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("RawMat") %>' />
</div>
<div class="col-xs-6 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" />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display5" runat="server" etichetta='<%# traduci("Base6060") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox5" runat="server" Text='<%# Bind("RawMatCost","{0:N4}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display6" runat="server" etichetta='<%# traduci("Incoterms") %>' />
<asp:DropDownList ID="DropDownList1" runat="server" DataSourceID="odsIncoterms" DataValueField="value" DataTextField="label" SelectedValue='<%# Bind("CodInco") %>' CssClass="text-right" />
</div>
</div>
<div class="row bottomLine">
<div class="col-xs-6 text-left">
<uc1:mod_display ID="mod_display7" runat="server" etichetta='<%# traduci("ExtraAlloy") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox7" runat="server" Text='<%# Bind("RawMatExtraCost","{0:N4}") %>' />
</div>
<div class="col-xs-6 text-right">
<uc1:mod_display ID="mod_display8" runat="server" etichetta='<%# traduci("Agency") %>' />
<asp:Label Font-Bold="true" ID="TextBox8" runat="server" Text='<%# Eval("ProvvCost","{0:N4}") %>' CssClass="text-right" />
</div>
</div>
<div class="row">
<div class="col-xs-12">
<uc1:mod_display ID="mod_display9" runat="server" etichetta='<%# traduci("Note") %>' />
<asp:TextBox Font-Bold="true" ID="TextBox1" runat="server" Text='<%# Bind("Note") %>' TextMode="MultiLine" Width="100%" Height="4em" />
</div>
</div>
<div class="row">
<div class="col-xs-6 col-xs-offset-3">
<div class="col-xs-6">
<asp:LinkButton runat="server" ID="LinkButton1" class="btn btn-success" Width="100%" CausesValidation="true" CommandName="Update"><i class="fa fa-check"></i>&nbsp;<%: traduci("Update") %></asp:LinkButton>
</div>
<div class="col-xs-6">
<asp:LinkButton runat="server" ID="LinkButton2" class="btn btn-danger" Width="100%" CausesValidation="false" CommandName="Cancel"><i class="fa fa-undo"></i>&nbsp;<%: traduci("Cancel") %></asp:LinkButton>
</div>
</div>
</EditItemTemplate>--%>
</asp:FormView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateHeaders">
<SelectParameters>
<asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
<asp:QueryStringParameter Name="QuoteRev" QueryStringField="QuoteRev" Type="Int32" />
<asp:Parameter DefaultValue="Y" Name="DoUpdate" Type="String" />
</SelectParameters>
<UpdateParameters>
<asp:Parameter Name="Original_QuoteType" Type="String" />
<asp:Parameter Name="Original_CodQuote" Type="Int64" />
<asp:Parameter Name="Original_QuoteRev" Type="Int32" />
<asp:Parameter Name="CodClient" Type="String" />
<asp:Parameter Name="CodItem" Type="String" />
<asp:Parameter Name="RawMat" Type="String" />
<asp:Parameter Name="RawMatCost" Type="Decimal" />
<asp:Parameter Name="RawMatExtraCost" Type="Decimal" />
<asp:Parameter Name="BatchQty" Type="Int32" />
<asp:Parameter Name="CodInco" Type="String" />
<asp:Parameter Name="Note" Type="String" />
</UpdateParameters>
</asp:ObjectDataSource>
<%--<asp:ObjectDataSource ID="odsProducts" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selItemsTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsCustomers" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selClientTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsRawMat" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selRawMatTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsIncoterms" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selIncotermsTableAdapter"></asp:ObjectDataSource>--%>
+17 -1
View File
@@ -7,11 +7,27 @@ using System.Web.UI.WebControls;
namespace C2P.WebUserControls
{
public partial class mod_Q_ExtrPar : System.Web.UI.UserControl
public partial class mod_Q_ExtrPar : SteamWare.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// fa toggle tra modo edit e read/item
/// </summary>
public void toggleMode()
{
if (frmView.CurrentMode == FormViewMode.ReadOnly)
{
frmView.ChangeMode(FormViewMode.Edit);
}
else
{
frmView.ChangeMode(FormViewMode.ReadOnly);
}
}
}
}
+41 -7
View File
@@ -3,15 +3,49 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace C2P.WebUserControls
{
public partial class mod_Q_ExtrPar
{
namespace C2P.WebUserControls {
public partial class mod_Q_ExtrPar {
/// <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>
/// frmView 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.FormView frmView;
/// <summary>
/// odsQuotes 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.ObjectDataSource odsQuotes;
}
}
+9 -11
View File
@@ -1,10 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Q_Header.ascx.cs" Inherits="C2P.WebUserControls.mod_Q_Header" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<%@ Register Src="~/WebUserControls/mod_display.ascx" TagName="mod_display" TagPrefix="uc1" %>
<asp:FormView ID="frmView" runat="server" DataKeyNames="QuoteType,CodQuote,QuoteRev" DataSourceID="odsQuotes" Width="100%">
<ItemTemplate>
<div class="row bottomLine">
@@ -107,11 +108,11 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateHeaders" OnUpdating="odsQuotes_Updating">
<asp:ObjectDataSource ID="odsQuotes" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="C2P_Data.DS_QuotesTableAdapters.QuoteFull_QTableAdapter" UpdateMethod="updateHeaders">
<SelectParameters>
<asp:ControlParameter ControlID="lblQuoteType" Name="QuoteType" PropertyName="Text" Type="String" />
<asp:ControlParameter ControlID="lblCodQuote" Name="CodQuote" PropertyName="Text" Type="Int64" />
<asp:ControlParameter ControlID="lblQuoteRev" Name="QuoteRev" PropertyName="Text" Type="Int32" />
<asp:QueryStringParameter Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
<asp:QueryStringParameter Name="QuoteRev" QueryStringField="QuoteRev" Type="Int32" />
<asp:Parameter DefaultValue="Y" Name="DoUpdate" Type="String" />
</SelectParameters>
<UpdateParameters>
@@ -128,9 +129,6 @@
<asp:Parameter Name="Note" Type="String" />
</UpdateParameters>
</asp:ObjectDataSource>
<asp:Label runat="server" ID="lblQuoteType" Visible="false" Text="" />
<asp:Label runat="server" ID="lblCodQuote" Visible="false" Text="" />
<asp:Label runat="server" ID="lblQuoteRev" Visible="false" Text="" />
<asp:ObjectDataSource ID="odsProducts" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selItemsTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsCustomers" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selClientTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsRawMat" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="C2P_Data.DS_UtilityTableAdapters.v_selRawMatTableAdapter"></asp:ObjectDataSource>
-46
View File
@@ -12,48 +12,6 @@ namespace C2P.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// tipo di quote x la scheda corrente
/// </summary>
public string QuoteType
{
get
{
return lblQuoteType.Text;
}
set
{
lblQuoteType.Text = value;
}
}
/// <summary>
/// codice quote x la scheda corrente
/// </summary>
public string CodQuote
{
get
{
return lblCodQuote.Text;
}
set
{
lblCodQuote.Text = value;
}
}
/// <summary>
/// rev quote x la scheda corrente
/// </summary>
public string QuoteRev
{
get
{
return lblQuoteRev.Text;
}
set
{
lblQuoteRev.Text = value;
}
}
/// <summary>
/// fa toggle tra modo edit e read/item
@@ -70,9 +28,5 @@ namespace C2P.WebUserControls
}
}
protected void odsQuotes_Updating(object sender, ObjectDataSourceMethodEventArgs e)
{
}
}
}
+18 -27
View File
@@ -12,6 +12,24 @@ namespace C2P.WebUserControls {
public partial class mod_Q_Header {
/// <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>
/// frmView control.
/// </summary>
@@ -30,33 +48,6 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsQuotes;
/// <summary>
/// lblQuoteType 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 lblQuoteType;
/// <summary>
/// lblCodQuote 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 lblCodQuote;
/// <summary>
/// lblQuoteRev 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 lblQuoteRev;
/// <summary>
/// odsProducts control.
/// </summary>
-3
View File
@@ -23,7 +23,6 @@ namespace C2P.WebUserControls
set
{
lblQuoteType.Text = value;
mod_Q_Header1.QuoteType = value;
}
}
/// <summary>
@@ -38,7 +37,6 @@ namespace C2P.WebUserControls
set
{
lblCodQuote.Text = value;
mod_Q_Header1.CodQuote = value;
}
}
/// <summary>
@@ -53,7 +51,6 @@ namespace C2P.WebUserControls
set
{
lblQuoteRev.Text = value;
mod_Q_Header1.QuoteRev = value;
}
}
/// <summary>
+11 -20
View File
@@ -10,14 +10,14 @@ namespace C2P.WebUserControls
{
public partial class mod_testata : System.Web.UI.UserControl
{
/// <summary>
/// nome della pagina correntemente caricata
/// </summary>
public string _paginaCorrente;
/// <summary>
/// memorizza la pagina precedente (ovvero la corrente ma non da page-object ma in session...
/// </summary>
public string _paginaPrecedente;
///// <summary>
///// nome della pagina correntemente caricata
///// </summary>
//public string _paginaCorrente;
///// <summary>
///// memorizza la pagina precedente (ovvero la corrente ma non da page-object ma in session...
///// </summary>
//public string _paginaPrecedente;
/// <summary>
/// caricamento pagina
/// </summary>
@@ -35,7 +35,7 @@ namespace C2P.WebUserControls
string answ = "";
try
{
if (_paginaCorrente.IndexOf(nomeElem) >= 0) answ = "active";
if (user_std.pagCorrente.IndexOf(nomeElem) >= 0) answ = "active";
}
catch
{ }
@@ -51,17 +51,8 @@ namespace C2P.WebUserControls
char[] delimiter = delimStr.ToCharArray();
string[] finalUrl = MyUrl.LocalPath.ToString().Split(delimiter);
int n = finalUrl.Length;
_paginaCorrente = finalUrl[n - 1].ToString();
if (_paginaPrecedente == "")
{
_paginaPrecedente = _paginaCorrente;
memLayer.ML.setSessionVal("_paginaPrecedente", _paginaPrecedente);
}
if (_paginaCorrente != _paginaPrecedente)
{
_paginaPrecedente = _paginaCorrente;
memLayer.ML.setSessionVal("_paginaPrecedente", _paginaPrecedente);
}
user_std.pagCorrente = finalUrl[n - 1].ToString();
user_std.pagPrecedente = Request.Url.ToString();
}
/// <summary>
/// wrapper traduzione
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.