From 7394d120e1312e4580e246202efe878842abcf90 Mon Sep 17 00:00:00 2001 From: Sarah Faey Date: Mon, 5 Dec 2022 17:05:31 +0100 Subject: [PATCH] fixed template reminder times --- Lieb/Models/GuildWars2/Raid/Raid.cs | 2 +- Lieb/Models/GuildWars2/Raid/RaidBase.cs | 6 ++++-- Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Lieb/Models/GuildWars2/Raid/Raid.cs b/Lieb/Models/GuildWars2/Raid/Raid.cs index 5f0225d..dd99b83 100644 --- a/Lieb/Models/GuildWars2/Raid/Raid.cs +++ b/Lieb/Models/GuildWars2/Raid/Raid.cs @@ -18,7 +18,7 @@ namespace Lieb.Models.GuildWars2.Raid public Raid() { } - public Raid(RaidTemplate template) : base(template) + public Raid(RaidTemplate template) : base(template, template.TimeZone) { TimeZoneInfo timeZone = TimeZoneInfo.FindSystemTimeZoneById(template.TimeZone); StartTimeUTC = TimeZoneInfo.ConvertTimeToUtc(template.StartTime, timeZone); diff --git a/Lieb/Models/GuildWars2/Raid/RaidBase.cs b/Lieb/Models/GuildWars2/Raid/RaidBase.cs index 334e240..8ff9a91 100644 --- a/Lieb/Models/GuildWars2/Raid/RaidBase.cs +++ b/Lieb/Models/GuildWars2/Raid/RaidBase.cs @@ -61,7 +61,7 @@ namespace Lieb.Models.GuildWars2.Raid public RaidBase() { } - public RaidBase(RaidBase template) + public RaidBase(RaidBase template, string timeZoneString) { this.Title = template.Title; this.Description = template.Description; @@ -84,13 +84,15 @@ namespace Lieb.Models.GuildWars2.Raid IsRandomSignUpRole = role.IsRandomSignUpRole }); } + + TimeZoneInfo timeZone = TimeZoneInfo.FindSystemTimeZoneById(timeZoneString); foreach (RaidReminder reminder in template.Reminders) { this.Reminders.Add(new RaidReminder() { DiscordServerId = reminder.DiscordServerId, DiscordChannelId = reminder.DiscordChannelId, - ReminderTimeUTC = reminder.ReminderTimeUTC, + ReminderTimeUTC = TimeZoneInfo.ConvertTimeToUtc(reminder.ReminderTimeUTC.DateTime, timeZone), Message = reminder.Message, Sent = false, Type = reminder.Type, diff --git a/Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor b/Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor index 70bb4fb..28af499 100644 --- a/Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor +++ b/Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor @@ -345,7 +345,7 @@ } foreach(StaticRaidReminder reminder in _staticReminders) { - reminder.ReminderTimeUTC = await TimeZoneService.GetUTCDateTime(reminder.ReminderDate.Date + reminder.ReminderTime.TimeOfDay); + reminder.ReminderTimeUTC = reminder.ReminderDate.Date + reminder.ReminderTime.TimeOfDay; reminder.Sent = true; _template.Reminders.Add(reminder); }