From 670ed21386d53b878b24cf541de299d582be2081 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Thu, 9 Jan 2025 09:26:53 +0100 Subject: [PATCH] Cleanup and fix --- .../Controllers/HeaderNavController.cs | 6 ++-- pointMaster/Controllers/HomeController.cs | 16 ++++++++--- pointMaster/Controllers/PatruljeController.cs | 6 ++-- pointMaster/Controllers/PointController.cs | 14 +++++----- pointMaster/Controllers/PosterController.cs | 2 +- pointMaster/Controllers/PrintController.cs | 28 ++++++++++++++++++- pointMaster/Controllers/StatsApiController.cs | 14 +++++----- pointMaster/Views/Home/Index.cshtml | 14 ++++++---- pointMaster/Views/Print/Patruljer.cshtml | 9 ++++-- pointMaster/Views/Print/Poster.cshtml | 20 +++++++++++++ 10 files changed, 95 insertions(+), 34 deletions(-) create mode 100644 pointMaster/Views/Print/Poster.cshtml diff --git a/pointMaster/Controllers/HeaderNavController.cs b/pointMaster/Controllers/HeaderNavController.cs index 3054942..cb95717 100644 --- a/pointMaster/Controllers/HeaderNavController.cs +++ b/pointMaster/Controllers/HeaderNavController.cs @@ -42,7 +42,7 @@ namespace pointMaster.Controllers public class HeaderNavViewModel { - public List links { get; set; } = null!; + public List links { get; set; } } public class NavUrl { @@ -52,7 +52,7 @@ namespace pointMaster.Controllers this.Title = title; this.Url = url; } - public string Url { get; set; } = null!; - public string Title { get; set; } = null!; + public string Url { get; set; } + public string Title { get; set; } } } diff --git a/pointMaster/Controllers/HomeController.cs b/pointMaster/Controllers/HomeController.cs index 921498d..7a360eb 100644 --- a/pointMaster/Controllers/HomeController.cs +++ b/pointMaster/Controllers/HomeController.cs @@ -53,6 +53,13 @@ namespace pointMaster.Controllers vm.Points = vm.Points.OrderByDescending(x => x.point).ToList(); vm.Turnout = vm.Turnout.OrderByDescending(x => x.point).ToList(); + var postId = Request.Cookies["Post"]; + if (postId != null) + { + int.TryParse(postId, out var id); + var post = await context.Poster.FindAsync(id); + vm.Post = post; + } return View(vm); } @@ -77,13 +84,14 @@ namespace pointMaster.Controllers public class HomePageViewModel { - public List Samlet { get; set; } = null!; - public List Turnout { get; set; } = null!; - public List Points { get; set; } = null!; + public List Samlet { get; set; } + public List Turnout { get; set; } + public List Points { get; set; } + public Post Post { get; set; } } public class PatruljePlacering { - public Patrulje Patrulje { get; set; } = null!; + public Patrulje Patrulje { get; set; } public int point { get; set; } } } diff --git a/pointMaster/Controllers/PatruljeController.cs b/pointMaster/Controllers/PatruljeController.cs index fa556fb..ef63e1a 100644 --- a/pointMaster/Controllers/PatruljeController.cs +++ b/pointMaster/Controllers/PatruljeController.cs @@ -129,9 +129,9 @@ namespace pointMaster.Controllers public class IndexViewModel { - public List patruljeModels { get; set; } = null!; - public Dictionary patruljePoints { get; set; } = null!; - public Dictionary patruljeTurnout { get; set; } = null!; + public List patruljeModels { get; set; } + public Dictionary patruljePoints { get; set; } + public Dictionary patruljeTurnout { get; set; } } } } diff --git a/pointMaster/Controllers/PointController.cs b/pointMaster/Controllers/PointController.cs index c6b702c..06d230d 100644 --- a/pointMaster/Controllers/PointController.cs +++ b/pointMaster/Controllers/PointController.cs @@ -190,28 +190,28 @@ namespace pointMaster.Controllers public class SelectPostViewModel { - public List Poster { get; set; } = null!; + public List Poster { get; set; } } public class GivPointViewModel { - public Post Runde { get; set; } = null!; - public Patrulje Patrulje { get; set; } = null!; + public Post Runde { get; set; } + public Patrulje Patrulje { get; set; } public Point points { get; set; } = new Point(); } public class SkiftPatruljeViewModel { - public List Patruljer { get; set; } = null!; - public Post? post { get; set; } = null!; + public List Patruljer { get; set; } + public Post? post { get; set; } } public class PointViewModel { - public List points { get; set; } = null!; + public List points { get; set; } public bool AllowedToDelete { get; set; } = false; } public class PatruljeInfoModel { - public Patrulje patrulje { get; set; } = null!; + public Patrulje patrulje { get; set; } public int totalPoints { get; set; } public int totalTurnout { get; set; } } diff --git a/pointMaster/Controllers/PosterController.cs b/pointMaster/Controllers/PosterController.cs index 2a9cc3e..bec12fa 100644 --- a/pointMaster/Controllers/PosterController.cs +++ b/pointMaster/Controllers/PosterController.cs @@ -64,7 +64,7 @@ namespace pointMaster.Controllers public class RundeViewModel { - public List Rounds { get; set; } = null!; + public List Rounds { get; set; } } } } diff --git a/pointMaster/Controllers/PrintController.cs b/pointMaster/Controllers/PrintController.cs index 558b367..2fef18d 100644 --- a/pointMaster/Controllers/PrintController.cs +++ b/pointMaster/Controllers/PrintController.cs @@ -32,10 +32,36 @@ namespace pointMaster.Controllers return View(vm); } + public async Task Poster() + { + var vm = new PrintPosterModel(); + + vm.poster = await context.Poster.ToListAsync(); + + + vm.QRcode = new Dictionary(); + + foreach (var item in vm.poster) + { + QRCodeGenerator QrGenerator = new QRCodeGenerator(); + QRCodeData QrCodeInfo = QrGenerator.CreateQrCode(Request.Host.Host + "/point/selectpost/" + item.Id, QRCodeGenerator.ECCLevel.Q); + + vm.QRcode.Add(item.Id, "data:image/png;base64," + Convert.ToBase64String(new PngByteQRCode(QrCodeInfo).GetGraphic(20))); + } + + return View(vm); + } + } public class PrintPatruljerModel { - public List patruljer { get; set; } = null!; + public List patruljer { get; set; } public Dictionary QRcode { get; set; } = new Dictionary(); } + + public class PrintPosterModel + { + public List poster { get; set; } + public Dictionary QRcode { get; set; } + } } diff --git a/pointMaster/Controllers/StatsApiController.cs b/pointMaster/Controllers/StatsApiController.cs index 95b437a..591dbae 100644 --- a/pointMaster/Controllers/StatsApiController.cs +++ b/pointMaster/Controllers/StatsApiController.cs @@ -51,9 +51,9 @@ namespace pointMaster.Controllers public class PointChartModel { [JsonProperty("name")] - public string Name { get; set; } = null!; + public string Name { get; set; } [JsonProperty("data")] - public List Data { get; set; } = null!; + public List Data { get; set; } public static async Task> Calculate(DataContext dataContext) { @@ -101,14 +101,14 @@ namespace pointMaster.Controllers } public class PointChartDataModel { - public string x { get; set; } = null!; + public string x { get; set; } public int y { get; set; } } public class StatModel { - public string Title { get; set; } = null!; - public string Value { get; set; } = null!; + public string Title { get; set; } + public string Value { get; set; } public static async Task> Calculate(DataContext dataContext) { @@ -156,9 +156,9 @@ namespace pointMaster.Controllers public class PointRatioModel { [JsonProperty("names")] - public List Names { get; set; } = null!; + public List Names { get; set; } [JsonProperty("data")] - public List Data { get; set; } = null!; + public List Data { get; set; } public static async Task Calculate(DataContext dataContext) { diff --git a/pointMaster/Views/Home/Index.cshtml b/pointMaster/Views/Home/Index.cshtml index ddd96aa..255e113 100644 --- a/pointMaster/Views/Home/Index.cshtml +++ b/pointMaster/Views/Home/Index.cshtml @@ -5,6 +5,10 @@

Velkommen til PointMaster

+ @if(Model.Post != null) + { +

Du giver point som @Model.Post.Name

+ }
@@ -21,11 +25,11 @@ @for (var i = 0; i < Model.Points.Count; i++) { - - @(i + 1) - @Model.Points[i].Patrulje.Name - @Model.Points[i].point - + + @(i + 1) + @Model.Points[i].Patrulje.Name + @Model.Points[i].point + } diff --git a/pointMaster/Views/Print/Patruljer.cshtml b/pointMaster/Views/Print/Patruljer.cshtml index 06c666e..4483587 100644 --- a/pointMaster/Views/Print/Patruljer.cshtml +++ b/pointMaster/Views/Print/Patruljer.cshtml @@ -9,10 +9,13 @@

@patrulje.Name

-

Medlemmer:

- @foreach (var medlem in patrulje.PatruljeMedlems) + @if(patrulje.PatruljeMedlems.Any()) { -

@medlem.Name

+

Medlemmer:

+ @foreach (var medlem in patrulje.PatruljeMedlems) + { +

@medlem.Name

+ } }
diff --git a/pointMaster/Views/Print/Poster.cshtml b/pointMaster/Views/Print/Poster.cshtml new file mode 100644 index 0000000..e44726d --- /dev/null +++ b/pointMaster/Views/Print/Poster.cshtml @@ -0,0 +1,20 @@ +@model pointMaster.Controllers.PrintPosterModel; +@{ + Layout = "_Point"; + ViewData["Title"] = "Patruljer"; +} + +@foreach (var post in Model.poster) +{ +
+
+

@post.Name

+
+
+ +
+} + + \ No newline at end of file