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

fix report ordine

Browse Source
This commit is contained in:
zaccaria.majid
2023-05-25 08:04:08 +02:00
parent 191ca5f2a2
commit 57d3f9433d
6 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>WebDoorCreator - Egalware</i>
<h4>Version: 0.9.2305.2417</h4>
<h4>Version: 0.9.2305.2508</h4>
<br /> Release note:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
0.9.2305.2417
0.9.2305.2508
Resources/manifest.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>0.9.2305.2417</version>
<url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.API.zip</url>
<version>0.9.2305.2508</version>
<url>http://nexus.steamware.net/repository/SWS/WDC/stable/WDC.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/WDC/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>
WebDoorCreator.UI/Components/DoorMan/DoorList.razor
+2 -2
View File
@@ -2,7 +2,7 @@
{
@if (orderStatus == 10)
{
@if(isRecalc)
@if (isRecalc)
{
<div class="modalOrd">
<div class="modalOrd-content text-center">
@@ -22,7 +22,7 @@
<HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@(()=> recalcSVGs(""))" ObjId="-2" ItemName="Recalc all the SVGs" ItemCount="0" ShowPlus="true" ImagePath="images/icons/arrows-rotate-solid.svg"></HwSvgObj>
</div>
<div class=" py-1">
<HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" ObjId="-3" ItemName="Get the order estimate" ItemCount="0" ShowPlus="true" ImagePath="images/icons/file-pdf-regular.svg"></HwSvgObj>
<HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" EC_ExeFunct="@(()=> reportUrl(currOrderId))" ObjId="-3" ItemName="Get the order estimate" ItemCount="0" ShowPlus="true" ImagePath="images/icons/file-pdf-regular.svg"></HwSvgObj>
</div>
<div class=" py-1">
<HwSvgObj LineColor="#CFD8DC" LineWidth="8" ObjH="200" ObjW="700" ObjId="-4" ItemName="Calculate total cost" ItemCount="0" ShowPlus="true" ImagePath="images/icons/calculator-solid.svg"></HwSvgObj>
WebDoorCreator.UI/Components/DoorMan/DoorList.razor.cs
+17
View File
@@ -263,6 +263,12 @@ namespace WebDoorCreator.UI.Components.DoorMan
protected async Task ReloadData()
{
var confData = await WDService.ConfigGetKey("prt_ReportServerUrl");
if (confData != null)
{
reportBaseUrl = confData.valore;
}
if (!AddDoorDict.ContainsKey("ADD NEW DOOR"))
{
AddDoorDict.Add("ADD NEW DOOR", "");
@@ -379,5 +385,16 @@ namespace WebDoorCreator.UI.Components.DoorMan
}
#endregion Private Properties
public string reportBaseUrl { get; set; } = "http://w2019-sql-steam/reportserver?/Test/WebDoor/";
protected async Task reportUrl(int orderId)
{
var url = $"{reportBaseUrl}ReportOrder&OrderID={orderId}&rs:Command=Render&rs:format=PDF";
await JSRuntime.InvokeAsync<object>("open", url, "_blank");
//NavManager.NavigateTo(url, true);
}
}
}
WebDoorCreator.UI/WebDoorCreator.UI.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>0.9.2305.2417</Version>
<Version>0.9.2305.2508</Version>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>aspnet-WebDoorCreator.UI-dfe95fed-1398-4144-bd43-8b3a765d6608</UserSecretsId>
</PropertyGroup>