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

Update grafico x GPW Core

Browse Source
This commit is contained in:
Samuele Locatelli
2021-12-16 13:13:45 +01:00
parent 0ef3249b7f
commit d83bc713ab
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Data/Controllers/GPWController.cs
+1 -1
View File
@@ -84,7 +84,7 @@ namespace GPW.CORE.Data.Controllers
rawRegAtt = localDbCtx
.DbSetRegAttivita
.Where(x => x.IdxDipendente == idxDipendente && dtInizio <= x.Inizio && x.Inizio <= dtFine)
.Include(a => a.FasiNav).ThenInclude(p=>p.ProgettoNav)
.Include(a => a.FasiNav).ThenInclude(p=>p.ProgettoNav).ThenInclude(c => c.ClienteNav)
.ToList();
// calcolo intervallo date...
GPW.CORE.Data/DbModels/RegAttivitaModel.cs
+20
View File
@@ -22,6 +22,26 @@ namespace GPW.CORE.Data.DbModels
/// Ore Attività - prima era ([dbo].[f_hourInterval]([inizio],[fine])) poi sostituita per performance
/// </summary>
public decimal? OreTot { get; set; }
[NotMapped]
public TimeSpan Durata
{
get
{
TimeSpan valore = TimeSpan.FromHours(0);
if (OreTot != null)
{
try
{
valore = TimeSpan.FromHours((double)OreTot);
}
catch (Exception exc)
{ }
}
return valore;
}
}
public decimal? Importo { get; set; }
[ForeignKey("IdxDipendente")]
GPW.CORE.UI/Components/RegAtt.razor
+14 -5
View File
@@ -6,13 +6,22 @@
<div class="d-flex">
@if (@CurrData.IdxFase > 0)
{
<div class="px-1 text-left border border-secondary border-top-0 border-bottom-0 border-left-0 table-info small">
<div>@CurrData.Inizio.ToString("HH:mm")</div>
<div class="">@CurrData.Fine.ToString("HH:mm")</div>
<div><b>@($"{CurrData.OreTot:N2}h")</b></div>
<div class="px-1 text-left border border-secondary border-top-0 border-bottom-0 border-left-0 table-info" style="font-size: 0.7rem;">
@if (@CurrData.OreTot > 1 )
{
<div>@CurrData.Inizio.ToString("HH:mm")</div>
<div>@CurrData.Fine.ToString("HH:mm")</div>
<div><sub>@($"{@CurrData.Durata.Hours}:{@CurrData.Durata.Minutes:00}")</sub></div>
}
else
{
<div>@CurrData.Inizio.ToString("HH")</div>
<div>@CurrData.Inizio.ToString("mm")</div>
<div><sub>@($"{CurrData.OreTot*60:N0}'")</sub></div>
}
</div>
<div class="px-1 text-left textTrim">
<div class="text-dark" title="@CurrData.FasiNav?.ProgettoNav?.NomeProj"><b>@CurrData.FasiNav?.ProgettoNav?.NomeProj</b></div>
<div class="text-dark" title="@CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale - @CurrData.FasiNav?.ProgettoNav?.NomeProj"><b>@CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale</b> - @CurrData.FasiNav?.ProgettoNav?.NomeProj</div>
<div class="text-secondary" title="@CurrData.FasiNav?.DescrizioneFase">@CurrData.FasiNav?.DescrizioneFase</div>
<div class="small" title="@CurrData.Descrizione">@CurrData.Descrizione</div>
</div>