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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-02 11:04:09 +01:00
parent a2a0ea66c9 49a38e1d92
commit db290137a1
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GWMS.Data/Controllers/GWMSController.cs
+10 -10
View File
@@ -870,11 +870,11 @@ namespace GWMS.Data.Controllers
else
{
double venduto = firstRecord.ValNumber - nextRecord.ValNumber;
// controllo se ho ordini chiusi
var ordRecords = rawDepOrderData.Where(x => x.DtExecStart.Date == currDay).FirstOrDefault();
if (ordRecords != null)
// controllo se ho ordini chiusi ieri
var ordQty = rawDepOrderData.Where(x => x.DtExecStart.Date == currDay).Sum(x => x.ExecutionQty);
if (ordQty > 0 )
{
venduto += ordRecords.ExecutionQty;
venduto += ordQty;
}
// salvo TS
@@ -897,12 +897,12 @@ namespace GWMS.Data.Controllers
else
{
double vendutoOggi = firstRecord1.ValNumber - lastRecord1.ValNumber;
// controllo se ho ordini chiusi
var ordRecords = rawDepOrderData.Where(x => x.DtExecStart.Date == today).FirstOrDefault();
if (ordRecords != null)
{
vendutoOggi += ordRecords.ExecutionQty;
}
// controllo se ho ordini chiusi oggi
var ordQty = rawDepOrderData.Where(x => x.DtExecStart.Date == today).Sum(x => x.ExecutionQty);
if (ordQty > 0 )
{
vendutoOggi += ordQty;
}
// salvo TS
SoldTS.Add(new TSData() { DtEvent = today, ValDouble = vendutoOggi });
GWMS.UI/GWMS.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.0.2202.0209</Version>
<Version>1.0.2202.0211</Version>
<UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GWMS - Gas Warehouse Management System</i>
<h4>Versione: 1.0.2202.0209</h4>
<h4>Versione: 1.0.2202.0211</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2202.0209
1.0.2202.0211
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2202.0209</version>
<version>1.0.2202.0211</version>
<url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>