Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp' into develop

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-09 11:45:47 +02:00
parent 2522d6f6a5 726d7ef34a
commit 95143aa0eb
6 changed files with 54 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/LongStopList.razor
+24 -2
View File
@@ -1,5 +1,27 @@
<h3>LongStopList</h3>
Lista fermate
<div class="col-4 my-1 p-2">
<div class="card">
<div class="card-body">
<div class="text-start" style="font-size: 1.8rem;">
Fermo Generico
</div>
<div class="text-end" style="font-size: 1.5rem;">
NCC_1701E
</div>
</div>
<div class="card-footer d-flex justify-content-between">
<div>
@*@($"{item.InizioStato:yyyy/MM/dd HH:mm:ss}")*@
09.10.2023 00:30
</div>
<div>
7h 30m
</div>
</div>
</div>
</div>
@code {
}
MP-TAB-SERV/Components/NotesMan.razor
+26 -18
View File
@@ -3,7 +3,13 @@
<div class="row">
<div class="col-9">
<LongStopList></LongStopList>
<div class="d-flex justify-content-between flex-wrap">
@for (int i = 0; i < 8; i++)
{
<LongStopList></LongStopList>
}
</div>
</div>
<div class="col-3">
@@ -26,34 +32,36 @@
foreach (var item in RecordList)
{
<div class="my-1 w-100">
<div class="card text-white bg-dark rCAll w-100">
<div class="card-title py-0 px-2 mb-0 rCTop bg-dark fs-3">
<div class="card text-white w-100" style="font-size: 1.5rem">
<div class="card-header py-0 px-2 mb-0 rCTop fs-3" style="background-color: rgba(33,36,39, .8)">
<b>@item.Operatore</b>
</div>
<div class="card-text p-1 d-flex align-items-end">
@item.Value
</div>
<div class="card-text p-1 d-flex align-items-end">
<div class="labelBottom text-start">
@* <asp:LinkButton runat="server" ID="lbtEdit" CommandArgument='<%# Eval("InizioStato","{0:dd/MM/yyyy HH:mm:ss.fff}") %>' OnClick="lbtEdit_Click" Visible='<%# enableEdit %>' CssClass="btn btn-sm w-100 btn-info py-0"><i class="fa fa-edit"></i></asp:LinkButton> *@
<button class="btn btn-sm w-100 btn-info py-0"><i class="fa fa-edit"></i></button>
<div class="card-body bg-dark p-1">
<div class="bg-dark p-1">
@item.Value
</div>
<div class="labelBottom text-end">
@* <asp:LinkButton runat="server" ID="lbtDel" CommandArgument='<%# Eval("InizioStato","{0:dd/MM/yyyy HH:mm:ss.fff}") %>' OnClick="lbtDel_Click" Visible='<%# enableEdit %>' CssClass="btn btn-sm w-100 btn-danger py-0" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaDel") %>'><i class="fa fa-trash"></i></asp:LinkButton> *@
<button class="btn btn-sm w-100 btn-danger py-0"><i class="fa fa-trash"></i></button>
<div class="d-flex justify-content-between">
<div class="col-6 p-2">
<button class="btn btn-sm btn-info w-100"><i class="fa fa-edit"></i></button>
</div>
<div class="col-6 p-2">
<button class="btn btn-sm btn-danger w-100"><i class="fa fa-trash"></i></button>
</div>
</div>
</div>
<div class="card-text p-1 d-flex align-items-end rCBot" style="font-size: 0.8em; border-top: 1px solid #ACACAC; color: #ACACAC">
<div class="labelBottom text-start p-0">
<div class="card-footer bg-dark d-flex justify-content-between" style="font-size: .8rem">
<div class="text-start p-0">
@($"{item.InizioStato:yyyy/MM/dd HH:mm:ss}")
</div>
<div class="labelBottom text-end p-0">
<div class="text-end p-0">
@item.CodArticolo
@($"ODL{item.IdxODL:000000000}")
@* <asp:Label runat="server" ID="Label1" Text='<%# Eval("CodArticolo") %>' Font-Bold="false" />
<asp:Label runat="server" ID="Label2" Text='<%# Eval("idxODL","ODL{0}") %>' Font-Bold="false" /> *@
</div>
</div>
@*<div class="card-text p-1 d-flex align-items-end rCBot" style="font-size: 0.8em; border-top: 1px solid #ACACAC; color: #ACACAC">
</div>*@
</div>
</div>
}
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2310.908</Version>
<Version>6.16.2310.910</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.908</h4>
<h4>Versione: 6.16.2310.910</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.908
6.16.2310.910
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2310.908</version>
<version>6.16.2310.910</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>