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

cleanup commenti

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-31 12:40:13 +01:00
parent 0d8caab7d8
commit 95c2e6d4f5
13 changed files with 7 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/ControlsMan.razor
-2
View File
@@ -33,8 +33,6 @@ else
<div class="row">
<div class="col-12">
<div class="">
@* </div>
<div class="form-floating"> *@
<label class="form-label text-light">Note controllo NON superato (opzionali)</label>
<textarea class="form-control" @bind="@noteKo" style="height: 6rem;"></textarea>
</div>
MP-TAB-SERV/Components/IobInfoMan.razor
+1 -36
View File
@@ -1,39 +1,4 @@
@*<div class="card">
<div class="card-header text-center">
<div>
<i class="fa-solid fa-microchip" style="font-size: 5rem;"></i>
</div>
<div>
<span>IOB Details</span>
</div>
</div>
<div class="card-body">
<ul class="list-group">
<li class="list-group-item d-flex justify-content-between">
<div>Machine Code: </div>
<div class="fw-bold">@idxMacch</div>
</li>
<li class="list-group-item d-flex justify-content-between">
<div>IOB Type: </div>
<div class="fw-bold"><i class="fa-brands fa-windows"></i> &nbsp; @infosIob.iType</div>
</li>
<li class="list-group-item d-flex justify-content-between">
<div>IOB Name: </div>
<div class="fw-bold">@infosIob.name</div>
</li>
<li class="list-group-item d-flex justify-content-between">
<div>IOB Address: </div>
<div class="fw-bold">@infosIob.IP</div>
</li>
<li class="list-group-item d-flex justify-content-between">
<div>CNC Absolute counter: </div>
<div class="fw-bold">@infosIob.CNC_Counter</div>
</li>
</ul>
</div>
</div>*@
<div class="d-flex justify-content-between flex-wrap mt-2">
<div class="d-flex justify-content-between flex-wrap mt-2">
<div class="col-6 flex-fill ">
<div class="p-2 h-100">
<div class="cardObj p-2 h-100">
MP-TAB-SERV/Components/LongStopList.razor
-2
View File
@@ -12,10 +12,8 @@
<div class="text-light p-2" @onclick="SelectFermo">
<div>
@($"{currFnq.InizioStato:yyyy/MM/dd HH:mm:ss}")
@*09.10.2023 00:30*@
</div>
<div>
@*7h 30m*@
@(MP.Data.Utils.FormDurata(currFnq.DurataMinuti))
</div>
<div class="text-end" style="font-size: 1.5rem;">
MP-TAB-SERV/Components/MachineBlock.razor
+1 -61
View File
@@ -34,7 +34,6 @@ else
if (Width > 640)
{
<div class="card shadow" @onclick="ShowDetail" style="border-radius: 15px; border: 0 solid transparent;">
@*<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">*@
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
<div class="bg-black">
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
@@ -130,66 +129,7 @@ else
}
else
{
@*<div class="d-flex justify-content-between">
<div class="card mapBlock shadow @RecMSE.Semaforo p-0 m-0 col-10">
<div class="m-1 bg-black">
<div class="card bg-black text-light p-0 rCBot">
<div class="row justify-content-center mx-0">
<div class="col-12 px-1">
<h4 class="text-start mb-0 fw-bold">
@RecMSE.Nome
</h4>
</div>
<div class="col-12 p-1 @RecMSE.Semaforo">
<div class="d-flex justify-content-between">
<div class="p-0 mr-auto">
<b>@RecMSE.DescrizioneStato</b>
</div>
<div class="p-0">
@(formatDurata(RecMSE.Durata))
</div>
</div>
</div>
<div class="col-12 p-0 text-nowrap" style="font-size: 1.2em; line-height: 1.0em;">
<div class="row px-1 fw-bold" style="font-size:0.85em;">
<div class="col pe-0">
<small class="text-success">Confermati</small>
</div>
<div class="col text-center px-0">
<small class="text-warning">Prodotti</small>
</div>
<div class="col text-end ps-0">
<small class="text-light">Ordinati</small>
</div>
</div>
<div class="row px-1">
<div class="col pe-0 text-success">
@($"{RecMSE.PezziConf:N0}")
</div>
<div class="col text-center text-warning px-0">
@($"{RecMSE.PezziProd:N0}")
</div>
<div class="col text-end ps-0">
@($"{RecMSE.NumPezzi:N0}")
</div>
</div>
<div class="row">
<div class="col m-1">
<ProdAdvDispl CountData="@CurrCount"></ProdAdvDispl>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-2 d-flex flex-wrap align-items-center justify-content-center p-1">
<button class="w-100 h-100 btn btn-secondary">
<i class="fa-solid fa-file-pdf" style="font-size: 4vw"></i>
</button>
</div>
</div>*@
<div class="cardBlock px-3 py-1">
<div class="text-center d-flex justify-content-between ">
<div class="col-4">
MP-TAB-SERV/Components/NotesMan.razor
-57
View File
@@ -51,61 +51,4 @@
</div>
</div>
@*
<div class="col-5 col-sm-4 col-lg-3 pl-1">
<div class="form-floating">
<input type="number" class="form-control" @bind="@NumComm" id="commentsNum" style="background-color: #212427; color: #FFF;">
<label for="commentsNum"># Commenti</label>
</div>
@if (RecordListComments == null)
{
<EgwCoreLib.Razor.LoadingData></EgwCoreLib.Razor.LoadingData>
}
else if (RecordListComments.Count == 0)
{
<div class="alert alert-warning">Nessun record trovato</div>
}
else
{
foreach (var item in RecordListComments)
{
<div class="my-1 w-100">
<div class="card text-white w-100" style="font-size: 1.5rem">
<div class="card-header py-0 px-2 mb-0 rCTop fs-3" style="background-color: rgba(33,36,39, .8)">
<b>@item.Operatore</b>
</div>
<div class="card-body bg-dark p-1">
<div class="bg-dark p-1">
@item.Value
</div>
<div class="d-flex justify-content-between">
<div class="col-6 p-2">
<button class="btn btn-sm btn-info w-100" @onclick="() => EditRec(item)"><i class="fa fa-edit"></i></button>
</div>
<div class="col-6 p-2">
<button class="btn btn-sm btn-danger w-100" @onclick="() => DeteleRec(item)"><i class="fa fa-trash"></i></button>
</div>
</div>
</div>
<div class="card-footer bg-dark d-flex justify-content-between" style="font-size: .8rem">
<div class="text-start p-0">
@($"{item.InizioStato:yyyy/MM/dd HH:mm:ss}")
</div>
<div class="text-end p-0">
@item.CodArticolo
@($"ODL{item.IdxODL:000000000}")
</div>
</div>
</div>
</div>
}
}
</div>
</div>
*@
MP-TAB-SERV/Components/ProdConfirm.razor
-137
View File
@@ -8,7 +8,6 @@
<div class="col-8 d-flex justify-content-end">
<div class="px-1 col-4">
<PrintMag RecMSE="RecMSE"></PrintMag>
@*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
</div>
@if (odlOk)
{
@@ -22,28 +21,9 @@
{
<div class="alert alert-warning fs-3">MANCA ODL: conferma NON permessa</div>
}
@*<div class="px-1">
<button class="btn btn-sm btn-secondary py-2 px-4">PDF</button>
</div>*@
</div>
</div>
@*@if (odlOk)
{
<div class="row">
<div class="col-12">
<button class="btn btn-lg text-light w-100 bg-success" style="font-size: 1rem;" @onclick="ToggleConfProd">
<i class="fa fa-check"></i> @ConfTitle
</button>
</div>
</div>
}
else
{
<div class="alert alert-warning fs-3">MANCA ODL: conferma NON permessa</div>
}*@
@if (showInnov)
{
@@ -71,10 +51,6 @@ else
<div class="col-3 p-1">
<div><span class="text-success">Pz Buoni</span>&nbsp;<span>@lblPz2RecBuoni</span></div>
<div><span class="text-danger">Pz scarto</span>&nbsp;<span>@lblPz2RecScarto</span></div>
@*<form class="form-floating">
<input type="text" class="form-control" id="floatingInputBuoni" value="@($"{lblPz2RecScarto} {lblPz2RecBuoni}")" disabled />
<label for="floatingInputBuoni" class="text-dark fw-bold">Totale</label>
</form>*@
</div>
<div class="col-3 p-1">
@if (showConfirm)
@@ -86,55 +62,6 @@ else
</div>
@*<div class="row textCondens text-end bg-dark m-1 p-1" runat="server" id="divInnovazioni" onloadeddata="showConfirmButton()">
<div class="col-6 py-1 text-start text-uppercase">
<b>Dati Incrementali</b>
</div>
<div class="col-6 text-end">
<sub>
ultima conferma --> @dtReqUpdate.ToString()
</sub>
</div>
<div class="col-6 col-sm-3 px-0 align-self-end fw-bold">
<label>Pz Prodotti CONFERMATI</label>
<input class="form-control fs-2 text-end alert alert-warning py-0 mb-0" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
</div>
<div class="col-6 col-sm-3 px-0 align-self-end fw-bold">
<div class="d-flex justify-content-around">
<div>
<span class="text-danger">Pz Scarto</span>
+
<span class="text-success">Pz Buoni</span>
</div>
</div>
<div class="px-2 fs-4">
<div class="d-flex justify-content-around">
<div>
<span runat="server" class="text-danger py-0">@lblPz2RecScarto</span>
+
<span runat="server" class="text-success py-0">@lblPz2RecBuoni</span>
</div>
</div>
</div>
</div>
<div class="col-6 col-sm-3 pr-1 align-self-end fw-bold">
@if (enablePzProdLasciati)
{
<label ID="lblNumLasciati" class="mb-0">Pz Prodotti LASCIATI</label>
<input class="form-control fs-2 text-end alert alert-warning py-0 mb-0" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
}
else
{
<label class="btn btn-dark text-light btn-lg w-100" Visible="false">&nbsp;</label>
}
</div>
<div class="col-6 col-sm-3 px-0 align-self-end fw-bold">
@if (showConfirm)
{
<button class="btn btn-success text-light btn-lg w-100" @onclick="SalvaConfPz"><i class="fa-regular fa-floppy-disk"></i> CONFERMA</button>
}
</div>
</div>*@
}
<div class="row textCondens mt-2">
<div class="col-4 py-1 text-start text-uppercase">
@@ -143,23 +70,11 @@ else
<div class="col-8 d-flex justify-content-end pe-3">
<div>
<a class="btn btn-info btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="scrap"><i class="fa fa-bug"></i></a>
@*<button class="btn btn-sm btn-primary py-2 px-4">MAG</button>*@
</div>
<div class="ms-2">
<a class="btn btn-primary btn-sm w-100 py-2 px-4" style="min-width: 72px; min-height: 39px" href="controls"><i class="fa fa-wrench"></i></a>
</div>
</div>
@*<div class="col-6 text-end" id="divPeriodo">
<div class="row">
</div>
<sub>
Periodo ODL calcolato:
<span>@dtInizio</span>
-
<span>@dtFine</span>
</sub>
</div>*@
<div class="d-flex justify-content-between flex-wrap">
<div class="col-6 col-sm-3 p-1">
@@ -233,58 +148,6 @@ else
</div>
@*<div class="col-6 col-sm-3 pl-1 px-sm-1 py-0 text-end">
<div class="alert alert-info py-1">
<div class="text-truncate">
Pz Prodotti TOT [A+B+C]
</div>
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span>@numPzProdotti.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 pr-1 px-sm-1 py-0 text-end">
<div class="alert alert-danger py-1">
<div class="text-truncate">
[B] Scarti VERS.
</div>
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span>@numPzScaConf.ToString("N0")</span>
}
</div>
</div>
</div>
<div class="col-6 col-sm-3 pl-1 py-0 text-end">
<div class="alert alert-success py-1">
<div class="text-truncate">
[C] Pz Buoni VERS.
</div>
<div class="my-0 fw-bold fs-2">
@if (isProcessing)
{
<i class="fa-solid fa-spinner span"></i>
}
else
{
<span>@numPzBuoniConf.ToString("N0")</span>
}
</div>
</div>
</div>*@
</div>
@if (!string.IsNullOrEmpty(lblOut))
{
MP-TAB-SERV/Components/ProdStat.razor
+1 -130
View File
@@ -1,133 +1,4 @@
@*<div class="accordion my-2" id="accProd">
<div class="accordion-item">
<h2 class="accordion-header" id="headingOne">
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
<i class="fa fa-gear"></i><b>Statistiche produzione</b>
</button>
</h2>
<div id="collapseOne" class="accordion-collapse collapse" aria-labelledby="headingOne" data-bs-parent="#accProd">
<div class="accordion-body p-1">
@if (RecMSE != null)
{
<div class="bg-dark text-light text-center fw-bold">
<div colspan="4">
@($"ODL num: {RecMSE.IdxOdl}, iniziato {RecMSE.DataInizioOdl:ddd yyyy.MM.dd, HH:mm}")
</div>
</div>
<table class="table table-sm table-striped text-center">
<thead>
<tr class="stdFont" style="text-align: center; font-size: x-small">
<td>
Cod articolo
</td>
<td>
Nr pezzi lanciati
</td>
<td>
Nr pezzi confermati
</td>
<td>
Nr pezzi fatti
</td>
</tr>
</thead>
<tbody>
<tr class="rowStyle stdFont fw-bold">
<td>
@RecMSE.CodArticolo
</td>
<td>
@($"{RecMSE.NumPezzi:N0}") pz.
</td>
<td>
@RecMSE.PezziConf pz.
</td>
<td>
(@($"{RecMSE.PezziProd:N0}") pz.)
</td>
</tr>
<tr class="stdFont" style="text-align: center;">
<td>
Efficienza Globale
</td>
<td>
Efficienza Lavoro
</td>
<td>
Efficienza Teorica
</td>
<td></td>
</tr>
<tr class="stdFont">
<td>
<div>
@RecMSE.OEE_tot
</div>
(@RecMSE.OEE_RT_tot)
</td>
<td>
<div>
@RecMSE.OEE_wrk
</div>
(@RecMSE.OEE_RT_wrk)
</td>
<td>
<div>
@RecMSE.OEE_run
</div>
(@RecMSE.OEE_RT_run)
</td>
<td></td>
</tr>
<tr class="stdFont" style="text-align: center;">
<td>
Tc Medio
</td>
<td>
Tc Lavoro
</td>
<td>
Tc Tecnico
</td>
<td>
Tc impostato
</td>
</tr>
</tbody>
@*<tr class="stdFont">
<td>
<div class="fw-bold">
@($"{RecMSE.TCMedio:0.###}")
</div>
(@($"{RecMSE.TCMedioRt:0.###}"))
</td>
<td>
<div class="fw-bold">
@($"{RecMSE.TCLav:0.###}")
</div>
(@($"{RecMSE.TCLavRT:0.###}"))
</td>
<td>
<div class="fw-bold">
@($"{RecMSE.TCEff:0.###}")
</div>
(@($"{RecMSE.TCEffRT:0.###}"))
</td>
<td>
<div class="fw-bold">
@($"{RecMSE.TCAssegnato:0.###}")
</div>
</td>
</tr>
</table>
}
</div>
</div>
</div>
</div>
*@
@*@($"ODL num: {RecMSE.IdxOdl}, iniziato {RecMSE.DataInizioOdl:ddd yyyy.MM.dd, HH:mm}")*@
<div class="d-flex justify-content-between">
<div class="col-6 py-1 text-start text-uppercase">
<b>Statistiche di prodizione</b>
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2310.3111</Version>
<Version>6.16.2310.3112</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/TCHistory.razor
-6
View File
@@ -10,9 +10,6 @@
<tr>
<th>Articolo</th>
<th>Informazioni</th>
@* <th>TCiclo</th> *@
@* <th>Note</th> *@
@* <th class="text-end">Impianto</th> *@
<th>Periodo</th>
</tr>
</thead>
@@ -30,7 +27,6 @@
<div class="placeholder col-6"></div>
<small class="placeholder col-6"></small>
</td>
@* <td><span class="placeholder col-12"></span></td> *@
<td><span class="placeholder col-12"></span></td>
<td class="text-end">
<div class="placeholder col-10"></div>
@@ -81,8 +77,6 @@
<small><b>Fine:</b> @item.DataFine</small>
</div>
</td>
@* <td class="text-end">
</td> *@
</tr>
}
}
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.3111</h4>
<h4>Versione: 6.16.2310.3112</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.3111
6.16.2310.3112
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2310.3111</version>
<version>6.16.2310.3112</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP-TAB-SERV/Shared/NavMenu.razor
-63
View File
@@ -2,34 +2,6 @@
@inject ListSelectDataSrv MDataService
@* <div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">MP-TAB-SERV</a>
<button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
<span class="navbar-toggler-icon"></span>
</button>
</div>
</div>
<div class="@NavMenuCssClass" @onclick="ToggleNavMenu">
<nav class="flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="" Match="NavLinkMatch.All">
<span class="oi oi-home" aria-hidden="true"></span> Home
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="counter">
<span class="oi oi-plus" aria-hidden="true"></span> Counter
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="fetchdata">
<span class="oi oi-list-rich" aria-hidden="true"></span> Fetch data
</NavLink>
</div>
</nav>
</div> *@
<div class="nav-scrollable">
<div class="bg-dark text-center py-2">
@@ -48,28 +20,6 @@
</div>
}
}
@*
<br />
<div class="nav-item px-2">
<NavLink class="nav-link px-2" href="" Match="NavLinkMatch.All">
<span class="bi bi-house-door-fill" aria-hidden="true"></span> Home
</NavLink>
</div>
<div class="nav-item px-2">
<NavLink class="nav-link px-2" href="counter">
<span class="bi bi-plus-square-fill" aria-hidden="true"></span> Counter
</NavLink>
</div>
<div class="nav-item px-2">
<NavLink class="nav-link px-2" href="weather">
<span class="bi bi-list-nested" aria-hidden="true"></span> Weather
</NavLink>
</div>
<div class="nav-item px-2">
<NavLink class="nav-link px-2" href="CardDemo">
<span class="bi bi-plus-square-fill" aria-hidden="true"></span> CardDemo
</NavLink>
</div> *@
</nav>
</div>
@@ -78,17 +28,4 @@
[Parameter]
public List<LinkMenu> MenuItems { get; set; } = new List<LinkMenu>();
#if false
private bool collapseNavMenu = true;
private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
private void ToggleNavMenu()
{
collapseNavMenu = !collapseNavMenu;
}
#endif
}