diff --git a/GPW.CORE.UI/Components/RegAddEditor.razor b/GPW.CORE.UI/Components/RegAddEditor.razor deleted file mode 100644 index 45d99aa..0000000 --- a/GPW.CORE.UI/Components/RegAddEditor.razor +++ /dev/null @@ -1,27 +0,0 @@ -@using CORE.Data.DbModels -@using UI.Data -@inject GpwDataService GDataServ - -selezionato @currRecord.IdxRa -
@currRecord.Inizio
- - - -@code { - - - [Parameter] - public RegAttivitaModel currRecord { get; set; } - - - [Parameter] - public EventCallback ItemReset { get; set; } - - /// - /// Indico item selezionato - /// - protected async void DoReset() - { - await ItemReset.InvokeAsync(true); - } -} diff --git a/GPW.CORE.UI/Components/RegAtt.razor b/GPW.CORE.UI/Components/RegAtt.razor index cfdf55e..78c4018 100644 --- a/GPW.CORE.UI/Components/RegAtt.razor +++ b/GPW.CORE.UI/Components/RegAtt.razor @@ -8,31 +8,38 @@ @if (@CurrData.IdxFase > 0) { @*
*@ - -
+
@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}",65)) - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}",75))
@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}",130))
@(trimLine($"{CurrData.Descrizione}",250))
+ @*
+
+ +
+
+ +
+
*@ } else {
- @**@
}
diff --git a/GPW.CORE.UI/Components/RegAttEditor.razor b/GPW.CORE.UI/Components/RegAttEditor.razor new file mode 100644 index 0000000..079287e --- /dev/null +++ b/GPW.CORE.UI/Components/RegAttEditor.razor @@ -0,0 +1,56 @@ +@using CORE.Data.DbModels +@using UI.Data +@inject GpwDataService GDataServ + +selezionato @currRecord.IdxRa +
@currRecord.Inizio
+ + + + + + + + +
+
+
+
+ + + +
+ +
+
+ @*
+
+
+ +
+ +
+
*@ +
+ +
+ + +@code { + + + [Parameter] + public RegAttivitaModel currRecord { get; set; } + + + [Parameter] + public EventCallback ItemReset { get; set; } + + /// + /// Indico item selezionato + /// + protected async void DoReset() + { + await ItemReset.InvokeAsync(true); + } +} diff --git a/GPW.CORE.UI/Components/WeekStat.razor b/GPW.CORE.UI/Components/WeekStat.razor index f7908c5..c676309 100644 --- a/GPW.CORE.UI/Components/WeekStat.razor +++ b/GPW.CORE.UI/Components/WeekStat.razor @@ -22,10 +22,10 @@
- @currData?.SumOreLav.ToString("N2") + @currData?.SumOreLav.ToString("N2")
-
+
@@ -33,10 +33,10 @@
- @currData?.SumOreComm.ToString("N2") + @currData?.SumOreComm.ToString("N2")
-
+
diff --git a/GPW.CORE.UI/Pages/Planner.razor b/GPW.CORE.UI/Pages/Planner.razor index 038d070..ce2e438 100644 --- a/GPW.CORE.UI/Pages/Planner.razor +++ b/GPW.CORE.UI/Pages/Planner.razor @@ -39,7 +39,7 @@ @if (currRecord != null) { - + } @if (ListRecords == null) { @@ -60,21 +60,12 @@ } } -
- - - - @*selRecordChanged="EditRecord" currList="@SlotList(DayOfWeek.Monday, i)"*@ - +
Pagina principale formato "agenda":
    -
  • schema agenda settimanale x la settimana corrente / selezionata
  • -
  • per ogni giorno (stile google) nome + numero gg in testa
  • -
  • blocco verticale (configirabile, default 7-21) ogni 30'
  • click --> modal compilazione record (selettore gerarchico + ricerca ultimi progetti pareto a dx)
  • click + trascina?!?!? da verificare
  • in testa 2 icone x indicare OK temperatura e OK x check C19
  • -
  • sulla dx una colonna di "tempo timbrato"