@@ -0,0 +10,4 @@
+						class="input max-width"
+						type="number"
+						min="1"
+						max="9999"

@@ -0,0 +203,4 @@
+				</div>
+			</div>
+		</div>
+		<!-- Debugging Elements - Set to false in production -->

@@ -0,0 +239,4 @@
+
+const rrule_input = ref('')
+const task = ref<ITask>(new TaskModel())
+const interval = ref('DAILY')

@@ -0,0 +282,4 @@
+})
+const repeatFromCompletionDate = ref('false')
+
+function getRRULEstring() {

@@ -0,0 +284,4 @@
+
+function getRRULEstring() {
+	let string = ''
+	string += `FREQ=${interval.value}`

@@ -0,0 +315,4 @@
+	}
+	if (stopType.value == 'date'){
+		// Having the stoptype as a date with an empty date breaks things (such as when the user clicks the Clear button. So we force a date here)
+		if (!stopDate.value) {

@@ -0,0 +320,4 @@
+		}
+		const date = new Date(stopDate.value)
+		// Typescript doesn't have replaceAll. Sorry :(
+		string += `;UNTIL=${date.toISOString().replace('-', '').replace('-', '').replace(':', '').replace(':', '').replace('.000', '')}`

@@ -0,0 +331,4 @@
+	return string
+}
+
+function loadRRULEstring(){

@@ -0,0 +409,4 @@
+
+
+
+function saveRRULEString(){

@@ -214,3 +214,3 @@
 	switch (results[2]) {
 		case 'biennially':
-			type = REPEAT_TYPES.Years
+			type = 'YEARLY'

@@ -536,3 +536,3 @@
 							variant="secondary"
 							icon="history"
-							@click="setFieldActive('repeatAfter')"
+							@click="() => { AddDefaultRepeats(); setFieldActive('repeats')}"

@@ -149,6 +148,7 @@ func ParseTaskFromVTODO(content string) (vTask *models.Task, err error) {
 		DueDate:     caldavTimeToTimestamp(task["DUE"]),
 		Updated:     caldavTimeToTimestamp(task["DTSTAMP"]),
 		StartDate:   caldavTimeToTimestamp(task["DTSTART"]),
+		Repeats: 	 task["RRULE"].Value,

@@ -116,3 +116,3 @@
 				rec, err := testHandler.testReadAllWithUser(url.Values{"sort_by": []string{"priority"}}, urlParams)
 				require.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeat_after":0,"repeat_mode":0,"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":0,"position":0,"reactions":null,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)
+				assert.Contains(t, rec.Body.String(), `{"id":33,"title":"task #33 with percent done","description":"","done":false,"done_at":"0001-01-01T00:00:00Z","due_date":"0001-01-01T00:00:00Z","reminders":null,"project_id":1,"repeats":'',"priority":0,"start_date":"0001-01-01T00:00:00Z","end_date":"0001-01-01T00:00:00Z","assignees":null,"labels":null,"hex_color":"","percent_done":0.5,"identifier":"test1-17","index":17,"related_tasks":{},"attachments":null,"cover_image_attachment_id":0,"is_favorite":false,"created":"2018-12-01T01:12:04Z","updated":"2018-12-01T01:12:04Z","bucket_id":0,"position":0,"reactions":null,"created_by":{"id":1,"name":"","username":"user1","created":"2018-12-01T15:13:12Z","updated":"2018-12-02T15:13:12Z"}}]`)

@@ -121,3 +121,2 @@
 				require.NoError(t, err)
-				assert.Contains(t, rec.Body.String(), `"repeat_after":3600`)
-				assert.NotContains(t, rec.Body.String(), `"repeat_after":0`)
+				assert.Contains(t, rec.Body.String(), `"repeats":'FREQ=HOURLY;INTERVAL=1'`)

@@ -0,0 +28,4 @@
+}
+
+func (Task20240819201553) TableName() string {
+	return "Task"

@@ -0,0 +36,4 @@
+		ID:          "20240819201553",
+		Description: "Adds the Repeats text field to support the new recurrence system",
+		Migrate: func(tx *xorm.Engine) error {
+			return tx.Sync2(Task20240819201553{})

@@ -494,3 +494,3 @@
 		ProjectID:    1,
 		RelatedTasks: map[RelationKind][]*Task{},
-		RepeatAfter:  3600,
+		Repeats:  'FREQ=HOURLY;INTERVAL=1',

@@ -72,2 +63,2 @@
-	// Can have three possible values which will trigger when the task is marked as done: 0 = repeats after the amount specified in repeat_after, 1 = repeats all dates each months (ignoring repeat_after), 3 = repeats from the current date rather than the last set date.
-	RepeatMode TaskRepeatMode `xorm:"not null default 0" json:"repeat_mode"`
+	// The RRULE string that configures how the task repeats.  
+	Repeats string `xorm:"TEXT not null 'repeats' default ''" json:"repeats"`

@@ -165,3 +158,2 @@
 func (t *Task) isRepeating() bool {
-	return t.RepeatAfter > 0 ||
-		t.RepeatMode == TaskRepeatModeMonth
+	return len(t.Repeats) > 0

@@ -1180,3 +1171,2 @@
 
-func setTaskDatesDefault(oldTask, newTask *Task) {
-	if oldTask.RepeatAfter == 0 {
+func updateRecurrence(oldTask, newTask *Task){

@@ -1302,0 +1179,4 @@
+	If the due date is not present, the start date is used and the end date is updated relative to that. 
+	If the start or due dates aren't present, the end date is updated.
+	*/
+	rruleManager, _ := rrule.StrToRRule(oldTask.Repeats)

@@ -1316,0 +1211,4 @@
+		will be based on the reference time, not the current time
+		*/
+		
+		now = time.Now() 

@@ -1321,3 +1236,1 @@
-			diff := oldTask.DueDate.Sub(oldTask.EndDate)
-			newTask.EndDate = newTask.DueDate.Add(-diff)
-		}
+		if !oldTask.DueDate.IsZero() {

@@ -355,3 +355,3 @@
 				switch t.Recurrence.Pattern.Type {
 				case "daily":
-					task.RepeatAfter = t.Recurrence.Pattern.Interval * 60 * 60 * 24
+					task.Repeats = fmt.Sprintf("FREQ=DAILY;INTERVAL=%d", t.Recurrence.Pattern.Interval)

@@ -0,0 +1,452 @@
+<template>
+	<div class="pb-4 pt-4">
+		<!--Repeat Interval -->

@@ -0,0 +36,4 @@
+		</div>
+		<!--Weekdays -->
+		<div 
+			v-if="interval=='WEEKLY'"

@@ -0,0 +57,4 @@
+		</div>
+		<!--Month Days -->
+		<div 
+			v-if="interval=='MONTHLY'" 

@@ -0,0 +63,4 @@
+			<label class="label">{{ $t('task.repeat.dayOfMonth') }}</label>
+			<div class="control max-width">
+				<div class="select max-width">
+					<select 

@@ -0,0 +79,4 @@
+			</div>
+			<div class="field has-addons max-width">
+				<div 
+					v-if="monthType=='weekday'"

@@ -0,0 +90,4 @@
+						>
+							<option
+								v-for="(value, key, index) of monthWeekdayOrdinalOpts"
+								:key="index"

@@ -0,0 +99,4 @@
+					</div>
+				</div>
+				<div 
+					v-if="monthType=='weekday'" 

@@ -0,0 +119,4 @@
+					</div>
+				</div>
+				<div
+					v-if="monthType=='dayOfMonth'"

@@ -0,0 +145,4 @@
+							@change="saveRRULEString()"
+						>
+							<option
+								v-for="(value, key, index) of stopTypeOpts"

@@ -0,0 +147,4 @@
+							<option
+								v-for="(value, key, index) of stopTypeOpts"
+								:key="index"
+								:value="key"

@@ -0,0 +155,4 @@
+					</div>
+				</div>
+				<div 
+					v-if="stopType=='date'" 

@@ -0,0 +166,4 @@
+					>
+				</div>
+				<div
+					v-if="stopType=='number'"

@@ -0,0 +186,4 @@
+			<div class="field has-addons max-width">
+				<div class="control max-width">
+					<div class="select max-width">
+						<select

@@ -0,0 +241,4 @@
+const task = ref<ITask>(new TaskModel())
+const interval = ref('DAILY')
+const intervalNumber = ref(1)
+const weeks = ref({

@@ -0,0 +242,4 @@
+const interval = ref('DAILY')
+const intervalNumber = ref(1)
+const weeks = ref({
+	'SU': {selectText: t('task.repeat.sunday'), checked: false},

@@ -0,0 +250,4 @@
+	'FR': {selectText: t('task.repeat.friday'), checked: false},
+	'SA': {selectText: t('task.repeat.saturday'), checked: false},
+})
+const monthType = ref('weekday')

@@ -0,0 +257,4 @@
+const stopType = ref('none')
+const stopDate = ref(new Date().toString())
+const stopNumber = ref(1)
+const intervalOpts = ref({

@@ -0,0 +267,4 @@
+	'YEARLY': 	{selectText: t('task.repeat.year'), selectTextPlural: t('task.repeat.years')},
+})
+
+const monthWeekdayOrdinalOpts = ref({

@@ -0,0 +292,4 @@
+	if (interval.value == 'WEEKLY'){
+		const enabledDays = []
+		for (const [key, value] of Object.entries(weeks.value)){
+			if (value.checked){

@@ -0,0 +300,4 @@
+			string += `;BYDAY=${enabledDays.join(',')}`
+		}
+	}
+	if (interval.value == 'MONTHLY') {

@@ -0,0 +307,4 @@
+		if (monthType.value == 'dayOfMonth'){
+			if (monthDayNumber.value < 1) {
+				monthDayNumber.value = 1
+			} else if (monthDayNumber.value > 31) {

@@ -0,0 +348,4 @@
+		'COUNT': '',
+	}
+
+	if (string){

@@ -0,0 +368,4 @@
+				}
+			}
+		} else if (optionsMap['FREQ'] == 'MONTHLY'){
+			console.log(optionsMap)

@@ -0,0 +423,4 @@
+	(value: ITask) => {
+		task.value = value
+		if (value.repeats) {
+			loadRRULEstring()

@@ -0,0 +432,4 @@
+		deep: true,
+	},
+)
+

@@ -0,0 +436,4 @@
+</script>
+
+<style lang="scss" scoped>
+p {

@@ -934,2 +928,2 @@
-      "each": "Each",
-      "specifyAmount": "Specify an amount…",
+      "taskRepeatsEvery": "Task Repeats Every",
+      "onWeekdays": "On Weekdays",

@@ -936,0 +938,4 @@
+      "fourthOrd": "Fourth",
+      "fifthOrd": "Fifth",
+      "lastOrd": "Last",
+      "second": "Second",

@@ -942,0 +961,4 @@
+      "saturday": "Saturday",
+      "never": "Never",
+      "onDate": "On Date",
+      "afterNumber": "After # of Repeats"

@@ -7,13 +7,8 @@ import type {IAttachment} from '@/modelTypes/IAttachment'
 import type {IProject} from '@/modelTypes/IProject'
 import type {ISubscription} from '@/modelTypes/ISubscription'
 import type {IBucket} from '@/modelTypes/IBucket'
-

@@ -72,3 +52,1 @@
-	repeatAfter: number | IRepeatAfter = 0
-	repeatFromCurrentDate = false
-	repeatMode: IRepeatMode = TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT
+	repeats: string

@@ -756,3 +755,3 @@
 	| 'relatedTasks'
 	| 'reminders'
-	| 'repeatAfter'
+	| 'repeats'

@@ -927,2 +925,2 @@
-	task.value.repeatAfter.amount = 0
-	task.value.repeatMode = TASK_REPEAT_MODES.REPEAT_MODE_DEFAULT
+async function AddDefaultRepeats() {
+	task.value.repeats = 'FREQ=DAILY;INTERVAL=1'

@@ -164,3 +164,3 @@
 						Title:       "Task 7",
 						DueDate:     testtimeTime,
-						RepeatAfter: 60 * 60 * 24 * 7, // The amount of seconds in a week
+						Repeats: "FREQ=WEEKLY;INTERVAL=1"

@@ -2470,7 +2470,7 @@ const docTemplate = `{
                     },
                     {
                         "type": "string",
-                        "description": "The sorting parameter. You can pass this multiple times to get the tasks ordered by multiple different parametes, along with ` + "`" + `order_by` + "`" + `. Possible values to sort by are ` + "`" + `id` + "`" + `, ` + "`" + `title` + "`" + `, ` + "`" + `description` + "`" + `, ` + "`" + `done` + "`" + `, ` + "`" + `done_at` + "`" + `, ` + "`" + `due_date` + "`" + `, ` + "`" + `created_by_id` + "`" + `, ` + "`" + `project_id` + "`" + `, ` + "`" + `repeat_after` + "`" + `, ` + "`" + `priority` + "`" + `, ` + "`" + `start_date` + "`" + `, ` + "`" + `end_date` + "`" + `, ` + "`" + `hex_color` + "`" + `, ` + "`" + `percent_done` + "`" + `, ` + "`" + `uid` + "`" + `, ` + "`" + `created` + "`" + `, ` + "`" + `updated` + "`" + `. Default is ` + "`" + `id` + "`" + `.",

@@ -3321,3 +3287,3 @@
           the tasks ordered by multiple different parametes, along with `order_by`.
           Possible values to sort by are `id`, `title`, `description`, `done`, `done_at`,
-          `due_date`, `created_by_id`, `project_id`, `repeat_after`, `priority`, `start_date`,
+          `due_date`, `created_by_id`, `project_id`, `repeat_s`, `priority`, `start_date`,