From 68c7004828ea44139b3310fa5376b65e3546ca31 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 7 Feb 2023 17:17:43 +0100 Subject: [PATCH] Update modello dati x gestione conf ricette --- MP.Data/Controllers/MpSpecController.cs | 49 ++++++++++++++----------- MP.Data/DatabaseModels/Macchine.cs | 2 + 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/MP.Data/Controllers/MpSpecController.cs b/MP.Data/Controllers/MpSpecController.cs index 3f8b3c6d..aef9d456 100644 --- a/MP.Data/Controllers/MpSpecController.cs +++ b/MP.Data/Controllers/MpSpecController.cs @@ -699,31 +699,38 @@ namespace MP.Data.Controllers public List MacchineGetFilt(string codGruppo) { List dbResult = new List(); - using (var dbCtx = new MoonProContext(_configuration)) + try { - if (codGruppo == "*") + using (var dbCtx = new MoonProContext(_configuration)) { - dbResult = dbCtx - .DbSetMacchine - .AsNoTracking() - .OrderBy(x => x.IdxMacchina) - .ToList(); - } - else - { - dbResult = dbCtx - .DbSetGrp2Macc - .Where(g => g.CodGruppo == codGruppo) - .Join(dbCtx.DbSetMacchine, - g => g.IdxMacchina, - m => m.IdxMacchina, - (g, m) => m - ) - .AsNoTracking() - .OrderBy(x => x.IdxMacchina) - .ToList(); + if (codGruppo == "*") + { + dbResult = dbCtx + .DbSetMacchine + .AsNoTracking() + .OrderBy(x => x.IdxMacchina) + .ToList(); + } + else + { + dbResult = dbCtx + .DbSetGrp2Macc + .Where(g => g.CodGruppo == codGruppo) + .Join(dbCtx.DbSetMacchine, + g => g.IdxMacchina, + m => m.IdxMacchina, + (g, m) => m + ) + .AsNoTracking() + .OrderBy(x => x.IdxMacchina) + .ToList(); + } } } + catch(Exception exc) + { + Log.Error($"Eccezione in MacchineGetFilt{Environment.NewLine}{exc}"); + } return dbResult; } diff --git a/MP.Data/DatabaseModels/Macchine.cs b/MP.Data/DatabaseModels/Macchine.cs index a2bbcc56..858e9709 100644 --- a/MP.Data/DatabaseModels/Macchine.cs +++ b/MP.Data/DatabaseModels/Macchine.cs @@ -20,6 +20,8 @@ namespace MP.Data.DatabaseModels public string CodMacchina { get; set; } = ""; public string Nome { get; set; } = ""; public string Descrizione { get; set; } = ""; + public string RecipePath { get; set; } = ""; + //public string Note { get; set; } = ""; //public string url { get; set; } = ""; //public string locazione { get; set; } = "";