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

Aggiunta preliminare pagina MyReport + update EgwCoreLib

Browse Source
This commit is contained in:
Samuele Locatelli
2023-06-28 14:56:16 +02:00
parent 8cd48454a1
commit 7425be3e2a
9 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.SMART/GPW.CORE.SMART.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>3.0.2305.1908</Version>
<Version>3.0.2306.2812</Version>
<ImplicitUsings>enable</ImplicitUsings>
<PackageProjectUrl>www.egalware.com</PackageProjectUrl>
<Description>GPW Smart UI</Description>
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+3 -2
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2306.1214</Version>
<Version>3.0.2306.2814</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@@ -32,7 +32,8 @@
<ItemGroup>
<PackageReference Include="BlazorCalendar" Version="2.5.3" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2303.215" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2306.2814" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2306.2814" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.14" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.14" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
GPW.CORE.WRKLOG/Pages/Index.razor
+14 -6
View File
@@ -31,18 +31,26 @@
</div>
<AuthorizeView>
<Authorized>
<div class="d-flex justify-content-between">
<NavLink class="w-50 btn btn-primary text-light p-2 m-2" title="Week Planner" href="WeekPlan">
<span class="oi oi-calendar" aria-hidden="true"></span> <br /> Week Planner
</NavLink>
<NavLink class="w-50 btn btn-primary text-light p-2 m-2" title="Record List" href="ListPlan">
<span class="oi oi-list-rich" aria-hidden="true"></span> <br /> Record List
</NavLink>
</div>
<div class="d-flex justify-content-between">
<NavLink class="w-25 btn btn-primary text-light p-2 m-2" title="Inserimento Rapido" href="FastRec">
<span class="fas fa-thumbtack pr-3" aria-hidden="true"></span> <br> Fast Rec
<span class="fas fa-thumbtack pr-3" aria-hidden="true"></span> <br /> Fast Rec
</NavLink>
<NavLink class="w-25 btn btn-primary text-light p-2 m-2" title="Week Planner" href="WeekPlan">
<span class="oi oi-calendar" aria-hidden="true"></span> <br> Week Planner
<NavLink class="w-25 btn btn-primary text-light p-2 m-2" title="Record List" href="DayOff">
<i class="fas fa-pause-circle px-2"></i> <br /> Ferie/Permessi/Malattia
</NavLink>
<NavLink class="w-25 btn btn-primary text-light p-2 m-2" title="Record List" href="ListPlan">
<span class="oi oi-list-rich" aria-hidden="true"></span> <br> Record List
<NavLink class="w-25 btn btn-primary text-light p-2 m-2" title="Record List" href="MyReport">
<i class="fas fa-chart-pie px-2"></i> <br /> My Report
</NavLink>
<a class="w-25 btn btn-primary text-light p-2 m-2" href="help/index.html" target="_blank" title="Help">
<span class="fas fa-question pr-3" aria-hidden="true"></span> <br> Help
<span class="fas fa-question pr-3" aria-hidden="true"></span> <br /> Help
</a>
</div>
</Authorized>
GPW.CORE.WRKLOG/Pages/MyReport.razor
+39
View File
@@ -0,0 +1,39 @@
@page "/MyReport"
<div class="card">
<div class="card-header table-primary d-flex justify-content-between">
<div>
<h3>My Report</h3>
<small>Report personale progetti svolti</small>
</div>
<div>
<PeriodoSel></PeriodoSel>
</div>
</div>
<div class="card-body p-1">
<div class="row">
@if (isLoading)
{
<LoadingData></LoadingData>
}
else
{
@*<div class="col-4">
@if (showMalattie)
{
<RegMalattia IdxDipendente="@idxDipendente" isLoading="@isLoading" ReportUpdate="()=>ForceReloadCal()"></RegMalattia>
}
else
{
<RegRichieste ReportUpdate="()=>ForceReloadCal()" months="@numMesi"></RegRichieste>
}
</div>
<div class="col-8 ps-0">
<CalendarioAziendale TasksList="@CalendarTasksList" months="@numMesi" firstDate="@dtMin" minDate="@dtMin" maxDate="@dtMax"></CalendarioAziendale>
</div>*@
}
</div>
</div>
</div>
GPW.CORE.WRKLOG/Pages/MyReport.razor.cs
+26
View File
@@ -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;
}
}
GPW.CORE.WRKLOG/Shared/NavMenu.razor
+5 -5
View File
@@ -41,16 +41,16 @@
<span class="fas fa-list px-2" aria-hidden="true"></span> <span class="@hideText">Record List</span>
</NavLink>
</div>
@*<div class="nav-item px-3">
<NavLink class="nav-link" href="Illness">
<span class="fas fa-notes-medical px-2" aria-hidden="true"></span> <span class="@hideText">Malattia</span>
</NavLink>
</div>*@
<div class="nav-item px-3">
<NavLink class="nav-link" href="DayOff">
<span class="fas fa-pause-circle px-2" aria-hidden="true"></span> <span class="@hideText">Ferie/Permessi/Malattia</span>
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="MyReport">
<i class="fas fa-chart-pie px-2"></i> <span class="@hideText">My Report</span>
</NavLink>
</div>
<div class="nav-item px-3">
<a href="help/index.html" target="_blank" class="nav-link">
<span class="fas fa-question px-2" aria-hidden="true"></span> <span class="@hideText">Help</span>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2306.1214</h4>
<h4>Versione: 3.0.2306.2814</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2306.1214
3.0.2306.2814
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2306.1214</version>
<version>3.0.2306.2814</version>
<url>http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html</changelog>
<mandatory>false</mandatory>