aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move DiscImageChef versions chart to ChartJS.

Browse Source
This commit is contained in:
Natalia Portillo
2019-11-03 04:18:47 +00:00
parent 908eb91d3f
commit f289a344dd
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
DiscImageChef.Server/Controllers/StatsController.cs
View File

@@ -114,22 +114,6 @@ namespace DiscImageChef.Server.Controllers
});
ViewBag.repOperatingSystems = operatingSystems.OrderBy(os => os.name).ToList();
List<PieSeriesData> windowsPieData = new List<PieSeriesData>();
decimal windowsCount = ctx.OperatingSystems.Where(o => o.Name == PlatformID.Win32NT.ToString()).
Sum(o => o.Count);
foreach(OperatingSystem version in
ctx.OperatingSystems.Where(o => o.Name == PlatformID.Win32NT.ToString()))
windowsPieData.Add(new PieSeriesData
{
Name =
$"{DetectOS.GetPlatformName(PlatformID.Win32NT, version.Version)}{(string.IsNullOrEmpty(version.Version) ? "" : " ")}{version.Version}",
Y = (double?)(version.Count / windowsCount)
});
ViewData["windowsPieData"] = windowsPieData;
}
if(ctx.Versions.Any())
@@ -143,15 +127,6 @@ namespace DiscImageChef.Server.Controllers
});
ViewBag.repVersions = versions.OrderBy(ver => ver.name).ToList();
decimal totalVersionCount = ctx.Versions.Sum(o => o.Count);
ViewData["versionsPieData"] = ctx.Versions.Select(version => new PieSeriesData
{
Name = version.Value == "previous" ? "Previous than 3.4.99.0" : version.Value,
Y = (double?)(version.Count / totalVersionCount), Sliced = version.Value == "previous",
Selected = version.Value == "previous"
}).ToList();
}
if(ctx.Commands.Any())
@@ -571,5 +546,24 @@ namespace DiscImageChef.Server.Controllers
return Json(result);
}
public IActionResult GetVersionsData()
{
string[][] result =
{
ctx.Versions.OrderByDescending(o => o.Count).Take(10).
Select(v => v.Value == "previous" ? "Previous than 3.4.99.0" : v.Value).ToArray(),
ctx.Versions.OrderByDescending(o => o.Count).Take(10).Select(x => x.Count.ToString()).ToArray()
};
if(result[0].Length < 10)
return Json(result);
result[0][9] = "Other";
result[1][9] = (ctx.Versions.Sum(o => o.Count) - result[1].Take(9).Sum(long.Parse)).ToString();
return Json(result);
}
}
}