@if (datiGiorno != null)
{
- @if (currMode == modoControllo.showGauge)
+ @if (currMode == CalendarModeEnum.modoControllo.showGauge)
{
setModeProgetti()">
@@ -157,7 +160,7 @@ else
}
- else if (currMode == modoControllo.showTimbr)
+ else if (currMode == CalendarModeEnum.modoControllo.showTimbr)
{
@@ -168,7 +171,7 @@ else
}
- else if (currMode == modoControllo.showProj)
+ else if (currMode == CalendarModeEnum.modoControllo.showProj)
{
@@ -185,7 +188,14 @@ else
}
-
+ @if ((currMode == CalendarModeEnum.modoControllo.showTimbr || currMode == CalendarModeEnum.modoControllo.showProj))
+ {
+
+ }
+ else if (currMode == CalendarModeEnum.modoControllo.showGauge){
+
+
+ }
diff --git a/GPW.CORE.SMART/Components/Calendario.razor.cs b/GPW.CORE.SMART/Components/Calendario.razor.cs
index c6b52ac..a45b8c0 100644
--- a/GPW.CORE.SMART/Components/Calendario.razor.cs
+++ b/GPW.CORE.SMART/Components/Calendario.razor.cs
@@ -11,10 +11,10 @@ namespace GPW.CORE.Smart.Components
#region Public Properties
[Parameter]
- public int IdxDipendente { get; set; } = -1;
- [Parameter]
- public modoControllo currMode { get; set; } = modoControllo.showCalendar;
+ public CalendarModeEnum.modoControllo currMode { get; set; } = CalendarModeEnum.modoControllo.showCalendar;
+ [Parameter]
+ public int IdxDipendente { get; set; } = -1;
[Parameter]
public List
? ListRecords
{
@@ -30,9 +30,8 @@ namespace GPW.CORE.Smart.Components
#region Protected Fields
- protected string emptyTime = "--/--";
protected DailyDataDTO? datiGiorno = null;
-
+ protected string emptyTime = "--/--";
#endregion Protected Fields
#region Protected Properties
@@ -48,9 +47,9 @@ namespace GPW.CORE.Smart.Components
private Dictionary DateCheck = new Dictionary();
- private List? listTimb = null;
- private List?> listRA = null!;
private List? listaP = new List();
+ private List?> listRA = null!;
+ private List? listTimb = null;
private TimbratureModel? Timb = null;
#endregion Private Fields
@@ -107,7 +106,7 @@ namespace GPW.CORE.Smart.Components
MService.targetDateMancTimb = dtCurr;
showDetail = true;
// se sono in calendario --> mostro dettagli...
- if (currMode == modoControllo.showCalendar)
+ if (currMode == CalendarModeEnum.modoControllo.showCalendar)
{
setModeDetail();
}
@@ -159,6 +158,11 @@ namespace GPW.CORE.Smart.Components
MService.setModeCalendar();
await Task.Delay(1);
}
+ private async Task backToGauge()
+ {
+ setModeDetail();
+ await Task.Delay(1);
+ }
///
/// Imposta modalità dettaglio (mostra i gauge)
@@ -244,15 +248,6 @@ namespace GPW.CORE.Smart.Components
#endregion Private Methods
- ///
- /// Modalità del controllo
- ///
- public enum modoControllo
- {
- showCalendar = 0,
- showGauge,
- showProj,
- showTimbr
- }
+
}
}
\ No newline at end of file
diff --git a/GPW.CORE.SMART/Components/CompProj.razor b/GPW.CORE.SMART/Components/CompProj.razor
index a8b1ca0..8a0ae47 100644
--- a/GPW.CORE.SMART/Components/CompProj.razor
+++ b/GPW.CORE.SMART/Components/CompProj.razor
@@ -1,5 +1,4 @@
-
-
+
diff --git a/GPW.CORE.SMART/Components/CompTimbra.razor b/GPW.CORE.SMART/Components/CompTimbra.razor
index 97a6d3f..0e8128d 100644
--- a/GPW.CORE.SMART/Components/CompTimbra.razor
+++ b/GPW.CORE.SMART/Components/CompTimbra.razor
@@ -1,11 +1,13 @@
-@if (isLoading)
+@using GPW.CORE.Smart.Data
+
+@if (isLoading)
{
}
else
{
- @if (!(modoCal == Calendario.modoControllo.showProj))
+ @if (!(modoCal == CalendarModeEnum.modoControllo.showProj))
{
diff --git a/GPW.CORE.SMART/Components/CompTimbra.razor.cs b/GPW.CORE.SMART/Components/CompTimbra.razor.cs
index e3fe1c5..e31b627 100644
--- a/GPW.CORE.SMART/Components/CompTimbra.razor.cs
+++ b/GPW.CORE.SMART/Components/CompTimbra.razor.cs
@@ -33,7 +33,7 @@ namespace GPW.CORE.Smart.Components
nextIsEntrata = MService.NextIsEntrata;
}
- private Calendario.modoControllo modoCal { get; set; } = Calendario.modoControllo.showCalendar;
+ private CalendarModeEnum.modoControllo modoCal { get; set; } = CalendarModeEnum.modoControllo.showCalendar;
protected override async Task OnParametersSetAsync()
{
@@ -114,7 +114,7 @@ namespace GPW.CORE.Smart.Components
if (IdxDipCurr > 0)
{
var lastMode = modoCal;
- modoCal = Calendario.modoControllo.showCalendar;
+ modoCal = CalendarModeEnum.modoControllo.showCalendar;
listRecords = null;
await Task.Delay(25);
// calcolo mese corrente e recupero dati
diff --git a/GPW.CORE.SMART/Data/CalendarModeEnum.cs b/GPW.CORE.SMART/Data/CalendarModeEnum.cs
new file mode 100644
index 0000000..dcfc2d8
--- /dev/null
+++ b/GPW.CORE.SMART/Data/CalendarModeEnum.cs
@@ -0,0 +1,16 @@
+namespace GPW.CORE.Smart.Data
+{
+ public class CalendarModeEnum
+ {
+ ///
+ /// Modalità del controllo
+ ///
+ public enum modoControllo
+ {
+ showCalendar = 0,
+ showGauge,
+ showProj,
+ showTimbr
+ }
+ }
+}
diff --git a/GPW.CORE.SMART/Data/MessageService.cs b/GPW.CORE.SMART/Data/MessageService.cs
index dcc377b..9c624a5 100644
--- a/GPW.CORE.SMART/Data/MessageService.cs
+++ b/GPW.CORE.SMART/Data/MessageService.cs
@@ -86,7 +86,7 @@ namespace GPW.CORE.Smart.Data
public bool isRicTimb { get; set; } = false;
- public Calendario.modoControllo modoCal { get; set; } = Calendario.modoControllo.showCalendar;
+ public CalendarModeEnum.modoControllo modoCal { get; set; } = CalendarModeEnum.modoControllo.showCalendar;
///
/// Indica ultima azione compiuta
@@ -240,7 +240,7 @@ namespace GPW.CORE.Smart.Data
public void setModeCalendar()
{
- modoCal = Calendario.modoControllo.showCalendar;
+ modoCal = CalendarModeEnum.modoControllo.showCalendar;
if (EA_CalModeChanged != null)
{
EA_CalModeChanged?.Invoke();
@@ -248,7 +248,7 @@ namespace GPW.CORE.Smart.Data
}
public void setModeGauge()
{
- modoCal = Calendario.modoControllo.showGauge;
+ modoCal = CalendarModeEnum.modoControllo.showGauge;
if (EA_CalModeChanged != null)
{
EA_CalModeChanged?.Invoke();
@@ -256,7 +256,7 @@ namespace GPW.CORE.Smart.Data
}
public void setModeProj()
{
- modoCal = Calendario.modoControllo.showProj;
+ modoCal = CalendarModeEnum.modoControllo.showProj;
if (EA_CalModeChanged != null)
{
EA_CalModeChanged?.Invoke();
@@ -264,7 +264,7 @@ namespace GPW.CORE.Smart.Data
}
public void setModeRichTimb()
{
- modoCal = Calendario.modoControllo.showTimbr;
+ modoCal = CalendarModeEnum.modoControllo.showTimbr;
if (EA_CalModeChanged != null)
{
EA_CalModeChanged?.Invoke();