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

Fix homepage

Browse Source 
- cards colors
- spazi
- link allarmi
- titoli vari
- operazioni lettura/rilettura
- click sel all
This commit is contained in:
Samuele Locatelli
2022-10-28 18:01:56 +02:00
parent 0bd15709aa
commit 10ec2a8853
27 changed files with 57 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.2715</Version>
<Version>1.2.2210.2817</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.2715</h4>
<h4>Version: 1.2.2210.2817</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.2715
1.2.2210.2817
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.2715</version>
<version>1.2.2210.2817</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.2715</Version>
<Version>1.2.2210.2817</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.2715</h4>
<h4>Version: 1.2.2210.2817</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.2715
1.2.2210.2817
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.2715</version>
<version>1.2.2210.2817</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.2715</Version>
<Version>1.2.2210.2817</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.2715</h4>
<h4>Version: 1.2.2210.2817</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.2715
1.2.2210.2817
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.2715</version>
<version>1.2.2210.2817</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/Components/AlAnFilter.razor
+3 -9
View File
@@ -1,11 +1,5 @@
<div class="d-flex justify-content-between">
<div class="d-flex justify-content-between pt-2 mb-1">
@*<span class="py-1">Mode:</span>*@
@*<div class="form-switch mx-3 py-1 d-flex justify-content-between">
<input class="form-check-input py-1" type="checkbox" role="switch" id="toggleRec" title="Show Alarms log or Alarm rec" @onclick="() => toggleRec()">
<b><label for="toggleRec">&nbsp;@currMode</label></b>
</div>*@
<div class="input-group input-group-sm">
<div class="input-group-text">
<span class="me-1 @DUCSSmode">DURATION</span>
@@ -17,9 +11,9 @@
</div>
</div>
<div class="d-flex justify-content-between pt-0">
<button class="btn btn-outline-primary btn-sm mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @dtStart</button>
<button class="btn btn-outline-primary btn-sm mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @dtEnd</button>
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight"><i class="fa-solid fa-bars"></i></a>
<button class="btn btn-sm btn-outline-secondary disabled py-0 mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @dtStart</button>
<button class="btn btn-sm btn-outline-secondary disabled py-0 mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @dtEnd</button>
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight" title="Toggle Filter"><i class="fa-solid fa-bars"></i></a>
<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasRight" aria-labelledby="offcanvasRightLabel">
<div class="offcanvas-header">
<h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTERS</b></h3>
MP.MONO.UI/Components/MachStatsOverview.razor
+6 -6
View File
@@ -4,7 +4,7 @@
@inject CurrentDataService MMDataService
@if (ListRecords != null && ListRecords.Count>0)
@if (ListRecords != null && ListRecords.Count > 0)
{
<ul class="list-group">
@foreach (var item in ListRecords)
@@ -23,11 +23,11 @@
}
else
{
<ul>
<li>OEE%</li>
<li>Stats Details</li>
<li>Graph & Analytics</li>
</ul>
@*<ul>
<li>OEE%</li>
<li>Stats Details</li>
<li>Graph & Analytics</li>
</ul>*@
<LoadingDataSmall></LoadingDataSmall>
}
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.2.2210.2815</Version>
<Version>1.2.2210.2817</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Pages/Alarms.razor
+1 -1
View File
@@ -28,7 +28,7 @@
<button class="btn btn-outline-primary btn-sm mx-2" id="liveToastBtn" @onclick="()=>resetMaxRecord()" title="Reset max record"><i class="fa-solid fa-list-ol"></i> &nbsp @MaxRecord</button>
<button class="btn btn-outline-primary btn-sm mx-2" @onclick="()=>resetDate()" title="Reset date"><i class="fa-solid fa-calendar"></i> &nbsp @dtRif</button>
}
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight"><i class="fa-solid fa-bars"></i></a>
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight" title="Toggle Filters"><i class="fa-solid fa-bars"></i></a>
<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasRight" aria-labelledby="offcanvasRightLabel">
<div class="offcanvas-header">
<h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTERS</b></h3>
MP.MONO.UI/Pages/Alarms.razor.cs
+3 -3
View File
@@ -153,13 +153,13 @@ namespace MP.MONO.UI.Pages
StateHasChanged();
}
protected bool wait { get; set; } = true;
protected bool isPageReady { get; set; } = false;
protected override async Task OnInitializedAsync()
{
wait = false;
await ReloadData(true);
StartTimer();
isPageReady = true;
}
protected async Task ReloadData(bool setChanged)
@@ -235,7 +235,7 @@ namespace MP.MONO.UI.Pages
protected async Task reloadFromMessage()
{
if (wait == true)
if (isPageReady == true)
{
try
{
MP.MONO.UI/Pages/AlarmsAnalysis.razor
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="card mb-5">
<div class=" col-12 card-header table-primary d-flex justify-content-between py-1">
<div class="col-4 pt-2">
<h5 class="pt-1"><i class="fa-solid fa-chart-bar"></i><b> ALARM ANALYSIS</b></h5>
<b class="fs-5 pt-1"><i class="fa-solid fa-chart-bar"></i><b> ALARM ANALYSIS</b></b>
</div>
<div class="col-8 pb-1">
<AlAnFilter FilterChanged="updateFilter"></AlAnFilter>
MP.MONO.UI/Pages/Index.razor
+17 -76
View File
@@ -7,51 +7,21 @@
<div class="d-flex justify-content-between">
<h1 class="col-9">MAPO-MONO</h1>
<div class="col-3 d-flex flex-row-reverse">
<div class="px-0 mx-1 py-1 text-center rounded d-flex justify-content-between" style="
position: absolute;
z-index: 1;
">
<div>
<button class="btn btn-primary mx-1 my-1" @onclick="@showAalarms">ALARMS PREVIEW</button>
</div>
@if (!compMode)
{
<div class="card">
<NavLink href="Alarms" class="text-decoration-none">
<AlarmsOverview compMode="@compMode"></AlarmsOverview>
</NavLink>
</div>
}
else
{
<div>
<NavLink href="Alarms" class="text-decoration-none">
<AlarmsOverview compMode="@compMode"></AlarmsOverview>
</NavLink>
</div>
}
<div class="col-3">
<div class="px-0 mx-1 py-1 text-center rounded">
<NavLink href="Alarms" class="text-decoration-none" title="ALARMS Detail Page">
<AlarmsOverview compMode="true"></AlarmsOverview>
</NavLink>
</div>
</div>
</div>
</div>
<div class="card-body">
<div class="row">
@*<div class="col">
<NavLink href="Stats" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="bi bi-graph-up-arrow pe-2"></i> MACHINE STATS</h5>
<div class="card-body bg-light text-dark p-1">
</div>
</div>
</NavLink>
</div>*@
<div class="col-3">
<NavLink href="Production" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="fa-solid fa-gears"></i> PRODUCTION</h5>
<NavLink href="Production" class="text-decoration-none" title="PRODUCTION Detail Page">
<div class="card text-dark mb-3">
<h5 class="card-header text-center fw-bold"><i class="fa-solid fa-gears"></i> PRODUCTION</h5>
<div class="card-body bg-light text-dark p-1">
<MachStatsOverview></MachStatsOverview>
<ProdOverview></ProdOverview>
@@ -60,9 +30,9 @@
</NavLink>
</div>
<div class="col-3">
<NavLink href="Parameters" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="fa-solid fa-list-ul"></i> PARAMETERS</h5>
<NavLink href="Parameters" class="text-decoration-none" title="PARAMETERS Detail Page">
<div class="card text-dark mb-3">
<h5 class="card-header text-center fw-bold"><i class="fa-solid fa-list-ul"></i> PARAMETERS</h5>
<div class="card-body bg-light text-dark p-1">
<ParamOverview ShowReduced="true"></ParamOverview>
</div>
@@ -70,9 +40,9 @@
</NavLink>
</div>
<div class="col-3">
<NavLink href="Maintenance" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="fa-solid fa-screwdriver-wrench"></i> MAINTENANCE</h5>
<NavLink href="Maintenance" class="text-decoration-none" title="MAINTENANCE Detail Page">
<div class="card text-dark mb-3">
<h5 class="card-header text-center fw-bold"><i class="fa-solid fa-screwdriver-wrench"></i> MAINTENANCE</h5>
<div class="card-body bg-light text-dark p-1">
<MaintTaskPending compMode="true"></MaintTaskPending>
</div>
@@ -80,44 +50,15 @@
</NavLink>
</div>
<div class="col-3">
<NavLink href="Tools" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="fa-solid fa-toolbox"></i> TOOLS</h5>
<NavLink href="Tools" class="text-decoration-none" title="TOOLS Detail Page">
<div class="card text-dark mb-3">
<h5 class="card-header text-center fw-bold"><i class="fa-solid fa-toolbox"></i> TOOLS</h5>
<div class="card-body bg-light text-dark p-1">
<ToolsOverview ShowReduced="true"></ToolsOverview>
</div>
</div>
</NavLink>
</div>
@*<div class="col">
<NavLink href="Events" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="fa-solid fa-clock-rotate-left"></i> EVENT HISTORY</h5>
<div class="card-body bg-light text-dark p-1">
<EventsOverview></EventsOverview>
</div>
</div>
</NavLink>
</div>*@
@*<div class="col">
<NavLink href="Activity" class="text-decoration-none">
<div class="card text-white mb-3">
<h5 class="card-header text-center bg-primary"><i class="fa-solid fa-wave-square"></i> ACTIVITY LOG</h5>
<div class="card-body bg-light text-dark p-1">
<ActivityOverview></ActivityOverview>
</div>
</div>
</NavLink>
</div>*@
</div>
</div>
</div>
@code {
private bool compMode { get; set; } = false;
private void showAalarms()
{
compMode = !compMode;
}
}
MP.MONO.UI/Pages/Parameters.razor
+1 -1
View File
@@ -39,7 +39,7 @@
<button class="btn btn-outline-primary btn-sm mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @DateFrom</button>
<button class="btn btn-outline-primary btn-sm mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @DateTo</button>
}
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight"><i class="fa-solid fa-bars"></i></a>
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight"><i class="fa-solid fa-bars" title="Toggle Filters"></i></a>
<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasRight" aria-labelledby="offcanvasRightLabel">
<div class="offcanvas-header">
<h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTERS</b></h3>
MP.MONO.UI/Pages/Parameters.razor.cs
+3 -2
View File
@@ -111,9 +111,10 @@ namespace MP.MONO.UI.Pages
selParams = new List<string>();
}
protected void selAll()
protected async Task selAll()
{
selParams = new List<string>();
await Task.Delay(50);
selectAll = true;
if (ListRecords != null)
{
@@ -122,6 +123,7 @@ namespace MP.MONO.UI.Pages
if (selParams.Count < maxDisplay)
{
selParams.Add(item.Title);
await Task.Delay(1);
}
}
}
@@ -132,7 +134,6 @@ namespace MP.MONO.UI.Pages
#region Private Fields
private int maxRecord = 120;
private bool showParam = false;
#endregion Private Fields
MP.MONO.UI/Pages/Tools.razor
+1 -8
View File
@@ -23,13 +23,6 @@
<div class="col-6 d-flex justify-content-between">
<div class="px-0">
<div class="input-group input-group-sm">
@*<div class="input-group-text">
<span class="me-1 @LVCSSmode">LOG VIEW</span>
<div class="form-check form-check-sm form-switch py-1" title="Parameter View Mode (RealTime / LogData)">
<input class="form-check-input" type="checkbox" id="mySwitch" name="setupAlarms" value="@isRT" checked @onclick="() => toggleRT()">
</div>
<span class="@RTCSSmode">REAL TIME</span>
</div>*@
<ToggleModes FilterChanged="updateFilter"></ToggleModes>
</div>
</div>
@@ -49,7 +42,7 @@
<button class="btn btn-outline-primary btn-sm mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @DateFrom</button>
<button class="btn btn-outline-primary btn-sm mx-2"><i class="fa-solid fa-calendar"></i> &nbsp @DateTo</button>
}
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight"><i class="fa-solid fa-bars"></i></a>
<a class="py-1 text-dark" data-bs-toggle="offcanvas" data-bs-target="#offcanvasRight" aria-controls="offcanvasRight" title="Toggle Filters"><i class="fa-solid fa-bars"></i></a>
<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasRight" aria-labelledby="offcanvasRightLabel">
<div class="offcanvas-header">
<h3 class="offcanvas-title" id="paramsFilterExampleLabel"><b>FILTERS</b></h3>
MP.MONO.UI/Pages/Tools.razor.cs
+3 -1
View File
@@ -140,9 +140,10 @@ namespace MP.MONO.UI.Pages
{
selTools = new List<string>();
}
protected void selAll()
protected async Task selAll()
{
selTools = new List<string>();
await Task.Delay(50);
selectAll = true;
if (ListRecords != null)
{
@@ -151,6 +152,7 @@ namespace MP.MONO.UI.Pages
if (selTools.Count < maxDisplay)
{
selTools.Add(item.Title);
await Task.Delay(1);
}
}
}
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.2.2210.2815</h4>
<h4>Version: 1.2.2210.2817</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.2.2210.2815
1.2.2210.2817
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.2.2210.2815</version>
<version>1.2.2210.2817</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/Shared/NavMenu.razor
+2 -2
View File
@@ -2,11 +2,11 @@
<div class="container-fluid">
@if (!showText)
{
<a class="navbar-brand p-0" @onclick="() => ToggleCompress()">M <i class="fas fa-caret-square-right"></i></a>
<a class="navbar-brand p-0" @onclick="() => ToggleCompress()" title="Expand menu">M <i class="fas fa-caret-square-right"></i></a>
}
else
{
<a class="navbar-brand" @onclick="() => ToggleCompress()">MP.MONO.UI <i class="fas fa-caret-square-left"></i></a>
<a class="navbar-brand" @onclick="() => ToggleCompress()" title="Collapse menu">MP.MONO.UI <i class="fas fa-caret-square-left"></i></a>
}
</div>
</div>