diff --git a/GPW.CORE.SMART/Components/Calendario.razor b/GPW.CORE.SMART/Components/Calendario.razor index ce78490..b548a13 100644 --- a/GPW.CORE.SMART/Components/Calendario.razor +++ b/GPW.CORE.SMART/Components/Calendario.razor @@ -173,7 +173,7 @@ else

- Progetti +

diff --git a/GPW.CORE.SMART/Components/CompProj.razor b/GPW.CORE.SMART/Components/CompProj.razor index c16dc24..3a6f66c 100644 --- a/GPW.CORE.SMART/Components/CompProj.razor +++ b/GPW.CORE.SMART/Components/CompProj.razor @@ -1,4 +1,4 @@ -@if (ListProgetti == null) +@*@if (ListProgetti == null) { } @@ -11,5 +11,5 @@ else if (ListProgetti.Count == 0) } else { - -} \ No newline at end of file +}*@ + \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/ProjectsLIst.razor.css b/GPW.CORE.SMART/Components/ProjectsLIst.razor.css new file mode 100644 index 0000000..9c8150e --- /dev/null +++ b/GPW.CORE.SMART/Components/ProjectsLIst.razor.css @@ -0,0 +1,6 @@ +.prjCard { + background-color: #D9D9D9; + height: 4rem; + border-radius: 1.2rem; + width: 100%; +} \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/ProjectsLIst.razor.less b/GPW.CORE.SMART/Components/ProjectsLIst.razor.less new file mode 100644 index 0000000..e2261d0 --- /dev/null +++ b/GPW.CORE.SMART/Components/ProjectsLIst.razor.less @@ -0,0 +1,6 @@ +.prjCard{ + background-color: #D9D9D9; + height: 4rem; + border-radius: 1.2rem; + width: 100%; +} diff --git a/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css b/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css new file mode 100644 index 0000000..00395a0 --- /dev/null +++ b/GPW.CORE.SMART/Components/ProjectsLIst.razor.min.css @@ -0,0 +1 @@ +.prjCard{background-color:#d9d9d9;height:4rem;border-radius:1.2rem;width:100%;} \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/ProjectsList.razor b/GPW.CORE.SMART/Components/ProjectsList.razor index ba42498..05c77b5 100644 --- a/GPW.CORE.SMART/Components/ProjectsList.razor +++ b/GPW.CORE.SMART/Components/ProjectsList.razor @@ -1,13 +1,11 @@ @using GPW.CORE.Data.DbModels @using GPW.CORE.Smart.Data -@if (ListProj != null) -{ - @foreach (var item in ListProj) - { -
- @item.Descrizione -
- } -} + +
+
+ ciao +
+
+ diff --git a/GPW.CORE.SMART/Components/ProjectsList.razor.cs b/GPW.CORE.SMART/Components/ProjectsList.razor.cs index 2c5c1ab..38474d1 100644 --- a/GPW.CORE.SMART/Components/ProjectsList.razor.cs +++ b/GPW.CORE.SMART/Components/ProjectsList.razor.cs @@ -1,5 +1,4 @@ using GPW.CORE.Data.DbModels; -using GPW.CORE.Data.DTO; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -23,23 +22,17 @@ namespace GPW.CORE.Smart.Components private bool isLoading { get; set; } = false; [Parameter] - public List ListProj { get; set; } = null!; - //{ - // get - // { - - // return _ListProj.Select(x => x.ListRA); - // } - - // set - // { - // _ListProj = value; - // } - //} - public List ListRegAtt { get; set; } = null!; - protected override Task OnParametersSetAsync() + public List ListTimb { - ListRegAtt = ListProj.Select(x=>x.ListRA).ToList(); + get + { + return _ListTimb.OrderByDescending(x => x.DataOra).ToList(); + } + + set + { + _ListTimb = value; + } } private bool canDelete(TimbratureModel currRec) @@ -59,6 +52,22 @@ namespace GPW.CORE.Smart.Components #region Protected Methods + protected async void ApprovaTimb(TimbratureModel currRecord) + { + string message = "Sicuro di voler approvare la richiesta selezionata?"; + if (!await JSRuntime.InvokeAsync("confirm", message)) + return; + + isLoading = true; + await Task.Delay(1); + await InvokeAsync(StateHasChanged); + currRecord.Approv = true; + // aggiorno + await CDService.TimbratureUpdate(currRecord); + await Task.Delay(1); + isLoading = false; + await ReqUpdate.InvokeAsync(true); + } protected async void Delete(TimbratureModel currRecord) { @@ -76,11 +85,26 @@ namespace GPW.CORE.Smart.Components await ReqUpdate.InvokeAsync(true); } + + + protected async void ScambioInOut(TimbratureModel currRecord) + { + isLoading = true; + await Task.Delay(1); + await InvokeAsync(StateHasChanged); + currRecord.Entrata = !currRecord.Entrata; + // aggiorno + await CDService.TimbratureUpdate(currRecord); + await Task.Delay(1); + isLoading = false; + await ReqUpdate.InvokeAsync(false); + } + #endregion Protected Methods #region Private Properties - private List _ListProj { get; set; } = new List(); + private List _ListTimb { get; set; } = new List(); [Inject] private CoreSmartDataService CDService { get; set; } = null!; diff --git a/GPW.CORE.SMART/compilerconfig.json b/GPW.CORE.SMART/compilerconfig.json index 9ecac7e..e9d0c20 100644 --- a/GPW.CORE.SMART/compilerconfig.json +++ b/GPW.CORE.SMART/compilerconfig.json @@ -30,5 +30,13 @@ { "outputFile": "Components/NavBottom.razor.css", "inputFile": "Components/NavBottom.razor.less" + }, + { + "outputFile": "Components/ProjectsList.css", + "inputFile": "Components/ProjectsList.less" + }, + { + "outputFile": "Components/ProjectsLIst.razor.css", + "inputFile": "Components/ProjectsLIst.razor.less" } ] \ No newline at end of file