Fix duration inputs in shutdown sequence triggers on systems with 12 …

…hour clock.
Raphiiko · Aug 15, 2024 · e281d05 · e281d05
1 parent d6d8d7b
commit e281d05
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Option for the brightness automations based on sleep mode to run on SteamVR launch. This now happens automatically when a HMD is connected.
 
+### Fixed
+
+- Duration inputs for shutdown sequence triggers being broken on systems using a 12-hour clock.
+
 ## [1.13.3]
 
 ### Fixed

diff --git a/src-ui/app/components/duration-input-setting/duration-input-setting.component.html b/src-ui/app/components/duration-input-setting/duration-input-setting.component.html
@@ -5,6 +5,7 @@
     readonly
     (mouseenter)="mouseEnter('INPUT')"
     (mouseleave)="mouseLeave('INPUT')"
+    (click)="mouseClickInput()"
     [disabled]="disabled"
   />
   <div

diff --git a/src-ui/app/components/duration-input-setting/duration-input-setting.component.ts b/src-ui/app/components/duration-input-setting/duration-input-setting.component.ts
@@ -91,4 +91,10 @@ export class DurationInputSettingComponent {
       if (Object.values(this.mouseInside).every((v) => !v)) this.inputOpen = false;
     }, 200);
   }
+
+  mouseClickInput() {
+    if (this.inputOpen && this.hourInput?.nativeElement) {
+      this.hourInput.nativeElement.focus();
+    }
+  }
 }
diff --git a/...w/tabs/shutdown-automations-triggers-tab/shutdown-automations-triggers-tab.component.html b/...w/tabs/shutdown-automations-triggers-tab/shutdown-automations-triggers-tab.component.html
@@ -44,15 +44,10 @@ <h2 translate>shutdown-automations.triggers.triggers</h2>
           <span translate>shutdown-automations.triggers.whenAsleepDuration.description</span>
         </div>
         <div class="setting-row-action">
-          <div class="input-wrapper">
-            <input
-              type="time"
-              step="1"
-              [value]="onSleepDurationString"
-              (change)="onSleepDurationChange(onSleepDurationInput.value)"
-              #onSleepDurationInput
-            />
-          </div>
+          <app-duration-input-setting
+            [value]="config.triggerOnSleepDuration"
+            (valueChange)="onSleepDurationChange($event)"
+          ></app-duration-input-setting>
         </div>
       </div>
 
@@ -117,15 +112,10 @@ <h2 translate>shutdown-automations.triggers.triggers</h2>
           <span translate>shutdown-automations.triggers.whenAloneDuration.description</span>
         </div>
         <div class="setting-row-action">
-          <div class="input-wrapper">
-            <input
-              type="time"
-              step="1"
-              [value]="whenAloneDurationString"
-              (change)="whenAloneDurationChange(whenAloneDurationInput.value)"
-              #whenAloneDurationInput
-            />
-          </div>
+          <app-duration-input-setting
+            [value]="config.triggerWhenAloneDuration"
+            (valueChange)="whenAloneDurationChange($event)"
+          ></app-duration-input-setting>
         </div>
       </div>
 

diff --git a/...iew/tabs/shutdown-automations-triggers-tab/shutdown-automations-triggers-tab.component.ts b/...iew/tabs/shutdown-automations-triggers-tab/shutdown-automations-triggers-tab.component.ts
@@ -22,8 +22,6 @@ export class ShutdownAutomationsTriggersTabComponent implements OnInit {
   protected onSleepActivationWindowEnd = '00:00';
   protected whenAloneActivationWindowStart = '00:00';
   protected whenAloneActivationWindowEnd = '00:00';
-  protected onSleepDurationString = '00:00:00';
-  protected whenAloneDurationString = '00:00:00';
 
   constructor(private automationConfigs: AutomationConfigService, private destroyRef: DestroyRef) {}
 
@@ -32,14 +30,12 @@ export class ShutdownAutomationsTriggersTabComponent implements OnInit {
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((configs) => {
         this.config = configs.SHUTDOWN_AUTOMATIONS;
-        this.onSleepDurationString = this.durationToString(this.config.triggerOnSleepDuration);
         this.onSleepActivationWindowStart = this.config.triggerOnSleepActivationWindowStart
           .map((v) => v.toString().padStart(2, '0'))
           .join(':');
         this.onSleepActivationWindowEnd = this.config.triggerOnSleepActivationWindowEnd
           .map((v) => v.toString().padStart(2, '0'))
           .join(':');
-        this.whenAloneDurationString = this.durationToString(this.config.triggerWhenAloneDuration);
         this.whenAloneActivationWindowStart = this.config.triggerWhenAloneActivationWindowStart
           .map((v) => v.toString().padStart(2, '0'))
           .join(':');
@@ -75,12 +71,7 @@ export class ShutdownAutomationsTriggersTabComponent implements OnInit {
     );
   }
 
-  async onSleepDurationChange(value: string) {
-    let [hours, minutes, seconds] = value.split(':').map((v) => parseInt(v));
-    if (isNaN(hours)) hours = 0;
-    if (isNaN(minutes)) minutes = 0;
-    if (isNaN(seconds)) seconds = 0;
-    const duration = (hours * 3600 + minutes * 60 + seconds) * 1000;
+  async onSleepDurationChange(duration: number) {
     await this.automationConfigs.updateAutomationConfig<ShutdownAutomationsConfig>(
       'SHUTDOWN_AUTOMATIONS',
       {
@@ -89,12 +80,7 @@ export class ShutdownAutomationsTriggersTabComponent implements OnInit {
     );
   }
 
-  async whenAloneDurationChange(value: string) {
-    let [hours, minutes, seconds] = value.split(':').map((v) => parseInt(v));
-    if (isNaN(hours)) hours = 0;
-    if (isNaN(minutes)) minutes = 0;
-    if (isNaN(seconds)) seconds = 0;
-    const duration = (hours * 3600 + minutes * 60 + seconds) * 1000;
+  async whenAloneDurationChange(duration: number) {
     await this.automationConfigs.updateAutomationConfig<ShutdownAutomationsConfig>(
       'SHUTDOWN_AUTOMATIONS',
       {