From c00f987f16a4cde770ee0b427f8f6303824dea9d Mon Sep 17 00:00:00 2001
From: "t.ruspekhofer"
Date: Sun, 13 Mar 2022 17:46:38 +0100
Subject: [PATCH] renamed Frequency to Interval
---
Lieb/Data/DbInitializer.cs | 2 +-
Lieb/Data/RaidTemplateService.cs | 8 ++++----
Lieb/Models/GuildWars2/Raid/RaidTemplate.cs | 2 +-
Lieb/Pages/Raids/RaidTemplateEdit.razor | 18 +++++++++++++++---
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/Lieb/Data/DbInitializer.cs b/Lieb/Data/DbInitializer.cs
index 2c15f2b..98a1f8a 100644
--- a/Lieb/Data/DbInitializer.cs
+++ b/Lieb/Data/DbInitializer.cs
@@ -125,7 +125,7 @@ namespace Lieb.Data
EndTime = templateStartTime.AddHours(2),
FreeForAllTime = templateStartTime.AddHours(-2),
VoiceChat = "ts.lieb.games",
- Frequency = 7,
+ Interval = 7,
CreateDaysBefore = 7,
TimeZone = "Europe/Vienna",
Roles = new[] { new PlannedRaidRole(){
diff --git a/Lieb/Data/RaidTemplateService.cs b/Lieb/Data/RaidTemplateService.cs
index dec7523..e4cb8cf 100644
--- a/Lieb/Data/RaidTemplateService.cs
+++ b/Lieb/Data/RaidTemplateService.cs
@@ -60,7 +60,7 @@ namespace Lieb.Data
raidToChange.EndTime = template.EndTime;
raidToChange.FreeForAllTime = template.FreeForAllTime;
raidToChange.TimeZone = template.TimeZone;
- raidToChange.Frequency = template.Frequency;
+ raidToChange.Interval = template.Interval;
raidToChange.CreateDaysBefore = template.CreateDaysBefore;
context.PlannedRaidRoles.RemoveRange(raidToChange.Roles);
@@ -105,9 +105,9 @@ namespace Lieb.Data
private void MoveTemplate(RaidTemplate template)
{
- template.StartTime = template.StartTime.AddDays(template.Frequency);
- template.EndTime = template.EndTime.AddDays(template.Frequency);
- template.FreeForAllTime = template.FreeForAllTime.AddDays(template.Frequency);
+ template.StartTime = template.StartTime.AddDays(template.Interval);
+ template.EndTime = template.EndTime.AddDays(template.Interval);
+ template.FreeForAllTime = template.FreeForAllTime.AddDays(template.Interval);
}
}
}
diff --git a/Lieb/Models/GuildWars2/Raid/RaidTemplate.cs b/Lieb/Models/GuildWars2/Raid/RaidTemplate.cs
index 9e8cff6..bbf8456 100644
--- a/Lieb/Models/GuildWars2/Raid/RaidTemplate.cs
+++ b/Lieb/Models/GuildWars2/Raid/RaidTemplate.cs
@@ -16,7 +16,7 @@ namespace Lieb.Models.GuildWars2.Raid
public string TimeZone { get; set; } = String.Empty;
- public int Frequency { get; set; }
+ public int Interval { get; set; }
public int CreateDaysBefore { get; set; }
}
diff --git a/Lieb/Pages/Raids/RaidTemplateEdit.razor b/Lieb/Pages/Raids/RaidTemplateEdit.razor
index 15858f4..6734b12 100644
--- a/Lieb/Pages/Raids/RaidTemplateEdit.razor
+++ b/Lieb/Pages/Raids/RaidTemplateEdit.razor
@@ -36,7 +36,7 @@
Raid Type:
-
+
@@ -123,6 +123,18 @@
+
+
+
+
+
+
@if(_template.RaidType == RaidType.Planned)
{
@@ -212,7 +224,7 @@
if (confirmed)
{
await RaidTemplateService.DeleteTemplate(_template.RaidTemplateId);
- NavigationManager.NavigateTo("raidoverview");
+ NavigationManager.NavigateTo("raidtemplateoverview");
}
}
@@ -249,6 +261,6 @@
_template.FreeForAllTime = _freeForAllDate.Date + _freeForAllTime.TimeOfDay;
await RaidTemplateService.AddOrEditTemplate(_template);
- NavigationManager.NavigateTo("raidoverview");
+ NavigationManager.NavigateTo("raidtemplateoverview");
}
}
\ No newline at end of file