diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index fc1a5cf1..c4be4952 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2604.2314 + 1.1.2604.2316 diff --git a/Lux.Report.Data/Services/PdfReportService.cs b/Lux.Report.Data/Services/PdfReportService.cs index 22d264f4..bb930f71 100644 --- a/Lux.Report.Data/Services/PdfReportService.cs +++ b/Lux.Report.Data/Services/PdfReportService.cs @@ -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); diff --git a/Lux.Report.Manager/Lux.Report.Manager.csproj b/Lux.Report.Manager/Lux.Report.Manager.csproj index a8f90ddc..66c07339 100644 --- a/Lux.Report.Manager/Lux.Report.Manager.csproj +++ b/Lux.Report.Manager/Lux.Report.Manager.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 1.1.2604.2214 + 1.1.2604.2316 diff --git a/Lux.Report.Server/Lux.Report.Server.csproj b/Lux.Report.Server/Lux.Report.Server.csproj index e342ffd8..6b7f7744 100644 --- a/Lux.Report.Server/Lux.Report.Server.csproj +++ b/Lux.Report.Server/Lux.Report.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + 1.1.2604.2316 @@ -27,4 +28,8 @@ + + + + diff --git a/Lux.Report.Server/post-build.ps1 b/Lux.Report.Server/post-build.ps1 new file mode 100644 index 00000000..d3e807d8 --- /dev/null +++ b/Lux.Report.Server/post-build.ps1 @@ -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 = "(.|\n)*?"; +$currRelNum=$MajMin + $currentDate +"." + $currentTime +$replace = "" + $MajMin + $currentDate +"." + $currentTime + ""; +$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 diff --git a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs index 83968399..fb11e74e 100644 --- a/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs +++ b/Lux.UI/Components/Compo/Warehouse/BuyOrderDetail.razor.cs @@ -82,7 +82,7 @@ namespace Lux.UI.Components.Compo.Warehouse /// 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) diff --git a/Lux.UI/Lux.UI.csproj b/Lux.UI/Lux.UI.csproj index df7304f9..acc28935 100644 --- a/Lux.UI/Lux.UI.csproj +++ b/Lux.UI/Lux.UI.csproj @@ -5,7 +5,7 @@ enable enable aspnet-Lux.UI-a758c101-a2f4-4e38-977d-1c4887dbbd50 - 1.1.2604.2314 + 1.1.2604.2316 diff --git a/Lux.UI/appsettings.Production.json b/Lux.UI/appsettings.Production.json index 4dd38f84..fc72d3fc 100644 --- a/Lux.UI/appsettings.Production.json +++ b/Lux.UI/appsettings.Production.json @@ -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" } } diff --git a/Lux.UI/appsettings.Staging.json b/Lux.UI/appsettings.Staging.json index c5a00ea1..96d84bc4 100644 --- a/Lux.UI/appsettings.Staging.json +++ b/Lux.UI/appsettings.Staging.json @@ -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" } } diff --git a/Lux.UI/appsettings.json b/Lux.UI/appsettings.json index a19ae993..db1c5eab 100644 --- a/Lux.UI/appsettings.json +++ b/Lux.UI/appsettings.json @@ -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", diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index af47dc53..bfb23687 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ LUX - Web Windows MES -

Versione: 1.1.2604.2314

+

Versione: 1.1.2604.2316


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 80d0183b..eb5e07f7 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2604.2314 +1.1.2604.2316 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 4caec98e..fa1b24ec 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2604.2314 + 1.1.2604.2316 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false