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

Altri update MON x gestione customizzazione dimensioni

Browse Source
This commit is contained in:
Samuele Locatelli
2025-03-18 09:42:19 +01:00
parent 79948d67d7
commit 7fd7710e9d
12 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MON.Client/Components/DetailViewMSE.razor
+22 -19
View File
@@ -6,9 +6,9 @@ else
{
<div class="card mb-1 border border-dark rounded rounded-3 shadow bg-dark @brightCss">
<div class="card-body @cssStatus(CurrRecord.Semaforo, doAnimate) bg-gradient text-white p-1">
<div class="bg-dark text-white opacity-75 px-1 rounded shadow small lh-sm py-0 my-0">
<div class="card-title text-uppercase bg-dark text-center py-0 my-0 fs-3 text-truncate">
<span class="">@CurrRecord.Nome</span>
<div class="bg-dark text-white opacity-80 px-1 rounded shadow small lh-sm py-0 my-0">
<div class="card-title text-uppercase text-center py-0 my-0 text-truncate" style="font-size: @titleMult;">
<span class="py-0 my-0 @textBlinkBright">@CurrRecord.Nome</span>
</div>
<div class="bg-dark text-white opacity-100 bg-gradient px-1 rounded shadow small lh-sm py-0">
@if (hasRow(1))
@@ -73,21 +73,24 @@ else
</div>
</div>
}
@if (hasRow(3))
@if (showTC)
{
<div class="d-flex justify-content-between small lh-sm">
@foreach (var item in rowValues(4))
{
<div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
}
</div>
}
else
{
<div class="d-flex justify-content-between small lh-sm">
<div class="px-1 pe-0">TC. Act</div>
<div class="px-1 ps-0">@getMinSec(@CurrRecord.TCLavRT) <small>[@getMinSec(@CurrRecord.TCAssegnato)]</small></div>
</div>
@if (hasRow(3))
{
<div class="d-flex justify-content-between small lh-sm">
@foreach (var item in rowValues(4))
{
<div class="px-1 @item.TagCss">@item.TagName: <b>@currVal(item.TagLocation)</b></div>
}
</div>
}
else
{
<div class="d-flex justify-content-between small lh-sm">
<div class="px-1 pe-0">TC. Act</div>
<div class="px-1 ps-0">@getMinSec(@CurrRecord.TCLavRT) <small>[@getMinSec(@CurrRecord.TCAssegnato)]</small></div>
</div>
}
}
</div>
</div>
@@ -104,7 +107,7 @@ else
else
{
<div class=" d-flex justify-content-between text-warning small w-100">
<div class="px-1 text-uppercase d-inline-block @textCss(@CurrRecord.DescrizioneStato)">
<div class="px-1 text-uppercase d-inline-block @textCss(@CurrRecord.DescrizioneStato) @textBlinkBright">
<span>@CurrRecord.DescrizioneStato</span>
</div>
<div class="px-1">@getMinSec(getDecimal(@CurrRecord.Durata))</div>
@@ -121,7 +124,7 @@ else
}
else
{
<div class="d-flex justify-content-around fs-5">
<div class="d-flex justify-content-around fs-3">
<div class="px-1">
<span class="text-light">@CurrRecord.PezziProd</span> / <span class="text-light">@CurrRecord.NumPezzi</span>
</div>
MP.MON.Client/Components/DetailViewMSE.razor.cs
+16
View File
@@ -38,6 +38,12 @@ namespace MP.MON.Client.Components
[Parameter]
public string brightCss { get; set; } = "";
[Parameter]
public string titleMult { get; set; } = "";
[Parameter]
public bool showTC { get; set; } = false;
#if false
protected override void OnParametersSet()
{
@@ -217,10 +223,20 @@ namespace MP.MON.Client.Components
{
answ += " opacity-50";
}
else
{
//answ += " bright100";
textBlinkBright = brightCss;
}
}
return answ;
}
/// <summary>
/// Valore brightness solo x elementi testuali durante lampeggio
/// </summary>
protected string textBlinkBright = "bright100";
private decimal getDecimal(object? rawData)
{
decimal answ = 0;
MP.MON/Components/Pages/Index.razor
+2 -2
View File
@@ -32,7 +32,7 @@ else
int mseIdx = 0;
for (int i = 0; i < mapNRow; i++)
{
<div class="row statusMap mx-1 my-1" style="font-size: @charMult;">
<div class="row statusMap mx-1 my-0" style="font-size: @charMult;">
@for (int j = 0; j < maxCol; j++)
{
var currMse = MseById(mseIdx);
@@ -43,7 +43,7 @@ else
@* <DetailMapSelector CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" cssOverlayOff="@cssOverlayOff" useNewDisplay="@newDisplay" @rendermode="InteractiveServer"></DetailMapSelector> *@
@if (newDisplay)
{
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="true" brightCss="@brightCss" @rendermode="InteractiveServer"></DetailViewMSE>
<DetailViewMSE CurrRecord="@currMse" currTagConf="@getIobTag(currMse.IdxMacchina)" currTagVal="@getTagVal(currMse.IdxMacchina)" doAnimate="@doAnimate" keepAliveMin="@keepAliveMin" showArt="@showArt" doBlink="@doBlink" maxChar4Scroll="@maxChar4Scroll" scrollText="@scrollText" brightCss="@brightCss" titleMult="@titleMult" showTC="@showTC" @rendermode="InteractiveServer"></DetailViewMSE>
}
else
{
MP.MON/Components/Pages/Index.razor.cs
+10 -5
View File
@@ -51,6 +51,7 @@ namespace MP.MON.Components.Pages
protected bool doAnimate = true;
protected bool scrollText = false;
protected bool showTC = false;
protected int fastRefreshMs = 1000;
protected int keepAliveMin = 1;
protected int maxCol = 6;
@@ -266,7 +267,11 @@ namespace MP.MON.Components.Pages
/// Moltiplicatore di base dei caratteri espresso in rem
/// </summary>
private string charMult = "1rem";
/// <summary>
/// Moltiplicatore dimensione titolo scheda detail
/// </summary>
private string titleMult = "2.5rem";
/// <summary>
/// css per impostare una luminosiità custom x andare a aumentare la brillantezza dei colori a livello di singolo blocco DetailMSE
/// </summary>
@@ -384,17 +389,17 @@ namespace MP.MON.Components.Pages
getConfVal("doAnimate", ref rawData);
doAnimate = rawData == "1";
getConfVal("MON_scrollText", ref rawData);
scrollText = rawData.ToLower() == "true";
scrollText = rawData.ToLower() == "true";
getConfVal("MON_showTC", ref rawData);
showTC = rawData.ToLower() == "true";
getConfValInt("pageRefreshSec", ref slowRefreshSec);
getConfVal("sART", ref showArt);
// con luminosità, dimensione carattere e num char x andare a capo x gestione specifica in caso di "allargamento componenti"
getConfValInt("MON_maxChar4Scroll", ref maxChar4Scroll);
getConfVal("MON_CharMult", ref charMult);
getConfVal("MON_NameMult", ref titleMult);
getConfVal("MON_BrightCss", ref brightCss);
Log.Info($"setupConf | Effettuato setup parametri | keepAlive: {keepAliveMin} | MaxCol: {maxCol} | doAnimate: {doAnimate} | slowRefreshSec: {slowRefreshSec} | fastRefreshMs: {fastRefreshMs}");
}
// verifico se ho richiesta filtro x codGruppo...
MP.MON/MP.MON.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.MON</RootNamespace>
<AssemblyName>$(AssemblyName.Replace(' ', '_'))</AssemblyName>
<Version>6.16.2503.1808</Version>
<Version>6.16.2503.1809</Version>
</PropertyGroup>
<ItemGroup>
MP.MON/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2503.1808</h4>
<h4>Versione: 6.16.2503.1809</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.MON/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2503.1808
6.16.2503.1809
MP.MON/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2503.1808</version>
<version>6.16.2503.1809</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>
MP.MON/post-build.ps1
+1 -1
View File
@@ -25,7 +25,7 @@ $manData = Get-Content $FileManIn
$manData = $manData -replace "1.0.0.0", $currRelNum
$manData = $manData -replace "{{DIRNAME}}", "MP-MON"
$manData = $manData -replace "{{BRANCHNAME}}", "stable/LAST"
$manData = $manData -replace "{{PACKNAME}}", "MP-MON"
$manData = $manData -replace "{{PACKNAME}}", "MP.MON"
Set-Content -Path $FileManOut -Value $manData
# replace x ChangeLog
MP.MON/wwwroot/css/site.css
+13 -9
View File
@@ -141,8 +141,7 @@ a,
content: "An error has occurred.";
}
/* Gestione specifica oggetti MON*/
/* Gestione luminosit� generale
*/
/* Gestione luminosit� generale */
.bright50 {
filter: brightness(50%);
}
@@ -167,6 +166,15 @@ a,
.bright200 {
filter: brightness(200%);
}
.opacity-80 {
opacity: 0.8;
}
.opacity-85 {
opacity: 0.85;
}
.opacity-90 {
opacity: 0.9;
}
/* MAIN: gestione layout dinamico mappa... */
.fontSmall {
font-size: 0.75rem;
@@ -244,20 +252,16 @@ a,
.text-reduced-c {
height: 1.1rem;
line-height: 0.9em;
/*overflow: hidden;*/
/*position: relative;*/
/*width: 100%;*/
/*white-space: nowrap;*/
overflow-wrap: anywhere;
}
.text-reduced-a {
font-size: 0.95rem;
font-size: 0.96rem;
}
.text-reduced-b {
font-size: 0.9rem;
font-size: 0.92rem;
}
.text-reduced-c {
font-size: 0.85rem;
font-size: 0.88rem;
}
/* gestione scroll testo A: 100% */
.scroll-left,
MP.MON/wwwroot/css/site.less
+14 -9
View File
@@ -145,8 +145,7 @@ a, .btn-link {
}
/* Gestione specifica oggetti MON*/
/* Gestione luminosità generale
*/
/* Gestione luminosità generale */
.bright50 {
filter: brightness(50%);
@@ -175,6 +174,16 @@ a, .btn-link {
filter: brightness(200%);
}
.opacity-80 {
opacity: 0.8
}
.opacity-85 {
opacity: 0.85
}
.opacity-90 {
opacity: 0.9
}
/* MAIN: gestione layout dinamico mappa... */
.fontSmall {
font-size: 0.75rem;
@@ -259,26 +268,22 @@ a, .btn-link {
.text-reduced {
height: 1.1rem;
line-height: 0.9em;
/*overflow: hidden;*/
/*position: relative;*/
/*width: 100%;*/
/*white-space: nowrap;*/
overflow-wrap: anywhere;
}
.text-reduced-a {
&:extend(.text-reduced);
font-size: 0.95rem;
font-size: 0.96rem;
}
.text-reduced-b {
&:extend(.text-reduced);
font-size: 0.9rem;
font-size: 0.92rem;
}
.text-reduced-c {
&:extend(.text-reduced);
font-size: 0.85rem;
font-size: 0.88rem;
}
MP.MON/wwwroot/css/site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long