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

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-10-09 17:10:08 +02:00
parent ef0a96561c e456635e1b
commit bd26d0a4bd
3 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/LongStopList.razor
+22 -18
View File
@@ -1,25 +1,29 @@
<div class="col-4 my-1 p-2">
<div class="card" @onclick="SelectFermo">
<div class="card-body @fnqSemaforo">
<div class="text-start fw-bold" style="font-size: 1.8rem;">
@fnqName
@if (currFnq != null)
{
<div class="col-12 col-sm-6 col-lg-4 my-1 p-2">
<div class="card">
<div class="card-body @setSemaforo(currFnq.Semaforo)">
<div class="text-start fw-bold" style="font-size: 1.8rem;">
@currFnq.Macchina
</div>
<div class="text-end" style="font-size: 1.5rem;">
@currFnq.CodArticolo
</div>
</div>
<div class="text-end" style="font-size: 1.5rem;">
@fnqArticle
</div>
</div>
<div class="card-footer d-flex justify-content-between bg-dark text-light">
<div>
@($"{fnqDateTime:yyyy/MM/dd HH:mm:ss}")
@*09.10.2023 00:30*@
</div>
<div>
@*7h 30m*@
@(fnqDurMin)
<div class="card-footer d-flex justify-content-between bg-dark text-light">
<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>
</div>
</div>
</div>
}
MP-TAB-SERV/Components/LongStopList.razor.cs
+23 -20
View File
@@ -6,26 +6,10 @@ namespace MP_TAB_SERV.Components
{
public partial class LongStopList
{
#region Public Properties
[Parameter]
public string fnqArticle { get; set; } = "";
public FermiNonQualModel currFnq { get; set; } = new FermiNonQualModel();
//public string fnqSemaforo { get; set; } = "";
[Parameter]
public DateTime fnqDateTime { get; set; } = DateTime.Now;
[Parameter]
public double fnqDurMin { get; set; } = 0;
[Parameter]
public string fnqName { get; set; } = "";
[Parameter]
public string fnqSemaforo { get; set; } = "";
#endregion Public Properties
#region Protected Properties
[Inject]
protected MessageService MsgServ { get; set; } = null!;
@@ -45,10 +29,29 @@ namespace MP_TAB_SERV.Components
{
await Task.Delay(1);
// salva la data-ora evento richiesto...
await MsgServ.CommentoDtRifSet(fnqDateTime);
await MsgServ.CommentoDtRifSet(currFnq.InizioStato);
NavMan.NavigateTo("prod-stop");
}
[Inject]
protected NavigationManager NavMan { get; set; } = null!;
#endregion Protected Methods
private string setSemaforo(string sem)
{
string answ = "";
if (sem == "sBl")
{
answ = "bg-primary text-warning";
}
else if (sem == "sGr")
{
answ = "bg-secondary text-dark";
}
else if (sem == "sGi")
{
answ = "bg-warning text-dark";
}
return answ;
}
}
}
MP-TAB-SERV/Components/NotesMan.razor
+15 -16
View File
@@ -1,13 +1,12 @@
<NotesEditor CanSave="true" Title="Nuovo Commento" RecMSE="@RecMSE" E_Updated="DoUpdate"></NotesEditor>
<div class="row">
<div class="col-9">
<div class="row mt-1">
<div class="col-7 col-sm-8 col-lg-9 pr-1">
<div class="row">
<div class="col-6">
<div class="input-group my-1">
<span class="input-group-text" id="basic-addon1">Ultimi gg</span>
<select class="form-select" @bind="@NumGiorni">
<div class="form-floating">
<select class="form-select" @bind="@NumGiorni" id="floatingLabelGG" style="background-color: #4d5052; color: #FFF;">
@for (int i = 1; i < 11; i++)
{
<option label="@i" value="@i"></option>
@@ -20,12 +19,13 @@
<option label="180" value="180"></option>
<option label="360" value="360"></option>
</select>
<label for="floatingLabelGG">Ultimi gg</label>
</div>
</div>
<div class="col-6">
<div class="input-group my-1">
<span class="input-group-text" id="basic-addon1">Durata min</span>
<select class="form-select" @bind="@DurataMin">
<div class="form-floating">
<select class="form-select" @bind="@DurataMin" id="floatingLabelDurMin" style="background-color: #4d5052; color: #FFF;">
@for (int i = 1; i < 7; i++)
{
<option label="@(5*i)'" value="@(5*i)"></option>
@@ -37,6 +37,7 @@
<option label="1gg" value="1440"></option>
<option label="2gg" value="2880"></option>
</select>
<label for="floatingLabelDurMin">Durata min</label>
</div>
</div>
</div>
@@ -44,15 +45,16 @@
<div class="d-flex justify-content-between flex-wrap">
@foreach (var item in RecordListFnq)
{
<LongStopList fnqName="@item.Stato" fnqArticle="@item.CodArticolo" fnqDateTime="@item.InizioStato" fnqDurMin="@item.DurataMinuti" fnqSemaforo="@setSemaforo(item.Semaforo)"></LongStopList>
<LongStopList currFnq="@item"></LongStopList>
}
</div>
</div>
<div class="col-3">
<div class="input-group my-1">
<span class="input-group-text" id="basic-addon1"># commenti</span>
<input type="number" class="form-control" @bind="@NumComm">
<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;">
<span for="commentsNum"># Commenti</span>
</div>
@@ -96,9 +98,6 @@
@($"ODL{item.IdxODL:000000000}")
</div>
</div>
@*<div class="card-text p-1 d-flex align-items-end rCBot" style="font-size: 0.8em; border-top: 1px solid #ACACAC; color: #ACACAC">
</div>*@
</div>
</div>
}