ScheduleEntry.skip

2024-09-09 13:10:53 +02:00 · 2024-09-09 13:10:53 +02:00 · bb972283a3
commit bb972283a3
parent 4cdb051e17
13 changed files with 81 additions and 30 deletions
--- a/src/main/angular/angular.json
+++ b/src/main/angular/angular.json
@ -125,5 +125,8 @@
        }
      }
    }
+  },
+  "cli": {
+    "analytics": false
  }
 }
--- a/src/main/angular/src/app/api/schedule/entry/ScheduleEntry.ts
+++ b/src/main/angular/src/app/api/schedule/entry/ScheduleEntry.ts
@ -1,4 +1,4 @@
-import {validateBooleanNotNull, validateDateAllowNull, validateNumberNotNull, validateStringNotEmptyNotNull} from "../../validators";
+import {validateBooleanNotNull, validateDateAllowNull, validateNumberAllowNull, validateNumberNotNull, validateStringNotEmptyNotNull} from "../../validators";
 import {Timestamp} from "../../Timestamp";
 import {Property} from "../../property/Property";
 import {Bulk} from "../../bulk/Bulk";
@ -26,6 +26,7 @@ export class ScheduleEntry {
    readonly minute: number,
    readonly second: number,
    readonly fuzzySeconds: number,
+    readonly skip: number,
    readonly lastClearTimestamp: Timestamp | null,
    readonly nextClearTimestamp: Timestamp | null,
    readonly nextFuzzyTimestamp: Timestamp | null,
@ -55,6 +56,7 @@ export class ScheduleEntry {
      validateNumberNotNull(json['minute']),
      validateNumberNotNull(json['second']),
      validateNumberNotNull(json['fuzzySeconds']),
+      validateNumberAllowNull(json['skip']) || 0,
      Timestamp.fromDateOrNull(validateDateAllowNull(json['lastClearTimestamp'])),
      Timestamp.fromDateOrNull(validateDateAllowNull(json['nextClearTimestamp'])),
      Timestamp.fromDateOrNull(validateDateAllowNull(json['nextFuzzyTimestamp'])),
--- a/src/main/angular/src/app/pages/schedule/list/schedule-list.component.html
+++ b/src/main/angular/src/app/pages/schedule/list/schedule-list.component.html
@ -6,13 +6,18 @@
  <div class="scheduleBox" *ngFor="let schedule of schedules; trackBy: Schedule.trackBy">
    <div class="schedule" [class.scheduleEnabled]="schedule.enabled">

-      <div class="header">
+      <div class="header" [class.skipActive]="schedule.next?.skip">

        <div class="enabled" (click)="set(schedule, 'enabled', !schedule.enabled)" [class.true]="schedule.enabled" [class.false]="!schedule.enabled">
          <fa-icon *ngIf="schedule.enabled" [icon]="faCheckCircle"></fa-icon>
          <fa-icon *ngIf="!schedule.enabled" [icon]="faCircle"></fa-icon>
        </div>

+        <div class="skip" (click)="skip(schedule.next)">
+          <img src="assets/skip.svg" [alt]="schedule.next?.skip">
+          {{ schedule.next?.skip }}
+        </div>
+
        <div class="title" [routerLink]="['/Schedule', {id: schedule.id}]">
          {{ schedule.title }}
        </div>
@ -24,13 +29,13 @@
      </div>

      <div class="timestampBox timestampBoxNext">
-        <div class="timestampTitle">
-          Nächste Ausführung:
-        </div>
        <div class="timestampTimestamp">
          <ng-container *ngIf="schedule.next">{{ schedule.next?.nextFuzzyTimestamp.dayName }}:&nbsp;{{ schedule.next?.nextFuzzyTimestamp.timeString }}</ng-container>
          <ng-container *ngIf="!schedule.next">- - -</ng-container>
        </div>
+        <div class="timestampTitle">
+          Nächste Ausführung:
+        </div>
        <div class="timestampBulk" [class.timestampBulkEmpty]="!schedule.next?.bulk" *ngIf="schedule.next?.bulk">
          {{ schedule.next?.bulk?.name }}
        </div>
--- a/src/main/angular/src/app/pages/schedule/list/schedule-list.component.less
+++ b/src/main/angular/src/app/pages/schedule/list/schedule-list.component.less
@ -24,6 +24,17 @@
          font-weight: bold;
        }

+        .skip {
+          padding: 0.45em;
+          float: left;
+
+          img {
+            display: inline;
+            vertical-align: bottom;
+            height: 1.3em;
+          }
+        }
+
        .delete {
          float: right;
          padding: 0.5em;
@ -110,6 +121,10 @@
      background-color: #F0FFF0;
    }

+    .skipActive {
+      background-color: orange;
+    }
+
    @media (min-width: 1000px) {
      float: left;
      width: 400px;
--- a/src/main/angular/src/app/pages/schedule/list/schedule-list.component.ts
+++ b/src/main/angular/src/app/pages/schedule/list/schedule-list.component.ts
@ -4,6 +4,8 @@ import {Schedule} from "../../../api/schedule/Schedule";
 import {faCheckCircle, faCircle, faTimesCircle} from '@fortawesome/free-regular-svg-icons';
 import {NO_OP} from "../../../api/api.service";
 import {Update} from "../../../api/Update";
+import {ScheduleEntryService} from "../../../api/schedule/entry/schedule-entry.service";
+import {ScheduleEntry} from "../../../api/schedule/entry/ScheduleEntry";

@Component({
  selector: 'app-schedule-list',
@ -24,6 +26,7 @@ export class ScheduleListComponent implements OnInit {

  constructor(
    readonly scheduleService: ScheduleService,
+    readonly entryService: ScheduleEntryService,
  ) {
    // nothing
  }
@ -63,4 +66,12 @@ export class ScheduleListComponent implements OnInit {
    }
  }

+  skip(entry: ScheduleEntry) {
+    let skip = entry.skip + 1;
+    if (skip > 7) {
+      skip = 0;
+    }
+    this.entryService.set(entry, 'skip', skip);
+  }
+
 }
--- a/src/main/angular/src/assets/skip.svg
+++ b/src/main/angular/src/assets/skip.svg
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="800px" height="800px" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="8" cy="37" r="6"/>
+  <path d="M24,31a6,6,0,1,0,6,6A6,6,0,0,0,24,31Zm0,8a2,2,0,1,1,2-2A2,2,0,0,1,24,39Z"/>
+  <circle cx="40" cy="37" r="6"/>
+  <path d="M37.4,19.6a1.9,1.9,0,0,0-3,.2,2.1,2.1,0,0,0,.2,2.7l4,3.9a1.9,1.9,0,0,0,2.8,0l4-3.9a2.3,2.3,0,0,0,.3-2.7,2,2,0,0,0-3.1-.2l-.6.6A18,18,0,0,0,6,21v2a2,2,0,0,0,4,0V21a14,14,0,0,1,28-.9Z"/>
+</svg>
--- a/src/main/angular/src/environments/environment.ts
+++ b/src/main/angular/src/environments/environment.ts
@ -1,22 +1,9 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-
 import {getBaseUrl} from "./UrlHelper";

-const PROD: boolean = true;
+const PROD: boolean = false;

 export const environment = {
  production: false,
  restBase: PROD ? 'http://10.0.0.50:8082' : getBaseUrl('http', 8080),
  websocketBase: PROD ? 'ws://10.0.0.50:8082' : getBaseUrl('ws', 8080),
 };
-
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.
--- a/src/main/java/de/ph87/homeautomation/DemoDataService.java
+++ b/src/main/java/de/ph87/homeautomation/DemoDataService.java
@ -91,6 +91,7 @@ public class DemoDataService {
    scheduleEntryController.setProperty(id, property == null ? null : property.getId());
    scheduleEntryController.setValue(id, value);
    scheduleEntryController.setBulk(id, bulk == null ? null : bulk.getId());
+    scheduleEntryController.setSkip(id, 1);
  }

 }
--- a/src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutor.java
+++ b/src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutor.java
@ -32,20 +32,25 @@ public class ScheduleExecutor {
  private void executeLastDue(final Schedule schedule) {
    final ZonedDateTime now = ZonedDateTime.now();
    schedule.getEntries().stream()
-      .filter(entry -> entry.getNextFuzzyTimestamp() != null && !entry.getNextFuzzyTimestamp().isAfter(now))
-      .max(Comparator.comparing(ScheduleEntry::getNextFuzzyTimestamp))
-      .ifPresent(entry -> executeEntry(schedule, entry));
+        .filter(entry -> entry.getNextFuzzyTimestamp() != null && !entry.getNextFuzzyTimestamp().isAfter(now))
+        .max(Comparator.comparing(ScheduleEntry::getNextFuzzyTimestamp))
+        .ifPresent(entry -> executeEntry(schedule, entry));
  }

  private void executeEntry(final Schedule schedule, final ScheduleEntry entry) {
-    log.info("Executing Schedule \"{}\" Entry {}", schedule.getTitle(), entry);
-    if (entry.getProperty() != null) {
-      log.debug("Schedule setting property: {} = {}", entry.getProperty().getTitle(), entry.getValue());
-      propertyWriter.writeToChannel(entry.getProperty(), entry.getValue());
-    }
-    if (entry.getBulk() != null) {
-      log.debug("Schedule executing Bulk: {}", entry.getBulk());
-      bulkExecutor.execute(entry.getBulk());
+    if (entry.getSkip() <= 0) {
+      log.info("Executing Schedule \"{}\" Entry {}", schedule.getTitle(), entry);
+      if (entry.getProperty() != null) {
+        log.debug("Schedule setting property: {} = {}", entry.getProperty().getTitle(), entry.getValue());
+        propertyWriter.writeToChannel(entry.getProperty(), entry.getValue());
+      }
+      if (entry.getBulk() != null) {
+        log.debug("Schedule executing Bulk: {}", entry.getBulk());
+        bulkExecutor.execute(entry.getBulk());
+      }
+    } else {
+      log.info("Skipping Schedule \"{}\" Entry {}", schedule.getTitle(), entry);
+      entry.setSkip(entry.getSkip() - 1);
    }
    entry.setLastClearTimestamp(entry.getNextClearTimestamp());
    entry.setLastFuzzyTimestamp(entry.getNextFuzzyTimestamp());
--- a/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntry.java
+++ b/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntry.java
@ -63,6 +63,9 @@ public class ScheduleEntry {

  private int fuzzySeconds = 0;

+  @Column(nullable = false)
+  private int skip = 0;
+
  @ManyToOne
  private Property property;

--- a/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntryController.java
+++ b/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntryController.java
@ -95,6 +95,11 @@ public class ScheduleEntryController {
    return scheduleEntryWriter.setFuzzySeconds(id, value);
  }

+  @PostMapping("set/{id}/skip")
+  public ScheduleEntryDto setSkip(@PathVariable final long id, @RequestBody final int value) {
+    return scheduleEntryWriter.setSkip(id, value);
+  }
+
  @PostMapping("set/{id}/property")
  public ScheduleEntryDto setProperty(@PathVariable final long id, @RequestBody(required = false) final Long propertyId) {
    return scheduleEntryWriter.setProperty(id, propertyId);
--- a/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntryDto.java
+++ b/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntryDto.java
@ -42,6 +42,8 @@ public class ScheduleEntryDto implements Serializable {

  public final int fuzzySeconds;

+  public final int skip;
+
  public final ZonedDateTime nextClearTimestamp;

  public final ZonedDateTime lastClearTimestamp;
@ -73,6 +75,7 @@ public class ScheduleEntryDto implements Serializable {
    this.minute = entry.getMinute();
    this.second = entry.getSecond();
    this.fuzzySeconds = entry.getFuzzySeconds();
+    this.skip = entry.getSkip();
    this.nextClearTimestamp = entry.getNextClearTimestamp();
    this.lastClearTimestamp = entry.getLastClearTimestamp();
    this.nextFuzzyTimestamp = entry.getNextFuzzyTimestamp();
--- a/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntryWriter.java
+++ b/src/main/java/de/ph87/homeautomation/schedule/entry/ScheduleEntryWriter.java
@ -130,6 +130,10 @@ public class ScheduleEntryWriter {
    return modifyValue(id, ScheduleEntry::setFuzzySeconds, value);
  }

+  public ScheduleEntryDto setSkip(final long id, final int value) {
+    return modifyValue(id, ScheduleEntry::setSkip, value);
+  }
+
  public ScheduleEntryDto setValue(final long id, final double value) {
    return modifyValue(id, ScheduleEntry::setValue, value);
  }