From d524aa9ffdf20b3a816b789735dfc7f47468bb93 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Sun, 3 Nov 2019 03:43:34 +0000
Subject: [PATCH] Move macOS versions chart to ChartJS.

---
 .../.idea.DiscImageChef.Server/.idea/misc.xml |  3 +++
 .../Controllers/StatsController.cs            | 27 ++++++++-----------
 DiscImageChef.Server/Views/Stats/Index.cshtml | 13 ++++++---
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.idea/.idea.DiscImageChef.Server/.idea/misc.xml b/.idea/.idea.DiscImageChef.Server/.idea/misc.xml
index 1d8c84d0..16d12254 100644
--- a/.idea/.idea.DiscImageChef.Server/.idea/misc.xml
+++ b/.idea/.idea.DiscImageChef.Server/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="com.jetbrains.rider.android.RiderAndroidMiscFileCreationComponent">
     <option name="ENSURE_MISC_FILE_EXISTS" value="true" />
   </component>
diff --git a/DiscImageChef.Server/Controllers/StatsController.cs b/DiscImageChef.Server/Controllers/StatsController.cs
index 366b223f..0a668e6d 100644
--- a/DiscImageChef.Server/Controllers/StatsController.cs
+++ b/DiscImageChef.Server/Controllers/StatsController.cs
@@ -115,22 +115,6 @@ namespace DiscImageChef.Server.Controllers
 
                     ViewBag.repOperatingSystems = operatingSystems.OrderBy(os => os.name).ToList();
 
-                    List<PieSeriesData> macosPieData = new List<PieSeriesData>();
-
-                    decimal macosCount = ctx.OperatingSystems.Where(o => o.Name == PlatformID.MacOSX.ToString()).
-                                             Sum(o => o.Count);
-
-                    foreach(OperatingSystem version in
-                        ctx.OperatingSystems.Where(o => o.Name == PlatformID.MacOSX.ToString()))
-                        macosPieData.Add(new PieSeriesData
-                        {
-                            Name =
-                                $"{DetectOS.GetPlatformName(PlatformID.MacOSX, version.Version)}{(string.IsNullOrEmpty(version.Version) ? "" : " ")}{version.Version}",
-                            Y = (double?)(version.Count / macosCount)
-                        });
-
-                    ViewData["macosPieData"] = macosPieData;
-
                     List<PieSeriesData> windowsPieData = new List<PieSeriesData>();
 
                     decimal windowsCount = ctx.OperatingSystems.Where(o => o.Name == PlatformID.Win32NT.ToString()).
@@ -526,5 +510,16 @@ namespace DiscImageChef.Server.Controllers
             ctx.OperatingSystems.Where(o => o.Name == PlatformID.Linux.ToString()).OrderByDescending(o => o.Count).
                 Take(10).Select(x => x.Count.ToString()).ToArray()
         });
+
+        public IActionResult GetMacOsData() => Json(new[]
+        {
+            ctx.OperatingSystems.Where(o => o.Name == PlatformID.MacOSX.ToString()).OrderByDescending(o => o.Count).
+                Take(10).
+                Select(x =>
+                           $"{DetectOS.GetPlatformName(PlatformID.MacOSX, x.Version)}{(string.IsNullOrEmpty(x.Version) ? "" : " ")}{x.Version}").
+                ToArray(),
+            ctx.OperatingSystems.Where(o => o.Name == PlatformID.MacOSX.ToString()).OrderByDescending(o => o.Count).
+                Take(10).Select(x => x.Count.ToString()).ToArray()
+        });
     }
 }
\ No newline at end of file
diff --git a/DiscImageChef.Server/Views/Stats/Index.cshtml b/DiscImageChef.Server/Views/Stats/Index.cshtml
index 97bd6866..aa6b8ae8 100644
--- a/DiscImageChef.Server/Views/Stats/Index.cshtml
+++ b/DiscImageChef.Server/Views/Stats/Index.cshtml
@@ -66,7 +66,8 @@
                 <div class="carousel-item">
                     <canvas id="linuxChart"></canvas>
                 </div>
-                <div class="carousel-item" id="macosChart">
+                <div class="carousel-item">
+                    <canvas id="macosChart"></canvas>
                 </div>
                 <div class="carousel-item" id="windowsChart">
                 </div>
@@ -544,12 +545,18 @@ function DrawOsPie(osData)
 
 function DrawLinuxPie(linuxData)
 {
-    DrawPie("linuxChart", "Top 10 Linux versions", linuxData[0], linuxData[1])
+    DrawPie("linuxChart", `Top ${linuxData[0].length} Linux versions`, linuxData[0], linuxData[1])
 }
 
-window.onload = () =;> {
+function DrawMacOsPie(macosData)
+{
+    DrawPie("macosChart", `Top ${macosData[0].length} macOS versions`, macosData[0], macosData[1])
+}
+
+window.onload = () => {
     $.ajax({dataType: "json", url: "/Stats/GetOsData", success: DrawOsPie, cache:false});
     $.ajax({dataType: "json", url: "/Stats/GetLinuxData", success: DrawLinuxPie, cache:false});
+    $.ajax({dataType: "json", url: "/Stats/GetMacOsData", success: DrawMacOsPie, cache:false});
 }
 
 </script>
\ No newline at end of file