Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2022-09-16 11:17:33 +02:00
parent cd7a8ccad8 08079d3e0e
commit d2fef81f55
10 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Prog/MP.Prog.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MP.Prog</RootNamespace>
<Version>6.15.2202.2715</Version>
<Version>6.15.2209.1609</Version>
</PropertyGroup>
<ItemGroup>
MP.Prog/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo gestione Programmi MAPO</i>
<h4>Versione: 6.15.2202.2715</h4>
<h4>Versione: 6.15.2209.1609</h4>
<br />
Note di rilascio:
<ul>
MP.Prog/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.15.2202.2715
6.15.2209.1609
MP.Prog/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.15.2202.2715</version>
<version>6.15.2209.1609</version>
<url>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.SPEC/Components/ParamsFilter.razor
+16 -14
View File
@@ -1,6 +1,6 @@
<div class="d-flex justify-content-between">
<div class="px-0">
<div class="px-0 py-1">
@if (!liveUpdate)
{
<button class="btn btn-secondary" type="button" @onclick="() => toggleUpdate()">
@@ -15,15 +15,17 @@
</button>
}
</div>
<div class="px-0">
<div class="d-flex justify-content-end">
@if (showEditPar)
{
<div class="px-2">
<button class="btn btn-primary" @onclick="() => toggleParams()"> <i class="fa-solid fa-arrow-right"></i></button>
</div>
<div class="px-2">
<select @bind="@selTempoAgg" class="form-select">
<div class="px-2 input-group mb-3 py-1" id="basic-addon1">
<div class="px-2 " id="basic-addon1" >
<button class="btn btn-primary" @onclick="() => toggleParams()"> <i class="fa-solid fa-arrow-right"></i></button>
</div>
<label class="input-group-text" for="tempoAgg">Tempo di aggiornamento</label>
<select @bind="@selTempoAgg" class="form-select" id="tempoAgg">
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
@@ -44,9 +46,8 @@
<option value="19">19</option>
<option value="20">20</option>
</select>
</div>
<div class="px-2">
<select @bind="@selMaxRecord" class="form-select">
<label class="input-group-text" for="maxRecord">Max record da vedere</label>
<select @bind="@selMaxRecord" class="form-select" id="maxRecord">
<option value="50">50</option>
<option value="100">100</option>
<option value="150">150</option>
@@ -62,12 +63,12 @@
}
else
{
<div class="px-2">
<div class="px-2 py-1 input-group-text" id="basic-addon1">
<button class="btn btn-primary" @onclick="() => toggleParams()"><i class="fa-solid fa-arrow-left"></i></button>
</div>
}
<div class="px-2">
<select @bind="@selMacchina" class="form-select">
<div class="px-2 py-1">
<select @bind="@selMacchina" class="form-select ">
<option value="*">--- Tutti ---</option>
@if (ListMacchine != null)
{
@@ -78,7 +79,7 @@
}
</select>
</div>
<div class="px-2">
<div class="px-2 py-1">
<select @bind="@selFlux" class="form-select">
<option value="*">--- Tutti ---</option>
@if (ListFlux != null)
@@ -93,3 +94,4 @@
</div>
</div>
</div>
MP.SPEC/Pages/PARAMS.razor
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="card">
<div class="card-header table-primary">
<div class="d-flex">
<div class="px-0">
<div class="px-0 py-1">
<h3><b>PARAMETERS</b></h3>
</div>
<div class="px-2 flex-fill">
MP.Stats/MP.Stats.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>MP.Stats</RootNamespace>
<UserSecretsId>826e877c-ba70-4253-84cb-d0b1cafd4440</UserSecretsId>
<Version>6.15.2209.0917</Version>
<Version>6.15.2209.1609</Version>
</PropertyGroup>
<ItemGroup>
MP.Stats/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo statistiche MAPO</i>
<h4>Versione: 6.15.2209.0917</h4>
<h4>Versione: 6.15.2209.1609</h4>
<br />
Note di rilascio:
<ul>
MP.Stats/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.15.2209.0917
6.15.2209.1609
MP.Stats/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.15.2209.0917</version>
<version>6.15.2209.1609</version>
<url>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>