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

Merge branch 'release/FixMyRepSize01'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-06-29 19:12:50 +02:00
parent fc9cb8d67a 6e44e7cb56
commit e53daaf6a7
13 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.Data/GPW.CORE.Data.csproj
+1 -2
View File
@@ -7,8 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2306.2817" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2306.2817" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2306.2917" />
<PackageReference Include="MailKit" Version="3.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.14" />
GPW.CORE.SMART/Data/CoreSmartDataService.cs
+1
View File
@@ -1,4 +1,5 @@
using EgwCoreLib.Razor.Data;
using EgwCoreLib.Utils;
using GPW.CORE.Data.DbModels;
using GPW.CORE.Data.DTO;
using Microsoft.AspNetCore.Identity.UI.Services;
GPW.CORE.SMART/GPW.CORE.SMART.csproj
+2 -2
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>3.0.2306.2817</Version>
<Version>3.0.2306.2917</Version>
<ImplicitUsings>enable</ImplicitUsings>
<PackageProjectUrl>www.egalware.com</PackageProjectUrl>
<Description>GPW Smart UI</Description>
@@ -28,7 +28,7 @@
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.SessionStorage" Version="2.3.0" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2306.2817" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2306.2917" />
<PackageReference Include="RestSharp" Version="108.0.3" />
<PackageReference Include="StackExchange.Redis" Version="2.6.96" />
</ItemGroup>
GPW.CORE.SMART/Pages/Jumper.razor.cs
+1
View File
@@ -1,4 +1,5 @@
using EgwCoreLib.Razor.Data;
using EgwCoreLib.Utils;
using GPW.CORE.Data.DbModels;
using GPW.CORE.Smart.Data;
using Microsoft.AspNetCore.Components;
GPW.CORE.WRKLOG/Components/DettAtt.razor
+5 -5
View File
@@ -6,23 +6,23 @@
<div class="py-0 my-1 small flex-fill ">
<div class="d-flex shadow">
<button @onclick="() => Edit()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-warning bg-opacity-25 btn-sm py-1 me-2" style="font-size: 1.1rem; width: 10em;" title="Edit">
<button @onclick="() => Edit()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-warning bg-opacity-25 btn-sm py-1 me-2" style="font-size: @FontSizeSmall; width: 10em;" title="Edit">
@if(ShowDate)
{
<div class="badge bg-primary w-100">@CurrData.Inizio.ToString("yyyy/MM/dd")</div>
}
<div>@CurrData.Inizio.ToString("HH:mm") - @CurrData.Fine.ToString("HH:mm")</div>
<div class="badge bg-dark p-1 w-100" style="font-size: 1.1rem;">@($"{@CurrData.Durata.Hours}h {@CurrData.Durata.Minutes:00}'")</div>
<div class="badge bg-dark p-1 w-100" style="font-size: @FontSizeSmall;">@($"{@CurrData.Durata.Hours}h {@CurrData.Durata.Minutes:00}'")</div>
</button>
<button @onclick="() => Clone()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-primary btn-sm py-1" style="font-size: 1.4rem; width:3.4em;" title="Copy">
<button @onclick="() => Clone()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-primary btn-sm py-1" style="font-size: @FontSizeBig; width:3.4em;" title="Copy">
<i class="fas fa-paste"></i>
</button>
<div class="px-2 py-0 text-start textTrim flex-fill" style="font-size: 1.1rem;">
<div class="px-2 py-0 text-start textTrim flex-fill" style="font-size: @FontSizeSmall;">
<div class="text-dark textTrim @cssTrim" title="@CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale - @CurrData.FasiNav?.ProgettoNav?.NomeProj"><b>@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}", MaxChar))</b> - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}", MaxChar))</div>
<div class="text-secondary textTrim @cssTrim" title="@CurrData.FasiNav?.DescrizioneFase">@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}", 100))</div>
<div class="text-trim @cssTrim" title="@CurrData.Descrizione">@(trimLine($"{CurrData.Descrizione}", MaxChar))</div>
</div>
<button @onclick="() => Delete()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-danger btn-sm py-1" style="font-size: 1.4rem; width:3.4em;">
<button @onclick="() => Delete()" class="px-1 text-center border border-secondary border-top-0 border-bottom-0 border-left-0 btn btn-danger btn-sm py-1" style="font-size: @FontSizeBig; width:3.4em;">
<i class="fas fa-trash-alt"></i>
</button>
</div>
GPW.CORE.WRKLOG/Components/DettAtt.razor.cs
+5
View File
@@ -32,6 +32,11 @@ namespace GPW.CORE.WRKLOG.Components
[Parameter]
public bool ShowDate { get; set; } = false;
[Parameter]
public string FontSizeBig { get; set; } = "1.4rem";
[Parameter]
public string FontSizeSmall { get; set; } = "1.1rem";
#endregion Public Properties
#region Protected Fields
GPW.CORE.WRKLOG/Components/MyRepStats.razor
+11 -9
View File
@@ -5,7 +5,7 @@
}
else
{
<div class="d-flex justify-content-around text-center">
<div class="d-flex justify-content-around text-center px-2">
<div class="mx-1 py-2 w-25 border border-dark text-dark rounded shadow text-center text-uppercase">
Progetti #
<div class="fw-bold">@numProj</div>
@@ -27,10 +27,10 @@
<div class="fw-bold">@($"{CurrData.OreComm:N2}")</div>
</div>
</div>
<div class="row my-2" style="min-height: 30rem;">
<div class="row my-2">
@if (ShowVert)
{
<div class="col-6 overflow-auto" style="min-height: 30rem; max-height: 60rem;">
<div class="col-6 overflow-auto" style="min-height: 40rem; max-height: 42rem;">
<div class="card shadow">
<div class="card-header">
Progetti
@@ -52,20 +52,22 @@
</ul>
</div>
</div>
<div class="col-6 overflow-auto" style="min-height: 30rem; max-height: 60rem;">
@if (selProj != 0)
{
<ProjAgendaDetail ListRA="@selRA" CloseReq="ResetDayAgenda" ItemSelected="ReportSelect" ItemCloned="ReportSelect" ItemDeleted="() => ReportDeleted()" MaxChar="60"></ProjAgendaDetail>
}
<div class="col-6 overflow-auto" style="min-height: 40rem; max-height: 42rem;">
@if (currRecord != null)
{
<RegAttEditor currRecord="@currRecord" ItemReset="UpdRegAttData" ItemUpdated="UpdRegAttData"></RegAttEditor>
}
@if (selProj != 0)
{
<div class="small">
<ProjAgendaDetail ListRA="@selRA" CloseReq="ResetDayAgenda" ItemSelected="ReportSelect" ItemCloned="ReportSelect" ItemDeleted="() => ReportDeleted()" MaxChar="60"></ProjAgendaDetail>
</div>
}
</div>
}
else
{
<div class="col-12">
<div class="col-12" style="min-height: 40rem; max-height: 42rem;">
<ChartHist Id="ProjTotal" Data="@histData" Labels="@histLabel" LineColor="rgb(7, 173, 236)" BackColor="rgba(107, 223, 255, 0.5)" ChartLabel="Ore Caricate"></ChartHist>
</div>
}
GPW.CORE.WRKLOG/Components/ProjAgendaDetail.razor
+2 -2
View File
@@ -16,14 +16,14 @@
</div>
</div>
</div>
<div class="card-body">
<div class="card-body py-0">
<div class="row">
@if (ListRA != null)
{
foreach (var item in ListRA)
{
<div class="col-12 p-0 @getItemCss(item)">
<DettAtt CurrData="item" Periodo="@(item.Durata.TotalHours)" ListFasi="@ListFasi" IdxDipSel="@IdxDipSel" ItemSelected="ReportSelected" ItemDeleted="() => ReportDeleted()" MaxChar="@MaxChar" ShowDate="true"></DettAtt>
<DettAtt CurrData="item" Periodo="@(item.Durata.TotalHours)" ListFasi="@ListFasi" IdxDipSel="@IdxDipSel" ItemSelected="ReportSelected" ItemDeleted="() => ReportDeleted()" MaxChar="@MaxChar" ShowDate="true" FontSizeBig="1.0rem" FontSizeSmall="0.8rem"></DettAtt>
</div>
}
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+3 -3
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2306.2916</Version>
<Version>3.0.2306.2919</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
@@ -32,8 +32,8 @@
<ItemGroup>
<PackageReference Include="BlazorCalendar" Version="2.5.3" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2306.2817" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2306.2817" />
<PackageReference Include="EgwCoreLib.Razor" Version="1.4.2306.2917" />
<PackageReference Include="EgwCoreLib.Utils" Version="1.4.2306.2917" />
<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/MyReport.razor
+14 -6
View File
@@ -3,13 +3,21 @@
<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 class="d-flex">
<div class="fs-3 pe-2">
<b>My Report</b>
</div>
<div class="px-2 pt-3">
<small>Report personale progetti svolti</small>
</div>
</div>
<div class="text-end">
<PeriodoSel E_PeriodoSel="setPeriodo" CurrPeriodo="@periodo"></PeriodoSel>
<Toggler SelFilter="@ToggleData" FilterChanged="evToggled"></Toggler>
<div class="text-end d-flex">
<div>
<Toggler SelFilter="@ToggleData" FilterChanged="evToggled"></Toggler>
</div>
<div>
<PeriodoSel E_PeriodoSel="setPeriodo" CurrPeriodo="@periodo"></PeriodoSel>
</div>
</div>
</div>
<div class="card-body p-1">
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2306.2916</h4>
<h4>Versione: 3.0.2306.2919</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2306.2916
3.0.2306.2919
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2306.2916</version>
<version>3.0.2306.2919</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>