diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html index e6cf9783..1226fa06 100644 --- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html +++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html @@ -73,7 +73,9 @@ - + diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss index 36228bda..d66ebb20 100644 --- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss +++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.scss @@ -29,7 +29,6 @@ stroke-width: 4px; stroke: #bdc4cd; stroke-miterlimit: 10; - fill: url('#New_Pattern_Swatch_1'); } .room-border { diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts index 629dbe6e..89d804e2 100644 --- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts +++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts @@ -1,4 +1,5 @@ import { Component, EventEmitter, Output } from '@angular/core'; +import { Location, LocationStrategy } from '@angular/common'; @Component({ selector: 'ngx-room-selector', @@ -58,7 +59,10 @@ export class RoomSelectorComponent { ], }; - constructor() { + constructor( + private location: Location, + private locationStrategy: LocationStrategy, + ) { this.selectRoom('2'); } @@ -79,4 +83,14 @@ export class RoomSelectorComponent { this.selectedRoom = roomNumber; this.sortRooms(); } + + getUrlPath(id: string) { + let baseHref = this.locationStrategy.getBaseHref(); + if (baseHref.endsWith('')) { + baseHref = baseHref.slice(0, -1); + } + const path = this.location.path(); + + return `url(${baseHref}${path}${id})`; + } } diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html index c79e4c48..7f46e332 100644 --- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html +++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.html @@ -19,8 +19,8 @@ - - + + diff --git a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts index 74ed18fc..ebbf0ab1 100644 --- a/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts +++ b/src/app/pages/dashboard/temperature/temperature-dragger/temperature-dragger.component.ts @@ -1,6 +1,15 @@ import { - Component, HostListener, ViewChild, ElementRef, Input, Output, EventEmitter, AfterViewInit, OnChanges, + Component, + HostListener, + ViewChild, + ElementRef, + Input, + Output, + EventEmitter, + AfterViewInit, + OnChanges, } from '@angular/core'; +import { Location, LocationStrategy } from '@angular/common'; const VIEW_BOX_SIZE = 300; @@ -77,7 +86,10 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges { private isMouseDown = false; private init = false; - constructor() { + constructor( + private location: Location, + private locationStrategy: LocationStrategy, + ) { this.oldValue = this.value; } @@ -116,6 +128,16 @@ export class TemperatureDraggerComponent implements AfterViewInit, OnChanges { this.invalidatePinPosition(); } + getUrlPath(id: string) { + let baseHref = this.locationStrategy.getBaseHref(); + if (baseHref.endsWith('')) { + baseHref = baseHref.slice(0, -1); + } + const path = this.location.path(); + + return `url(${baseHref}${path}${id}${this.svgControlId})`; + } + private invalidate(): void { this.bottomAngleRad = TemperatureDraggerComponent.toRad(this.bottomAngle); this.calculateVars();