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

Fix btn stampa report

Browse Source
This commit is contained in:
Annamaria Sassi
2026-04-23 16:12:43 +02:00
parent d9c59a05a5
commit 22a7aa4477
13 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Lux.API/Lux.API.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2604.2314</Version>
<Version>1.1.2604.2316</Version>
</PropertyGroup>
<ItemGroup>
Lux.Report.Data/Services/PdfReportService.cs
+6 -1
View File
@@ -42,7 +42,12 @@ namespace Lux.Report.Data.Services
Report.DataSource = ds;
Report.DataMember = "";
// deve diventare dinamico da paramsConfig + ParamsVal +...
Report.Parameters["pImgPath"].Value = imgFullUrl;
foreach (DevExpress.XtraReports.Parameters.Parameter param in Report.Parameters)
{
if (param.Name.Equals("pImgPath"))
Report.Parameters["pImgPath"].Value = imgFullUrl;
}
//Report.Parameters["pImgPath"].Value = imgFullUrl;
using var msOut = new MemoryStream();
Report.ExportToPdf(msOut);
Lux.Report.Manager/Lux.Report.Manager.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2604.2214</Version>
<Version>1.1.2604.2316</Version>
</PropertyGroup>
<ItemGroup>
Lux.Report.Server/Lux.Report.Server.csproj
+5
View File
@@ -4,6 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2604.2316</Version>
</PropertyGroup>
<ItemGroup>
@@ -27,4 +28,8 @@
<Folder Include="unsafe_upload\" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
</Target>
</Project>
Lux.Report.Server/post-build.ps1
+33
View File
@@ -0,0 +1,33 @@
param([string]$ProjectDir, [string]$ProjectPath);
$FileVers="..\Resources\VersNum.txt"
$FileManIn="..\Resources\manifest-original.xml"
$FileManOut="..\Resources\manifest.xml"
$FileCLogIn="..\Resources\ChangeLog-original.html"
$FileCLogOut="..\Resources\ChangeLog.html"
$MajMin="1.1."
$currentDate = get-date -format yyMM;
$currentTime = get-date -format ddHH;
$find = "<Version>(.|\n)*?</Version>";
$currRelNum=$MajMin + $currentDate +"." + $currentTime
$replace = "<Version>" + $MajMin + $currentDate +"." + $currentTime + "</Version>";
$csproj = Get-Content $ProjectPath
$csprojUpdated = $csproj -replace $find, $replace
Write-Output "Update csproj | $currRelNum"
Set-Content -Path $ProjectPath -Value $csprojUpdated
Set-Content -Path $FileVers -Value $currRelNum
# replace x manifest
$manData = Get-Content $FileManIn
$manData = $manData -replace "1.0.0.0", $currRelNum
$manData = $manData -replace "{{DIRNAME}}", "GPW"
$manData = $manData -replace "{{BRANCHNAME}}", "stable"
$manData = $manData -replace "{{PACKNAME}}", "GPW.UI"
Set-Content -Path $FileManOut -Value $manData
# replace x ChangeLog
$clogData = Get-Content $FileCLogIn
$clogData = $clogData -replace "{{CURRENT-REL}}", $currRelNum
Set-Content -Path $FileCLogOut -Value $clogData
Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs
+1 -1
View File
@@ -82,7 +82,7 @@ namespace Lux.UI.Components.Compo.Warehouse
/// <returns></returns>
private string DownloadUrl(int currId, string RepType = "BuyOrder", string SelFile = "BuyOrder_01")
{
return $"{apiUrl}/download?ReqId={currId}&RepType={RepType}&SelFile={SelFile}";
return $"{apiUrl}/download?ReqId={currId}&RepType={RepType}&SelFile={SelFile}.repx";
}
private void SaveNumRec(int newNum)
Lux.UI/Lux.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50</UserSecretsId>
<Version>1.1.2604.2314</Version>
<Version>1.1.2604.2316</Version>
</PropertyGroup>
<ItemGroup>
Lux.UI/appsettings.Production.json
+1 -1
View File
@@ -19,6 +19,6 @@
"ChannelPub": "EgwEngineInput",
"ChannelSub": "EgwEngineOutput",
"Prog.ApiUrl": "https://office.egalware.com/lux/srv/api",
"ReportUrl": "https://office.egalware.com/Lux/RepSrv/"
"ReportUrl": "https://office.egalware.com/Lux/RepSrv"
}
}
Lux.UI/appsettings.Staging.json
+1 -1
View File
@@ -19,6 +19,6 @@
"ChannelPub": "EgwEngineInput",
"ChannelSub": "EgwEngineOutput",
"Prog.ApiUrl": "https://iis01.egalware.com/lux/srv/api",
"ReportUrl": "https://iis01.egalware.com/Lux/RepSrv/"
"ReportUrl": "https://iis01.egalware.com/Lux/RepSrv"
}
}
Lux.UI/appsettings.json
+1 -1
View File
@@ -66,7 +66,7 @@
"GenericBaseUrl": "generic",
"Prog.ApiUrl": "https://localhost:7135/api",
//"Prog.ApiUrl": "https://office.egalware.com/lux/srv/api",
"ReportUrl": "https://iis01.egalware.com/Lux/RepSrv/",
"ReportUrl": "https://iis01.egalware.com/Lux/RepSrv",
"ImageBaseUrl": "Image",
"RouteBaseUrl": "window",
"ChannelBom": "luxdev:bom",
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>LUX - Web Windows MES</i>
<h4>Versione: 1.1.2604.2314</h4>
<h4>Versione: 1.1.2604.2316</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2604.2314
1.1.2604.2316
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2604.2314</version>
<version>1.1.2604.2316</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>