From 01270d625401f67eff1144c612c4340225275d21 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 15:07:51 +0100 Subject: [PATCH 1/7] fix dotnet5 --> dotnet6 --- MP.Land/MP.Land.csproj | 2 +- .../PublishProfiles/FolderProfile.pubxml | 6 ++- .../Properties/PublishProfiles/IIS01.pubxml | 42 +++++++++---------- .../Properties/PublishProfiles/IIS02.pubxml | 41 +++++++++--------- .../PublishProfiles/IISProfile.pubxml | 28 ++++++------- .../W2019-IIS-DEVProfile.pubxml | 41 +++++++++--------- MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- 9 files changed, 86 insertions(+), 80 deletions(-) diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 1efb7b9b..1ed01814 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.14.2202.2117 + 6.14.2202.2214 diff --git a/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml b/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml index cb2062ae..d067ccc3 100644 --- a/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,7 +10,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - bin\publish\net5.0\ + bin\publish\net6.0\ FileSystem + + net6.0 + d949ab45-9b65-4594-a97e-182bc3831707 + false \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IIS01.pubxml b/MP.Land/Properties/PublishProfiles/IIS01.pubxml index b96ae492..334a283d 100644 --- a/MP.Land/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Land/Properties/PublishProfiles/IIS01.pubxml @@ -4,25 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS01:8172/MsDeploy.axd - Default Web Site/MP/LAND - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - True - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS01:8172/MsDeploy.axd + Default Web Site/MP/LAND + + False + WMSVC + True + jenkins + <_SavePWD>True + net6.0 + True + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IIS02.pubxml b/MP.Land/Properties/PublishProfiles/IIS02.pubxml index fab9f1d8..9ad04ed8 100644 --- a/MP.Land/Properties/PublishProfiles/IIS02.pubxml +++ b/MP.Land/Properties/PublishProfiles/IIS02.pubxml @@ -4,24 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS02:8172/MsDeploy.axd - Default Web Site/MP/LAND - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://IIS02:8172/MsDeploy.axd + Default Web Site/MP/LAND + + False + WMSVC + True + jenkins + <_SavePWD>True + net6.0 + True + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml index aad930b6..32fa27be 100644 --- a/MP.Land/Properties/PublishProfiles/IISProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/IISProfile.pubxml @@ -4,18 +4,18 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - Package - Release - Any CPU - - True - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - bin\publish\MP.Land.zip - true - Default Web Site/MP/LAND - net5.0 - false - + + Package + Release + Any CPU + + True + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + bin\publish\MP.Land.zip + true + Default Web Site/MP/LAND + net6.0 + false + \ No newline at end of file diff --git a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml index 18e61f7a..9524a06f 100644 --- a/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml +++ b/MP.Land/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml @@ -4,24 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/MP/LAND - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://iis03.egalware.com:8172/MsDeploy.axd + Default Web Site/MP/LAND + + False + WMSVC + True + jenkins + <_SavePWD>True + net6.0 + True + \ No newline at end of file diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index a885b5e8..16ca5893 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.14.2202.2117

+

