Skip to content

Issue 145 - Add Variable Day of Month Option for DayOfMonthTrigger #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
william-deeken wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Issue 145 - Add Variable Day of Month Option for DayOfMonthTrigger #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f845fda
DayOfMonthTrigger- new configs, updated GetNextDayOfMonth logic for n…
william-deeken Jan 31, 2025
6d5de2d
Updated DayOfMonthTrigger.GetNextMonthWithValidVariableDate to return…
william-deeken Jan 31, 2025
266bb86
DayOfMonthTriggerTests - GetNextDayOfMonthData - added all new Variab…
william-deeken Feb 5, 2025
bacbcde
DayOfMonthTrigger.GetNextExecution - update to handle variable date t…
william-deeken Feb 7, 2025
572acf3
DayOfMonthTrigger - 1) Added default value for DayType setting. 2) Tr…
william-deeken Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,364 changes: 1,356 additions & 8 deletions MFiles.VAF.Extensions.Tests/Configuration/ScheduledExecution/DayOfMonthTriggerTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

350 changes: 290 additions & 60 deletions MFiles.VAF.Extensions/Configuration/ScheduledExecution/DayOfMonthTrigger.cs
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions MFiles.VAF.Extensions/Configuration/ScheduledExecution/DayOfMonthTriggerType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using MFiles.VAF.Configuration;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace MFiles.VAF.Extensions.Configuration.ScheduledExecution
{
[UsesConfigurationResources]
public enum DayOfMonthTriggerType
{
[JsonConfEditor(Label = ResourceMarker.Id + nameof(Resources.Configuration.Schedule_MonthlyTrigger_DayType_SpecificDate))]
SpecificDate = 0,
[JsonConfEditor(Label = ResourceMarker.Id + nameof(Resources.Configuration.Schedule_MonthlyTrigger_DayType_VariableDate))]
VariableDate = 1
}
}
63 changes: 63 additions & 0 deletions MFiles.VAF.Extensions/Resources/Configuration.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions MFiles.VAF.Extensions/Resources/Configuration.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@
<data name="Schedule_DailyTrigger_TriggerTimes_Label" xml:space="preserve">
<value>Trigger Times</value>
</data>
<data name="Schedule_DayOfMonthTrigger_NthDay_HelpText" xml:space="preserve">
<value>Ordinal number for the occurrence of a certain weekday within a month to schedule. For instance, set to "1" for the first Saturday of the month.</value>
</data>
<data name="Schedule_DayOfMonthTrigger_NthDay_Label" xml:space="preserve">
<value>Nth Weekday</value>
</data>
<data name="Schedule_DayOfMonthTrigger_TriggerDays_ChildName" xml:space="preserve">
<value>Day</value>
</data>
Expand All @@ -186,6 +192,21 @@
<data name="Schedule_DayOfMonthTrigger_UnrepresentableDateHandling_Label" xml:space="preserve">
<value>Unrepresentable Date Handling</value>
</data>
<data name="Schedule_DayOfMonthTrigger_Weekday_Label" xml:space="preserve">
<value>Weekday</value>
</data>
<data name="Schedule_MonthlyTrigger_DayType_HelpText" xml:space="preserve">
<value>Use "Specific Date" if you require a specific date every month (e.g. 5th of every month). Use "Variable Date" if you require the nth weekday of every month (e.g. the second Tuesday of every month).</value>
</data>
<data name="Schedule_MonthlyTrigger_DayType_Label" xml:space="preserve">
<value>Date Type</value>
</data>
<data name="Schedule_MonthlyTrigger_DayType_SpecificDate" xml:space="preserve">
<value>Specific Date</value>
</data>
<data name="Schedule_MonthlyTrigger_DayType_VariableDate" xml:space="preserve">
<value>Variable Date</value>
</data>
<data name="Schedule_Triggers_HelpText" xml:space="preserve">
<value />
</data>
Expand Down
13 changes: 11 additions & 2 deletions MFiles.VAF.Extensions/Resources/Schedule.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion MFiles.VAF.Extensions/Resources/Schedule.fi.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<value>Päivittäin seuraavina kellonaikoina: {0}.</value>
<comment>Shown to describe a daily trigger for a schedule. {0} will be replaced with the trigger times.</comment>
</data>
<data name="Triggers_DayOfMonthTrigger" xml:space="preserve">
<data name="Triggers_DayOfMonthTrigger_SpecificDate" xml:space="preserve">
<value>Kuukauden {0} päivä seuraavina kellonaikoina: {1}.</value>
<comment>Shown to describe a day-of-month trigger. {0} will be replaced with the days of the month this will trigger, and {1} will be replaced with the trigger times.</comment>
</data>
Expand Down
2 changes: 1 addition & 1 deletion MFiles.VAF.Extensions/Resources/Schedule.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<value>Quotidien aux heures : {0}.</value>
<comment>Shown to describe a daily trigger for a schedule. {0} will be replaced with the trigger times.</comment>
</data>
<data name="Triggers_DayOfMonthTrigger" xml:space="preserve">
<data name="Triggers_DayOfMonthTrigger_SpecificDate" xml:space="preserve">
<value>Le {0} du mois aux heures : {1}.</value>
<comment>Shown to describe a day-of-month trigger. {0} will be replaced with the days of the month this will trigger, and {1} will be replaced with the trigger times.</comment>
</data>
Expand Down
8 changes: 6 additions & 2 deletions MFiles.VAF.Extensions/Resources/Schedule.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,13 @@
<value>Daily at the following times: {0}.</value>
<comment>Shown to describe a daily trigger for a schedule. {0} will be replaced with the trigger times.</comment>
</data>
<data name="Triggers_DayOfMonthTrigger" xml:space="preserve">
<data name="Triggers_DayOfMonthTrigger_SpecificDate" xml:space="preserve">
<value>On the {0} of the month at the following times: {1}.</value>
<comment>Shown to describe a day-of-month trigger. {0} will be replaced with the days of the month this will trigger, and {1} will be replaced with the trigger times.</comment>
<comment>Shown to describe a day-of-month trigger with Specific Date type. {0} will be replaced with the days of the month this will trigger, and {1} will be replaced with the trigger times.</comment>
</data>
<data name="Triggers_DayOfMonthTrigger_VariableDate" xml:space="preserve">
<value>Every {0} {1} of the month at the following times: {2}.</value>
<comment>Shown to describe a day-of-month trigger with Variable Date type. {0} will be replaced by an ordinal number, {1} will be replaced by the weekday, and {2} will be replaced with the trigger times.</comment>
</data>
<data name="Triggers_WeeklyTrigger" xml:space="preserve">
<value>Every {0} at the following times: {1}.</value>
Expand Down