From 8947a03e5ad905eb88e47686c4c108e0ecc7c229 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 30 Sep 2021 18:58:13 +0200 Subject: [PATCH 1/3] Cambio path x download page --- MP.Stats/Components/DataPager.razor | 2 +- MP.Stats/Pages/Download.cshtml.cs | 2 +- MP.Stats/temp/Scarti.csv | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 MP.Stats/temp/Scarti.csv diff --git a/MP.Stats/Components/DataPager.razor b/MP.Stats/Components/DataPager.razor index bf75fb07..085c9b87 100644 --- a/MP.Stats/Components/DataPager.razor +++ b/MP.Stats/Components/DataPager.razor @@ -50,7 +50,7 @@ } else { - Download Data + Download Data } } diff --git a/MP.Stats/Pages/Download.cshtml.cs b/MP.Stats/Pages/Download.cshtml.cs index 2556693b..4d60f0e1 100644 --- a/MP.Stats/Pages/Download.cshtml.cs +++ b/MP.Stats/Pages/Download.cshtml.cs @@ -40,7 +40,7 @@ namespace MP.Stats.Pages { fileName = Request.Query["fileName"]; } - var filePath = Path.Combine(_env.ContentRootPath, fileName); + var filePath = Path.Combine(_env.ContentRootPath, "temp\\", fileName); //var filePath = Path.Combine(_env.WebRootPath, "..\\temp\\", fileName); byte[] fileBytes = System.IO.File.ReadAllBytes(filePath); diff --git a/MP.Stats/temp/Scarti.csv b/MP.Stats/temp/Scarti.csv new file mode 100644 index 00000000..70a17da1 --- /dev/null +++ b/MP.Stats/temp/Scarti.csv @@ -0,0 +1,7 @@ +Causale;CodArticolo;CodMacchina;Cognome;DataOraRif;DescArticolo;Descrizione;IdxMacchina;IdxOdl;KeyRichiesta;MatrOpr;Nome;Note;Qta +01;60682;SIM08;Steamware;25/05/2021 18:08:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Usura Utensile;SIMUL_08;61894;TEST MASTER SLAVE 1;1;CEO;;3 +REC;60682;SIM08;Steamware;23/05/2021 23:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Recuperabili;SIMUL_08;61810;TEST MASTER SLAVE 1;1;CEO;;1 +ND;60682;SIM08;Steamware;23/05/2021 22:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX; -- Non Definito --;SIMUL_08;61810;TEST MASTER SLAVE 1;1;CEO;;1 +06;60682;SIM08;Steamware;23/05/2021 21:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Posaggio Pezzo Errato;SIMUL_08;61802;TEST MASTER SLAVE 1;1;CEO;;1 +05;60682;SIM08;Steamware;23/05/2021 20:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Prova Pezzo;SIMUL_08;61802;TEST MASTER SLAVE 1;1;CEO;;1 +04;60682;SIM08;Steamware;23/05/2021 19:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Caduta tensione;SIMUL_08;61802;TEST MASTER SLAVE 1;1;CEO;;1 From db5500b3a7d10bee196caca36411f673140ba5fc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 30 Sep 2021 18:59:09 +0200 Subject: [PATCH 2/3] pulizia gitignore --- .gitignore | 1 + MP.Stats/temp/Scarti.csv | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 MP.Stats/temp/Scarti.csv diff --git a/.gitignore b/.gitignore index 90ec6acf..d5894a08 100644 --- a/.gitignore +++ b/.gitignore @@ -346,3 +346,4 @@ Backup*/ UpgradeLog*.XML MP.Prog/Shared/MainLayout.razor +MP.Stats/temp/*.csv diff --git a/MP.Stats/temp/Scarti.csv b/MP.Stats/temp/Scarti.csv deleted file mode 100644 index 70a17da1..00000000 --- a/MP.Stats/temp/Scarti.csv +++ /dev/null @@ -1,7 +0,0 @@ -Causale;CodArticolo;CodMacchina;Cognome;DataOraRif;DescArticolo;Descrizione;IdxMacchina;IdxOdl;KeyRichiesta;MatrOpr;Nome;Note;Qta -01;60682;SIM08;Steamware;25/05/2021 18:08:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Usura Utensile;SIMUL_08;61894;TEST MASTER SLAVE 1;1;CEO;;3 -REC;60682;SIM08;Steamware;23/05/2021 23:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Recuperabili;SIMUL_08;61810;TEST MASTER SLAVE 1;1;CEO;;1 -ND;60682;SIM08;Steamware;23/05/2021 22:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX; -- Non Definito --;SIMUL_08;61810;TEST MASTER SLAVE 1;1;CEO;;1 -06;60682;SIM08;Steamware;23/05/2021 21:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Posaggio Pezzo Errato;SIMUL_08;61802;TEST MASTER SLAVE 1;1;CEO;;1 -05;60682;SIM08;Steamware;23/05/2021 20:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Prova Pezzo;SIMUL_08;61802;TEST MASTER SLAVE 1;1;CEO;;1 -04;60682;SIM08;Steamware;23/05/2021 19:04:00;INSONORIZZANTE PARATIA DX 520MCA GSX;Caduta tensione;SIMUL_08;61802;TEST MASTER SLAVE 1;1;CEO;;1 From 027a0b4b4c4458b18436a61b17a4fd0c07a9aa4c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 30 Sep 2021 19:00:05 +0200 Subject: [PATCH 3/3] update favicon --- MP.Stats/MP.Stats.csproj | 8 +++++++- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 386c5d07..988f9641 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.14.2109.3018 + 6.14.2109.3019 @@ -43,6 +43,12 @@ + + + Always + + + PreserveNewest diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index dd111479..12e9f1a1 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

Versione: 6.14.2109.3018

+

Versione: 6.14.2109.3019


Note di rilascio:
    diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 7a93d651..4e302d02 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.14.2109.3018 +6.14.2109.3019 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 9cefd91b..d3b9d8fe 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.14.2109.3018 + 6.14.2109.3019 https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false