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

vers 0.6.60:

Browse Source 
- nuovo sito report esterno incluso con iframe in report viewer
- eliminate pagine e reports da sito principale
This commit is contained in:
Samuele E. Locatelli
2014-04-30 17:31:31 +02:00
parent 1cbbcfaceb
commit 408aeaa641
19 changed files with 60 additions and 11700 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P.sln
+8 -5
View File
@@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2P", "C2P\C2P.csproj", "{794D02DE-58E3-4BAF-BC8C-89037DE2EB8E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{48061E85-FCBD-459A-9D11-4D0D84E20A3B}"
ProjectSection(SolutionItems) = preProject
WE-Markdown.css = WE-Markdown.css
..\..\..\..\AppData\Local\Microsoft\VisualStudio\11.0\Extensions\3n5pf1om.0kz\schemas\WE-Palette.css = ..\..\..\..\AppData\Local\Microsoft\VisualStudio\11.0\Extensions\3n5pf1om.0kz\schemas\WE-Palette.css
WE-settings.xml = WE-settings.xml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2P_Data", "C2P_Data\C2P_Data.csproj", "{2F5A305C-ACBA-4B09-844A-2C7A0919C175}"
EndProject
@@ -18,6 +13,8 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "C2P_DB", "C2P_Project\C2P_D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{4F4FFE7B-6DE9-4F60-BA1A-A5CBF996A29C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C2P_Report", "C2P_Report\C2P_Report.csproj", "{58147587-0B58-4EA6-8746-5A462BC6AA41}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -58,6 +55,12 @@ Global
{4F4FFE7B-6DE9-4F60-BA1A-A5CBF996A29C}.Release|Any CPU.Build.0 = Release|Any CPU
{4F4FFE7B-6DE9-4F60-BA1A-A5CBF996A29C}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
{4F4FFE7B-6DE9-4F60-BA1A-A5CBF996A29C}.WinLab|Any CPU.Build.0 = Release|Any CPU
{58147587-0B58-4EA6-8746-5A462BC6AA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58147587-0B58-4EA6-8746-5A462BC6AA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58147587-0B58-4EA6-8746-5A462BC6AA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58147587-0B58-4EA6-8746-5A462BC6AA41}.Release|Any CPU.Build.0 = Release|Any CPU
{58147587-0B58-4EA6-8746-5A462BC6AA41}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU
{58147587-0B58-4EA6-8746-5A462BC6AA41}.WinLab|Any CPU.Build.0 = WinLab|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
C2P/C2P.csproj
+1 -4
View File
@@ -63,7 +63,7 @@
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
<Reference Include="Microsoft.ReportViewer.WinForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL" />
<Reference Include="Microsoft.ScriptManager.MSAjax, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
@@ -342,9 +342,6 @@
<None Include="Properties\PublishProfiles\localhost.pubxml" />
<None Include="Properties\PublishProfiles\RemoteZip.pubxml" />
<None Include="Properties\PublishProfiles\WinLab.pubxml" />
<Content Include="Reports\PlaceHolder.file" />
<Content Include="Reports\ReportOffers.rdlc" />
<Content Include="Reports\ReportOffers.rdl" />
<None Include="Scripts\jquery-2.1.0.intellisense.js" />
<Content Include="Scripts\jquery-2.1.0.js" />
<Content Include="Scripts\jquery-2.1.0.min.js" />
C2P/RepOffers.aspx
+3 -2
View File
@@ -1,6 +1,6 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="RepOffers.aspx.cs" Inherits="C2P.RepOffers" %>
<%@ Register Assembly="Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" Namespace="Microsoft.Reporting.WebForms" TagPrefix="rsweb" %>
<%--<%@ Register Assembly="Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" Namespace="Microsoft.Reporting.WebForms" TagPrefix="rsweb" %>--%>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
@@ -8,6 +8,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div style="background-color: white;">
<rsweb:ReportViewer ID="ReportOffers" runat="server" Font-Names="Verdana" Font-Size="8pt" Width="100%" WaitMessageFont-Names="Verdana" WaitMessageFont-Size="14pt" SizeToReportContent="true" Height="100%"></rsweb:ReportViewer>
<%--<rsweb:ReportViewer ID="ReportOffers" runat="server" Font-Names="Verdana" Font-Size="8pt" Width="100%" WaitMessageFont-Names="Verdana" WaitMessageFont-Size="14pt" SizeToReportContent="true" Height="100%"></rsweb:ReportViewer>--%>
<iframe id="repView" runat="server" style="background-color: white; border: 0; position: fixed; top: 80px; left: 0; right: 0; bottom: 0px; width: 100%; height: 80%;"></iframe>
</div>
</asp:Content>
C2P/RepOffers.aspx.cs
+7 -3
View File
@@ -1,5 +1,5 @@
using C2P_Data;
using Microsoft.Reporting.WebForms;
//using C2P_Data;
//using Microsoft.Reporting.WebForms;
using System;
using System.Collections.Generic;
using System.Data;
@@ -17,6 +17,9 @@ namespace C2P
{
if (!Page.IsPostBack)
{
// imposto iframe!
repView.Src=string.Format(@"{0}/ReportViewer.aspx?ticket={1}", memLayer.ML.confReadString("reportsUrl"),Request.QueryString["ticket"]);
#if false
if (memLayer.ML.confReadBool("ReportRemoteRender"))
{
ReportOffers.ProcessingMode = ProcessingMode.Remote;
@@ -50,7 +53,8 @@ namespace C2P
// 3) inserimento dataset nel report
localReport.DataSources.Add(new ReportDataSource("dsVocabolario", tabVoc));
localReport.DataSources.Add(new ReportDataSource("dsQuoteFull_Q_Data", tabQuote));
}
}
#endif
}
}
}
C2P/RepOffers.aspx.designer.cs
Generated
+2 -2
View File
@@ -13,12 +13,12 @@ namespace C2P {
public partial class RepOffers {
/// <summary>
/// ReportOffers control.
/// repView control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.Reporting.WebForms.ReportViewer ReportOffers;
protected global::System.Web.UI.HtmlControls.HtmlIframe repView;
}
}
C2P/Reports/PlaceHolder.file
-1
View File
@@ -1 +0,0 @@

