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

Update scroll testo + fix dimensioni su PDA HandHeld

Browse Source
This commit is contained in:
Samuele Locatelli
2024-05-23 16:23:11 +02:00
parent f651b0d22f
commit 3b1bd8f322
16 changed files with 308 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB3/Components/ProdConfirm.razor
+12 -12
View File
@@ -7,14 +7,14 @@
<div class="row">
@if (enableMagPrint)
{
<div class="col-6">
<div class="col-6 pe-1">
<PrintMag RecMSE="RecMSE"></PrintMag>
</div>
}
@if (odlOk)
{
<div class="@ConfCssWidth">
<button class="btn btn-lg @ConfBg py-2 px-4" style="width: 100%" @onclick="()=>ToggleConfProd()">
<div class="@ConfCssWidth ps-1">
<button class="btn btn-lg @ConfBg py-2 px-2 text-nowrap text-truncate" style="width: 100%" @onclick="()=>ToggleConfProd()">
<i class="fa-solid fa-check pe-1"></i><span>@ConfTitle</span>
</button>
</div>
@@ -92,11 +92,11 @@
</div>
}
<div class="row textCondens mt-2">
<div class="row textCondens mt-2 px-2">
<div class="col-12 py-0 text-start text-uppercase lh-1 fw-bold">
Dati Globali ODL
</div>
<div class="col-6 col-sm-3 py-1">
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 px-2 shadows" style=" background-color: #fff3cd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[A] NUOVI Pz.Prod</span>
@@ -113,7 +113,7 @@
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 px-2" style=" background-color: #cff4fc; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">Pz Prodotti TOT [A+B+C]</span>
@@ -130,7 +130,7 @@
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 px-2" style=" background-color: #f8d7da; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[B] Scarti VERS.</span>
@@ -147,7 +147,7 @@
</div>
</div>
</div>
<div class="col-6 col-sm-3 py-1">
<div class="col-6 col-sm-3 p-1">
<div class="text-center h-100 px-2" style=" background-color: #d1e7dd; border-radius: .5rem;">
<div class="text-truncate lh-sm pt-1">
<span class="text-dark small">[C] Pz Buoni VERS.</span>
@@ -168,11 +168,11 @@
@if (!confProdActive)
{
<div class="row textCondens mt-1 py-1">
<div class="col-6">
<a class="btn btn-info w-100 py-2 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i> Reg. SCARTI</a>
<div class="col-6 pe-1">
<a class="btn btn-lg btn-info w-100 py-2 px-1 " style="min-width: 6rem;" href="scrap"><i class="fa fa-bug"></i> Reg. SCARTI</a>
</div>
<div class=" col-6">
<a class="btn btn-primary w-100 py-2" style="min-width: 6rem;" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
<div class=" col-6 ps-1">
<a class="btn btn-lg btn-primary w-100 py-2 px-1" style="min-width: 6rem;" href="controls"><i class="fa fa-wrench"></i> Reg. CONTROLLI</a>
</div>
</div>
}
MP-TAB3/Components/ProdStopMan.razor
+5 -2
View File
@@ -1,11 +1,14 @@
<div class=" col-4 col-sm-4 col-md-4 col-lg-2 flex-fill2 ">
<div class=" col-4 col-sm-4 col-md-4 col-lg-2 flex-fill2">
<div class="p-2 h-100 w-100">
<div class="@objCss text-center card w-100 h-100" @onclick="() => ReportSelected()">
<div class="card-body text-light">
<i class="@objIcon" style="font-size: 8vw"></i>
</div>
<div class="card-footer text-center h-100 bg-dark text-light opacity-75 p-1">
<span class="d-inline-block text-center text-nowrap text-truncate mw-100" style="font-size: 1.3rem;">@objTxt</span>
@* <span class="d-inline-block text-center text-nowrap text-truncate mw-100 scroll-left" style="font-size: 1.3rem;">@objTxt</span> *@
<div class="d-inline-block @textCss(objTxt)" style="font-size: 1.3rem;">
<span>@objTxt</span>
</div>
</div>
</div>
</div>
MP-TAB3/Components/ProdStopMan.razor.cs
+45
View File
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Components;
using static Org.BouncyCastle.Math.EC.ECCurve;
namespace MP_TAB3.Components
{
@@ -23,13 +24,57 @@ namespace MP_TAB3.Components
#endregion Public Properties
#region Protected Properties
[Inject]
protected IConfiguration config { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected override void OnInitialized()
{
maxChar4Scroll = config.GetValue<int>("ServerConf:maxChar4Scroll");
}
protected async Task ReportSelected()
{
await E_EventSelected.InvokeAsync(IdxEvento);
}
/// <summary>
/// CSS class x testo (se descr lunga scorre...)
/// </summary>
protected string textCss(string currText)
{
string answ = " text-nowrap text-truncate w-100";
if (currText.Length > maxChar4Scroll)
{
// calcolo delta... a-b-c con 5-10-oltre
int delta = currText.Length - maxChar4Scroll;
if (delta < 5)
{
answ = " scroll-left-a";
}
else if (delta < 10)
{
answ = " scroll-left-b";
}
else
{
answ = " scroll-left-c";
}
}
return answ;
}
#endregion Protected Methods
#region Private Fields
private int maxChar4Scroll = 20;
#endregion Private Fields
}
}
MP-TAB3/Components/ProdStopMan.razor.css
+108
View File
@@ -0,0 +1,108 @@
/* gestione scroll testo A: 100% */
.scroll-left-a {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left-a span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left-a 8s ease infinite;
-webkit-animation: scroll-left-a 8s ease infinite;
animation: scroll-left-a 8s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left-a {
0% {
transform: translateX(-50%);
}
30% {
transform: translateX(-50%);
}
80% {
transform: translateX(-80%);
}
}
/* gestione scroll testo B: 120% */
.scroll-left-b {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left-b span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left-b 8s ease infinite;
-webkit-animation: scroll-left-b 8s ease infinite;
animation: scroll-left-b 8s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left-b {
0% {
transform: translateX(-50%);
}
30% {
transform: translateX(-50%);
}
80% {
transform: translateX(-120%);
}
}
/* gestione scroll testo C: 150% */
.scroll-left-c {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left-c span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left-c 8s ease infinite;
-webkit-animation: scroll-left-c 8s ease infinite;
animation: scroll-left-c 8s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left-c {
0% {
transform: translateX(-50%);
}
30% {
transform: translateX(-50%);
}
80% {
transform: translateX(-150%);
}
}
MP-TAB3/Components/ProdStopMan.razor.less
+123
View File
@@ -0,0 +1,123 @@
body {
}
/* gestione scroll testo A: 100% */
.scroll-left-a {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left-a span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left-a 8s ease infinite;
-webkit-animation: scroll-left-a 8s ease infinite;
animation: scroll-left-a 8s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left-a {
0% {
transform: translateX(-50%);
}
30% {
transform: translateX(-50%);
}
80% {
transform: translateX(-80%);
}
}
/* gestione scroll testo B: 120% */
.scroll-left-b {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left-b span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left-b 8s ease infinite;
-webkit-animation: scroll-left-b 8s ease infinite;
animation: scroll-left-b 8s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left-b {
0% {
transform: translateX(-50%);
}
30% {
transform: translateX(-50%);
}
80% {
transform: translateX(-120%);
}
}
/* gestione scroll testo C: 150% */
.scroll-left-c {
height: 1.5em;
overflow: hidden;
position: relative;
width: 100%;
white-space: nowrap;
}
.scroll-left-c span {
/*display: inline-block;*/
position: absolute;
width: 100%;
height: 100%;
margin: 0;
line-height: 1.5em;
/* Starting position */
-moz-transform: translateX(-50%);
-webkit-transform: translateX(-50%);
transform: translateX(-50%);
/* Apply animation to this element */
-moz-animation: scroll-left-c 8s ease infinite;
-webkit-animation: scroll-left-c 8s ease infinite;
animation: scroll-left-c 8s ease infinite;
}
/* Move it (define the animation) */
@keyframes scroll-left-c {
0% {
transform: translateX(-50%);
}
30% {
transform: translateX(-50%);
}
80% {
transform: translateX(-150%);
}
}
MP-TAB3/Components/ProdStopMan.razor.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
.scroll-left-a{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left-a span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left-a 8s ease infinite;-webkit-animation:scroll-left-a 8s ease infinite;animation:scroll-left-a 8s ease infinite;}@keyframes scroll-left-a{0%{transform:translateX(-50%);}30%{transform:translateX(-50%);}80%{transform:translateX(-80%);}}.scroll-left-b{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left-b span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left-b 8s ease infinite;-webkit-animation:scroll-left-b 8s ease infinite;animation:scroll-left-b 8s ease infinite;}@keyframes scroll-left-b{0%{transform:translateX(-50%);}30%{transform:translateX(-50%);}80%{transform:translateX(-120%);}}.scroll-left-c{height:1.5em;overflow:hidden;position:relative;width:100%;white-space:nowrap;}.scroll-left-c span{position:absolute;width:100%;height:100%;margin:0;line-height:1.5em;-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%);-moz-animation:scroll-left-c 8s ease infinite;-webkit-animation:scroll-left-c 8s ease infinite;animation:scroll-left-c 8s ease infinite;}@keyframes scroll-left-c{0%{transform:translateX(-50%);}30%{transform:translateX(-50%);}80%{transform:translateX(-150%);}}
MP-TAB3/MP-TAB3.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2405.2315</Version>
<Version>6.16.2405.2316</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB3</RootNamespace>
</PropertyGroup>
MP-TAB3/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2405.2315</h4>
<h4>Versione: 6.16.2405.2316</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB3/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2405.2315
6.16.2405.2316
MP-TAB3/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2405.2315</version>
<version>6.16.2405.2316</version>
<url>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP-TAB3/appsettings.json
+2 -1
View File
@@ -25,7 +25,8 @@
"BasePathDisegni": "\\\\iis01\\W$\\Files\\Disegni",
"BaseUrlTab": "/MP/TAB3",
"ImgBasePath": "https://iis01.egalware.com/MP/images/macchine/small/",
"MpIoNS": "MoonPro:SQL2016DEV:MoonPro"
"MpIoNS": "MoonPro:SQL2016DEV:MoonPro",
"maxChar4Scroll": 21
},
"AlarmDest": "samuele.locatelli@egalware.com, ceo@steamware.net",
"MailKitMailSettings": {
MP-TAB3/compilerconfig.json
+4
View File
@@ -54,5 +54,9 @@
{
"outputFile": "Components/ParamsMan.razor.css",
"inputFile": "Components/ParamsMan.razor.less"
},
{
"outputFile": "Components/ProdStopMan.razor.css",
"inputFile": "Components/ProdStopMan.razor.less"
}
]
MP.Mon/MP.Mon.csproj
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>6.16.2405.1719</Version>
<Version>6.16.2405.2315</Version>
</PropertyGroup>
<ItemGroup>
MP.Mon/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MON MAPO</i>
<h4>Versione: 6.16.2405.1719</h4>
<h4>Versione: 6.16.2405.2315</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.Mon/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2405.1719
6.16.2405.2315
MP.Mon/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2405.1719</version>
<version>6.16.2405.2315</version>
<url>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/MP.Mon.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-MON/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>