diff --git a/GPW.CORE.SMART/Components/Calendario.razor b/GPW.CORE.SMART/Components/Calendario.razor index e6c87c3..6dddc99 100644 --- a/GPW.CORE.SMART/Components/Calendario.razor +++ b/GPW.CORE.SMART/Components/Calendario.razor @@ -16,121 +16,128 @@ else { @if (timbratureOggi.TimbrExpl != null) { -
-
-
- Entrata - @if (timbratureOggi.TimbrExpl.Entrata1 != null) - { -
+ @if (showGauge) + { +
+
+
+ Entrata + @if (timbratureOggi.TimbrExpl.Entrata1 != null) + { +
- @($"{timbratureOggi.TimbrExpl.Entrata1:HH:mm}") -
- } - else - { -
- @emptyTime -
- } -
-
- Uscita - @if (timbratureOggi.TimbrExpl.Uscita1 != null) - { -
+ @($"{timbratureOggi.TimbrExpl.Entrata1:HH:mm}") +
+ } + else + { +
+ @emptyTime +
+ } +
+
+ Uscita + @if (timbratureOggi.TimbrExpl.Uscita1 != null) + { +
- @($"{timbratureOggi.TimbrExpl.Uscita1:HH:mm}") -
- } - else - { -
- @emptyTime -
- } + @($"{timbratureOggi.TimbrExpl.Uscita1:HH:mm}") +
+ } + else + { +
+ @emptyTime +
+ } +
-
-
-
- -
-
- +
+
+
- -
+ + + + } + else + { + + } } else { -
+
NESSUN DATO DISPONIBILE
@@ -152,11 +159,15 @@ else
} else - { - @*
- - -
*@ + { +
+
+

+ Gestione mancate timbrature +

+
+ +
} }
diff --git a/GPW.CORE.SMART/Components/Calendario.razor.cs b/GPW.CORE.SMART/Components/Calendario.razor.cs index 99c2d8f..fabcc52 100644 --- a/GPW.CORE.SMART/Components/Calendario.razor.cs +++ b/GPW.CORE.SMART/Components/Calendario.razor.cs @@ -74,8 +74,8 @@ namespace GPW.CORE.Smart.Components private void changeMode() { + showGauge = false; MService.isRicTimb = true; - MService.ReportRicTimb(); } diff --git a/GPW.CORE.SMART/Components/DtCard.razor b/GPW.CORE.SMART/Components/DtCard.razor index 796e759..42bd200 100644 --- a/GPW.CORE.SMART/Components/DtCard.razor +++ b/GPW.CORE.SMART/Components/DtCard.razor @@ -2,16 +2,7 @@ {
- @($"{oraRichiesta:dddd dd MMMM}") -
-
- @($"{dtCurr:HH}") -
-
:
-
- @($"{dtCurr:mm}") -
-
+ @($"{oraRichiesta:dddd dd MMMM}")
diff --git a/GPW.CORE.SMART/Components/DtCard.razor.css b/GPW.CORE.SMART/Components/DtCard.razor.css index c5e625c..cd676f5 100644 --- a/GPW.CORE.SMART/Components/DtCard.razor.css +++ b/GPW.CORE.SMART/Components/DtCard.razor.css @@ -15,6 +15,9 @@ color: #fff; background-color: #F1C40F; } +.titolo { + font-size: 1rem; +} .data { font-weight: bold; padding-top: 1.5rem; diff --git a/GPW.CORE.SMART/Components/DtCard.razor.less b/GPW.CORE.SMART/Components/DtCard.razor.less index fef80cb..22f5670 100644 --- a/GPW.CORE.SMART/Components/DtCard.razor.less +++ b/GPW.CORE.SMART/Components/DtCard.razor.less @@ -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; } diff --git a/GPW.CORE.SMART/Components/DtCard.razor.min.css b/GPW.CORE.SMART/Components/DtCard.razor.min.css index 75c5994..985f604 100644 --- a/GPW.CORE.SMART/Components/DtCard.razor.min.css +++ b/GPW.CORE.SMART/Components/DtCard.razor.min.css @@ -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;} \ No newline at end of file +.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;} \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/TimbList.razor b/GPW.CORE.SMART/Components/TimbList.razor index 8249604..6b0e0dd 100644 --- a/GPW.CORE.SMART/Components/TimbList.razor +++ b/GPW.CORE.SMART/Components/TimbList.razor @@ -2,7 +2,7 @@ @using GPW.CORE.Smart.Data - +
@if (EnableAdmin) @@ -55,8 +55,12 @@
@item.DipNav.Cognome @item.DipNav.Nome
+ @item.DataOra.ToString("dd/MM - HH:mm") + } + else + { + @item.DataOra.ToString("HH:mm") } - @item.DataOra.ToString("dd/MM - HH:mm")
@if (@item.Entrata == true) diff --git a/GPW.CORE.SMART/Components/TimbList.razor.cs b/GPW.CORE.SMART/Components/TimbList.razor.cs index c6a2411..c2a5338 100644 --- a/GPW.CORE.SMART/Components/TimbList.razor.cs +++ b/GPW.CORE.SMART/Components/TimbList.razor.cs @@ -81,6 +81,8 @@ namespace GPW.CORE.Smart.Components await ReqUpdate.InvokeAsync(true); } + + protected async void ScambioInOut(TimbratureModel currRecord) { isLoading = true;