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

ok pagine iob info mach det e work shift

Browse Source
This commit is contained in:
zaccaria.majid
2023-10-25 17:34:38 +02:00
parent 02d770ce05
commit 8a121f59b2
16 changed files with 118 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/IobInfoMan.razor
+53 -1
View File
@@ -1,4 +1,4 @@
<div class="card">
@*<div class="card">
<div class="card-header text-center">
<div>
<i class="fa-solid fa-microchip" style="font-size: 5rem;"></i>
@@ -31,4 +31,56 @@
</li>
</ul>
</div>
</div>*@
<div class="d-flex justify-content-between flex-wrap mt-2">
<div class="col-6 flex-fill ">
<div class="p-2 h-100">
<div class="cardObj p-2 h-100">
<div class="fs-6 text-secondary">Iob Type</div>
<div class="d-flex justify-content-center flex-wrap align-items-center">
@if(infosIob.iType == MP.Data.Objects.Enums.IobType.rPi)
{
<img src="/images/linuxLogo.png" style="height: 70px; width: 70px" />
}
else if (infosIob.iType == MP.Data.Objects.Enums.IobType.WIN || infosIob.iType == MP.Data.Objects.Enums.IobType.ND)
{
<img src="/images/winLogo.png" style="height: 70px; width: 70px" />
}
</div>
</div>
</div>
</div>
<div class="col-6 h-100 flex-fill ">
<div class="p-2">
<div class="cardObj w-100 p-2">
<div class="fs-6 text-secondary">Machine Cod</div>
<div class="fs-4 fw-bold">@idxMacch</div>
</div>
</div>
<div class="p-2">
<div class="cardObj w-100 p-2">
<div class="fs-6 text-secondary">Iob Address</div>
<div class="fs-4 fw-bold">@infosIob.IP</div>
</div>
</div>
</div>
</div>
<div class="d-flex justify-content-between flex-wrap align-items-centermt-2">
<div class="col-6 flex-fill ">
<div class="p-2">
<div class="cardObj w-100 p-2">
<div class="fs-6 text-secondary">Iob Name</div>
<div class="fs-4 fw-bold">@infosIob.name</div>
</div>
</div>
</div>
<div class="col-6 h-100 flex-fill ">
<div class="p-2">
<div class="cardObj w-100 p-2">
<div class="fs-6 text-secondary">CNC Absolute counter</div>
<div class="fs-4 fw-bold">@infosIob.CNC_Counter</div>
</div>
</div>
</div>
</div>
MP-TAB-SERV/Components/IobInfoMan.razor.css
+5
View File
@@ -0,0 +1,5 @@
.cardObj {
border-radius: 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);
}
MP-TAB-SERV/Components/IobInfoMan.razor.less
+5
View File
@@ -0,0 +1,5 @@
.cardObj {
border-radius: 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);
}
MP-TAB-SERV/Components/IobInfoMan.razor.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
.cardObj{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);}
MP-TAB-SERV/Components/ProdConfirm.razor
+8 -6
View File
@@ -49,7 +49,7 @@ else
<div class="d-flex justify-content-between">
<div class="col-3 p-1">
<form class="form-floating">
<input type="number" class="form-control bg-danger" id="floatingInputConf" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<input type="number" class="form-control bg-success" id="floatingInputConf" @bind="numPzProdotti2Rec" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<label for="floatingInputConf" class="text-dark fw-bold" style="font-size: .8rem;">Pezzi confermati</label>
</form>
</div>
@@ -57,8 +57,8 @@ else
<form class="form-floating">
@if (enablePzProdLasciati)
{
<input type="number" class="form-control bg-success" id="floatingInputScarti" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<label for="floatingInputScarti" class="text-dark fw-bold">Scarti</label>
<input type="number" class="form-control bg-secondary" id="floatingInputScarti" @bind="numPzLasciati" @onblur="() => setConfirmBtn(true)" @onfocus="() => setConfirmBtn(false)">
<label for="floatingInputScarti" class="text-dark fw-bold">Lasciati</label>
}
else
{
@@ -67,10 +67,12 @@ else
</form>
</div>
<div class="col-3 p-1">
<form class="form-floating">
<input type="number" class="form-control" id="floatingInputBuoni" value="@(lblPz2RecScarto + lblPz2RecBuoni)" disabled>
<div><span class="text-success">Pz Buoni</span>&nbsp;<span>@lblPz2RecBuoni</span></div>
<div><span class="text-danger">Pz scarto</span>&nbsp;<span>@lblPz2RecScarto</span></div>
@*<form class="form-floating">
<input type="text" class="form-control" id="floatingInputBuoni" value="@($"{lblPz2RecScarto} {lblPz2RecBuoni}")" disabled />
<label for="floatingInputBuoni" class="text-dark fw-bold">Totale</label>
</form>
</form>*@
</div>
<div class="col-3 p-1">
@if (showConfirm)
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.2509</Version>
<Version>6.16.2310.2517</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/WorkShift.razor
+19 -38
View File
@@ -7,25 +7,30 @@
else
{
<MachineBlock RecMSE="CurrMSE" FullMode="false"></MachineBlock>
<div class="card">
<div class="card-header bg-dark text-light">
<h2>Gestione Turni</h2>
</div>
<div class="card-body bg-dark text-light p-1">
<div class="row my-2">
<div class="col-12 col-md-6 my-2">
<h2>Gestione Turni</h2>
<div class="my-2 d-flex justify-content-cente">
<div class="col-12 col-md-6 my-2 text-center cardShift">
<div class="d-flex justify-content-center flex-wrap align-items-center">
<div class="col-8">
<h2><b>Stato Turni Attivi</b></h2>
</div>
<div class="col-8 fs-5 @cssByState(T1) p-2 mb-2" style="border-radius: 0.375rem">
<div class="d-flex justify-content-around">
<div class="form-check form-switch fs-2">
<input class="form-check-input" type="checkbox" @bind="@T1">
<label class="form-check-label">Turno 1</label>
</div>
</div>
</div>
<div class="col-8 fs-5 @cssByState(T2) p-2 mb-2" style="border-radius: 0.375rem">
<div class="d-flex justify-content-around">
<div class="form-check form-switch fs-2">
<input class="form-check-input" type="checkbox" @bind="@T2">
<label class="form-check-label">Turno 2</label>
</div>
</div>
</div>
<div class="col-8 fs-5 @cssByState(T3) p-2 mb-2" style="border-radius: 0.375rem">
<div class="d-flex justify-content-around">
<div class="form-check form-switch fs-2">
<input class="form-check-input" type="checkbox" @bind="@T3">
@@ -33,38 +38,14 @@ else
</div>
</div>
</div>
<div class="col-12 col-md-6 my-2 text-center">
<div class="row">
<div class="col-2"></div>
<div class="col-8">
<h2><b>Stato Turni Attivi</b></h2>
</div>
<div class="col-2"></div>
<div class="col-2"></div>
<div class="col-8 fs-5 @cssByState(T1)">
Turno 1
</div>
<div class="col-2"></div>
<div class="col-2"></div>
<div class="col-8 fs-5 @cssByState(T2)">
Turno 2
</div>
<div class="col-2"></div>
<div class="col-2"></div>
<div class="col-8 fs-5 @cssByState(T3)">
Turno 3
</div>
<div class="col-2"></div>
</div>
<div class="d-flex justify-content-center my-2 w-100 px-2">
<div class="row w-100" >
<div class="col-6 bg-success text-warning" style="border-radius: 0.375rem 0 0 0.375rem; ">
Turno Aperto
</div>
<div class="row my-2">
<div class="col-2"></div>
<div class="col-4 bg-success text-warning px-2">
Turno Aperto
</div>
<div class="col-4 bg-secondary px-2">
Turno Chiuso
</div>
<div class="col-2"></div>
<div class="col-6 bg-secondary" style="border-radius: 0 0.375rem 0.375rem 0; ">
Turno Chiuso
</div>
</div>
</div>
MP-TAB-SERV/Pages/WorkShift.razor.css
+5
View File
@@ -0,0 +1,5 @@
.cardShift {
border-radius: 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.2) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);
}
MP-TAB-SERV/Pages/WorkShift.razor.less
+5
View File
@@ -0,0 +1,5 @@
.cardShift {
border-radius: 0.375rem;
background: linear-gradient(121deg, rgba(255, 255, 255, 0.20) -0.71%, rgba(255, 255, 255, 0.05) 97.66%);
box-shadow: 0px 4px 24px -1px rgba(0, 0, 0, 0.25);
}
MP-TAB-SERV/Pages/WorkShift.razor.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
.cardShift{border-radius:.375rem;background:linear-gradient(121deg,rgba(255,255,255,.2) -.71%,rgba(255,255,255,.05) 97.66%);box-shadow:0 4px 24px -1px rgba(0,0,0,.25);}
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2310.2509</h4>
<h4>Versione: 6.16.2310.2517</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2310.2509
6.16.2310.2517
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.2509</version>
<version>6.16.2310.2517</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>
MP-TAB-SERV/compilerconfig.json
+12
View File
@@ -18,5 +18,17 @@
{
"outputFile": "Components/ProdStat.razor.css",
"inputFile": "Components/ProdStat.razor.less"
},
{
"outputFile": "Pages/IobInfo.razor.css",
"inputFile": "Pages/IobInfo.razor.less"
},
{
"outputFile": "Components/IobInfoMan.razor.css",
"inputFile": "Components/IobInfoMan.razor.less"
},
{
"outputFile": "Pages/WorkShift.razor.css",
"inputFile": "Pages/WorkShift.razor.less"
}
]
MP-TAB-SERV/wwwroot/images/linuxLogo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

MP-TAB-SERV/wwwroot/images/winLogo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB