Merge branch 'johannesjo:master' into openproject-filter-fix

Author: 19Topgun93

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -49,9 +49,11 @@ assignees: ''
 
 <!--- For the desktop versions, there is also an error log file in case there is no console output.
 Usually, you can find it here:
-on Linux: ~/.config/superProductivity/logs/main.log
 on macOS: ~/Library/Logs/superProductivity/main.log
 on Windows: %USERPROFILE%\AppData\Roaming\superProductivity\logs\main.log
+on Linux: ~/.config/superProductivity/logs/main.log
+on Linux (snap): ~/snap/superproductivity/common/.config/superProductivity/logs
+on Linux (flatpak): ~/.var/app/com.super_productivity/SuperProductivity/config/superProductivity/logs
 
 If you don't feel comfortable posting your logs here in public you can also send to me via email: [email protected]
 . -->

src/app/features/config/config-sound-form/config-sound-form.component.html

@@ -53,5 +53,13 @@
         }
       </mat-select>
     </mat-form-field>
+    <mat-form-field class="width100">
+      <mat-label>{{ 'GCF.SOUND.TRACK_TIME_SOUND' | translate }}</mat-label>
+      <mat-select formControlName="trackTimeSound">
+        @for (sound of soundOpts; track sound) {
+          <mat-option [value]="sound.value">{{ sound.label }}</mat-option>
+        }
+      </mat-select>
+    </mat-form-field>
   </div>
 </collapsible>

src/app/features/config/config-sound-form/config-sound-form.component.ts

@@ -55,6 +55,7 @@ export class ConfigSoundFormComponent {
     volume: new FormControl<number>(0),
     doneSound: new FormControl<string | null>(null),
     breakReminderSound: new FormControl<string | null>(null),
+    trackTimeSound: new FormControl<string | null>(null),
     isIncreaseDoneSoundPitch: new FormControl<boolean>(false),
   });
 
@@ -72,6 +73,7 @@ export class ConfigSoundFormComponent {
             volume: data.volume ?? 0,
             doneSound: data.doneSound ?? null,
             breakReminderSound: data.breakReminderSound ?? null,
+            trackTimeSound: data.trackTimeSound ?? null,
             isIncreaseDoneSoundPitch: data.isIncreaseDoneSoundPitch ?? false,
           });
         }
