Merge tag 'CsvOutputSTATS' into develop
Fix output csv x STATS + fix grafico diff x PROG
This commit is contained in:
@@ -3,9 +3,9 @@
|
||||
@using DiffMatchPatch
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6 table-success">
|
||||
<div class="col-6 table-primary">
|
||||
<div class="row">
|
||||
<div class="col-4 text-success">
|
||||
<div class="col-4 text-primary">
|
||||
<h4>Archivio</h4>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
@@ -15,9 +15,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 table-danger">
|
||||
<div class="col-6 table-warning">
|
||||
<div class="row">
|
||||
<div class="col-4 text-danger">
|
||||
<div class="col-4 text-warning">
|
||||
<h4>Attuale</h4>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
@@ -29,13 +29,13 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row" style=" height: @(pHeight)em; overflow-y: scroll;">
|
||||
<div class="col-6 table-success">
|
||||
<div class="border border-success p-2 bg-light">
|
||||
<div class="col-6 table-primary">
|
||||
<div class="border border-primary p-2 bg-light">
|
||||
<p style="max-width: 70em;">@((MarkupString)oldResult)</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 table-danger">
|
||||
<div class="border border-danger p-2 bg-light">
|
||||
<div class="col-6 table-warning">
|
||||
<div class="border border-warning p-2 bg-light">
|
||||
<p style="max-width: 70em;">@((MarkupString)newResult)</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="card-header bg-secondary text-light">
|
||||
<div class="row">
|
||||
<div class="col-4">
|
||||
<h5>Dettaglio modifiche</h5>
|
||||
<h3>Dettaglio modifiche</h3>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
@if (_currItem.Active)
|
||||
@@ -11,10 +11,10 @@
|
||||
{
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<button type="button" class="btn btn-success btn-block" value="Cancel" @onclick="RejectChange">Mantieni Archivio <i class="fas fa-file-download"></i></button>
|
||||
<button type="button" class="btn btn-primary btn-lg btn-block" value="Cancel" @onclick="RejectChange">Mantieni Archivio <i class="fas fa-arrow-right"></i></button>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<button type="button" class="btn btn-danger btn-block" value="Cancel" @onclick="ApproveChange">Accetta Attuale <i class="fas fa-file-upload"></i></button>
|
||||
<button type="button" class="btn btn-warning btn-lg btn-block" value="Cancel" @onclick="ApproveChange"><i class="fas fa-arrow-left"></i> Accetta Modifiche</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@@ -23,7 +23,7 @@
|
||||
{
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<button type="button" class="btn btn-success btn-block" value="" @onclick="ExportArchive">Sostituisci da Archivio <i class="fas fa-file-download"></i></button>
|
||||
<button type="button" class="btn btn-success btn-lg btn-block" value="" @onclick="ExportArchive">Sostituisci da Archivio <i class="fas fa-file-download"></i></button>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
</div>
|
||||
@@ -33,7 +33,7 @@
|
||||
<div class="col-2">
|
||||
</div>
|
||||
<div class="col-2 text-right">
|
||||
<button type="button" class="btn btn-primary btn-block" value="Cancel" @onclick="cancelUpdate" title="Chiudi">Chiudi <i class="fas fa-window-close"></i></button>
|
||||
<button type="button" class="btn btn-light btn-lg btn-block" value="Cancel" @onclick="cancelUpdate" title="Chiudi">Chiudi <i class="fas fa-window-close"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<RootNamespace>MP.Prog</RootNamespace>
|
||||
<Version>6.14.2109.2815</Version>
|
||||
<Version>6.14.2109.3016</Version>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<body>
|
||||
<i>Modulo gestione Programmi MAPO</i>
|
||||
<h4>Versione: 6.14.2109.2815</h4>
|
||||
<h4>Versione: 6.14.2109.3016</h4>
|
||||
<br />
|
||||
Note di rilascio:
|
||||
<ul>
|
||||
|
||||
@@ -1 +1 @@
|
||||
6.14.2109.2815
|
||||
6.14.2109.3016
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<item>
|
||||
<version>6.14.2109.2815</version>
|
||||
<version>6.14.2109.3016</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>
|
||||
|
||||
Reference in New Issue
Block a user