diff --git a/Helios/Models/ChargeTimestamp.cs b/Helios/Models/ChargeTimestamp.cs index be257689940865839dc53e525754b3e45f3d92dc..03ca2a7fc712717bcedd7b84993794d8df474a3f 100644 --- a/Helios/Models/ChargeTimestamp.cs +++ b/Helios/Models/ChargeTimestamp.cs @@ -3,12 +3,13 @@ namespace Helios.Models { public class ChargeTimestamp { - public DateTimeOffset Timestamp { get; set; } - public int Chage { get; set; } + public string Timestamp { get; set; } + public int Charge { get; set; } - public ChargeTimestamp(DateTimeOffset dateTime, int charge) + public ChargeTimestamp(string timestamp, int charge) { - + this.Timestamp = timestamp; + this.Charge = charge; } } } diff --git a/Helios/Source/UserService.cs b/Helios/Source/UserService.cs index 0cedda339d856ac91a700e82adcde5a8b39e9042..780781fc8e807d6feb3479265c162a09afbcda5e 100644 --- a/Helios/Source/UserService.cs +++ b/Helios/Source/UserService.cs @@ -28,34 +28,34 @@ namespace Helios.Source private List<ChargeTimestamp> GetChargeTimestamps() { - List<ChargeTimestamp> timestamps = new List<ChargeTimestamp> - { - new ChargeTimestamp(DateTimeOffset.Parse("01:00 AM"), 100), - new ChargeTimestamp(DateTimeOffset.Parse("02:00 AM"), 98), - new ChargeTimestamp(DateTimeOffset.Parse("03:00 AM"), 96), - new ChargeTimestamp(DateTimeOffset.Parse("04:00 AM"), 94), - new ChargeTimestamp(DateTimeOffset.Parse("05:00 AM"), 92), - new ChargeTimestamp(DateTimeOffset.Parse("06:00 AM"), 90), - new ChargeTimestamp(DateTimeOffset.Parse("07:00 AM"), 83), - new ChargeTimestamp(DateTimeOffset.Parse("08:00 AM"), 80), - new ChargeTimestamp(DateTimeOffset.Parse("09:00 AM"), 71), - new ChargeTimestamp(DateTimeOffset.Parse("10:00 AM"), 64), - new ChargeTimestamp(DateTimeOffset.Parse("11:00 AM"), 60), - new ChargeTimestamp(DateTimeOffset.Parse("12:00 PM"), 61), - new ChargeTimestamp(DateTimeOffset.Parse("13:00 PM"), 62), - new ChargeTimestamp(DateTimeOffset.Parse("14:00 PM"), 60), - new ChargeTimestamp(DateTimeOffset.Parse("15:00 PM"), 55), - new ChargeTimestamp(DateTimeOffset.Parse("16:00 PM"), 51), - new ChargeTimestamp(DateTimeOffset.Parse("17:00 PM"), 48), - new ChargeTimestamp(DateTimeOffset.Parse("18:00 PM"), 43), - new ChargeTimestamp(DateTimeOffset.Parse("19:00 PM"), 36), - new ChargeTimestamp(DateTimeOffset.Parse("20:00 PM"), 30), - new ChargeTimestamp(DateTimeOffset.Parse("21:00 PM"), 71), - new ChargeTimestamp(DateTimeOffset.Parse("22:00 PM"), 71), - new ChargeTimestamp(DateTimeOffset.Parse("23:00 PM"), 71), - }; + List<ChargeTimestamp> timestamps = new() + { + new ChargeTimestamp("01:00 AM", 55), + new ChargeTimestamp("02:00 AM", 52), + new ChargeTimestamp("03:00 AM", 50), + new ChargeTimestamp("04:00 AM", 49), + new ChargeTimestamp("05:00 AM", 47), + new ChargeTimestamp("06:00 AM", 42), + new ChargeTimestamp("07:00 AM", 39), + new ChargeTimestamp("08:00 AM", 39), + new ChargeTimestamp("09:00 AM", 42), + new ChargeTimestamp("10:00 AM", 52), + new ChargeTimestamp("11:00 AM", 60), + new ChargeTimestamp("12:00 PM", 69), + new ChargeTimestamp("13:00 PM", 74), + new ChargeTimestamp("14:00 PM", 80), + new ChargeTimestamp("15:00 PM", 86), + new ChargeTimestamp("16:00 PM", 80), + new ChargeTimestamp("17:00 PM", 72), + new ChargeTimestamp("18:00 PM", 66), + new ChargeTimestamp("19:00 PM", 60), + new ChargeTimestamp("20:00 PM", 56), + new ChargeTimestamp("21:00 PM", 50), + new ChargeTimestamp("22:00 PM", 45), + new ChargeTimestamp("23:00 PM", 42) + }; - return timestamps; + return timestamps; } private int GetSolarInput() diff --git a/Helios/Views/User/UserPage.cshtml b/Helios/Views/User/UserPage.cshtml index e28c39f69e0e2b8a17f3c0da04415e4eaf3d5ee1..869ff8c23f19602b0287817199157007f3b77bce 100644 --- a/Helios/Views/User/UserPage.cshtml +++ b/Helios/Views/User/UserPage.cshtml @@ -290,21 +290,24 @@ <script> - const labels = ["01:00", "02:00", "03:00", "04:00", "05:00", "06:00", "07:00", "08:00", "09:00", "10:00", "11:00", "12:00"]; + const labels = []; + const chartData = []; + + const modelData = @Html.Raw(Json.Serialize(Model.ChargeTimestamps)); + + modelData.forEach(value => { + labels.push(value.timestamp) + chartData.push(value.charge) + }); + const data = { labels: labels, datasets: [ { - label: 'Summer', - data: [100, 98, 97, 87, 71, 60, 58, 59, 54, 45, 50, 55], + label: 'Charge', + data: chartData, backgroundColor: 'rgb(33, 85, 239)', borderColor: 'rgb(33, 85, 239)', - }, - { - label: 'Winter', - data: [100, 98, 97, 87, 71, 60, 55, 45, 42, 39, 36, 33, 30], - backgroundColor: 'rgb(239, 33, 31)', - borderColor: 'rgb(239, 33, 31)', } ] }; @@ -320,7 +323,7 @@ }, title: { display: true, - text: 'Summer and Winter Performance Comparison (For demonstration purposes only!)' + text: 'Power Usage (For demonstration purposes only!)' } } },