@@ -92,6 +94,9 @@ export class ConfigSoundFormComponent {
       this.soundForm
         .get('breakReminderSound')!
         .patchValue(this.config.breakReminderSound, { emitEvent: false, onlySelf: true });
+      this.soundForm
+        .get('trackTimeSound')!
+        .patchValue(this.config.trackTimeSound, { emitEvent: false, onlySelf: true });
       this.soundForm
         .get('isIncreaseDoneSoundPitch')!
         .patchValue(this.config.isIncreaseDoneSoundPitch, {
@@ -112,6 +117,8 @@ export class ConfigSoundFormComponent {
       cfg.breakReminderSound
     ) {
       playSound(cfg.breakReminderSound, cfg.volume);
+    } else if (cfg.trackTimeSound !== this.config?.trackTimeSound && cfg.trackTimeSound) {
+      playSound(cfg.trackTimeSound, cfg.volume);
     } else {
       playDoneSound(cfg);
     }

src/app/features/config/default-global-config.const.ts

@@ -140,6 +140,7 @@ export const DEFAULT_GLOBAL_CONFIG: GlobalConfigState = {
     isIncreaseDoneSoundPitch: true,
     doneSound: 'done2.mp3',
     breakReminderSound: null,
+    trackTimeSound: null,
   },
   timeTracking: {
     trackingInterval: TRACKING_INTERVAL,
@@ -150,6 +151,8 @@ export const DEFAULT_GLOBAL_CONFIG: GlobalConfigState = {
     isTrackingReminderEnabled: false,
     isTrackingReminderShowOnMobile: false,
     trackingReminderMinTime: 5 * minute,
+    isTrackingReminderNotify: false, // Show desktop notification when tracking reminder is triggered
+    isTrackingReminderFocusWindow: false, // Focus the application window when tracking reminder is triggered
   },
   reminder: {
     isCountdownBannerEnabled: true,

src/app/features/config/form-cfgs/sound-form.const.ts

@@ -57,5 +57,14 @@ export const SOUND_FORM_CFG: ConfigFormSection<SoundConfig> = {
         change: ({ model }) => playSound(model.breakReminderSound, model.volume),
       },
     },
+    {
+      key: 'trackTimeSound',
+      type: 'select',
+      templateOptions: {
+        label: T.GCF.SOUND.TRACK_TIME_SOUND,
+        options: SOUND_OPTS,
+        change: ({ model }) => playSound(model.trackTimeSound, model.volume),
+      },
+    },
   ],
 };

src/app/features/config/form-cfgs/time-tracking-form.const.ts

@@ -54,6 +54,22 @@ export const TIME_TRACKING_FORM_CFG: ConfigFormSection<TimeTrackingConfig> = {
         label: T.GCF.TIME_TRACKING.L_IS_TRACKING_REMINDER_SHOW_ON_MOBILE,
       },
     },
+    {
+      key: 'isTrackingReminderNotify',
+      type: 'checkbox',
+      hideExpression: (model) => !model.isTrackingReminderEnabled,
+      templateOptions: {
+        label: T.GCF.TIME_TRACKING.L_IS_TRACKING_REMINDER_NOTIFY,
+      },
+    },
+    {
+      key: 'isTrackingReminderFocusWindow',
+      type: 'checkbox',
+      hideExpression: (model) => !model.isTrackingReminderEnabled,
+      templateOptions: {
+        label: T.GCF.TIME_TRACKING.L_IS_TRACKING_REMINDER_FOCUS_WINDOW,
+      },
+    },
     {
       key: 'trackingReminderMinTime',
       type: 'duration',

src/app/features/config/global-config.model.ts

@@ -40,6 +40,8 @@ export type TimeTrackingConfig = Readonly<{
   isTrackingReminderEnabled: boolean;
   isTrackingReminderShowOnMobile: boolean;
   trackingReminderMinTime: number;
+  isTrackingReminderNotify: boolean;
+  isTrackingReminderFocusWindow: boolean;
 }>;
 
 export type EvaluationConfig = Readonly<{
@@ -112,6 +114,7 @@ export type SoundConfig = Readonly<{
   isIncreaseDoneSoundPitch: boolean;
   doneSound: string | null;
   breakReminderSound: string | null;
+  trackTimeSound: string | null;
   volume: number;
 }>;
 

src/app/features/tasks/task/task.component.ts

@@ -739,7 +739,7 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
 
   moveToToday(): void {
     const t = this.task();
-    if (t.projectId && !t.parentId) {
+    if (t.projectId) {
       this._projectService.moveTaskToTodayList(t.id, t.projectId);
       this.addToMyDay();
     }
@@ -899,13 +899,11 @@ export class TaskComponent implements OnDestroy, AfterViewInit {
     }
 
     if (checkKeyCombo(ev, keys.moveToTodaysTasks) && t.projectId) {
-      if (!t.parentId) {
-        ev.preventDefault();
-        // same default shortcut as schedule so we stop propagation
-        ev.stopPropagation();
-        this.focusNext(true, true);
-        this.moveToToday();
-      }
+      ev.preventDefault();
+      // same default shortcut as schedule so we stop propagation
+      ev.stopPropagation();
+      this.focusNext(true, true);
+      this.moveToToday();
     }
 
     // collapse sub tasks

src/app/features/tracking-reminder/tracking-reminder.service.ts

@@ -6,9 +6,11 @@ import { combineLatest, EMPTY, merge, Observable, of, Subject } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
+  first,
   map,
   shareReplay,
   switchMap,
+  throttleTime,
   withLatestFrom,
 } from 'rxjs/operators';
 import { realTimer$ } from '../../util/real-timer';
@@ -22,8 +24,13 @@ import { T } from '../../t.const';
 import { TranslateService } from '@ngx-translate/core';
 import { TimeTrackingConfig } from '../config/global-config.model';
 import { IS_TOUCH_ONLY } from '../../util/is-touch-only';
-import { DateService } from 'src/app/core/date/date.service';
+import { DateService } from '../../core/date/date.service';
 import { TakeABreakService } from '../take-a-break/take-a-break.service';
+import { NotifyService } from '../../core/notify/notify.service';
+import { UiHelperService } from '../ui-helper/ui-helper.service';
+import { playSound } from '../../util/play-sound';
+
+const DESKTOP_NOTIFICATION_THROTTLE = 60 * 1000;
 
 @Injectable({
   providedIn: 'root',
@@ -37,6 +44,8 @@ export class TrackingReminderService {
   private _translateService = inject(TranslateService);
   private _dateService = inject(DateService);
   private _takeABreakService = inject(TakeABreakService);
+  private _notifyService = inject(NotifyService);
+  private _uiHelperService = inject(UiHelperService);
 
   _cfg$: Observable<TimeTrackingConfig> = this._globalConfigService.cfg$.pipe(
     map((cfg) => cfg?.timeTracking),
@@ -73,6 +82,9 @@ export class TrackingReminderService {
     shareReplay(),
   );
 
+  // New throttled notification stream
+  private _throttledNotificationTrigger$ = new Subject<string>();
+
   init(): void {
     this.remindCounter$.subscribe((count) => {
       this._triggerBanner(count);
@@ -81,6 +93,30 @@ export class TrackingReminderService {
     this._hideTrigger$.subscribe((v) => {
       this._hideBanner();
     });
+
+    // Set up throttled notification handling
+    this._throttledNotificationTrigger$
+      .pipe(
+        throttleTime(DESKTOP_NOTIFICATION_THROTTLE),
+        // Get all needed config in one go
+        withLatestFrom(
+          this._globalConfigService.sound$,
+          this._globalConfigService.cfg$.pipe(map((cfg) => cfg.timeTracking)),
+        ),
+      )
+      .subscribe(([durationStr, soundCfg, timeTrackingCfg]) => {
+        this._showNotification(durationStr);
+
+        // Play sound if configured
+        if (soundCfg.trackTimeSound) {
+          playSound(soundCfg.trackTimeSound as string);
+        }
+
+        // Focus window if enabled
+        if (timeTrackingCfg.isTrackingReminderFocusWindow) {
+          this._focusWindow();
+        }
+      });
   }
 
   private _hideBanner(): void {
@@ -109,6 +145,20 @@ export class TrackingReminderService {
         fn: () => this._dismissBanner(),
       },
     });
+
+    // Handle desktop notification if enabled
+    this._globalConfigService.cfg$
+      .pipe(
+        filter((cfg) => !!cfg),
+        first(),
+      )
+      .subscribe((cfg) => {
+        // Show desktop notification if enabled
+        if (cfg.timeTracking.isTrackingReminderNotify) {
+          // Instead of showing directly, queue it through the throttled subject
+          this._throttledNotificationTrigger$.next(durationStr);
+        }
+      });
   }
 
   private _openDialog(): void {
@@ -153,4 +203,20 @@ export class TrackingReminderService {
     this._bannerService.dismiss(BannerId.StartTrackingReminder);
     this._manualReset$.next();
   }
+
+  private _showNotification(durationStr: string): void {
+    this._notifyService.notify({
+      title: this._translateService.instant(
+        T.F.TIME_TRACKING.D_TRACKING_REMINDER.NOTIFICATION_TITLE,
+      ),
+      body: this._translateService.instant(T.F.TIME_TRACKING.B_TTR.MSG, {
+        time: durationStr,
+      }),
+      requireInteraction: true,
+    });
+  }
+
+  private _focusWindow(): void {
+    this._uiHelperService.focusApp();
+  }
 }

src/app/features/work-view/work-view.component.ts

@@ -6,8 +6,10 @@ import {
   ElementRef,
   inject,
   input,
+  OnChanges,
   OnDestroy,
   OnInit,
+  SimpleChanges,
   ViewChild,
 } from '@angular/core';
 import { TaskService } from '../tasks/task.service';
@@ -25,7 +27,7 @@ import {
   zip,
 } from 'rxjs';
 import { TaskWithSubTasks } from '../tasks/task.model';
-import { delay, filter, map, switchMap } from 'rxjs/operators';
+import { delay, filter, map, switchMap, take } from 'rxjs/operators';
 import { fadeAnimation } from '../../ui/animations/fade.ani';
 import { PlanningModeService } from '../planning-mode/planning-mode.service';
 import { T } from '../../t.const';
@@ -85,7 +87,7 @@ import { TranslatePipe } from '@ngx-translate/core';
     TranslatePipe,
   ],
 })
-export class WorkViewComponent implements OnInit, OnDestroy, AfterContentInit {
+export class WorkViewComponent implements OnInit, OnChanges, OnDestroy, AfterContentInit {
   taskService = inject(TaskService);
   takeABreakService = inject(TakeABreakService);
   planningModeService = inject(PlanningModeService);
@@ -179,6 +181,26 @@ export class WorkViewComponent implements OnInit, OnDestroy, AfterContentInit {
     );
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    const undoneChanges = changes['undoneTasks'];
+    const doneChanges = changes['doneTasks'];
+
+    if ((undoneChanges || doneChanges) && this.taskService.selectedTaskId$) {
+      const undoneArr = this.undoneTasks();
+      const doneArr = this.doneTasks();
+      const allTasks = [...undoneArr, ...doneArr];
+
+      this.taskService.selectedTaskId$.pipe(take(1)).subscribe((selectedTaskId) => {
+        if (selectedTaskId) {
+          const isSelectedStillPresent = allTasks.some((t) => t.id === selectedTaskId);
+          if (!isSelectedStillPresent) {
+            this.taskService.setSelectedId(null);
+          }
+        }
+      });
+    }
+  }
+
   ngOnDestroy(): void {
     if (this._switchListAnimationTimeout) {
       window.clearTimeout(this._switchListAnimationTimeout);

src/app/t.const.ts

@@ -1289,6 +1289,7 @@ const T = {
         TASK: 'F.TIME_TRACKING.D_TRACKING_REMINDER.TASK',
         TRACK_TO: 'F.TIME_TRACKING.D_TRACKING_REMINDER.TRACK_TO',
         UNTRACKED_TIME: 'F.TIME_TRACKING.D_TRACKING_REMINDER.UNTRACKED_TIME',
+        NOTIFICATION_TITLE: 'F.TIME_TRACKING.D_TRACKING_REMINDER.NOTIFICATION_TITLE',
       },
     },
     WORKLOG: {
@@ -1574,6 +1575,7 @@ const T = {
       IS_INCREASE_DONE_PITCH: 'GCF.SOUND.IS_INCREASE_DONE_PITCH',
       TITLE: 'GCF.SOUND.TITLE',
       VOLUME: 'GCF.SOUND.VOLUME',
+      TRACK_TIME_SOUND: 'GCF.SOUND.TRACK_TIME_SOUND',
     },
     TAKE_A_BREAK: {
       ADD_NEW_IMG: 'GCF.TAKE_A_BREAK.ADD_NEW_IMG',
@@ -1603,6 +1605,9 @@ const T = {
       L_TRACKING_INTERVAL: 'GCF.TIME_TRACKING.L_TRACKING_INTERVAL',
       L_TRACKING_REMINDER_MIN_TIME: 'GCF.TIME_TRACKING.L_TRACKING_REMINDER_MIN_TIME',
       TITLE: 'GCF.TIME_TRACKING.TITLE',
+      L_IS_TRACKING_REMINDER_NOTIFY: 'GCF.TIME_TRACKING.L_IS_TRACKING_REMINDER_NOTIFY',
+      L_IS_TRACKING_REMINDER_FOCUS_WINDOW:
+        'GCF.TIME_TRACKING.L_IS_TRACKING_REMINDER_FOCUS_WINDOW',
     },
   },
   GLOBAL_SNACK: {

src/assets/i18n/en.json

@@ -1267,7 +1267,8 @@
         "IDLE_FOR": "You have been idle for:",
         "TASK": "Task",
         "TRACK_TO": "Track to:",
-        "UNTRACKED_TIME": "Untracked time:"
+        "UNTRACKED_TIME": "Untracked time:",
+        "NOTIFICATION_TITLE": "Track your time!"
       }
     },
     "WORKLOG": {
@@ -1548,6 +1549,7 @@
     },
     "SOUND": {
       "BREAK_REMINDER_SOUND": "Take a break reminder sound",
+      "TRACK_TIME_SOUND": "Track time reminder sound",
       "DONE_SOUND": "Task marked done sound",
       "IS_INCREASE_DONE_PITCH": "Increase pitch for every task done",
       "TITLE": "Sound",
@@ -1578,7 +1580,9 @@
       "L_IS_TRACKING_REMINDER_SHOW_ON_MOBILE": "Show tracking reminder on mobile app",
       "L_TRACKING_INTERVAL": "Time tracking interval (EXPERIMENTAL)",
       "L_TRACKING_REMINDER_MIN_TIME": "Time to wait before showing tracking reminder Banner",
-      "TITLE": "Time Tracking"
+      "TITLE": "Time Tracking",
+      "L_IS_TRACKING_REMINDER_NOTIFY": "Notify when time tracking reminder is shown",
+      "L_IS_TRACKING_REMINDER_FOCUS_WINDOW": "Focus app window when reminder is active (desktop only)"
     }
   },
   "GLOBAL_SNACK": {