patrick/Homeautomation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into property2

Browse Source
This commit is contained in:
Patrick Haßel 2021-11-04 13:16:43 +01:00
commit 69c5be604a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/angular/src/app/pages/schedule/schedule.component.html
View File

@ -62,6 +62,11 @@
<ng-container *ngIf="entry.type === 'SUNRISE' || entry.type === 'SUNSET'"> <ng-container *ngIf="entry.type === 'SUNRISE' || entry.type === 'SUNSET'">
<td> <td>
<select [(ngModel)]="entry.zenith" (ngModelChange)="set(entry, 'zenith', entry.zenith)"> <select [(ngModel)]="entry.zenith" (ngModelChange)="set(entry, 'zenith', entry.zenith)">
<option value="87">
[&nbsp;87°]
<ng-container *ngIf="entry.type === 'SUNRISE'">Nach Sonnenaufgang</ng-container>
<ng-container *ngIf="entry.type === 'SUNSET'">Vor Sonnenuntergang</ng-container>
</option>
<option value="90.8333"> <option value="90.8333">
[&nbsp;90°] [&nbsp;90°]
<ng-container *ngIf="entry.type === 'SUNRISE'">Sonnenaufgang</ng-container> <ng-container *ngIf="entry.type === 'SUNRISE'">Sonnenaufgang</ng-container>

9
src/main/java/de/ph87/homeautomation/DemoDataService.java
View File

@ -65,6 +65,8 @@ public class DemoDataService {
final KnxGroup helligkeit = createKnxGroupIfNotExists("Helligkeit", 0, 5, 6, "9.004", false, true); final KnxGroup helligkeit = createKnxGroupIfNotExists("Helligkeit", 0, 5, 6, "9.004", false, true);
final KnxGroupDto szene_haus = createKnxGroupIfNotExists("Szene Haus", 0, 0, 21, "17.004", PropertyType.LUX, false, true);
if (deviceRepository.count() == 0) { if (deviceRepository.count() == 0) {
createDeviceSwitch("Ambiente EG", ambiente_eg_status, ambiente_eg_schalten); createDeviceSwitch("Ambiente EG", ambiente_eg_status, ambiente_eg_schalten);
createDeviceSwitch("Ambiente OG", ambiente_og_status, ambiente_og_schalten); createDeviceSwitch("Ambiente OG", ambiente_og_status, ambiente_og_schalten);
@ -125,6 +127,13 @@ public class DemoDataService {
createTime(scheduleBadLichtMitte, true, 0, 0, 0, MIN30, true); createTime(scheduleBadLichtMitte, true, 0, 0, 0, MIN30, true);
createTime(scheduleBadLichtMitte, true, 1, 0, 0, MIN30, false); createTime(scheduleBadLichtMitte, true, 1, 0, 0, MIN30, false);
scheduleRepository.save(scheduleBadLichtMitte); scheduleRepository.save(scheduleBadLichtMitte);
final Schedule scheduleSzeneHaus = createSchedule(true, "Dekoration", szene_haus.getProperty());
createSunrise(scheduleSzeneHaus, true, Zenith.ASTRONOMICAL, 0, 31);
createTime(scheduleSzeneHaus, true, 8, 30, 0, 0, 30);
createSunset(scheduleSzeneHaus, true, Zenith.OFFICIAL, 0, 31);
createSunset(scheduleSzeneHaus, true, Zenith.ASTRONOMICAL, 0, 30);
scheduleRepository.save(scheduleSzeneHaus);
} }
} }