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-17 17:23:35 +01:00
parent 742bda00c1 b8073b5a73
commit 7cb2ad724c
16 changed files with 213 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.SMART/Components/Calendario.razor
+1 -1
View File
@@ -173,7 +173,7 @@ else
<div class="p-2 text-center text-light">
<div>
<h3>
<CompProj></CompProj>
<CompProj ListProgetti="listaP"></CompProj>
</h3>
</div>
</div>
GPW.CORE.SMART/Components/Calendario.razor.cs
+21
View File
@@ -49,6 +49,8 @@ namespace GPW.CORE.Smart.Components
private Dictionary<DateTime, string> DateCheck = new Dictionary<DateTime, string>();
private List<TimbratureModel>? listTimb = null;
private List<List<RegAttivitaModel>?> listRA = null!;
private List<RegAttivitaModel>? listaP = new List<RegAttivitaModel>();
private TimbratureModel? Timb = null;
#endregion Private Fields
@@ -196,9 +198,28 @@ namespace GPW.CORE.Smart.Components
{
isApprovedEntr = true;
isApprovedEsc = true;
listaP.Clear();
if (ListRecords != null)
{
datiGiorno = ListRecords.Where(x => x.DtRif == dtCurr).FirstOrDefault();
listRA = ListRecords.Select(x => x.ListRA).ToList();
foreach (var item in listRA)
{
if (item != null)
{
foreach (var k in item)
{
if (k != null)
{
if (k.Inizio.Date == dtCurr.Date)
{
listaP.Add(k);
}
}
}
}
}
listTimb = await CSDataService.TimbratureDay(dtCurr, IdxDipendente);
if (listTimb != null)
{
GPW.CORE.SMART/Components/CompProj.razor
+1 -1
View File
@@ -12,4 +12,4 @@ else if (ListProgetti.Count == 0)
else
{
}*@
<ProjectsList EnableAdmin="false" EnableEdit="true" ReqUpdate="DoUpdate" TextCss="text-light"></ProjectsList>
<ProjectsList ListRA="ListProgetti" EnableAdmin="false" EnableEdit="true" ReqUpdate="DoUpdate" TextCss="text-light"></ProjectsList>
GPW.CORE.SMART/Components/CompProj.razor.cs
+1 -1
View File
@@ -13,7 +13,7 @@ namespace GPW.CORE.Smart.Components
public int IdxDipCurr { get; set; } = 0;
[Parameter]
public List<DailyDataDTO>? ListProgetti { get; set; } = null;
public List<RegAttivitaModel>? ListProgetti { get; set; } = null;
#endregion Public Properties
GPW.CORE.SMART/Components/CompTimbra.razor
+11 -4
View File
@@ -5,10 +5,17 @@
else
{
<div>
<DtCard NextIsExtrata="@nextIsEntrata" IsLoading=@isLoading IsRicTimb="isRicTimb"></DtCard>
<div class="row m-3">
<BottoniEntrEsc IsRicTimb="@isRicTimb" IdxDipendente="@IdxDipCurr" ListRecords="@listRecords"></BottoniEntrEsc>
</div>
@if (!(modoCal == Calendario.modoControllo.showProj))
{
<DtCard NextIsExtrata="@nextIsEntrata" IsLoading=@isLoading IsRicTimb="isRicTimb"></DtCard>
<div class="row m-3">
<BottoniEntrEsc IsRicTimb="@isRicTimb" IdxDipendente="@IdxDipCurr" ListRecords="@listRecords"></BottoniEntrEsc>
</div>
}
else
{
<DtCard NextIsExtrata="@nextIsEntrata" IsLoading=@isLoading IsRicTimb="isRicTimb" isCompactMode="true"></DtCard>
}
</div>
<div class="row mt-2">
<div class="col">
GPW.CORE.SMART/Components/DtCard.razor
+36 -13
View File
@@ -11,22 +11,45 @@
}
else
{
<div class="cardContainer @cardCss">
<div class="data">
<span>@($"{dtCurr:dddd dd MMMM}")</span>
</div>
<div class="ora">
<div class="d-flex justify-content-center">
<div>
@($"{dtCurr:HH}")
</div>
<div class="@cssSec">:</div>
<div>
@($"{dtCurr:mm}")
@if (!isCompactMode)
{
<div class="cardContainer @cardCss">
<div class="data">
<span>@($"{dtCurr:dddd dd MMMM}")</span>
</div>
<div class="ora">
<div class="d-flex justify-content-center">
<div>
@($"{dtCurr:HH}")
</div>
<div class="@cssSec">:</div>
<div>
@($"{dtCurr:mm}")
</div>
</div>
</div>
</div>
</div>
}
else
{
<div class="cardContainerCompact @cardCss">
<div class="data">
<span>@($"{dtCurr:dddd dd MMMM}")</span>
<div class="ora">
<div class="d-flex justify-content-center">
<div>
@($"{dtCurr:HH}")
</div>
<div class="@cssSec">:</div>
<div>
@($"{dtCurr:mm}")
</div>
</div>
</div>
</div>
</div>
}
}
GPW.CORE.SMART/Components/DtCard.razor.cs
+3 -1
View File
@@ -15,7 +15,9 @@ namespace GPW.CORE.Smart.Components
[Parameter]
public bool NextIsExtrata { get; set; } = true;
[Parameter]
public bool isCompactMode { get; set; } = false;
#endregion Public Properties
#region Public Methods
GPW.CORE.SMART/Components/DtCard.razor.css
+35 -3
View File
@@ -1,11 +1,43 @@
.cardContainer {
padding-bottom: 1rem;
min-height: 8.5rem;
.cardContainerAll {
border-radius: 12px;
width: 100%;
box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.7);
color: #fff;
}
.cardContainer {
border-radius: 12px;
width: 100%;
box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.7);
color: #fff;
min-height: 8.5rem;
padding-bottom: 1rem;
}
.cardContainerCompact {
border-radius: 12px;
width: 100%;
box-shadow: 0px 3px 4px rgba(0, 0, 0, 0.7);
color: #fff;
min-height: 4rem;
}
.cardContainerCompact .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;
font-size: 1rem;
}
.cardContainerCompact .ora {
width: 100%;
font-weight: bold;
position: relative;
font-size: 3.5rem;
text-align: center;
font-size: 2.8rem;
}
.cardContainerMancTimb {
padding-bottom: 1rem;
min-height: 8.5rem;
GPW.CORE.SMART/Components/DtCard.razor.less
+23 -3
View File
@@ -1,12 +1,32 @@
.cardContainer {
padding-bottom: 1rem;
min-height: 8.5rem;
.cardContainerAll {
border-radius: 12px;
width: 100%;
box-shadow: 0px 3px 4px rgba(0,0,0,0.7);
color: #fff;
}
.cardContainer {
.cardContainerAll;
min-height: 8.5rem;
padding-bottom: 1rem;
}
.cardContainerCompact {
.cardContainerAll;
min-height: 4rem;
}
.cardContainerCompact .data{
.data;
font-size: 1rem;
}
.cardContainerCompact .ora {
.ora;
font-size: 2.8rem;
}
.cardContainerMancTimb {
padding-bottom: 1rem;
min-height: 8.5rem;
GPW.CORE.SMART/Components/DtCard.razor.min.css
Vendored
+1 -1
View File
@@ -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;}.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;}.txtSec{font-weight:normal;font-size:2rem;}.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;}}
.cardContainerAll{border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;}.cardContainer{border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;min-height:8.5rem;padding-bottom:1rem;}.cardContainerCompact{border-radius:12px;width:100%;box-shadow:0 3px 4px rgba(0,0,0,.7);color:#fff;min-height:4rem;}.cardContainerCompact .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;font-size:1rem;}.cardContainerCompact .ora{width:100%;font-weight:bold;position:relative;font-size:3.5rem;text-align:center;font-size:2.8rem;}.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;}.txtSec{font-weight:normal;font-size:2rem;}.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;}}
GPW.CORE.SMART/Components/ProjectsLIst.razor.css
+21 -8
View File
@@ -1,32 +1,44 @@
.prjCard {
background-color: #fff;
height: 4rem;
width: 100%;
border-radius: 1.2rem;
border-radius: 1.5rem;
display: flex;
justify-content: space-between;
align-content: start;
}
.prjTime,
.extBase {
padding: 0.5rem;
font-size: 1rem;
background-color: #304FFE;
height: 100%;
}
.prjTime {
padding: 0.5rem;
font-size: 1rem;
background-color: #304FFE;
height: 100%;
border-radius: 0.8rem 1.2rem 1.2rem 0.8rem;
}
.prjTotHour {
padding: 0.5rem;
font-size: 1.25rem;
font-size: 1rem;
background-color: #304FFE;
border-radius: 1.2rem;
height: 100%;
border-radius: 1.2rem 0.8rem 0.8rem 1.2rem;
display: table-cell;
vertical-align: middle;
}
.prjContent {
font-size: 1rem;
color: #000;
text-align: start;
padding-left: 0.5rem;
width: 100%;
}
.prjContent .fase {
font-size: 0.85rem;
color: rgba(128, 128, 128, 0.8);
}
.prjContent .group {
font-weight: bold;
text-transform: capitalize;
}
.prjContent .desc {
display: inline-block;
@@ -35,6 +47,7 @@
.up {
display: flex;
justify-content: space-between;
width: 100%;
}
/*
.prjContent .group {
GPW.CORE.SMART/Components/ProjectsLIst.razor.less
+21 -11
View File
@@ -1,19 +1,30 @@
.prjCard {
background-color: #fff;
height: 4rem;
width: 100%;
border-radius: 1.2rem;
border-radius: 1.5rem;
display: flex;
justify-content: space-between;
align-content: start;
}
.prjTime, .prjTotHour {
.extBase {
padding: 0.5rem;
font-size: 1.25rem;
font-size: 1rem;
background-color: #304FFE;
border-radius: 1.2rem;
height: 100%;
height: 100%;
}
.prjTime{
.extBase;
border-radius: 0.8rem 1.2rem 1.2rem 0.8rem;
}
.prjTotHour {
.extBase;
border-radius: 1.2rem 0.8rem 0.8rem 1.2rem;
display: table-cell;
vertical-align: middle
}
.prjContent{
@@ -21,15 +32,13 @@
color: #000;
text-align: start;
padding-left: 0.5rem;
width: 100%;
}
.prjContent .fase {
font-size: 0.85rem;
color: rgba(128, 128, 128, 0.8)
}
.prjContent .group {
font-weight: bold;
color: rgba(128, 128, 128, 0.8);
text-transform: capitalize;
}
.prjContent .desc {
@@ -40,6 +49,7 @@
.up {
display: flex;
justify-content: space-between;
width: 100%;
}
/*
GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.prjCard{background-color:#fff;height:4rem;width:100%;border-radius:1.2rem;display:flex;justify-content:space-between;align-content:start;}.prjTime,.prjTotHour{padding:.5rem;font-size:1.25rem;background-color:#304ffe;border-radius:1.2rem;height:100%;}.prjContent{font-size:1rem;color:#000;text-align:start;padding-left:.5rem;}.prjContent .fase{font-size:.85rem;color:rgba(128,128,128,.8);}.prjContent .group{font-weight:bold;}.prjContent .desc{display:inline-block;word-break:break-word;}.up{display:flex;justify-content:space-between;}
.prjCard{background-color:#fff;width:100%;border-radius:1.5rem;display:flex;justify-content:space-between;align-content:start;}.extBase{padding:.5rem;font-size:1rem;background-color:#304ffe;height:100%;}.prjTime{padding:.5rem;font-size:1rem;background-color:#304ffe;height:100%;border-radius:.8rem 1.2rem 1.2rem .8rem;}.prjTotHour{padding:.5rem;font-size:1rem;background-color:#304ffe;height:100%;border-radius:1.2rem .8rem .8rem 1.2rem;display:table-cell;vertical-align:middle;}.prjContent{font-size:1rem;color:#000;text-align:start;padding-left:.5rem;width:100%;}.prjContent .fase{font-size:.85rem;color:rgba(128,128,128,.8);text-transform:capitalize;}.prjContent .desc{display:inline-block;word-break:break-word;}.up{display:flex;justify-content:space-between;width:100%;}
GPW.CORE.SMART/Components/ProjectsList.razor
+18 -15
View File
@@ -1,25 +1,28 @@
@using GPW.CORE.Data.DbModels
@using GPW.CORE.Smart.Data
@for (int i = 0; i < 5; i++)
@if (ListRA != null)
{
<div class="pt-2">
<div class="prjCard">
<div class="up">
<div class="prjTime">
<div>08:10</div>
<div>10:10</div>
</div>
<div class="prjContent">
<div class="group">EgalwSW</div>
<div class="fase">Sviluppo</div>
<div class="desc">Aggiunte nuove funzionalità</div>
@foreach (var item in ListRA)
{
<div class="pt-2">
<div class="prjCard">
<div class="up">
<div class="prjTime">
<div>@($"{item.Inizio:HH:mm}")</div>
<div>@($"{item.Fine:HH:mm}")</div>
</div>
<div class="prjContent">
<div class="group"><b>@item.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale</b> @item.FasiNav?.ProgettoNav?.NomeProj</div>
<div class="fase">@item.FasiNav?.DescrizioneFase</div>
<div class="desc">@item.Descrizione</div>
</div>
<div class="prjTotHour">@($"{item.Durata.Hours:00}"):@($"{item.Durata.Minutes:00}")</div>
</div>
</div>
<div class="prjTotHour">2:00</div>
</div>
</div>
}
}
GPW.CORE.SMART/Components/ProjectsList.razor.cs
+17 -12
View File
@@ -22,18 +22,23 @@ namespace GPW.CORE.Smart.Components
private bool isLoading { get; set; } = false;
[Parameter]
public List<TimbratureModel> ListTimb
{
get
{
return _ListTimb.OrderByDescending(x => x.DataOra).ToList();
}
public List<RegAttivitaModel>? ListRA { get; set; } = null!;
//{
// get
// {
// return _ListRA.OrderByDescending(x => x.).ToList();
// }
set
{
_ListTimb = value;
}
}
// set
// {
// _ListRA = value;
// }
//}
//protected override Task OnParametersSetAsync()
//{
// //var lista = ListRA.Select(x=>x.Select(s=>s.))
//}
private bool canDelete(TimbratureModel currRec)
{
@@ -104,7 +109,7 @@ namespace GPW.CORE.Smart.Components
#region Private Properties
private List<TimbratureModel> _ListTimb { get; set; } = new List<TimbratureModel>();
private List<List<RegAttivitaModel>?> _ListRA { get; set; } = new List<List<RegAttivitaModel>?>();
[Inject]
private CoreSmartDataService CDService { get; set; } = null!;
GPW.CORE.SMART/Pages/Jumper.razor
+2 -1
View File
@@ -1,5 +1,6 @@
@page "/Jumper"
<h3>Jumper</h3>
<h3>Logging in...</h3>
<LoadingData></LoadingData>