C2P/Reports/ReportOffers.rdl
-5815
View File
File diff suppressed because it is too large Load Diff
C2P/Reports/ReportOffers.rdlc
-5815
View File
File diff suppressed because it is too large Load Diff
C2P/Web.WinLab.config
+1
View File
@@ -15,6 +15,7 @@
</connectionStrings>
-->
<appSettings>
<add key="reportsUrl" value="http://c2p-rep.steamware.net/" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="C2PConnectionString" value="Data Source=localhost\SQLExpress2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="VocabolarioConnectionString" value="Data Source=localhost\SQLExpress2008R2;Initial Catalog=C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
</appSettings>
C2P/Web.config
+12 -4
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433
@@ -24,7 +24,16 @@
<add key="defDayFrom" value="-365" />
<add key="intUpdatePagina_ms" value="60000" />
<!--area reports-->
<add key="ReportRemoteRender" value="true"/>
<add key="ReportRemoteRender" value="true" />
<add key="enableQueue" value="false" />
<add key="PdfFolder" value="PDF" />
<add key="doPdfCopy" value="false" />
<add key="reportsUrl" value="http://10.74.82.218/C2P_Report/" />
<!--datasources e stampanti!-->
<add key="printerOffers" value="\\W2012R2SAM\PDFCreator" />
<add key="PageWidthOffers" value="21cm" />
<add key="PageHeightOffers" value="29.7cm" />
<add key="MarginOffers" value="0.5cm" />
<!--stringhe connessione-->
<add key="C2PConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer;" />
<add key="VocabolarioConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=Proxima_C2P;Persist Security Info=True;User ID=sa;Password=keyhammer" />
@@ -34,8 +43,7 @@
</connectionStrings>
<system.web>
<httpHandlers>
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91"
validate="false" />
<add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" validate="false" />
</httpHandlers>
<compilation debug="true" targetFramework="4.5">
<assemblies>
C2P/WebUserControls/mod_QuoteDet.ascx
+13 -45
View File
@@ -19,35 +19,21 @@
<asp:Label runat="server" ID="lblStatus" /></b>
<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:ImageButton runat="server" ID="btnGetPdf" ImageUrl="~/Images/pdfExport.png" Height="24px" ToolTip="print" OnClick="btnGetPdf_Click" />
<%--<asp:ImageButton runat="server" ID="btnGetPdf" ImageUrl="~/Images/pdfExport.png" Height="24px" ToolTip="print" />--%>
<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>
</div>
<div class="container">
</asp:HyperLink></div></div></div></div><div class="container">
<div class="row" style="min-height: 402px;">
<div class="panel panel-default">
<%--<div class="panel-heading">--%>
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-default" 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="lbCosts" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("COSTS") %></asp:LinkButton>
</div>
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-default" 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-default" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("PACK-PARAM") %></asp:LinkButton>
</div>
</div>
<%--</div>--%>
<div class="panel-body">
<asp:LinkButton runat="server" ID="lbHeader" class="btn btn-default" 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="lbCosts" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Costs"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("COSTS") %></asp:LinkButton></div><div class="btn-group">
<asp:LinkButton runat="server" ID="lbExtrPar" class="btn btn-default" 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-default" OnClick="lbt_Click" CommandArgument="PackPar"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("PACK-PARAM") %></asp:LinkButton></div></div><%--</div>--%><div class="panel-body">
<uc1:mod_Q_Costs ID="mod_Q_Costs1" runat="server" />
<uc2:mod_Q_ExtrPar ID="mod_Q_ExtrPar1" runat="server" />
<uc3:mod_Q_Header ID="mod_Q_Header1" runat="server" />
@@ -61,36 +47,18 @@
<%--<div class="panel-heading">--%>
<div class="btn-group btn-group-justified">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("QUOTATION") %></asp:LinkButton>
</div>
</div>
<%--</div>--%>
<div class="panel-body">
<asp:LinkButton runat="server" ID="lbQuotation" class="btn btn-default" OnClick="lbt_Click" CommandArgument="Quote"><i class="fa fa-tasks"></i>&nbsp;<%: traduci("QUOTATION") %></asp:LinkButton></div></div><%--</div>--%><div class="panel-body">
<uc5:mod_Q_Quot ID="mod_Q_Quot1" runat="server" />
</div>
</div>
</div>
<div id="divStato0" runat="server" class="row">
<div class="col-xs-4 col-xs-offset-4">
<asp:LinkButton runat="server" ID="lbCreateOffer" class="btn btn-success" Width="100%" OnClick="lnkCreateOffer_Click"><i class="fa fa-check"></i>&nbsp;<%: traduci("nextIdxQState-01") %></asp:LinkButton>
</div>
</div>
<div id="divStato1" runat="server" class="row">
<asp:LinkButton runat="server" ID="lbCreateOffer" class="btn btn-success" Width="100%" OnClick="lnkCreateOffer_Click"><i class="fa fa-check"></i>&nbsp;<%: traduci("nextIdxQState-01") %></asp:LinkButton></div></div><div id="divStato1" runat="server" class="row">
<div class="col-xs-4 col-xs-offset-2">
<asp:LinkButton runat="server" ID="lbReject" class="btn btn-danger" Width="100%" OnClick="lbReject_Click"><i class="fa fa-thumbs-o-down"></i>&nbsp;<%: traduci("nextIdxQState-00") %></asp:LinkButton>
</div>
<div class="col-xs-4">
<asp:LinkButton runat="server" ID="lbApprove" class="btn btn-success" Width="100%" OnClick="lbApprove_Click"><i class="fa fa-thumbs-o-up"></i>&nbsp;<%: traduci("nextIdxQState-02") %></asp:LinkButton>
</div>
</div>
<div id="divStato2" runat="server" class="row">
<asp:LinkButton runat="server" ID="lbReject" class="btn btn-danger" Width="100%" OnClick="lbReject_Click"><i class="fa fa-thumbs-o-down"></i>&nbsp;<%: traduci("nextIdxQState-00") %></asp:LinkButton></div><div class="col-xs-4">
<asp:LinkButton runat="server" ID="lbApprove" class="btn btn-success" Width="100%" OnClick="lbApprove_Click"><i class="fa fa-thumbs-o-up"></i>&nbsp;<%: traduci("nextIdxQState-02") %></asp:LinkButton></div></div><div id="divStato2" runat="server" class="row">
<div class="col-xs-4 col-xs-offset-4">
<asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("nextIdxQState-03") %></asp:LinkButton>
</div>
</div>
<div id="divStato3" runat="server" class="row">
<asp:LinkButton runat="server" ID="lbRelease" class="btn btn-success" Width="100%" OnClick="lbRelease_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("nextIdxQState-03") %></asp:LinkButton></div></div><div id="divStato3" runat="server" class="row">
<div class="col-xs-4 col-xs-offset-4">
<asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("createNewRev") %></asp:LinkButton>
</div>
</div>
</div>
<asp:LinkButton runat="server" ID="lbNewRev" class="btn btn-success" Width="100%" OnClick="lbNewRev_Click"><i class="fa fa-upload"></i>&nbsp;<%: traduci("createNewRev") %></asp:LinkButton></div></div></div>
C2P/WebUserControls/mod_QuoteDet.ascx.cs
+9
View File
@@ -412,6 +412,15 @@ namespace C2P.WebUserControls
Response.Redirect(string.Format("Quote?QuoteType={0}&CodQuote={1}&QuoteRev={2}", tab[0].QuoteType, tab[0].CodQuote, tab[0].QuoteRev));
}
}
/// <summary>
/// chiamo stampa del singolo report, PER ORA con tutto il ticket 4 hard coded...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnGetPdf_Click(object sender, ImageClickEventArgs e)
{
reportPrinter.obj.stampaReport(reportRichiesto.ReportOffers, 4, @"\\W2012R2SAM\PDFCreator");
}
}
}
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_Project/bin/Release/C2P_DB.dacpac
BIN
View File
Binary file not shown.
C2P_Project/bin/Release/C2P_Project.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.6.58.149")]
[assembly: AssemblyFileVersion("0.6.58.149")]
[assembly: AssemblyVersion("0.6.60.150")]
[assembly: AssemblyFileVersion("0.6.60.150")]
[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.6.58.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.6.58.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.6.60.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.6.60.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+