feat: set first day of the week #528

johannesjo · Oct 2, 2020 · b83bfea · b83bfea
1 parent 5144d3a
commit b83bfea
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 5 deletions.
diff --git a/src/app/features/config/default-global-config.const.ts b/src/app/features/config/default-global-config.const.ts
@@ -14,7 +14,8 @@ export const DEFAULT_GLOBAL_CONFIG: GlobalConfigState = {
     isTurnOffMarkdown: false,
     isAutoAddWorkedOnToToday: false,
     isDisableInitialDialog: false,
-    defaultProjectId: null
+    defaultProjectId: null,
+    firstDayOfWeek: 0,
   },
   evaluation: {
     isHideEvaluationSheet: false,

diff --git a/src/app/features/config/form-cfgs/misc-settings-form.const.ts b/src/app/features/config/form-cfgs/misc-settings-form.const.ts
@@ -70,5 +70,22 @@ export const MISC_SETTINGS_FORM_CFG: ConfigFormSection<MiscConfig> = {
         label: T.GCF.MISC.DEFAULT_PROJECT,
       },
     },
+    {
+      key: 'firstDayOfWeek',
+      type: 'select',
+      templateOptions: {
+        label: T.GCF.MISC.FIRST_DAY_OF_WEEK,
+        required: true,
+        options: [
+          {label: T.F.TASK_REPEAT.F.SUNDAY, value: 0},
+          {label: T.F.TASK_REPEAT.F.MONDAY, value: 1},
+          {label: T.F.TASK_REPEAT.F.TUESDAY, value: 2},
+          {label: T.F.TASK_REPEAT.F.WEDNESDAY, value: 3},
+          {label: T.F.TASK_REPEAT.F.THURSDAY, value: 4},
+          {label: T.F.TASK_REPEAT.F.FRIDAY, value: 5},
+          {label: T.F.TASK_REPEAT.F.SATURDAY, value: 6},
+        ],
+      },
+    },
   ]
 };
diff --git a/src/app/features/config/global-config.model.ts b/src/app/features/config/global-config.model.ts
@@ -50,6 +50,7 @@ export type MiscConfig = Readonly<{
   isAutoAddWorkedOnToToday: boolean;
   isDisableInitialDialog: boolean;
   defaultProjectId: string | null;
+  firstDayOfWeek: number;
 }>;
 
 export type EvaluationConfig = Readonly<{

diff --git a/src/app/t.const.ts b/src/app/t.const.ts
@@ -957,7 +957,8 @@ export const T = {
       'IS_HIDE_NAV': 'GCF.MISC.IS_HIDE_NAV',
       'IS_NOTIFY_WHEN_TIME_ESTIMATE_EXCEEDED': 'GCF.MISC.IS_NOTIFY_WHEN_TIME_ESTIMATE_EXCEEDED',
       'IS_TURN_OFF_MARKDOWN': 'GCF.MISC.IS_TURN_OFF_MARKDOWN',
-      'TITLE': 'GCF.MISC.TITLE'
+      'TITLE': 'GCF.MISC.TITLE',
+      "FIRST_DAY_OF_WEEK": 'GCF.MISC.FIRST_DAY_OF_WEEK',
     },
     'POMODORO': {
       'BREAK_DURATION': 'GCF.POMODORO.BREAK_DURATION',

diff --git a/src/app/ui/owl-wrapper/owl-wrapper.component.html b/src/app/ui/owl-wrapper/owl-wrapper.component.html
@@ -10,5 +10,6 @@
                       [sPlaceholder]="T.DATETIME_SCHEDULE.PLACEHOLDER|translate"
                       [sPressEnterToSubmit]="T.DATETIME_SCHEDULE.PRESS_ENTER_AGAIN|translate"
                       [sTomorrow]="T.DATETIME_SCHEDULE.TOMORROW|translate"
+                      [firstDayOfWeek]="(firstDayOfWeek$|async)"
                       name="owlDate"
                       ngDefaultControl></owl-date-time-inline>
diff --git a/src/app/ui/owl-wrapper/owl-wrapper.component.ts b/src/app/ui/owl-wrapper/owl-wrapper.component.ts
@@ -1,4 +1,7 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map, startWith } from 'rxjs/operators';
+import { GlobalConfigService } from 'src/app/features/config/global-config.service';
 import { T } from 'src/app/t.const';
 
 @Component({
@@ -31,7 +34,12 @@ export class OwlWrapperComponent {
     '23:30',
   ];
 
-  constructor() {
+  firstDayOfWeek$: Observable<number> = this._globalConfigService.misc$.pipe(
+    map(cfg => cfg.firstDayOfWeek),
+    startWith(0),
+  );
+
+  constructor(private _globalConfigService: GlobalConfigService) {
   }
 
   @Input('dateTime')

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -941,7 +941,8 @@
       "IS_HIDE_NAV": "Navigation verbergen, bis die Hauptüberschrift angezeigt wird (nur Desktop)",
       "IS_NOTIFY_WHEN_TIME_ESTIMATE_EXCEEDED": "Benachrichtigen, wenn die geschätzte Zeit überschritten wurde",
       "IS_TURN_OFF_MARKDOWN": "Deaktivieren Sie das Markdown-Parsing für Notizen",
-      "TITLE": "Verschiedene Einstellungen"
+      "TITLE": "Verschiedene Einstellungen",
+      "FIRST_DAY_OF_WEEK": "Erster Tag der Woche"
     },
     "POMODORO": {
       "BREAK_DURATION": "Dauer der kurzen Pausen",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -957,7 +957,8 @@
       "IS_HIDE_NAV": "Hide navigation until main header is hovered (desktop only)",
       "IS_NOTIFY_WHEN_TIME_ESTIMATE_EXCEEDED": "Notify when time estimate was exceeded",
       "IS_TURN_OFF_MARKDOWN": "Turn off markdown parsing for notes",
-      "TITLE": "Misc Settings"
+      "TITLE": "Misc Settings",
+      "FIRST_DAY_OF_WEEK": "First day of the week"
     },
     "POMODORO": {
       "BREAK_DURATION": "Duration of short breaks",