Egalware/gpw_next
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/gpw_next into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-01-13 19:21:04 +01:00
parent a0c831af95 796679f91b
commit e2778a51ec
5 changed files with 60 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.SMART/Components/Calendario.razor
+11 -9
View File
@@ -17,12 +17,12 @@ else
@if (timbratureOggi.TimbrExpl != null)
{
<div>
<div type="button" class="d-flex justify-content-between text-center bg-transparent text-light border-0" data-bs-toggle="modal" data-bs-target="#myModal">
<div @onclick="()=>changeMode()" 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="text-success">
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata1)">
@($"{timbratureOggi.TimbrExpl.Entrata1:HH:mm}")
</div>
@@ -38,7 +38,7 @@ else
Uscita
@if (timbratureOggi.TimbrExpl.Uscita1 != null)
{
<div class="text-primary">
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita1)">
@($"{timbratureOggi.TimbrExpl.Uscita1:HH:mm}")
</div>
@@ -59,7 +59,7 @@ else
Entrata
@if (timbratureOggi.TimbrExpl.Entrata2 != null)
{
<div class="text-success">
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata2)">
@($"{timbratureOggi.TimbrExpl.Entrata2:HH:mm}")
</div>
@@ -75,7 +75,7 @@ else
Uscita
@if (timbratureOggi.TimbrExpl.Uscita2 != null)
{
<div class="text-primary">
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita2)">
@($"{timbratureOggi.TimbrExpl.Uscita2:HH:mm}")
</div>
@@ -96,7 +96,7 @@ else
Entrata
@if (timbratureOggi.TimbrExpl.Entrata3 != null)
{
<div class="text-success">
<div class="@cssChooseEntr(timbratureOggi.TimbrExpl.Entrata3)">
@($"{timbratureOggi.TimbrExpl.Entrata3:HH:mm}")
</div>
@@ -112,7 +112,7 @@ else
Uscita
@if (timbratureOggi.TimbrExpl.Uscita3 != null)
{
<div class="text-primary">
<div class="@cssChooseEsc(timbratureOggi.TimbrExpl.Uscita3)">
@($"{timbratureOggi.TimbrExpl.Uscita3:HH:mm}")
</div>
@@ -153,7 +153,9 @@ else
}
else
{
<div class="timeContainer">
<input type="time" />
</div>
}
}
<div class="row p-2 pt-3">
@@ -184,7 +186,7 @@ else
<TimbHandler></TimbHandler>
</div>
</div>
</div>
</div>
</div>
GPW.CORE.SMART/Components/Calendario.razor.cs
+9 -1
View File
@@ -1,3 +1,4 @@
using GPW.CORE.Data.DbModels;
using GPW.CORE.Data.DTO;
using GPW.CORE.Smart.Data;
using Microsoft.AspNetCore.Components;
@@ -26,7 +27,8 @@ namespace GPW.CORE.Smart.Components
#region Protected Fields
protected string emptyTime = "--/--";
protected List<DailyDataDTO>? listRecords = null;
protected DailyDataDTO? timbratureOggi = null;
#endregion Protected Fields
@@ -105,6 +107,12 @@ namespace GPW.CORE.Smart.Components
//await reloadData();
}
private void changeMode()
{
showGauge = !showGauge;
}
private async Task resetCal()
{
showDetail = false;
GPW.CORE.SMART/Components/Calendario.razor.css
+18
View File
@@ -24,4 +24,22 @@
border-radius: 0.8rem;
color: #fff;
background-color: #1ABC9C;
}
.timeContainer {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
}
.timeContainer input {
border: none;
border-radius: 0.8rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 2rem;
background-color: #d9d9d9;
font-size: 3rem;
}
input[type="time"]::-webkit-calendar-picker-indicator {
color: #fff;
}
GPW.CORE.SMART/Components/Calendario.razor.less
+21
View File
@@ -23,3 +23,24 @@
background-color: #1ABC9C;
}
.timeContainer {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
}
.timeContainer input {
border: none;
border-radius: 0.8rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 2rem;
background-color: #d9d9d9;
font-size: 3rem;
}
input[type="time"]::-webkit-calendar-picker-indicator {
color: #fff;
}
GPW.CORE.SMART/Components/Calendario.razor.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.statsContainer{border:.3rem solid #e67e22;border-radius:.8rem;padding-bottom:10px;}.baseBtn{height:2.5rem;border:0;border-radius:.8rem;color:#fff;}.btnReset{height:2.5rem;border:0;border-radius:.8rem;color:#fff;background-color:#1ab7ea;}.btnTemp{height:2.5rem;border:0;border-radius:.8rem;color:#fff;background-color:#1abc9c;}
.statsContainer{border:.3rem solid #e67e22;border-radius:.8rem;padding-bottom:10px;}.baseBtn{height:2.5rem;border:0;border-radius:.8rem;color:#fff;}.btnReset{height:2.5rem;border:0;border-radius:.8rem;color:#fff;background-color:#1ab7ea;}.btnTemp{height:2.5rem;border:0;border-radius:.8rem;color:#fff;background-color:#1abc9c;}.timeContainer{width:100%;height:100%;display:flex;justify-content:center;}.timeContainer input{border:0;border-radius:.8rem;padding-left:.5rem;padding-right:.5rem;margin:2rem;background-color:#d9d9d9;font-size:3rem;}input[type="time"]::-webkit-calendar-picker-indicator{color:#fff;}