From 8d0870477b08bbcb90ecf5361e7e7b6afd38ea16 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 29 Oct 2024 17:54:35 +0100 Subject: [PATCH] PROG - fix missing file x IOB (errore in assegnazione modifica pre salvataggio in EFCore) --- MP.FileData/Controllers/FileController.cs | 101 ++++++++++------------ MP.Prog/Components/ArchiveStatus.razor.cs | 4 +- MP.Prog/MP.Prog.csproj | 2 +- MP.Prog/Resources/ChangeLog.html | 2 +- MP.Prog/Resources/VersNum.txt | 2 +- MP.Prog/Resources/manifest.xml | 2 +- MP.Prog/appsettings.json | 10 ++- 7 files changed, 58 insertions(+), 65 deletions(-) diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs index 3ea65ec5..027e0aa4 100644 --- a/MP.FileData/Controllers/FileController.cs +++ b/MP.FileData/Controllers/FileController.cs @@ -869,21 +869,21 @@ namespace MP.FileData.Controllers DateTime adesso = DateTime.Now; using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration)) { - // SOLO SE richiesto forzatura tags - if (forceTag) + // elenco Tags + List currTags = localDbCtx.DbSetTags.ToList(); + FileModel currItem = null; + foreach (var item in updFiles) { - // elenco Tags - List currTags = localDbCtx.DbSetTags.ToList(); - FileModel currItem = null; - foreach (var item in updFiles) - { - // recupero record da DB... - currItem = localDbCtx - .DbSetProgFile - .Where(x => x.FileId == item.FileId) - .Include(x => x.Tags) - .FirstOrDefault(); + // recupero record da DB... + currItem = localDbCtx + .DbSetProgFile + .Where(x => x.FileId == item.FileId) + .Include(x => x.Tags) + .FirstOrDefault(); + // SOLO SE richiesto forzatura tags + if (forceTag) + { List Tags = new List(); List Tag4File = new List(); // se necessario bonifico filename... @@ -933,30 +933,24 @@ namespace MP.FileData.Controllers // salvo i tags relativi ai files currItem.Tags.Clear(); currItem.Tags = Tag4File; - //localDbCtx.Entry(currItem).State = EntityState.Modified; } - //localDbCtx.SaveChanges(); } - try - { - // salvo - localDbCtx.SaveChanges(); - } - catch (Exception exc) - { - Log.Error($"Errore in salvataggio FileSetChecked{Environment.NewLine}{exc}"); - } - } -#if false - // update comunque data-ora - foreach (var item in updFiles) - { - // salvo update file - item.LastCheck = adesso; - localDbCtx.Entry(item).State = EntityState.Modified; - } -#endif + // update comunque data-ora e stato missing + currItem.DiskStatus = FileState.Ok; + currItem.LastCheck = adesso; + localDbCtx.Entry(currItem).State = EntityState.Modified; + } + + // salvo + try + { + localDbCtx.SaveChanges(); + } + catch (Exception exc) + { + Log.Error($"Errore in salvataggio FileSetChecked{Environment.NewLine}{exc}"); + } answ = true; } GC.Collect(); @@ -977,21 +971,21 @@ namespace MP.FileData.Controllers DateTime adesso = DateTime.Now; using (MoonPro_ProgContext localDbCtx = new MoonPro_ProgContext(_configuration)) { - // SOLO SE richiesto forzatura tags - if (forceTag) + // elenco Tags + List currTags = localDbCtx.DbSetTags.ToList(); + FileModel currItem = null; + foreach (var item in missFiles) { - // elenco Tags - List currTags = localDbCtx.DbSetTags.ToList(); - FileModel currItem = null; - foreach (var item in missFiles) - { - // recupero record da DB... - currItem = localDbCtx - .DbSetProgFile - .Where(x => x.FileId == item.FileId) - .Include(x => x.Tags) - .FirstOrDefault(); + // recupero record da DB... + currItem = localDbCtx + .DbSetProgFile + .Where(x => x.FileId == item.FileId) + .Include(x => x.Tags) + .FirstOrDefault(); + // SOLO SE richiesto forzatura tags + if (forceTag) + { List Tags = new List(); List Tag4File = new List(); // se necessario bonifico filename... @@ -1043,18 +1037,13 @@ namespace MP.FileData.Controllers currItem.Tags = Tag4File; //localDbCtx.Entry(currItem).State = EntityState.Modified; } - //localDbCtx.SaveChanges(); } + // update comunque data-ora e stato missing + currItem.DiskStatus = FileState.Missing; + currItem.LastCheck = adesso; + localDbCtx.Entry(currItem).State = EntityState.Modified; } - // update comunque data-ora e stato missing - foreach (var item in missFiles) - { - // salvo update file - item.DiskStatus = FileState.Missing; - item.LastCheck = adesso; - localDbCtx.Entry(item).State = EntityState.Modified; - } try { // salvo diff --git a/MP.Prog/Components/ArchiveStatus.razor.cs b/MP.Prog/Components/ArchiveStatus.razor.cs index 9a186f0f..8436c327 100644 --- a/MP.Prog/Components/ArchiveStatus.razor.cs +++ b/MP.Prog/Components/ArchiveStatus.razor.cs @@ -87,7 +87,7 @@ namespace MP.Prog.Components setupMessages.Add("Inizio Analisi Archivio..."); await InvokeAsync(StateHasChanged); await ArchiveCheck(maxHour); - await Task.Delay(400); + await Task.Delay(200); ClearMessage(); await ReloadData(); } @@ -99,7 +99,7 @@ namespace MP.Prog.Components setupMessages.Add($"Inizio Analisi Archivio | Archivio {idxMacchina}"); await InvokeAsync(StateHasChanged); await ArchiveSingleCheck(idxMacchina, 0); - await Task.Delay(400); + await Task.Delay(200); ClearMessage(); await ReloadData(); } diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index c5bd87e0..6be6089a 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net6.0 MP.Prog - 6.16.2410.2910 + 6.16.2410.2917 True diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index b88d8894..261745d2 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2410.2910

+

Versione: 6.16.2410.2917


Note di rilascio:
    diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index c04a835b..53d4963c 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2410.2910 +6.16.2410.2917 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index f245f835..7bf14bc0 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2410.2910 + 6.16.2410.2917 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Prog.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false diff --git a/MP.Prog/appsettings.json b/MP.Prog/appsettings.json index 4bb09151..e3d55f38 100644 --- a/MP.Prog/appsettings.json +++ b/MP.Prog/appsettings.json @@ -54,13 +54,17 @@ "DefaultSearch": "##" }, "ConnectionStrings": { - "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", - "MP.Prog": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", + + "DefaultConnection": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", + "MP.Prog": "Server=W2019-SQL-STEAM;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", + //"DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", + //"MP.Prog": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", "Redis": "localhost:26379,serviceName=devel,DefaultDatabase=5,connectTimeout=5000,syncTimeout=5000,asyncTimeout=5000,abortConnect=false,ssl=false" }, "ServerConf": { "FolderBasePath": "\\\\stor01", - "Prog.ApiUrl": "https://iis01.egalware.com/MP/PROG" + "Prog.ApiUrl": "https://office.egalware.com/MP/PROG" + //"Prog.ApiUrl": "https://iis01.egalware.com/MP/PROG" }, "SpecialConf": { "AppUrl": "/MP/PROG",