Merge branch 'master' into develop
This commit is contained in:
Samuele Locatelli
@@ -5,7 +5,7 @@
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>MP.INVE</RootNamespace>
|
||||
<Version>6.16.2212.2213</Version>
|
||||
<Version>6.16.2212.2215</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -41,6 +41,9 @@
|
||||
<None Update="post-build.ps1">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="temp\.placeholder">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||
<Exec Command="powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 -ProjectDir $(ProjectDir) -ProjectPath $(ProjectPath)" />
|
||||
|
||||
+41
-33
@@ -22,7 +22,7 @@ else
|
||||
<div class="input-group">
|
||||
<label class="input-group-text" for="txtSearch"><i class="fa-solid fa-magnifying-glass"></i></label>
|
||||
<input type="text" class="form-control" id="txtSearch" @bind="@searchVal" title="Campo Ricerca" placeholder="Ricerca [ALT-R]" accesskey="R">
|
||||
<button @onclick="reset" class="btn btn-success input-group-text"><i class="fa-solid fa-rotate"></i></button>
|
||||
<button @onclick="reset" class="btn btn-secondary input-group-text"><i class="fa-solid fa-rotate"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -75,39 +75,47 @@ else
|
||||
}
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-center d-flex justify-content-between">
|
||||
<div>
|
||||
<button class="btn btn-sm btn-primary mx-1" title="Mostra i dati delle scansioni per questa sessione" @onclick="mostraDati">
|
||||
<i class="fa-regular fa-rectangle-list"></i>
|
||||
</button>
|
||||
@if (fileExist)
|
||||
{
|
||||
<a target="_blank" href="Download?fileName=@fileName" class="btn btn-block btn-sm btn-success"><span class="oi oi-cloud-download"></span> Save</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-info mx-1" title="Mostra i dati delle scansioni per questa sessione" @onclick="() => ExportCSV()">
|
||||
<i class="fa-regular fa-file-excel"></i>
|
||||
<td class="text-end">
|
||||
<div class="d-flex justify-content-end">
|
||||
<div class="btn-group px-2">
|
||||
<label class="input-group-text" title="Dettagli"><i class="fa-solid fa-magnifying-glass"></i></label>
|
||||
<button class="btn btn-sm btn-primary" title="Mostra i dati delle scansioni per questa sessione" @onclick="mostraDati">
|
||||
<i class="fa-regular fa-rectangle-list"></i>
|
||||
</button>
|
||||
}
|
||||
@if (sessione.DtEnd == null)
|
||||
{
|
||||
<button class="btn btn-sm btn-danger mx-1 " title="Chiudi la sessione corrente" @onclick="()=>chiudiSessione(sessione.InveSessID)"><i class="fa-solid fa-stop"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary mx-1" title="Chiudi la sessione corrente" @onclick="()=>chiudiSessione(sessione.InveSessID)" disabled><i class="fa-solid fa-stop"></i></button>
|
||||
}
|
||||
@if ((sessione.DtEnd != null) && (!sessione.Transferred))
|
||||
{
|
||||
<button class="btn btn-sm btn-success mx-1" title="Ripri la sessione corrente" @onclick="()=>apriSessione(sessione.InveSessID)"><i class="fa-regular fa-circle-play"></i></button>
|
||||
<button class="btn btn-sm btn-warning mx-1" title="Trasferisci la sessione corrente" @onclick="()=>trasfSessione(sessione.InveSessID)"><i class="fa-solid fa-file-import"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary mx-1" title="Ripri la sessione corrente" @onclick="()=>apriSessione(sessione.InveSessID)" disabled><i class="fa-regular fa-circle-play"></i></button>
|
||||
<button class="btn btn-sm btn-secondary mx-1" title="Trasferisci la sessione corrente" @onclick="()=>trasfSessione(sessione.InveSessID)" disabled><i class="fa-solid fa-file-import"></i></button>
|
||||
}
|
||||
@if (fileExist)
|
||||
{
|
||||
<a target="_blank" href="Download?fileName=@fileName" class="btn btn-sm btn-primary" title="Scarica file CSV">
|
||||
<span class="oi oi-cloud-download"></span>
|
||||
</a>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-info " title="Genera file CSV per Excel" @onclick="() => ExportCSV()">
|
||||
<i class="fa-regular fa-file-excel"></i>
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
<div class="btn-group px-1">
|
||||
<label class="input-group-text" title="Azioni"><i class="fa-solid fa-folder-tree"></i></label>
|
||||
@if (sessione.DtEnd == null)
|
||||
{
|
||||
<button class="btn btn-sm btn-danger" title="Chiudi la sessione corrente" @onclick="()=>chiudiSessione(sessione.InveSessID)"><i class="fa-solid fa-stop"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary" title="Chiudi la sessione corrente" @onclick="()=>chiudiSessione(sessione.InveSessID)" disabled><i class="fa-solid fa-stop"></i></button>
|
||||
}
|
||||
@if ((sessione.DtEnd != null) && (!sessione.Transferred))
|
||||
{
|
||||
<button class="btn btn-sm btn-success" title="Ripri la sessione corrente" @onclick="()=>apriSessione(sessione.InveSessID)"><i class="fa-regular fa-circle-play"></i></button>
|
||||
<button class="btn btn-sm btn-warning" title="Trasferisci la sessione corrente" @onclick="()=>trasfSessione(sessione.InveSessID)"><i class="fa-solid fa-file-import"></i></button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<button class="btn btn-sm btn-secondary" title="Ripri la sessione corrente" @onclick="()=>apriSessione(sessione.InveSessID)" disabled><i class="fa-regular fa-circle-play"></i></button>
|
||||
<button class="btn btn-sm btn-secondary" title="Trasferisci la sessione corrente" @onclick="()=>trasfSessione(sessione.InveSessID)" disabled><i class="fa-solid fa-file-import"></i></button>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>Modulo MAPOINVE </i>
|
||||
<h4>Versione: 6.16.2212.2213</h4>
|
||||
<h4>Versione: 6.16.2212.2215</h4>
|
||||
<br /> Note di rilascio:
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -1 +1 @@
|
||||
6.16.2212.2213
|
||||
6.16.2212.2215
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>6.16.2212.2213</version>
|
||||
<version>6.16.2212.2215</version>
|
||||
<url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
|
||||
<changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
|
||||
<mandatory>false</mandatory>
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
"maxAge": "2000",
|
||||
"cacheCheckArtUsato": 2,
|
||||
"redisLongTimeCache": 15,
|
||||
"MpIoBaseUrl": "http://localhost/MP/IO/"
|
||||
"MpIoBaseUrl": "http://localhost/MP/IO/",
|
||||
"BaseUrlJumper": "https://maposrv.egalware.com/mp/inve/Jumper?"
|
||||
}
|
||||
}
|
||||
@@ -19,8 +19,6 @@
|
||||
"cacheCheckArtUsato": "2",
|
||||
"redisLongTimeCache": "15",
|
||||
"MpIoBaseUrl": "http://localhost:20967/",
|
||||
"BaseUrl": "https://iis01.egalware.com/mp/inve/Acquisizione?",
|
||||
"BaseUrlJumper": "https://iis01.egalware.com/mp/inve/Jumper?",
|
||||
"BaseUrlJumperTest": "https://localhost:7213/Jumper?"
|
||||
"BaseUrlJumper": "https://iis01.egalware.com/mp/inve/Jumper?"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user