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

Merge branch 'Release/FixFiltroSelnuovoPODL'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-12-01 15:41:11 +01:00
parent 353a7490ae 7ecba56748
commit 8069f8377f
8 changed files with 30 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.SPEC/Components/ListODL.razor.cs
+1 -23
View File
@@ -1,9 +1,7 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.WebUtilities;
using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.SPEC.Data;
using MP.SPEC.Pages;
using MP.SPEC.Services;
using NLog;
@@ -74,15 +72,10 @@ namespace MP.SPEC.Components
[Inject]
protected IOApiService MpIoApiCall { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
#endregion Protected Properties
#region Protected Methods
protected int odlCercato = 0;
/// <summary>
/// Registra chiusura ODL alla data indicata
/// </summary>
@@ -145,14 +138,6 @@ namespace MP.SPEC.Components
protected override async Task OnInitializedAsync()
{
if (NavManager.Uri.Contains("ODL?"))
{
var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
if (QueryHelpers.ParseQuery(uri.Query).TryGetValue("IdxOdl", out var _idxOdl))
{
odlCercato = int.Parse(_idxOdl);
}
}
ListStati = await MDService.AnagStatiComm();
}
@@ -426,14 +411,7 @@ namespace MP.SPEC.Components
isLoading = true;
SearchRecords = await MDService.ListODLFilt(currFilter.IsActive, currFilter.SearchVal, currFilter.CodFase, currFilter.CodReparto, currFilter.IdxMacchina, currFilter.DtStart, currFilter.DtEnd);
totalCount = SearchRecords.Count;
if (NavManager.Uri.Contains("ODL?"))
{
ListRecords = SearchRecords.Where(x => x.IdxOdl == odlCercato).Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
}
else
{
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
}
ListRecords = SearchRecords.Skip(numRecord * (currPage - 1)).Take(numRecord).ToList();
await Task.Delay(1);
await InvokeAsync(() => StateHasChanged());
isLoading = false;
MP.SPEC/Components/ListPODL.razor.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace MP.SPEC.Components
currRecord = null;
currRecord = selRec;
await RecordSel.InvokeAsync(Utils.POdlExt.clone(selRec));
header = "Nuovo PODL";
header = "Duplica PODL";
}
/// <summary>
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2212.114</Version>
<Version>6.16.2212.115</Version>
</PropertyGroup>
<ItemGroup>
MP.SPEC/Pages/PODL.razor
+21 -17
View File
@@ -60,7 +60,7 @@
{
<div class="row">
<div class="col-12">
<div class="card mb-5">
<div class="card mb-5 mt-2">
<div class="card-header bg-primary text-light">@header</div>
<div class="card-body">
<div class="row">
@@ -76,20 +76,22 @@
<div class="input-group input-group-sm">
<span class="input-group-text" id="inputGroup-sizing-sm">Articolo</span>
<select @bind="@currRecord.CodArticolo" class="form-select">
<option value="">--Selezionare un articolo--</option>
@if (ListArticoli != null)
{
foreach (var item in ListArticoli)
{
@if (item.CodArticolo == currRecordControlli.CodArticolo)
{
<option value="@item.CodArticolo" selected>@item.CodArticolo | @item.DescArticolo | @item.Disegno</option>
}
else
{
<option value="@item.CodArticolo">@item.CodArticolo | @item.DescArticolo | @item.Disegno</option>
}
@* @if (item.CodArticolo == currRecordControlli.CodArticolo)
{
<option value="@item.CodArticolo" selected>@item.CodArticolo | @item.DescArticolo | @item.Disegno</option>
else
{
}
}*@
<option value="@item.CodArticolo">@item.CodArticolo | @item.DescArticolo | @item.Disegno</option>
}
}
}
</select>
</div>
</div>
@@ -145,6 +147,7 @@
<div class="input-group input-group-sm">
<span class="input-group-text" id="inputGroup-sizing-sm">Macchina</span>
<select @bind="@currRecord.IdxMacchina" class="form-select">
<option value="">--Selezionare una macchina--</option>
@if (ListMacchine != null)
{
foreach (var item in ListMacchine)
@@ -152,14 +155,15 @@
@if (!item.Descrizione.Contains("NEW Descrizione"))
{
if (item.IdxMacchina == currRecordControlli.IdxMacchina)
{
<option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
}
else
{
<option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
}
@*if (item.IdxMacchina == currRecordControlli.IdxMacchina)
{
<option selected value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
}
else
{
}
*@
<option value="@item.IdxMacchina">@item.IdxMacchina | @item.Descrizione</option>
}
}
}
MP.SPEC/Pages/PODL.razor.cs
+3
View File
@@ -6,6 +6,7 @@ using MP.SPEC.Components;
using MP.SPEC.Data;
using MP.SPEC.Services;
using NLog;
using System.Reflection.PortableExecutable;
namespace MP.SPEC.Pages
{
@@ -137,6 +138,7 @@ namespace MP.SPEC.Pages
/// <returns></returns>
protected async Task reqNewPODL()
{
header = "Nuovo PODL";
#if false
if (ListArticoli != null && ListArticoli.Count > 0)
{
@@ -182,6 +184,7 @@ namespace MP.SPEC.Pages
protected async Task selRecord(PODLExpModel selRec)
{
currRecord = selRec;
await Task.Delay(1);
}
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2212.114</h4>
<h4>Versione: 6.16.2212.115</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2212.114
6.16.2212.115
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2212.114</version>
<version>6.16.2212.115</version>
<url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>