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

Dyn resize chars x tanti RA

Browse Source
This commit is contained in:
Samuele Locatelli
2024-03-26 17:22:42 +01:00
parent c3f011ec75
commit 041eae2260
6 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.WRKLOG/Components/DayHoriz.razor
+39 -35
View File
@@ -71,49 +71,54 @@
}
else
{
@*<!-- MPF -->*@
<div class="d-flex justify-content-between text-center small">
@if (hasFest && DayDTO != null && DayDTO.ListFermateAzienda != null)
{
@foreach (var fermata in DayDTO.ListFermateAzienda)
@if (hasFest || hasFerie || hasPerm)
{
<div class="d-flex justify-content-between text-center small">
@*<!-- MPF -->*@
@if (hasFest && DayDTO != null && DayDTO.ListFermateAzienda != null)
{
if (fermata.codGiust == "FEST")
@foreach (var fermata in DayDTO.ListFermateAzienda)
{
<div class="mx-2 bg-danger rounded text-warning w-100">
<div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
</div>
if (fermata.codGiust == "FEST")
{
<div class="mx-2 bg-danger rounded text-warning w-100">
<div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
</div>
}
else
{
<div class="mx-2 bg-warning rounded text-danger w-100">
<div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
</div>
}
}
else
}
@if (hasFerie && DayDTO != null && DayDTO.ListFerieDip != null)
{
@foreach (var richiesta in DayDTO.ListFerieDip)
{
<div class="mx-2 bg-warning rounded text-danger w-100">
<div class="text-uppercase"><b>@fermata.codGiust</b> | @fermata.descrizione</div>
<div class="mx-2 bg-info rounded text-light w-100">
<div>
<b>FERIE</b> | <small class="small">@richiesta.Note</small>
</div>
</div>
}
}
}
@if (hasFerie && DayDTO != null && DayDTO.ListFerieDip != null)
{
@foreach (var richiesta in DayDTO.ListFerieDip)
@if (hasPerm && DayDTO != null && DayDTO.ListRichiesteDip != null)
{
<div class="mx-2 bg-info rounded text-light w-100">
<div>
<b>FERIE</b> | <small class="small">@richiesta.Note</small>
@foreach (var richiesta in DayDTO.ListRichiesteDip)
{
<div class="mx-2 bg-warning rounded text-dark w-100">
<div>
<b>@richiesta.CodGiust</b> | <small class="small">@richiesta.Note, @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")</small>
</div>
</div>
</div>
}
}
}
@if (hasPerm && DayDTO != null && DayDTO.ListRichiesteDip != null)
{
@foreach (var richiesta in DayDTO.ListRichiesteDip)
{
<div class="mx-2 bg-warning rounded text-dark w-100">
<div>
<b>@richiesta.CodGiust</b> | <small class="small">@richiesta.Note, @($"{@richiesta.DtStart:HH.mm} - {@richiesta.DtEnd:HH.mm}")</small>
</div>
</div>
}
}
</div>
</div>
}
@*<!-- Timbrature -->*@
<div class="d-flex justify-content-between text-center">
@if (DayDTO != null && DayDTO.ListTimbr != null && DayDTO.ListTimbr.Count > 0)
@@ -148,14 +153,13 @@
}
else
{
<div class="py-0 mb-1 flex-fill" style="font-size: 1em;">
&nbsp;
</div>
}
</div>
@*<!-- RegAtt -->*@
<div class="d-flex justify-content-between text-center">
<div class="d-flex justify-content-between text-center" style="@cStyle">
@if (@noData)
{
<AddRA NewItemCreated="ReportSelected" InizioPer="@FirstTimb" IdxDip="@IdxDipSel" EnableAction="@EnableActionMenu"></AddRA>
GPW.CORE.WRKLOG/Components/DayHoriz.razor.cs
+22
View File
@@ -372,6 +372,28 @@ namespace GPW.CORE.WRKLOG.Components
#region Private Methods
protected string cStyle
{
get
{
int numBlock = ListRegAtt().Count;
string fSize = "1.1rem";
if (numBlock > 8)
{
fSize = "0.8rem";
}
else if (numBlock > 6)
{
fSize = "0.9rem";
}
else if (numBlock > 4)
{
fSize = "1.0rem";
}
return $"font-size: {fSize};";
}
}
private List<RegAttivitaModel> ListRegAtt()
{
// init
GPW.CORE.WRKLOG/GPW.CORE.WRKLOG.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>3.0.2403.1611</Version>
<Version>3.0.2403.2617</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2403.1611</h4>
<h4>Versione: 3.0.2403.2617</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
3.0.2403.1611
3.0.2403.2617
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2403.1611</version>
<version>3.0.2403.2617</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>