Versione: 6.14.2202.2214


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index aad2ebaf..d40f1bff 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.14.2202.2117 +6.14.2202.2214 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 5c6ef561..11669282 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.14.2202.2117 + 6.14.2202.2214 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false From 9c98ee945a9eb3d51fffb6d60ec10346d683c025 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 15:25:14 +0100 Subject: [PATCH 2/7] refresh MP prog --- .../Properties/PublishProfiles/IIS03.pubxml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 MP.Prog/Properties/PublishProfiles/IIS03.pubxml diff --git a/MP.Prog/Properties/PublishProfiles/IIS03.pubxml b/MP.Prog/Properties/PublishProfiles/IIS03.pubxml new file mode 100644 index 00000000..a5a89087 --- /dev/null +++ b/MP.Prog/Properties/PublishProfiles/IIS03.pubxml @@ -0,0 +1,28 @@ + + + + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://iis03.egalware.com:8172/MsDeploy.axd + Default Web Site/MP/PROG + + False + WMSVC + True + jenkins + <_SavePWD>True + net6.0 + True + + \ No newline at end of file From 4d2dc1057971af94551267f1fec7798d6be8beb4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 15:25:23 +0100 Subject: [PATCH 3/7] completo refresh progetto MP-PROG --- MP.Prog/MP.Prog.csproj | 6 ++- .../PublishProfiles/FolderProfile.pubxml | 6 ++- .../Properties/PublishProfiles/IIS01.pubxml | 4 +- .../Properties/PublishProfiles/IIS02.pubxml | 41 ++++++++++--------- .../PublishProfiles/IISProfile.pubxml | 28 ++++++------- .../W2019-IIS-DEVProfile.pubxml | 27 ------------ MP.Prog/Resources/ChangeLog.html | 2 +- MP.Prog/Resources/VersNum.txt | 2 +- MP.Prog/Resources/manifest.xml | 2 +- 9 files changed, 50 insertions(+), 68 deletions(-) delete mode 100644 MP.Prog/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index d1be0928..1a67ce59 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,13 +3,17 @@ net6.0 MP.Prog - 6.14.2112.2315 + 6.14.2202.2215 + + <_WebToolingArtifacts Remove="Properties\PublishProfiles\IIS03.pubxml" /> + + diff --git a/MP.Prog/Properties/PublishProfiles/FolderProfile.pubxml b/MP.Prog/Properties/PublishProfiles/FolderProfile.pubxml index cb2062ae..c10ad3f5 100644 --- a/MP.Prog/Properties/PublishProfiles/FolderProfile.pubxml +++ b/MP.Prog/Properties/PublishProfiles/FolderProfile.pubxml @@ -10,7 +10,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU FileSystem - bin\publish\net5.0\ + bin\publish\net6.0\ FileSystem + + net6.0 + 3223dde4-564e-4d58-8a94-e368b9778c67 + false \ No newline at end of file diff --git a/MP.Prog/Properties/PublishProfiles/IIS01.pubxml b/MP.Prog/Properties/PublishProfiles/IIS01.pubxml index 8770d4a4..b839fe8f 100644 --- a/MP.Prog/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Prog/Properties/PublishProfiles/IIS01.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt False d9901b50-e61c-400c-b62c-fa060cf72c29 false - https://IIS01:8172/MsDeploy.axd + https://iis01.egalware.com:8172/MsDeploy.axd Default Web Site/MP/PROG False @@ -22,7 +22,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True jenkins <_SavePWD>True - net5.0 + net6.0 True \ No newline at end of file diff --git a/MP.Prog/Properties/PublishProfiles/IIS02.pubxml b/MP.Prog/Properties/PublishProfiles/IIS02.pubxml index 414f1262..93927fb1 100644 --- a/MP.Prog/Properties/PublishProfiles/IIS02.pubxml +++ b/MP.Prog/Properties/PublishProfiles/IIS02.pubxml @@ -4,24 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://IIS02:8172/MsDeploy.axd - Default Web Site/MP/PROG - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://iis02.egalware.com:8172/MsDeploy.axd + Default Web Site/MP/PROG + + False + WMSVC + True + jenkins + <_SavePWD>True + net6.0 + True + \ No newline at end of file diff --git a/MP.Prog/Properties/PublishProfiles/IISProfile.pubxml b/MP.Prog/Properties/PublishProfiles/IISProfile.pubxml index ac1eb81f..123b322c 100644 --- a/MP.Prog/Properties/PublishProfiles/IISProfile.pubxml +++ b/MP.Prog/Properties/PublishProfiles/IISProfile.pubxml @@ -4,18 +4,18 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - Package - Release - Any CPU - - True - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - bin\publish\MP.Prog.zip - true - Default Web Site/MP/PROG - net5.0 - false - + + Package + Release + Any CPU + + True + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + bin\publish\MP.Prog.zip + true + Default Web Site/MP/PROG + net6.0 + false + \ No newline at end of file diff --git a/MP.Prog/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Prog/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml deleted file mode 100644 index e4965fb0..00000000 --- a/MP.Prog/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/MP/PROG - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - - \ No newline at end of file diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 3fcbcdb1..75ed12d2 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

    Versione: 6.14.2112.2315

    +

    Versione: 6.14.2202.2215


    Note di rilascio:
      diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index aae3317e..0ff04fb1 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -6.14.2112.2315 +6.14.2202.2215 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index 4acad0c0..d1d89627 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.14.2112.2315 + 6.14.2202.2215 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 From e345e61d8a81f9ae6f1f854e360f93ab56912997 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 16:02:35 +0100 Subject: [PATCH 4/7] refresh MP.Data --- MP.Data/MP.Data.csproj | 2 +- MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MP.Data/MP.Data.csproj b/MP.Data/MP.Data.csproj index 7ca5fda4..f7007495 100644 --- a/MP.Data/MP.Data.csproj +++ b/MP.Data/MP.Data.csproj @@ -20,6 +20,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 831e5788..de793444 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.14.2202.2119 + 6.14.2202.2215 diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 9ea7b464..28d70c2d 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

      Versione: 6.14.2202.2119

      +

      Versione: 6.14.2202.2215


      Note di rilascio:
        diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index f76f5e45..0ff04fb1 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.14.2202.2119 +6.14.2202.2215 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 8ed1f779..0836dfca 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.14.2202.2119 + 6.14.2202.2215 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 From fef6d4ccfc5857103b8ad43014cae821cadee96f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 16:24:32 +0100 Subject: [PATCH 5/7] Continuo cleanup da Blazorise's components --- MP.Prog/Startup.cs | 8 ------- MP.Stats/Components/ChartControlli.razor.cs | 25 +++++++++++++++------ MP.Stats/Components/ChartOEE.razor | 4 ++-- MP.Stats/Components/ChartOEE.razor.cs | 25 ++++++++++++++------- MP.Stats/Components/ChartScarti.razor.cs | 21 ++++++++++++----- MP.Stats/Components/ChartUserLog.razor | 4 ++-- MP.Stats/Components/ChartUserLog.razor.cs | 25 +++++++++++++++------ MP.Stats/Components/SelectionFilter.razor | 3 +-- MP.Stats/MP.Stats.csproj | 4 ---- MP.Stats/Pages/Test.razor.cs | 12 +++++----- MP.Stats/Pages/_Host.cshtml | 17 -------------- MP.Stats/Startup.cs | 8 ------- MP.Stats/_Imports.razor | 4 +--- 13 files changed, 81 insertions(+), 79 deletions(-) diff --git a/MP.Prog/Startup.cs b/MP.Prog/Startup.cs index 9a2f02f1..02178eb0 100644 --- a/MP.Prog/Startup.cs +++ b/MP.Prog/Startup.cs @@ -188,14 +188,6 @@ namespace MP.Prog .AddEntityFrameworkStores(); #endif -#if false - services.AddBlazorise(options => - { - options.ChangeTextOnKeyPress = true; // optional - }) - .AddBootstrapProviders() - .AddFontAwesomeIcons(); -#endif //// Elmah //services.AddElmah(); //string elmaConn = "Data Source=SQL2016DEV;Initial Catalog=Elmah;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=SHERPA.BBM;"; diff --git a/MP.Stats/Components/ChartControlli.razor.cs b/MP.Stats/Components/ChartControlli.razor.cs index b7a574df..43770f10 100644 --- a/MP.Stats/Components/ChartControlli.razor.cs +++ b/MP.Stats/Components/ChartControlli.razor.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Blazorise.Charts; using Microsoft.AspNetCore.Components; using MP.Stats.Data; @@ -85,8 +84,10 @@ namespace MP.Stats.Components AspectRatio = 1 }; +#if false protected PieChart PieVC = new PieChart(); - protected LineChart TimeSerieVC = new LineChart(); + protected LineChart TimeSerieVC = new LineChart(); +#endif #endregion Protected Fields @@ -134,6 +135,7 @@ namespace MP.Stats.Components #region Private Methods +#if false private PieChartDataset GetBarChartDataset() { var answ = new PieChartDataset @@ -145,7 +147,8 @@ namespace MP.Stats.Components HoverBorderWidth = 3 }; return answ; - } + } +#endif private List GetBarChartLabels() { @@ -153,6 +156,7 @@ namespace MP.Stats.Components return answ; } +#if false /// /// Elenco 2 linee x controli KO /KO /// @@ -170,7 +174,8 @@ namespace MP.Stats.Components BorderDash = new List { } }; return answ; - } + } +#endif private List GetLineChartLabels() { @@ -208,7 +213,9 @@ namespace MP.Stats.Components protected List getLineColors(float alpha) { List answ = new List(); - answ.Add(ChartColor.FromRgba(54, 82, 254, alpha)); +#if false + answ.Add(ChartColor.FromRgba(54, 82, 254, alpha)); +#endif return answ; } @@ -220,6 +227,7 @@ namespace MP.Stats.Components protected List getPieColors(float alpha) { List answ = new List(); +#if false foreach (var item in ParetoData) { if (item.label == EsitoOK) @@ -230,12 +238,14 @@ namespace MP.Stats.Components { answ.Add(ChartColor.FromRgba(254, 82, 65, alpha)); } - } + } +#endif return answ; } protected async Task HandleRedraw() { +#if false if (PieVC != null) { await PieVC.Clear(); @@ -245,7 +255,8 @@ namespace MP.Stats.Components { await TimeSerieVC.Clear(); await TimeSerieVC.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); - } + } +#endif } #endregion Protected Methods diff --git a/MP.Stats/Components/ChartOEE.razor b/MP.Stats/Components/ChartOEE.razor index 91670d2c..dfd20a4b 100644 --- a/MP.Stats/Components/ChartOEE.razor +++ b/MP.Stats/Components/ChartOEE.razor @@ -21,10 +21,10 @@
        - + @**@
        - + @**@
        diff --git a/MP.Stats/Components/ChartOEE.razor.cs b/MP.Stats/Components/ChartOEE.razor.cs index b241e6df..1e425a08 100644 --- a/MP.Stats/Components/ChartOEE.razor.cs +++ b/MP.Stats/Components/ChartOEE.razor.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Blazorise.Charts; using Microsoft.AspNetCore.Components; using MP.Stats.Data; @@ -82,9 +81,9 @@ namespace MP.Stats.Components AspectRatio = 3.5 }; - protected LineChart NumGuasti = new LineChart(); + protected List NumGuasti = new List(); - protected BarChart ParetoGuasti = new BarChart(); + protected List ParetoGuasti = new List(); #endregion Protected Fields @@ -132,6 +131,7 @@ namespace MP.Stats.Components #region Private Methods +#if false private BarChartDataset GetBarChartDataset() { var answ = new BarChartDataset @@ -143,7 +143,8 @@ namespace MP.Stats.Components HoverBorderWidth = 5 }; return answ; - } + } +#endif private List GetBarChartLabels() { @@ -151,6 +152,7 @@ namespace MP.Stats.Components return answ; } +#if false private LineChartDataset GetLineChartDataset() { var answ = new LineChartDataset @@ -164,7 +166,8 @@ namespace MP.Stats.Components BorderDash = new List { } }; return answ; - } + } +#endif private List GetLineChartLabels() { @@ -202,6 +205,7 @@ namespace MP.Stats.Components protected List backgroundColors(int numRecords, float alpha) { List answ = new List(); +#if false // verde... for (int i = 0; i < numRecords / 3; i++) { @@ -215,7 +219,8 @@ namespace MP.Stats.Components while (answ.Count < numRecords) { answ.Add(ChartColor.FromRgba(255, 99, 132, alpha)); - } + } +#endif return answ; } @@ -224,13 +229,17 @@ namespace MP.Stats.Components { if (ParetoGuasti != null) { +#if false await ParetoGuasti.Clear(); - await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); + await ParetoGuasti.AddLabelsDatasetsAndUpdate(GetBarChartLabels(), GetBarChartDataset()); +#endif } if (NumGuasti != null) { +#if false await NumGuasti.Clear(); - await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); + await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); +#endif } } diff --git a/MP.Stats/Components/ChartScarti.razor.cs b/MP.Stats/Components/ChartScarti.razor.cs index 2c8cd2f0..76b2c7a7 100644 --- a/MP.Stats/Components/ChartScarti.razor.cs +++ b/MP.Stats/Components/ChartScarti.razor.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Blazorise.Charts; using Microsoft.AspNetCore.Components; using MP.Stats.Data; @@ -81,9 +80,11 @@ namespace MP.Stats.Components AspectRatio = 3.5 }; +#if false protected LineChart NumGuasti = new LineChart(); - protected BarChart ParetoGuasti = new BarChart(); + protected BarChart ParetoGuasti = new BarChart(); +#endif #endregion Protected Fields @@ -131,6 +132,7 @@ namespace MP.Stats.Components #region Private Methods +#if false private BarChartDataset GetBarChartDataset() { var answ = new BarChartDataset @@ -142,7 +144,8 @@ namespace MP.Stats.Components HoverBorderWidth = 5 }; return answ; - } + } +#endif private List GetBarChartLabels() { @@ -150,6 +153,7 @@ namespace MP.Stats.Components return answ; } +#if false private LineChartDataset GetLineChartDataset() { var answ = new LineChartDataset @@ -163,7 +167,8 @@ namespace MP.Stats.Components BorderDash = new List { } }; return answ; - } + } +#endif private List GetLineChartLabels() { @@ -201,6 +206,7 @@ namespace MP.Stats.Components protected List backgroundColors(int numRecords, float alpha) { List answ = new List(); +#if false // rosso... for (int i = 0; i < numRecords / 3; i++) { @@ -214,13 +220,15 @@ namespace MP.Stats.Components while (answ.Count < numRecords) { answ.Add(ChartColor.FromRgba(54, 82, 235, alpha)); - } + } +#endif return answ; } protected async Task HandleRedraw() { +#if false if (ParetoGuasti != null) { await ParetoGuasti.Clear(); @@ -230,7 +238,8 @@ namespace MP.Stats.Components { await NumGuasti.Clear(); await NumGuasti.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); - } + } +#endif } #endregion Protected Methods diff --git a/MP.Stats/Components/ChartUserLog.razor b/MP.Stats/Components/ChartUserLog.razor index 2f870d3d..53c4139c 100644 --- a/MP.Stats/Components/ChartUserLog.razor +++ b/MP.Stats/Components/ChartUserLog.razor @@ -21,10 +21,10 @@
        - + @* *@
        - +@* *@
        diff --git a/MP.Stats/Components/ChartUserLog.razor.cs b/MP.Stats/Components/ChartUserLog.razor.cs index 96e600ce..5a2f1149 100644 --- a/MP.Stats/Components/ChartUserLog.razor.cs +++ b/MP.Stats/Components/ChartUserLog.razor.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Blazorise.Charts; using Microsoft.AspNetCore.Components; using MP.Stats.Data; @@ -85,8 +84,10 @@ namespace MP.Stats.Components AspectRatio = 1 }; +#if false protected PieChart PieVC = new PieChart(); - protected LineChart TimeSerieVC = new LineChart(); + protected LineChart TimeSerieVC = new LineChart(); +#endif #endregion Protected Fields @@ -134,6 +135,7 @@ namespace MP.Stats.Components #region Private Methods +#if false private PieChartDataset GetBarChartDataset() { var answ = new PieChartDataset @@ -145,7 +147,8 @@ namespace MP.Stats.Components HoverBorderWidth = 3 }; return answ; - } + } +#endif private List GetBarChartLabels() { @@ -153,6 +156,7 @@ namespace MP.Stats.Components return answ; } +#if false /// /// Elenco 2 linee x controli KO /KO /// @@ -170,7 +174,8 @@ namespace MP.Stats.Components BorderDash = new List { } }; return answ; - } + } +#endif private List GetLineChartLabels() { @@ -208,6 +213,7 @@ namespace MP.Stats.Components protected List backgroundColors(int numRecords, float alpha) { List answ = new List(); +#if false // verde... for (int i = 0; i < numRecords / 3; i++) { @@ -221,7 +227,8 @@ namespace MP.Stats.Components while (answ.Count < numRecords) { answ.Add(ChartColor.FromRgba(180, 180, 35, alpha)); - } + } +#endif return answ; } @@ -234,12 +241,15 @@ namespace MP.Stats.Components protected List getLineColors(float alpha) { List answ = new List(); - answ.Add(ChartColor.FromRgba(54, 82, 254, alpha)); +#if false + answ.Add(ChartColor.FromRgba(54, 82, 254, alpha)); +#endif return answ; } protected async Task HandleRedraw() { +#if false if (PieVC != null) { await PieVC.Clear(); @@ -249,7 +259,8 @@ namespace MP.Stats.Components { await TimeSerieVC.Clear(); await TimeSerieVC.AddLabelsDatasetsAndUpdate(GetLineChartLabels(), GetLineChartDataset()); - } + } +#endif } #endregion Protected Methods diff --git a/MP.Stats/Components/SelectionFilter.razor b/MP.Stats/Components/SelectionFilter.razor index 8bba127f..a8c45f07 100644 --- a/MP.Stats/Components/SelectionFilter.razor +++ b/MP.Stats/Components/SelectionFilter.razor @@ -1,5 +1,4 @@ -@using Blazorise.Components -@using MP.Stats.Data +@using MP.Stats.Data
        diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index de793444..3cbbbba5 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -175,10 +175,6 @@ - - - - diff --git a/MP.Stats/Pages/Test.razor.cs b/MP.Stats/Pages/Test.razor.cs index 6237ab7f..8603a75e 100644 --- a/MP.Stats/Pages/Test.razor.cs +++ b/MP.Stats/Pages/Test.razor.cs @@ -11,11 +11,9 @@ using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; +using MP.Data; using MP.Stats; using MP.Stats.Shared; -using Blazorise; -using Blazorise.Charts; -using MP.Data; namespace MP.Stats.Pages { @@ -66,10 +64,12 @@ namespace MP.Stats.Pages } } +#if false PieChart pieChart; LineChart lineChart; HorizontalBarChart barChartHoriz; - BarChart barChart; + BarChart barChart; +#endif protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -182,8 +182,10 @@ namespace MP.Stats.Pages #endif string[] Labels = { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" }; +#if false List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; - List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; + List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; +#endif private List RandomizeData() { diff --git a/MP.Stats/Pages/_Host.cshtml b/MP.Stats/Pages/_Host.cshtml index 08212dcb..e2cd9e43 100644 --- a/MP.Stats/Pages/_Host.cshtml +++ b/MP.Stats/Pages/_Host.cshtml @@ -17,13 +17,6 @@ - - - - @* - - *@ - @@ -40,16 +33,6 @@ 🗙
        - - @* - *@ - @**@ - @**@ - - @* - - *@ - diff --git a/MP.Stats/Startup.cs b/MP.Stats/Startup.cs index be7906a3..f512bd48 100644 --- a/MP.Stats/Startup.cs +++ b/MP.Stats/Startup.cs @@ -1,4 +1,3 @@ -using Blazorise; using ElmahCore.Mvc; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -8,7 +7,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MP.Stats.Data; using System.Globalization; -using Blazorise.Bootstrap; namespace MP.Stats { @@ -77,12 +75,6 @@ namespace MP.Stats // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 public void ConfigureServices(IServiceCollection services) { - services.AddBlazorise(options => - { - options.ChangeTextOnKeyPress = true; // optional - }) - .AddBootstrapProviders(); - // Elmah services.AddElmah(); //string elmaConn = "Data Source=SQL2016DEV;Initial Catalog=Elmah;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=SHERPA.BBM;"; diff --git a/MP.Stats/_Imports.razor b/MP.Stats/_Imports.razor index 1dc55d9a..5527ce16 100644 --- a/MP.Stats/_Imports.razor +++ b/MP.Stats/_Imports.razor @@ -7,6 +7,4 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop @using MP.Stats -@using MP.Stats.Shared -@using Blazorise -@using Blazorise.Charts \ No newline at end of file +@using MP.Stats.Shared \ No newline at end of file From b85ed12f1cb962ea77228e70bbfa13836794c5a6 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 16:28:20 +0100 Subject: [PATCH 6/7] Eliminati (commentati) elementi grafici x fix compilazione --- MP.Stats/Components/ChartControlli.razor | 4 ++-- MP.Stats/Components/ChartScarti.razor | 4 ++-- MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MP.Stats/Components/ChartControlli.razor b/MP.Stats/Components/ChartControlli.razor index 2f870d3d..20f37cc0 100644 --- a/MP.Stats/Components/ChartControlli.razor +++ b/MP.Stats/Components/ChartControlli.razor @@ -1,4 +1,4 @@ -
        +@*
        @if (RawData == null || RawData.Count == 0) {
        @@ -29,4 +29,4 @@
        } -
        \ No newline at end of file +*@ \ No newline at end of file diff --git a/MP.Stats/Components/ChartScarti.razor b/MP.Stats/Components/ChartScarti.razor index bfc68ed0..daf5d238 100644 --- a/MP.Stats/Components/ChartScarti.razor +++ b/MP.Stats/Components/ChartScarti.razor @@ -1,4 +1,4 @@ -
        +@*
        @if (RawData == null || RawData.Count == 0) {
        @@ -29,4 +29,4 @@
        } -
        \ No newline at end of file +*@ \ No newline at end of file diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 3cbbbba5..6139ae63 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net6.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 6.14.2202.2215 + 6.14.2202.2216 diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index 28d70c2d..535c583f 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

        Versione: 6.14.2202.2215

        +

        Versione: 6.14.2202.2216


        Note di rilascio:
          diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 0ff04fb1..c0b0ea90 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -6.14.2202.2215 +6.14.2202.2216 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index 0836dfca..2609579b 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.14.2202.2215 + 6.14.2202.2216 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 From f22bd910a2c3086dcd2f9c828ac35e61e5ad47ec Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 22 Feb 2022 16:31:33 +0100 Subject: [PATCH 7/7] fix pusblish profiles --- .../Properties/PublishProfiles/IIS01.pubxml | 5 ++- .../Properties/PublishProfiles/IIS02.pubxml | 5 ++- .../PublishProfiles/IISProfile.pubxml | 2 +- .../W2019-IIS-DEVProfile.pubxml | 41 ++++++++++--------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml index ac3c88c6..94ae9a8f 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS01.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IIS01.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt False d9901b50-e61c-400c-b62c-fa060cf72c29 false - https://IIS01:8172/MsDeploy.axd + https://iis01.egalware.com:8172/MsDeploy.axd Default Web Site/MP/STATS False @@ -22,6 +22,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True jenkins <_SavePWD>True - net5.0 + net6.0 + True \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml index 3f2c9acb..bfb09418 100644 --- a/MP.Stats/Properties/PublishProfiles/IIS02.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IIS02.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt False d9901b50-e61c-400c-b62c-fa060cf72c29 false - https://IIS02:8172/MsDeploy.axd + https://iis02.egalware.com:8172/MsDeploy.axd Default Web Site/MP/STATS False @@ -22,6 +22,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt True jenkins <_SavePWD>True - net5.0 + net6.0 + True \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml index 7159a5db..3ae36f18 100644 --- a/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml +++ b/MP.Stats/Properties/PublishProfiles/IISProfile.pubxml @@ -15,7 +15,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt bin\publish\MP.Stats.zip true Default Web Site/MP/STATS - net5.0 + net6.0 false \ No newline at end of file diff --git a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml index 6b790904..0ef183bf 100644 --- a/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml +++ b/MP.Stats/Properties/PublishProfiles/W2019-IIS-DEVProfile.pubxml @@ -4,24 +4,25 @@ This file is used by the publish/package process of your Web project. You can cu by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. --> - - MSDeploy - True - Release - Any CPU - - - False - d9901b50-e61c-400c-b62c-fa060cf72c29 - false - https://w2019-iis-dev:8172/MsDeploy.axd - Default Web Site/MP/STATS - - False - WMSVC - True - jenkins - <_SavePWD>True - net5.0 - + + MSDeploy + True + Release + Any CPU + + + False + d9901b50-e61c-400c-b62c-fa060cf72c29 + false + https://iis03.egalware.com:8172/MsDeploy.axd + Default Web Site/MP/STATS + + False + WMSVC + True + jenkins + <_SavePWD>True + net6.0 + True + \ No newline at end of file