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

Completato controllo immagine dell'item in existing products offers e in new product (da validare...)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2014-09-02 18:20:55 +02:00
parent e799a5a7bd
commit a88c8b8923
15 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/ExistingProductOffer.aspx
+2 -3
View File
@@ -1,6 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="ExistingProductOffer.aspx.cs" Inherits="C2P.ExistingProductOffer" %>
<%@ Register Src="~/WebUserControls/mod_autocomplete.ascx" TagPrefix="uc1" TagName="mod_autocomplete" %>
<%@ Register Src="~/WebUserControls/mod_imgPreview.ascx" TagPrefix="uc1" TagName="mod_imgPreview" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
@@ -54,11 +55,9 @@
</div>
</div>
<div class="col-xs-2">
<asp:Image ID="Image1" runat="server" ImageUrl="~/Drawings/MissingImage.png" />
<uc1:mod_imgPreview runat="server" ID="mod_imgPreview" imgSize="192" CodItem="" />
</div>
</div>
<%--<div class="row" style="font-size: 1.2em; line-height: 1.6em;">
</div>--%>
</div>
</div>
</div>
C2P/ExistingProductOffer.aspx.cs
+25 -5
View File
@@ -11,19 +11,39 @@ namespace C2P
{
protected void Page_Load(object sender, EventArgs e)
{
repView.Visible = (acArticolo.valore != "");
fixDetailVisibility();
acArticolo.eh_reset += acArticolo_eh_reset;
acArticolo.eh_valSelezionato += acArticolo_eh_valSelezionato;
}
/// <summary>
/// selezionato articolo
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void acArticolo_eh_valSelezionato(object sender, EventArgs e)
{
repView.Visible = (acArticolo.valore != "");
mod_imgPreview.CodItem = acArticolo.valore;
fixDetailVisibility();
}
/// <summary>
/// determina visualizzazione dettagli articolo
/// </summary>
private void fixDetailVisibility()
{
repView.Visible = (acArticolo.valore != "");
mod_imgPreview.Visible = (acArticolo.valore != "");
}
/// <summary>
/// resettato articolo
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void acArticolo_eh_reset(object sender, EventArgs e)
{
repView.Visible = false;
//repView.Visible = false;
//mod_imgPreview.Visible = false;
mod_imgPreview.CodItem = "";
fixDetailVisibility();
}
/// <summary>
/// url x rimbalzo offerta
C2P/ExistingProductOffer.aspx.designer.cs
Generated
+2 -2
View File
@@ -58,12 +58,12 @@ namespace C2P {
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Image1 control.
/// mod_imgPreview 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.Image Image1;
protected global::C2P.WebUserControls.mod_imgPreview mod_imgPreview;
}
}
C2P/WebUserControls/mod_OffersArchive.ascx
+1 -1
View File
@@ -3,7 +3,7 @@
<%@ Register Src="mod_selPeriodo.ascx" TagName="mod_selPeriodo" TagPrefix="uc2" %>
<%@ Register Src="mod_slider.ascx" TagName="mod_slider" TagPrefix="uc3" %>
<%@ Register Src="mod_range.ascx" TagName="mod_range" TagPrefix="uc4" %>
<%@ Register Src="~/WebUserControls/mod_imgPreview.ascx" TagPrefix="uc1" TagName="mod_imgPreview" %>
<%@ Register Src="mod_imgPreview.ascx" TagPrefix="uc1" TagName="mod_imgPreview" %>
<%if (false)
C2P/WebUserControls/mod_newProduct.ascx
+40 -30
View File
@@ -6,6 +6,8 @@
<%@ Register Src="~/WebUserControls/mod_S_PackPar.ascx" TagName="mod_S_PackPar" TagPrefix="uc4" %>
<%@ Register Src="~/WebUserControls/mod_S_Quot.ascx" TagName="mod_S_Quot" TagPrefix="uc5" %>
<%@ Register Src="~/WebUserControls/mod_S_Dies.ascx" TagName="mod_S_Dies" TagPrefix="uc6" %>
<%@ Register Src="~/WebUserControls/mod_imgPreview.ascx" TagPrefix="uc7" TagName="mod_imgPreview" %>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
@@ -33,43 +35,51 @@
</div>
</div>
<div class="container">
<div class="row"> <!--style="min-height: 282px;">-->
<div class="panel panel-warning">
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Header"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("HEADER") %></asp:LinkButton>
<div class="row">
<!--style="min-height: 282px;">-->
<div class="col-xs-10">
<div class="panel panel-warning">
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Header"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("HEADER") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="ExtrPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("EXTRUS-PARAM") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbPackPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("PACK-PARAM") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbDiesPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="DiesPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("DIES-PARAM") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbCosts" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("COSTS") %></asp:LinkButton>
</div>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="ExtrPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("EXTRUS-PARAM") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbPackPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("PACK-PARAM") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbDiesPar" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="DiesPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("DIES-PARAM") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbCosts" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("COSTS") %></asp:LinkButton>
<div class="panel-body bg-warning">
<uc1:mod_S_Costs ID="mod_S_Costs1" runat="server" />
<uc2:mod_S_ExtrPar ID="mod_S_ExtrPar1" runat="server" />
<uc3:mod_S_Header ID="mod_S_Header1" runat="server" />
<uc4:mod_S_PackPar ID="mod_S_PackPar1" runat="server" />
<uc6:mod_S_Dies ID="mod_S_Dies1" runat="server" />
</div>
</div>
<div class="panel-body bg-warning">
<uc1:mod_S_Costs ID="mod_S_Costs1" runat="server" />
<uc2:mod_S_ExtrPar ID="mod_S_ExtrPar1" runat="server" />
<uc3:mod_S_Header ID="mod_S_Header1" runat="server" />
<uc4:mod_S_PackPar ID="mod_S_PackPar1" runat="server" />
<uc6:mod_S_Dies ID="mod_S_Dies1" runat="server" />
</div>
</div>
<div class="col-xs-2">
<uc7:mod_imgPreview runat="server" ID="mod_imgPreview" imgSize="192" CodItem="" />
</div>
</div>
<div class="row">
<div class="panel panel-warning">
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("QUOTATION") %></asp:LinkButton>
<div class="col-xs-10">
<div class="panel panel-warning">
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-warning" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("QUOTATION") %></asp:LinkButton>
</div>
</div>
<div class="panel-body bg-warning">
<uc5:mod_S_Quot ID="mod_S_Quot1" runat="server" />
</div>
</div>
<div class="panel-body bg-warning">
<uc5:mod_S_Quot ID="mod_S_Quot1" runat="server" />
</div>
</div>
</div>
C2P/WebUserControls/mod_newProduct.ascx.cs
+4
View File
@@ -239,9 +239,11 @@ namespace C2P.WebUserControls
QuoteRev = Request.QueryString["QuoteRev"];
// carico stato offerta...
int IdxQS = 0;
string CodItem = "";
try
{
IdxQS = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0].IdxQState;
CodItem = DtProxy.man.taQFQ.getByKey(QuoteType, Convert.ToInt32(CodQuote), Convert.ToInt32(QuoteRev), "N")[0].CodItem;
}
catch
{ }
@@ -250,6 +252,8 @@ namespace C2P.WebUserControls
setBtnVisibility();
mod_S_Quot1.doUpdate();
mod_S_Costs1.doUpdate();
// fix articolo x visualizzazione...
mod_imgPreview.CodItem = CodItem;
}
/// <summary>
/// Calcola css dato valore prezzo offerto vs importi full cost e min price
C2P/WebUserControls/mod_newProduct.ascx.designer.cs
Generated
+9
View File
@@ -192,6 +192,15 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::C2P.WebUserControls.mod_S_Dies mod_S_Dies1;
/// <summary>
/// mod_imgPreview control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::C2P.WebUserControls.mod_imgPreview mod_imgPreview;
/// <summary>
/// lbQuotation control.
/// </summary>
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("0.9.119.274")]
[assembly: AssemblyFileVersion("0.9.119.274")]
[assembly: AssemblyVersion("0.9.120.275")]
[assembly: AssemblyFileVersion("0.9.120.275")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")]
[assembly: AssemblyCompany("Steamware")]
VersGen/C2P.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("0.9.119.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.9.119.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.9.120.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.9.120.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+