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

vers 1.9.128

Browse Source 
pubblicato online TUTOT ocn modifiche x calcolo CORRETTO DSR e fix reports con 2 tipi e copia al momento del deploy...
This commit is contained in:
Samuele E. Locatelli
2014-09-10 10:41:45 +02:00
parent 58e0a9cc9e
commit 8925c5a57d
21 changed files with 38566 additions and 1881 deletions
Download Patch File Download Diff File Expand all files Collapse all files
C2P/bin/C2P.dll
BIN
View File
Binary file not shown.
C2P/bin/NLog.dll
BIN
View File
Binary file not shown.
C2P_Report/C2P_Report.csproj
+20 -7
View File
@@ -101,16 +101,29 @@
<Folder Include="App_Data\" />
</ItemGroup>
<ItemGroup>
<Content Include="Reports\ReportOffers_.rdl" />
<Content Include="temp\PlaceHolder.file" />
<Content Include="logs\PlaceHolder.file" />
<Content Include="Reports\PlaceHolder.file" />
<Content Include="Base.Master" />
<Content Include="Reports\WinLab\StdCostList.rdlc">
<SubType>Designer</SubType>
</Content>
<None Include="Properties\PublishProfiles\218.pubxml" />
<None Include="Properties\PublishProfiles\WinLab.pubxml" />
<Content Include="Reports\StdCostList.rdl" />
<Content Include="Reports\ReportOffers_Q.rdl" />
<Content Include="Reports\ReportOffers_S.rdl" />
<Content Include="setupTgt.bat" />
<Content Include="Reports\srv218\ReportOffers_Q.rdl" />
<Content Include="Reports\srv218\ReportOffers_S.rdl" />
<Content Include="Reports\WinLab\ReportOffers_Q.rdl" />
<Content Include="Reports\WinLab\ReportOffers_S.rdl" />
<EmbeddedResource Include="Reports\srv218\ReportOffers_Q.rdlc" />
<EmbeddedResource Include="Reports\srv218\ReportOffers_S.rdlc" />
<Content Include="Reports\srv218\StdCostList.rdlc">
<SubType>Designer</SubType>
</Content>
<EmbeddedResource Include="Reports\WinLab\ReportOffers_Q.rdlc" />
<EmbeddedResource Include="Reports\WinLab\ReportOffers_S.rdlc" />
<Content Include="Reports\srv218\StdCostList.rdl" />
<Content Include="Reports\WinLab\StdCostList.rdl" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -131,9 +144,6 @@
<Name>C2P_Data</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Reports\ReportOffers_.rdlc" />
</ItemGroup>
<ItemGroup>
<Content Include="Reports\StdCostList.rdlc">
<SubType>Designer</SubType>
@@ -179,6 +189,9 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<PropertyGroup>
<PreBuildEvent>"$(ProjectDir)setupTgt.bat" "$(ConfigurationName)" "$(ProjectDir)"</PreBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
C2P_Report/Reports/ReportOffers_Q.rdlc
+4 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Report xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner" xmlns:cl="http://schemas.microsoft.com/sqlserver/reporting/2010/01/componentdefinition" xmlns="http://schemas.microsoft.com/sqlserver/reporting/2010/01/reportdefinition">
<Author>Vers. 2.1.1</Author>
<Author>Vers. 2.2.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="DB_C2P">
@@ -535,7 +535,8 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Lookup("C2P_prt1_ReportTitle",Fields!Lemma.Value,Fields!Traduzione.Value, "dsVocabolario")</Value>
<Value>=Switch(Globals!ReportName="ReportOffers_Q",Lookup("C2P_prt1_ReportTitle",Fields!Lemma.Value,Fields!Traduzione.Value, "dsVocabolario"),
Globals!ReportName="ReportOffers_S", Lookup("C2P_prt1_ReportTitle_S",Fields!Lemma.Value,Fields!Traduzione.Value, "dsVocabolario"),True,"Missing Title")</Value>
<Style>
<FontFamily>=Variables!FontEtichette.Value</FontFamily>
<FontSize>16pt</FontSize>
@@ -6656,7 +6657,7 @@
<TablixMember />
<TablixMember>
<Visibility>
<Hidden>true</Hidden>
<Hidden>=iif(LEFT(Globals!ReportName,14)="ReportOffers_S",False,True)</Hidden>
</Visibility>
</TablixMember>
</TablixMembers>
C2P_Report/Reports/ReportOffers_S.rdlc
+1378 -39
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/WinLab/ReportOffers_Q.rdl
+6928
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/WinLab/ReportOffers_Q.rdlc
+6928
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/WinLab/ReportOffers_S.rdl
+6928
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/WinLab/ReportOffers_S.rdlc
+6928
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/StdCostList.rdl → C2P_Report/Reports/WinLab/StdCostList.rdl
View File
C2P_Report/Reports/WinLab/StdCostList.rdlc
+1348
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/ReportOffers_Q.rdl → C2P_Report/Reports/srv218/ReportOffers_Q.rdl
+4 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Report xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner" xmlns:cl="http://schemas.microsoft.com/sqlserver/reporting/2010/01/componentdefinition" xmlns="http://schemas.microsoft.com/sqlserver/reporting/2010/01/reportdefinition">
<Author>Vers. 2.1.1</Author>
<Author>Vers. 2.2.1</Author>
<AutoRefresh>0</AutoRefresh>
<DataSources>
<DataSource Name="DB_C2P">
@@ -535,7 +535,8 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Lookup("C2P_prt1_ReportTitle",Fields!Lemma.Value,Fields!Traduzione.Value, "dsVocabolario")</Value>
<Value>=Switch(Globals!ReportName="ReportOffers_Q",Lookup("C2P_prt1_ReportTitle",Fields!Lemma.Value,Fields!Traduzione.Value, "dsVocabolario"),
Globals!ReportName="ReportOffers_S", Lookup("C2P_prt1_ReportTitle_S",Fields!Lemma.Value,Fields!Traduzione.Value, "dsVocabolario"),True,"Missing Title")</Value>
<Style>
<FontFamily>=Variables!FontEtichette.Value</FontFamily>
<FontSize>16pt</FontSize>
@@ -6656,7 +6657,7 @@
<TablixMember />
<TablixMember>
<Visibility>
<Hidden>true</Hidden>
<Hidden>=iif(LEFT(Globals!ReportName,14)="ReportOffers_S",False,True)</Hidden>
</Visibility>
</TablixMember>
</TablixMembers>
C2P_Report/Reports/ReportOffers_.rdl → C2P_Report/Reports/srv218/ReportOffers_Q.rdlc
+2006 -893
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/ReportOffers_S.rdl → C2P_Report/Reports/srv218/ReportOffers_S.rdl
+1378 -39
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/ReportOffers_.rdlc → C2P_Report/Reports/srv218/ReportOffers_S.rdlc
+2006 -893
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/srv218/StdCostList.rdl
+1318
View File
File diff suppressed because it is too large Load Diff
C2P_Report/Reports/srv218/StdCostList.rdlc
+1348
View File
File diff suppressed because it is too large Load Diff
C2P_Report/bin/C2P_Report.dll
BIN
View File
Binary file not shown.
C2P_Report/setupTgt.bat
+40
View File
@@ -0,0 +1,40 @@
@echo off
echo Effettua setup dei file specifici per i gli ambienti target pre build installer: verifica da nome configurazione %1
if %1 == "Release" goto Release
if %1 == "Debug" goto Debug
if %1 == "WinLab" goto WinLab
if %1 == "218" goto 218
:Release
echo Release: non devo copiare nulla, per sicurezza copio 218...
goto 218
goto END
:Debug
echo Debug: non devo copiare nulla, per sicurezza copio 218...
goto 218
goto END
:Installer
echo Installer: non devo copiare nulla
goto END
:WinLab
echo WinLab: copio files WinLab
del %2"Reports\*.rdl"
del %2"Reports\*.rdlc"
copy %2"Reports\WinLab\*.rdlc" %2"Reports\"
goto END
:218
echo 218: copio files Tekal
del %2"Reports\*.rdl"
del %2"Reports\*.rdlc"
copy %2"Reports\srv218\*.rdlc" %2"Reports\"
goto END
:END
echo Fatto!
VersGen/C2P.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.9.127.282")]
[assembly: AssemblyFileVersion("1.9.127.282")]
[assembly: AssemblyVersion("1.9.128.283")]
[assembly: AssemblyFileVersion("1.9.128.283")]
[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("1.9.127.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.127.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.9.128.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.9.128.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+