From 7746d3916157e43fca7a24e2a768f7fb83136cf1 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Wed, 6 Sep 2023 15:41:48 +0200
Subject: [PATCH] fix(task): remove wrong repeat types

Repeating "monthly" or "yearly" was never what people expected, only 30 or 365 days which is not always correct. This change removes these settings since the repeating modes will be re-done anyway.

Related to https://kolaente.dev/vikunja/frontend/issues/3585#issuecomment-53642
---
 src/components/tasks/partials/repeatAfter.vue | 6 ++----
 src/helpers/time/period.ts                    | 4 ----
 src/i18n/lang/en.json                         | 2 +-
 src/services/task.ts                          | 6 ------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/components/tasks/partials/repeatAfter.vue b/src/components/tasks/partials/repeatAfter.vue
index 24064a3ae..1ba858cb7 100644
--- a/src/components/tasks/partials/repeatAfter.vue
+++ b/src/components/tasks/partials/repeatAfter.vue
@@ -7,8 +7,8 @@
 			<x-button variant="secondary" class="is-small" @click="() => setRepeatAfter(1, 'weeks')">
 				{{ $t('task.repeat.everyWeek') }}
 			</x-button>
-			<x-button variant="secondary" class="is-small" @click="() => setRepeatAfter(1, 'months')">
-				{{ $t('task.repeat.everyMonth') }}
+			<x-button variant="secondary" class="is-small" @click="() => setRepeatAfter(30, 'days')">
+				{{ $t('task.repeat.every30d') }}
 			</x-button>
 		</div>
 		<div class="is-flex is-align-items-center mb-2">
@@ -51,8 +51,6 @@
 							<option value="hours">{{ $t('task.repeat.hours') }}</option>
 							<option value="days">{{ $t('task.repeat.days') }}</option>
 							<option value="weeks">{{ $t('task.repeat.weeks') }}</option>
-							<option value="months">{{ $t('task.repeat.months') }}</option>
-							<option value="years">{{ $t('task.repeat.years') }}</option>
 						</select>
 					</div>
 				</div>
diff --git a/src/helpers/time/period.ts b/src/helpers/time/period.ts
index bf2dcf4d4..1c708b460 100644
--- a/src/helpers/time/period.ts
+++ b/src/helpers/time/period.ts
@@ -16,10 +16,6 @@ export function secondsToPeriod(seconds: number): { unit: PeriodUnit, amount: nu
 	if (seconds % SECONDS_A_DAY === 0) {
 		if (seconds % SECONDS_A_WEEK === 0) {
 			return {unit: 'weeks', amount: seconds / SECONDS_A_WEEK}
-		} else if (seconds % SECONDS_A_MONTH === 0) {
-			return {unit: 'days', amount: seconds / SECONDS_A_MONTH * 30}
-		} else if (seconds % SECONDS_A_YEAR === 0) {
-			return {unit: 'years', amount: seconds / SECONDS_A_YEAR}
 		} else {
 			return {unit: 'days', amount: seconds / SECONDS_A_DAY}
 		}
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index e0564957a..4c410ad51 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -770,7 +770,7 @@
     "repeat": {
       "everyDay": "Every Day",
       "everyWeek": "Every Week",
-      "everyMonth": "Every Month",
+      "every30d": "Every 30 Days",
       "mode": "Repeat mode",
       "monthly": "Monthly",
       "fromCurrentDate": "From Current Date",
diff --git a/src/services/task.ts b/src/services/task.ts
index 3bcc5b427..2e246d966 100644
--- a/src/services/task.ts
+++ b/src/services/task.ts
@@ -81,12 +81,6 @@ export default class TaskService extends AbstractService<ITask> {
 				case 'weeks':
 					repeatAfterSeconds = model.repeatAfter.amount * SECONDS_A_WEEK
 					break
-				case 'months':
-					repeatAfterSeconds = model.repeatAfter.amount * SECONDS_A_MONTH
-					break
-				case 'years':
-					repeatAfterSeconds = model.repeatAfter.amount * SECONDS_A_YEAR
-					break
 			}
 		}
 		model.repeatAfter = repeatAfterSeconds