openlp/web-remote
1
0
Fork 0
mirror of https://gitlab.com/openlp/web-remote.git synced 2024-12-22 03:22:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_24_hour_setting' into 'master'

Browse Source 
Make stage views use the 12 hour time setting

Closes #14

See merge request openlp/web-remote!33
This commit is contained in:
Tim Bentley 2021-02-22 17:30:53 +00:00
commit 145329f65f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/components/chord-view/chord-view.component.html
View File

@ -11,7 +11,7 @@
</div>
</div>
<div class="sidebar">
<div class="time">{{ time|date:'HH:mm' }}</div>
<div class="time">{{ (openlpService.getIsTwelveHourTime()) ? (time|date:'h:mm a') : (time|date:'HH:mm') }}</div>
<div class="transpose">
<button mat-icon-button (click)="transposeUp()">
<mat-icon>keyboard_arrow_up</mat-icon>

2
src/app/components/stage-view/stage-view.component.html
View File

@ -16,7 +16,7 @@
</div>
<div class="sidebar">
<div class="top">
<div class="time">{{ time|date:'HH:mm' }}</div>
<div class="time">{{ (openlpService.getIsTwelveHourTime()) ? (time|date:'h:mm a') : (time|date:'HH:mm') }}</div>
<div class="notes" [innerHTML]="notes|nl2br"></div>
</div>
<div class="close"><button mat-raised-button class="closeButton" routerLink="/">Close</button></div>

8
src/app/openlp.service.ts
View File

@ -39,6 +39,7 @@ const httpOptions = {
export class OpenLPService {
private apiURL: string;
public stateChanged$: EventEmitter<State>;
private isTwelveHourTime = true;
constructor(private http: HttpClient) {
const host = window.location.hostname;
@ -53,11 +54,12 @@ export class OpenLPService {
this.stateChanged$ = new EventEmitter<State>();
this.retrieveSystemInformation().subscribe(info => {
const ws = new WebSocket(`ws://${host}:${info.websocket_port}`);
const ws = new WebSocket(`ws://${host}:${info.websocket_port}`);
ws.onmessage = (event) => {
const reader = new FileReader();
reader.onload = () => {
const state = deserialize(JSON.parse(reader.result as string).results, State);
this.isTwelveHourTime = state.twelve;
this.stateChanged$.emit(state);
};
reader.readAsText(event.data);
@ -69,6 +71,10 @@ export class OpenLPService {
httpOptions.headers = httpOptions.headers.set('Authorization', token);
}
getIsTwelveHourTime(): boolean {
return this.isTwelveHourTime;
}
retrieveSystemInformation(): Observable<SystemInformation> {
return this.http.get<SystemInformation>(`${this.apiURL}/core/system`, httpOptions);
}