From 0300ce6eacf1c28290be1d3bb7732d46d8813d28 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Jun 2023 18:05:10 +0200 Subject: [PATCH 1/5] Fix display immagine --- GPW.CORE.Data/GPW.CORE.Data.csproj | 3 +-- GPW.CORE.SMART/Data/CoreSmartDataService.cs | 1 + GPW.CORE.SMART/GPW.CORE.SMART.csproj | 4 ++-- GPW.CORE.SMART/Pages/Jumper.razor.cs | 1 + GPW.CORE.WRKLOG/Components/MyRepStats.razor | 6 +++--- GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj | 6 +++--- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/GPW.CORE.Data/GPW.CORE.Data.csproj b/GPW.CORE.Data/GPW.CORE.Data.csproj index 144006f..ba819da 100644 --- a/GPW.CORE.Data/GPW.CORE.Data.csproj +++ b/GPW.CORE.Data/GPW.CORE.Data.csproj @@ -7,8 +7,7 @@ - - + diff --git a/GPW.CORE.SMART/Data/CoreSmartDataService.cs b/GPW.CORE.SMART/Data/CoreSmartDataService.cs index 7306af5..b26ec61 100644 --- a/GPW.CORE.SMART/Data/CoreSmartDataService.cs +++ b/GPW.CORE.SMART/Data/CoreSmartDataService.cs @@ -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; diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index 15a3371..3b02f6a 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.2306.2817 + 3.0.2306.2917 enable www.egalware.com GPW Smart UI @@ -28,7 +28,7 @@ - + diff --git a/GPW.CORE.SMART/Pages/Jumper.razor.cs b/GPW.CORE.SMART/Pages/Jumper.razor.cs index 259a018..9bb01ce 100644 --- a/GPW.CORE.SMART/Pages/Jumper.razor.cs +++ b/GPW.CORE.SMART/Pages/Jumper.razor.cs @@ -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; diff --git a/GPW.CORE.WRKLOG/Components/MyRepStats.razor b/GPW.CORE.WRKLOG/Components/MyRepStats.razor index 9c845d1..3b94ce9 100644 --- a/GPW.CORE.WRKLOG/Components/MyRepStats.razor +++ b/GPW.CORE.WRKLOG/Components/MyRepStats.razor @@ -27,10 +27,10 @@
@($"{CurrData.OreComm:N2}")
-
+
@if (ShowVert) { -
+
Progetti @@ -52,7 +52,7 @@
-
+
@if (selProj != 0) { diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index d6f56ba..16a7fc3 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.2916 + 3.0.2306.2918 enable enable @@ -32,8 +32,8 @@ - - + + diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 60c1616..ab31b92 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2306.2916

+

Versione: 3.0.2306.2918


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 253cfb7..3a96188 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2306.2916 +3.0.2306.2918 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 0597304..39a0abd 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2306.2916 + 3.0.2306.2918 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false From 4c10c121e3cca4b2164259d36f06360dcff81ffd Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Jun 2023 18:15:05 +0200 Subject: [PATCH 2/5] MyReport Update layout FHD --- GPW.CORE.WRKLOG/Components/MyRepStats.razor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GPW.CORE.WRKLOG/Components/MyRepStats.razor b/GPW.CORE.WRKLOG/Components/MyRepStats.razor index 3b94ce9..eb5a90d 100644 --- a/GPW.CORE.WRKLOG/Components/MyRepStats.razor +++ b/GPW.CORE.WRKLOG/Components/MyRepStats.razor @@ -27,10 +27,10 @@
    @($"{CurrData.OreComm:N2}")
-
+
@if (ShowVert) { -
+
Progetti @@ -52,7 +52,7 @@
-
+
@if (selProj != 0) { @@ -65,7 +65,7 @@ } else { -
+
} From 27876c653064911235786d0752d5f1b1efe9b9b9 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Jun 2023 18:23:59 +0200 Subject: [PATCH 3/5] Update altezza grafici --- GPW.CORE.WRKLOG/Components/MyRepStats.razor | 4 ++-- GPW.CORE.WRKLOG/Pages/MyReport.razor | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/GPW.CORE.WRKLOG/Components/MyRepStats.razor b/GPW.CORE.WRKLOG/Components/MyRepStats.razor index eb5a90d..3be18e7 100644 --- a/GPW.CORE.WRKLOG/Components/MyRepStats.razor +++ b/GPW.CORE.WRKLOG/Components/MyRepStats.razor @@ -5,7 +5,7 @@ } else { -
+
Progetti #
@numProj
@@ -65,7 +65,7 @@ } else { -
+
} diff --git a/GPW.CORE.WRKLOG/Pages/MyReport.razor b/GPW.CORE.WRKLOG/Pages/MyReport.razor index 47bbd43..2d3342a 100644 --- a/GPW.CORE.WRKLOG/Pages/MyReport.razor +++ b/GPW.CORE.WRKLOG/Pages/MyReport.razor @@ -3,13 +3,21 @@
-
-

My Report

- Report personale progetti svolti +
+
+ My Report +
+
+ Report personale progetti svolti +
-
- - +
+
+ +
+
+ +
From e2dccac33599299b1af2ffea03a449cba5e8549d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Jun 2023 18:56:39 +0200 Subject: [PATCH 4/5] MyReport: - height max 42rem --- GPW.CORE.WRKLOG/Components/MyRepStats.razor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GPW.CORE.WRKLOG/Components/MyRepStats.razor b/GPW.CORE.WRKLOG/Components/MyRepStats.razor index 3be18e7..af96f79 100644 --- a/GPW.CORE.WRKLOG/Components/MyRepStats.razor +++ b/GPW.CORE.WRKLOG/Components/MyRepStats.razor @@ -30,7 +30,7 @@
@if (ShowVert) { -
+
Progetti @@ -52,7 +52,7 @@
-
+
@if (selProj != 0) { @@ -65,7 +65,7 @@ } else { -
+
} From 6e44e7cb56fa89d0e5c48b01a43053eaf833cb0d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 29 Jun 2023 19:12:23 +0200 Subject: [PATCH 5/5] Fix size dettaglio proj --- GPW.CORE.WRKLOG/Components/DettAtt.razor | 10 +++++----- GPW.CORE.WRKLOG/Components/DettAtt.razor.cs | 5 +++++ GPW.CORE.WRKLOG/Components/MyRepStats.razor | 10 ++++++---- GPW.CORE.WRKLOG/Components/ProjAgendaDetail.razor | 4 ++-- GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj | 2 +- Resources/ChangeLog.html | 2 +- Resources/VersNum.txt | 2 +- Resources/manifest.xml | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/GPW.CORE.WRKLOG/Components/DettAtt.razor b/GPW.CORE.WRKLOG/Components/DettAtt.razor index dca5c70..655c4af 100644 --- a/GPW.CORE.WRKLOG/Components/DettAtt.razor +++ b/GPW.CORE.WRKLOG/Components/DettAtt.razor @@ -6,23 +6,23 @@
- - -
+
@(trimLine($"{CurrData.FasiNav?.ProgettoNav?.ClienteNav?.RagSociale}", MaxChar)) - @(trimLine($"{CurrData.FasiNav?.ProgettoNav?.NomeProj}", MaxChar))
@(trimLine($"{CurrData.FasiNav?.DescrizioneFase}", 100))
@(trimLine($"{CurrData.Descrizione}", MaxChar))
-
diff --git a/GPW.CORE.WRKLOG/Components/DettAtt.razor.cs b/GPW.CORE.WRKLOG/Components/DettAtt.razor.cs index de5d89c..d5b68a4 100644 --- a/GPW.CORE.WRKLOG/Components/DettAtt.razor.cs +++ b/GPW.CORE.WRKLOG/Components/DettAtt.razor.cs @@ -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 diff --git a/GPW.CORE.WRKLOG/Components/MyRepStats.razor b/GPW.CORE.WRKLOG/Components/MyRepStats.razor index af96f79..c81c88d 100644 --- a/GPW.CORE.WRKLOG/Components/MyRepStats.razor +++ b/GPW.CORE.WRKLOG/Components/MyRepStats.razor @@ -53,14 +53,16 @@
- @if (selProj != 0) - { - - } @if (currRecord != null) { } + @if (selProj != 0) + { +
+ +
+ }
} else diff --git a/GPW.CORE.WRKLOG/Components/ProjAgendaDetail.razor b/GPW.CORE.WRKLOG/Components/ProjAgendaDetail.razor index 6adb09e..dd97e60 100644 --- a/GPW.CORE.WRKLOG/Components/ProjAgendaDetail.razor +++ b/GPW.CORE.WRKLOG/Components/ProjAgendaDetail.razor @@ -16,14 +16,14 @@
-
+
@if (ListRA != null) { foreach (var item in ListRA) {
- +
} diff --git a/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj b/GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj index 16a7fc3..20c3e7b 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.2918 + 3.0.2306.2919 enable enable diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index ab31b92..1469a35 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2306.2918

+

Versione: 3.0.2306.2919


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 3a96188..44a0011 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2306.2918 +3.0.2306.2919 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 39a0abd..6dedcb0 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,6 +1,6 @@ - 3.0.2306.2918 + 3.0.2306.2919 http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false