diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index ccabeb0..1a38939 100644 --- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj +++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj @@ -3,7 +3,7 @@ net6.0 enable - 3.0.2305.1908 + 3.0.2306.2812 enable www.egalware.com GPW Smart UI diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 0741fd6..6bff00f 100644 --- a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj +++ b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj @@ -2,7 +2,7 @@ net6.0 - 3.0.2306.1214 + 3.0.2306.2814 enable enable @@ -32,7 +32,8 @@ - + + diff --git a/GPW.CORE.WRKLOG/Pages/Index.razor b/GPW.CORE.WRKLOG/Pages/Index.razor index 569a3fd..0e29648 100644 --- a/GPW.CORE.WRKLOG/Pages/Index.razor +++ b/GPW.CORE.WRKLOG/Pages/Index.razor @@ -31,18 +31,26 @@ +
+ +
Week Planner +
+ +
Record List +
+
-
Fast Rec +
Fast Rec
- -
Week Planner + +
Ferie/Permessi/Malattia
- -
Record List + +
My Report
-
Help +
Help
diff --git a/GPW.CORE.WRKLOG/Pages/MyReport.razor b/GPW.CORE.WRKLOG/Pages/MyReport.razor new file mode 100644 index 0000000..870ddc4 --- /dev/null +++ b/GPW.CORE.WRKLOG/Pages/MyReport.razor @@ -0,0 +1,39 @@ +@page "/MyReport" + + +
+
+
+

My Report

+ Report personale progetti svolti +
+
+ +
+
+
+
+ @if (isLoading) + { + + } + else + { + @*
+ @if (showMalattie) + { + + } + else + { + + } +
+
+ +
*@ + } +
+
+
+ diff --git a/GPW.CORE.WRKLOG/Pages/MyReport.razor.cs b/GPW.CORE.WRKLOG/Pages/MyReport.razor.cs new file mode 100644 index 0000000..c47ef44 --- /dev/null +++ b/GPW.CORE.WRKLOG/Pages/MyReport.razor.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using System.Net.Http; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.AspNetCore.Components.Forms; +using Microsoft.AspNetCore.Components.Routing; +using Microsoft.AspNetCore.Components.Web; +using Microsoft.AspNetCore.Components.Web.Virtualization; +using Microsoft.JSInterop; +using GPW.CORE.WRKLOG; +using GPW.CORE.WRKLOG.Shared; +using GPW.CORE.WRKLOG.Components; +using EgwCoreLib.Razor; + +namespace GPW.CORE.WRKLOG.Pages +{ + public partial class MyReport + { + + protected bool isLoading { get; set; } = false; + } +} \ No newline at end of file diff --git a/GPW.CORE.WRKLOG/Shared/NavMenu.razor b/GPW.CORE.WRKLOG/Shared/NavMenu.razor index e361782..79a4a12 100644 --- a/GPW.CORE.WRKLOG/Shared/NavMenu.razor +++ b/GPW.CORE.WRKLOG/Shared/NavMenu.razor @@ -41,16 +41,16 @@ Record List - @**@ +