Merge branch 'develop' of https://gitlab.steamware.net/steamware/gpw_next into develop
This commit is contained in:
Samuele Locatelli
@@ -16,121 +16,128 @@ else
|
||||
{
|
||||
@if (timbratureOggi.TimbrExpl != null)
|
||||
{
|
||||
<div>
|
||||
<div type="button" class="d-flex justify-content-between text-center bg-transparent text-light border-0">
|
||||
<div class="pe-1 text-decoration-none">
|
||||
Entrata
|
||||
@if (timbratureOggi.TimbrExpl.Entrata1 != null)
|
||||
{
|
||||
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata1)">
|
||||
@if (showGauge)
|
||||
{
|
||||
<div>
|
||||
<div type="button" class="d-flex justify-content-between text-center bg-transparent text-light border-0">
|
||||
<div class="pe-1 text-decoration-none">
|
||||
Entrata
|
||||
@if (timbratureOggi.TimbrExpl.Entrata1 != null)
|
||||
{
|
||||
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata1)">
|
||||
|
||||
@($"{timbratureOggi.TimbrExpl.Entrata1:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-success">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
Uscita
|
||||
@if (timbratureOggi.TimbrExpl.Uscita1 != null)
|
||||
{
|
||||
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita1)">
|
||||
@($"{timbratureOggi.TimbrExpl.Entrata1:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-success">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
Uscita
|
||||
@if (timbratureOggi.TimbrExpl.Uscita1 != null)
|
||||
{
|
||||
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita1)">
|
||||
|
||||
@($"{timbratureOggi.TimbrExpl.Uscita1:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-primary">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
@($"{timbratureOggi.TimbrExpl.Uscita1:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-primary">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button class="d-flex justify-content-between text-center bg-transparent text-light border-0">
|
||||
<div class="pe-1">
|
||||
Entrata
|
||||
@if (timbratureOggi.TimbrExpl.Entrata2 != null)
|
||||
{
|
||||
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata2)">
|
||||
<div>
|
||||
<button class="d-flex justify-content-between text-center bg-transparent text-light border-0">
|
||||
<div class="pe-1">
|
||||
Entrata
|
||||
@if (timbratureOggi.TimbrExpl.Entrata2 != null)
|
||||
{
|
||||
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata2)">
|
||||
|
||||
@($"{timbratureOggi.TimbrExpl.Entrata2:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-success">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
Uscita
|
||||
@if (timbratureOggi.TimbrExpl.Uscita2 != null)
|
||||
{
|
||||
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita2)">
|
||||
@($"{timbratureOggi.TimbrExpl.Entrata2:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-success">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
Uscita
|
||||
@if (timbratureOggi.TimbrExpl.Uscita2 != null)
|
||||
{
|
||||
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita2)">
|
||||
|
||||
@($"{timbratureOggi.TimbrExpl.Uscita2:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-primary">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
@($"{timbratureOggi.TimbrExpl.Uscita2:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-primary">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
<div>
|
||||
<button class="d-flex justify-content-between text-center bg-transparent text-light border-0">
|
||||
<div class="pe-1">
|
||||
Entrata
|
||||
@if (timbratureOggi.TimbrExpl.Entrata3 != null)
|
||||
{
|
||||
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata3)">
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
<div>
|
||||
<button class="d-flex justify-content-between text-center bg-transparent text-light border-0">
|
||||
<div class="pe-1">
|
||||
Entrata
|
||||
@if (timbratureOggi.TimbrExpl.Entrata3 != null)
|
||||
{
|
||||
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata3)">
|
||||
|
||||
@($"{timbratureOggi.TimbrExpl.Entrata3:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-success">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
Uscita
|
||||
@if (timbratureOggi.TimbrExpl.Uscita3 != null)
|
||||
{
|
||||
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita3)">
|
||||
@($"{timbratureOggi.TimbrExpl.Entrata3:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-success">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div>
|
||||
Uscita
|
||||
@if (timbratureOggi.TimbrExpl.Uscita3 != null)
|
||||
{
|
||||
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita3)">
|
||||
|
||||
@($"{timbratureOggi.TimbrExpl.Uscita3:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-primary">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
@($"{timbratureOggi.TimbrExpl.Uscita3:HH:mm}")
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="text-primary">
|
||||
@emptyTime
|
||||
</div>
|
||||
}
|
||||
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="alert bg-warning w-100 text-center mt-1">
|
||||
<div class="alert bg-warning w-100 text-center mt-1" @onclick="()=>changeMode()">
|
||||
NESSUN DATO DISPONIBILE
|
||||
</div>
|
||||
|
||||
@@ -152,11 +159,15 @@ else
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
@*<div class="d-flex justify-content-between">
|
||||
<button class="btn btn-success">Entrata</button>
|
||||
<button class="btn btn-danger">Uscita</button>
|
||||
</div>*@
|
||||
{
|
||||
<div class="p-2 text-center text-light">
|
||||
<div>
|
||||
<h3>
|
||||
Gestione mancate timbrature
|
||||
</h3>
|
||||
</div>
|
||||
<TimbUser IdxDipCurr="IdxDipendente" ListTimbRich="listTimb"></TimbUser>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
<div class="row p-2 pt-3">
|
||||
|
||||
@@ -74,8 +74,8 @@ namespace GPW.CORE.Smart.Components
|
||||
|
||||
private void changeMode()
|
||||
{
|
||||
showGauge = false;
|
||||
MService.isRicTimb = true;
|
||||
|
||||
MService.ReportRicTimb();
|
||||
}
|
||||
|
||||
|
||||
@@ -2,16 +2,7 @@
|
||||
{
|
||||
<div class="cardContainerMancTimb">
|
||||
<div class="data">
|
||||
<span>@($"{oraRichiesta:dddd dd MMMM}")</span>
|
||||
<div class="d-flex justify-content-center pe-3">
|
||||
<div>
|
||||
@($"{dtCurr:HH}")
|
||||
</div>
|
||||
<div class="@cssSec">:</div>
|
||||
<div>
|
||||
@($"{dtCurr:mm}")
|
||||
</div>
|
||||
</div>
|
||||
<span>@($"{oraRichiesta:dddd dd MMMM}")</span>
|
||||
</div>
|
||||
<div class="oraRichiesta">
|
||||
<input @bind="oraRichiesta" type="time" step="300" />
|
||||
|
||||
@@ -15,6 +15,9 @@
|
||||
color: #fff;
|
||||
background-color: #F1C40F;
|
||||
}
|
||||
.titolo {
|
||||
font-size: 1rem;
|
||||
}
|
||||
.data {
|
||||
font-weight: bold;
|
||||
padding-top: 1.5rem;
|
||||
|
||||
@@ -17,6 +17,10 @@
|
||||
background-color: #F1C40F;
|
||||
}
|
||||
|
||||
.titolo {
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.data {
|
||||
font-weight: bold;
|
||||
padding-top: 1.5rem;
|
||||
@@ -24,7 +28,7 @@
|
||||
position: relative;
|
||||
font-size: 1.25rem;
|
||||
text-transform: uppercase;
|
||||
display: flex;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
.cardContainer{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;}.cardContainerMancTimb{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;background-color:#f1c40f;}.data{font-weight:bold;padding-top:1.5rem;padding-left:1.5rem;position:relative;font-size:1.25rem;text-transform:uppercase;display:flex;justify-content:space-between;}.ora{width:100%;font-weight:bold;position:relative;font-size:3.5rem;text-align:center;}.oraRichiesta{width:100%;font-weight:bold;position:relative;font-size:2rem;text-align:center;padding-top:1.5rem;}.oraRichiesta input{border-radius:.5rem;border:0;padding:.25rem;}.defaultCard{background-color:rgba(0,128,255,.8);}.cardEntrata{background-color:#9b59b6;}.cardUscita{background-color:#4caf50;}.pulse-warning{box-shadow:0 0 20px 5px rgba(0,128,255,.8);animation:pulse-warning 2.5s infinite;}@-webkit-keyframes pulse-warning{0%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}@keyframes pulse-warning{0%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,0);box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-moz-box-shadow:0 0 20px 5px rgba(255,170,0,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}.txtSec{font-weight:normal;font-size:2rem;}
|
||||
.cardContainer{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;}.cardContainerMancTimb{padding-bottom:1rem;min-height:8.5rem;border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;background-color:#f1c40f;}.titolo{font-size:1rem;}.data{font-weight:bold;padding-top:1.5rem;padding-left:1.5rem;position:relative;font-size:1.25rem;text-transform:uppercase;display:flex;justify-content:space-between;}.ora{width:100%;font-weight:bold;position:relative;font-size:3.5rem;text-align:center;}.oraRichiesta{width:100%;font-weight:bold;position:relative;font-size:2rem;text-align:center;padding-top:1.5rem;}.oraRichiesta input{border-radius:.5rem;border:0;padding:.25rem;}.defaultCard{background-color:rgba(0,128,255,.8);}.cardEntrata{background-color:#9b59b6;}.cardUscita{background-color:#4caf50;}.pulse-warning{box-shadow:0 0 20px 5px rgba(0,128,255,.8);animation:pulse-warning 2.5s infinite;}@-webkit-keyframes pulse-warning{0%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-webkit-box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}@keyframes pulse-warning{0%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}70%{-moz-box-shadow:0 0 20px 5px rgba(0,128,255,0);box-shadow:0 0 20px 5px rgba(0,128,255,0);}100%{-moz-box-shadow:0 0 20px 5px rgba(255,170,0,.8);box-shadow:0 0 20px 5px rgba(0,128,255,.8);color:#fff;}}.txtSec{font-weight:normal;font-size:2rem;}
|
||||
@@ -2,7 +2,7 @@
|
||||
@using GPW.CORE.Smart.Data
|
||||
|
||||
|
||||
<table class="table table-sm table-striped table-responsive-md">
|
||||
<table class="table table-sm table-responsive-md text-light">
|
||||
<thead>
|
||||
<tr>
|
||||
@if (EnableAdmin)
|
||||
@@ -55,8 +55,12 @@
|
||||
<div>
|
||||
<small><b>@item.DipNav.Cognome</b> @item.DipNav.Nome</small>
|
||||
</div>
|
||||
@item.DataOra.ToString("dd/MM - HH:mm")
|
||||
}
|
||||
else
|
||||
{
|
||||
@item.DataOra.ToString("HH:mm")
|
||||
}
|
||||
@item.DataOra.ToString("dd/MM - HH:mm")
|
||||
</td>
|
||||
<td title="Entrata">
|
||||
@if (@item.Entrata == true)
|
||||
|
||||
@@ -81,6 +81,8 @@ namespace GPW.CORE.Smart.Components
|
||||
await ReqUpdate.InvokeAsync(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected async void ScambioInOut(TimbratureModel currRecord)
|
||||
{
|
||||
isLoading = true;
|
||||
|
||||
Reference in New Issue
Block a user