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

Fix display area monthTag

Browse Source
This commit is contained in:
Samuele Locatelli
2025-06-12 09:21:24 +02:00
parent 641eed422c
commit 1fbc8b314a
8 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW.CORE.ADM/Components/Compo/MonthTagMan.razor
+51 -44
View File
@@ -45,48 +45,50 @@
}
else
{
<table class="table table-striped table-sm text-start">
<thead>
<tr class="">
<th>
<button class="btn btn-primary btn-sm" @onclick="() => ForceReload()"><i class="fa-solid fa-rotate"></i></button>
</th>
<th>Anno <Sorter ParamName="Anno" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th>Mese <Sorter ParamName="Mese" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th>Cognome Nome <Sorter ParamName="CognomeNome" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th class="text-end">CodTag <Sorter ParamName="CodTag" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th class="text-end"># Tag <Sorter ParamName="NumTag" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th class="text-end"># Dis <Sorter ParamName="NumDis" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
@*
<div class="row">
<div class="@mainDivCss">
<table class="table table-striped table-sm text-start">
<thead>
<tr>
<th>
<button class="btn btn-primary btn-sm" @onclick="() => ForceReload()"><i class="fa-solid fa-rotate"></i></button>
</th>
<th>Anno <Sorter ParamName="Anno" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th>Mese <Sorter ParamName="Mese" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th>Cognome Nome <Sorter ParamName="CognomeNome" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th class="text-end">CodTag <Sorter ParamName="CodTag" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th class="text-end"># Tag <Sorter ParamName="NumTag" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th class="text-end"># Dis <Sorter ParamName="NumDis" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
@*
<th>Colonna 4 <Sorter ParamName="" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th>
<th>Colonna 5 <Sorter ParamName="" IsAsc="@sortAsc" CurrParam="@sortField" sortReq="SortRequested"></Sorter></th> *@
<th></th>
</tr>
</thead>
<th></th>
</tr>
</thead>
<tbody>
@foreach (var item in ListRecords)
{
<tr>
<td>
@if (SelItem == null)
{
<button class="btn btn-primary btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
}
else
{
<button class="btn btn-secondary btn-sm" disabled><i class="fa-solid fa-edit"></i></button>
}
</td>
<td>@item.Anno</td>
<td>@item.Mese</td>
<td>@item.CognomeNome</td>
<td class="text-end">@item.CodTag</td>
<td class="text-end">@item.NumTag</td>
<td class="text-end">@item.NumDis</td>
<tbody>
@foreach (var item in ListRecords)
{
<tr class="@CssCheckSel(item)">
<td>
@if (SelItem == null)
{
<button class="btn btn-primary btn-sm" @onclick="() => DoSelect(item)"><i class="fa-solid fa-search"></i></button>
}
else
{
<button class="btn btn-secondary btn-sm" disabled><i class="fa-solid fa-edit"></i></button>
}
</td>
<td>@item.Anno</td>
<td>@item.Mese</td>
<td>@item.CognomeNome</td>
<td class="text-end">@item.CodTag</td>
<td class="text-end">@item.NumTag</td>
<td class="text-end">@item.NumDis</td>
@*
@*
<td>
@if (item.Enabled && item.NumFasi == 0)
{
@@ -97,17 +99,22 @@
<button class="btn btn-secondary btn-sm" disabled><i class="fa-solid fa-trash"></i></button>
}
</td> *@
</tr>
}
</tbody>
</table>
</tr>
}
</tbody>
</table>
</div>
@if (SelRecord != null)
{
<div class="@detDivCss">
modulo dettaglio da visualizzare
</div>
}
</div>
}
</div>
<div class="card-footer">
<EgwCoreLib.Razor.DataPager PageSize="@numRecord" currPage="@currPage" totalCount="@totalCount" showLoading="@isLoading" numRecordChanged="SetNumRec" numPageChanged="SetPage"></EgwCoreLib.Razor.DataPager>
</div>
</div>
GPW.CORE.ADM/Components/Compo/MonthTagMan.razor.cs
+15
View File
@@ -44,6 +44,21 @@ namespace GPW.CORE.ADM.Components.Compo
SelRecord = currRec;
}
private string mainDivCss
{
get => SelRecord == null ? "col-12" : "col-9";
}
private string detDivCss
{
get => SelRecord == null ? "col-0" : "col-3";
}
protected string CssCheckSel(MonthTagModel currRec)
{
bool isSel = SelRecord != null && SelRecord.IdxDipendente == currRec.IdxDipendente && SelRecord.Anno == currRec.Anno && SelRecord.Mese == currRec.Mese;
return isSel ? "table-info" : "";
}
protected async Task ForceReload()
{
currPage = 1;
GPW.CORE.ADM/Components/Compo/listTagDD.razor
+1 -9
View File
@@ -1,8 +1,4 @@
<h3>listTagDD</h3>
<div class="card-body p-1 small">
<div class="card-body p-1 small">
@if (ListRecords == null || isLoading)
{
@@ -44,7 +40,3 @@
</table>
}
</div>
</div>
GPW.CORE.ADM/Components/Compo/listTagDD.razor.cs
+1 -1
View File
@@ -8,7 +8,7 @@ using NLog;
namespace GPW.CORE.ADM.Components.Compo
{
public partial class listTagDD
public partial class ListTagDD
{
#region Protected Properties
GPW.CORE.ADM/GPW.CORE.ADM.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>4.1.2506.1115</Version>
<Version>4.1.2506.1209</Version>
</PropertyGroup>
<ItemGroup>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 4.1.2506.1115</h4>
<h4>Versione: 4.1.2506.1209</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
4.1.2506.1115
4.1.2506.1209
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>4.1.2506.1115</version>
<version>4.1.2506.1209</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>