From 2b2e66af0c9311bfcfdec34ead3f776ab6ef339f Mon Sep 17 00:00:00 2001 From: smallbenji Date: Sun, 24 Nov 2024 19:32:04 +0100 Subject: [PATCH] Adding sass and extra stats --- pointMaster/Controllers/StatsApiController.cs | 15 +++- pointMaster/js/package.json | 2 + pointMaster/js/src/components/Stats.vue | 84 +++++++++++-------- 3 files changed, 67 insertions(+), 34 deletions(-) diff --git a/pointMaster/Controllers/StatsApiController.cs b/pointMaster/Controllers/StatsApiController.cs index 87b5919..41c3d32 100644 --- a/pointMaster/Controllers/StatsApiController.cs +++ b/pointMaster/Controllers/StatsApiController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Newtonsoft.Json; using pointMaster.Data; -using pointMaster.Models; namespace pointMaster.Controllers { @@ -76,6 +75,8 @@ namespace pointMaster.Controllers var vm = new List(); var pointData = await dataContext.Points.ToListAsync(); + var patruljeData = await dataContext.Patruljer.ToListAsync(); + var postData = await dataContext.Poster.ToListAsync(); vm.Add(new StatModel { @@ -83,6 +84,18 @@ namespace pointMaster.Controllers Value = pointData.Sum(x => x.Points + x.Turnout).ToString() }); + vm.Add(new StatModel + { + Title = "Antal patruljer", + Value = patruljeData.Count().ToString() + }); + + vm.Add(new StatModel + { + Title = "Antal poster", + Value = postData.Count().ToString() + }); + return Ok(JsonConvert.SerializeObject(vm)); } diff --git a/pointMaster/js/package.json b/pointMaster/js/package.json index 763e5a0..b8b587c 100644 --- a/pointMaster/js/package.json +++ b/pointMaster/js/package.json @@ -14,6 +14,8 @@ "@vue/cli-plugin-typescript": "^5.0.8", "apexcharts": "^4.0.0", "axios": "^1.7.7", + "sass": "^1.81.0", + "sass-loader": "^16.0.3", "vue": "^3.5.13" }, "devDependencies": { diff --git a/pointMaster/js/src/components/Stats.vue b/pointMaster/js/src/components/Stats.vue index 8c59d78..cfc41d0 100644 --- a/pointMaster/js/src/components/Stats.vue +++ b/pointMaster/js/src/components/Stats.vue @@ -1,15 +1,19 @@ - \ No newline at end of file +