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

vers 6.57:

Browse Source 
- update report
- inserita rev history
This commit is contained in:
Samuele E. Locatelli
2014-04-29 16:51:02 +02:00
parent fa46eb0404
commit 4b3b945cec
12 changed files with 5127 additions and 1368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/Reports/ReportOffers.rdl
+2553 -679
View File
File diff suppressed because it is too large Load Diff
C2P/Reports/ReportOffers.rdlc
+2553 -679
View File
File diff suppressed because it is too large Load Diff
C2P/RevisionHistory.aspx
+3 -5
View File
@@ -9,7 +9,7 @@
<div class="row">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><%: traduci("RevisionHistory") %></h3>
<h3 class="panel-title text-center"><%: traduci("RevisionHistory") %></h3>
</div>
<div class="panel-body">
<div class="row" style="min-height: 3.1em;">
@@ -88,12 +88,10 @@
<asp:SessionParameter SessionField="searchVal" Type="String" DefaultValue="*" />
</FilterParameters>
<SelectParameters>
<asp:Parameter Type="String" Name="QuoteType" DefaultValue="Q" />
<asp:Parameter Type="String" Name="CodQuote" DefaultValue="0" />
<asp:QueryStringParameter DefaultValue="Q" Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter DefaultValue="0" Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />
</SelectParameters>
</asp:ObjectDataSource>
<%--<asp:QueryStringParameter DefaultValue="Q" Name="QuoteType" QueryStringField="QuoteType" Type="String" />
<asp:QueryStringParameter DefaultValue="0" Name="CodQuote" QueryStringField="CodQuote" Type="Int64" />--%>
</div>
</div>
</div>
C2P/WebUserControls/mod_QuoteDet.ascx
+4 -2
View File
@@ -20,8 +20,10 @@
<asp:Label runat="server" ID="lblIdxQState" Visible="false" />
&nbsp;|&nbsp;
<asp:ImageButton runat="server" ID="btnGetPdf" ImageUrl="~/Images/pdfExport.png" Height="24px" ToolTip="print" />
<asp:Label runat="server" ID="lblQuoteType" />
<asp:Label runat="server" ID="lblCodQuote" /><span style="color: #dedede; font-size: 0.8em;">.<asp:Label runat="server" ID="lblQuoteRev" /></span>
<asp:HyperLink runat="server" ID="hlRevHist" Target="_blank">
<asp:Label runat="server" ID="lblQuoteType" />
<asp:Label runat="server" ID="lblCodQuote" /><span style="color: #dedede; font-size: 0.8em;">.<asp:Label runat="server" ID="lblQuoteRev" /></span>
</asp:HyperLink>
</div>
</div>
</div>
C2P/WebUserControls/mod_QuoteDet.ascx.cs
+2
View File
@@ -106,6 +106,8 @@ namespace C2P.WebUserControls
if (!Page.IsPostBack)
{
updateBaseData();
hlRevHist.NavigateUrl = string.Format("~/RevisionHistory?QuoteType={0}&CodQuote={1}", QuoteType, CodQuote);
hlRevHist.ToolTip = traduci("RevisionHistory");
prevReq = "";
setModVisibility("Header");
}
C2P/WebUserControls/mod_QuoteDet.ascx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace C2P.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.ImageButton btnGetPdf;
/// <summary>
/// hlRevHist 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.HyperLink hlRevHist;
/// <summary>
/// lblQuoteType control.
/// </summary>
C2P/WebUserControls/mod_testata.ascx
+1 -1
View File
@@ -33,7 +33,7 @@
</a>
</li>
<li class='<%: "dropdown " + liClass("ExistingProductOffer NewProductOffer OffersArchive Quote")%>'>
<li class='<%: "dropdown " + liClass("ExistingProductOffer NewProductOffer OffersArchive Quote RevisionHistory")%>'>
<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-th"></i>
<span>Offers</span>
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_Data/DS_Quotes.xss
+2 -2
View File
@@ -6,7 +6,7 @@
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-2" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:QuoteList" ZOrder="2" X="462" Y="129" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
<Shape ID="DesignTable:QuoteList" ZOrder="2" X="462" Y="129" Height="476" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="349" />
<Shape ID="DesignTable:QuoteRM" ZOrder="10" X="122" Y="271" Height="324" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:QuoteWorkExt" ZOrder="11" X="102" Y="35" Height="210" Width="230" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:QuoteWorkInt" ZOrder="9" X="882" Y="11" Height="305" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
@@ -70,7 +70,7 @@
<Connector ID="DesignRelation:FK_QuoteExtra_QuoteList" ZOrder="4" LineWidth="11">
<RoutePoints>
<Point>
<X>762</X>
<X>730</X>
<Y>430</Y>
</Point>
<Point>
C2P_Data/bin/Release/C2P_Data.dll
BIN
View File
Binary file not shown.