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

Ancora refine grafici e dato ordini

Browse Source
This commit is contained in:
Samuele Locatelli
2021-06-03 12:31:05 +02:00
parent 18a92c5732
commit ea581ee190
7 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GWMS.Data/Controllers/GWMSController.cs
+24 -6
View File
@@ -99,16 +99,33 @@ namespace GWMS.Data.Controllers
// FIXME TODO !!!! è casuale
Random rnd = new Random();
int soglia01 = rnd.Next(6000, 7500);
int soglia02 = rnd.Next(1000, 3000);
var simLevel = rnd.Next(1, (int)currPlant.LevelMax);
List<TSData> SimLevelTS = new List<TSData>();
List<TSData> SimOrderTS = new List<TSData>();
DateTime adesso = DateTime.Now;
int lastLevel = simLevel;
for (int i = 100; i > 0; i--)
int lastOrder = 0;
int anticipo = 0;
for (int i = 200; i > 0; i--)
{
lastLevel = lastLevel - rnd.Next(0, 100);
// se < 500 --> rialzo
lastLevel = lastLevel < 1000 ? 9000 : lastLevel;
SimLevelTS.Add(new TSData() { DtEvent = adesso.AddMinutes(-i * 3), ValDouble = lastLevel });
anticipo = i * 30;
lastLevel = lastLevel - rnd.Next(0, 200);
// se inferiore a soglia 1 --> ordine
if (lastLevel + lastOrder < soglia01)
{
lastOrder = rnd.Next(10000 - soglia01, 10000 - soglia02);
SimOrderTS.Add(new TSData() { DtEvent = adesso.AddMinutes(-anticipo), ValDouble = lastOrder });
}
// se inferiore a soglia 2 --> refill
if (lastLevel < soglia02)
{
lastLevel += lastOrder;
lastOrder = 0;
}
SimLevelTS.Add(new TSData() { DtEvent = adesso.AddMinutes(-anticipo), ValDouble = lastLevel });
//SimLevelTS.Add(new TSData() { DtEvent = adesso.AddMinutes(-i), ValDouble = simLevel + i * 20 + rnd.Next(0, 5) });
}
@@ -119,7 +136,8 @@ namespace GWMS.Data.Controllers
PlantDesc = currPlant.PlantDesc,
LevelAct = simLevel,
LevelMax = currPlant.LevelMax,
LevelTS = SimLevelTS
LevelTS = SimLevelTS,
OrderTS = SimOrderTS
};
return answ;
}
GWMS.Data/DTO/PlantDTO.cs
+2
View File
@@ -35,6 +35,8 @@ namespace GWMS.Data.DTO
public List<TSData> LevelTS { get; set; } = new List<TSData>();
public List<TSData> OrderTS { get; set; } = new List<TSData>();
public double TempMax { get; set; } = 40;
public double TempAct { get; set; } = 0;
GWMS.UI/Components/PlantDetail.razor
+6 -5
View File
@@ -19,7 +19,7 @@
<div class="row">
<div class=" col-9">
<div class="row">
<div class=" col-2">
<div class="col-2 text-center">
<b>Livello</b>
</div>
<div class="col-5">
@@ -28,7 +28,7 @@
<div class="col-5 text-right">
@currItem.LevelMax
</div>
<div class=" col-2">
<div class="col-2 text-center">
@currItem.LevelRatio %
</div>
<div class="col-10">
@@ -36,15 +36,16 @@
<ProgressBar Value="@currItem.LevelRatio" Striped="false" Animated="false" />
</Progress>
</div>
<div class="col-2 text-left">
# ordini
<div class="col-2 text-center align-middle">
ordini:
<div class="h2"><b>@currItem.OrderTS.Count</b></div>
</div>
<div class="col-10">
<LineChart @ref="LevelVal" TItem="double" OptionsObject="lineChartOptions" />
</div>
</div>
</div>
<div class=" col-3">
<div class="col-3">
<img src="./img/LogoBlu.svg" class="img-fluid" />
<i>Immagine impianto</i>
</div>
GWMS.UI/Components/PlantDetail.razor.cs
+7 -19
View File
@@ -79,6 +79,7 @@ namespace GWMS.UI.Components
{
var dataReload = Task.Run(async () =>
{
// aggiunta delay o non riesce a disegnare
Thread.Sleep(50);
await HandleRedraw();
});
@@ -96,9 +97,10 @@ namespace GWMS.UI.Components
{
//Label = "Livello",
Data = _currItem.LevelTS.Select(x => x.ValDouble).ToList(),
BorderColor = backgroundColors(1, 1f),
BorderColor = getLineColors(1f),
Fill = true,
PointRadius = 2,
PointRadius = 3,
BorderWidth = 2,
LineTension = 0,
BorderDash = new List<int> { }
};
@@ -107,7 +109,7 @@ namespace GWMS.UI.Components
private List<string> GetLineChartLabels()
{
var answ = _currItem.LevelTS.Select(x => x.DtEvent.ToString("ddd dd.MM HH:mm")).ToList();
var answ = _currItem.LevelTS.Select(x => x.DtEvent.ToString("dd.MM HH:mm")).ToList();
return answ;
}
@@ -120,24 +122,10 @@ namespace GWMS.UI.Components
/// </summary>
/// <param name="numRecords"></param>
/// <returns></returns>
protected List<string> backgroundColors(int numRecords, float alpha)
protected List<string> getLineColors(float alpha)
{
List<string> answ = new List<string>();
// verde...
for (int i = 0; i < numRecords / 3; i++)
{
answ.Add(ChartColor.FromRgba(54, 235, 82, alpha));
}
// arancione
for (int i = 0; i < numRecords / 3; i++)
{
answ.Add(ChartColor.FromRgba(255, 206, 86, alpha));
}
while (answ.Count < numRecords)
{
answ.Add(ChartColor.FromRgba(255, 99, 132, alpha));
}
answ.Add(ChartColor.FromRgba(54, 82, 254, alpha));
return answ;
}
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 1.0.2106.0311</h4>
<h4>Versione: 1.0.2106.0312</h4>
<br />
Note di rilascio:
<ul>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2106.0311
1.0.2106.0312
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2106.0311</version>
<version>1.0.2106.0312</version>
<url>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/GWMS.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>