From d769f3445ed4779715b5c2570731b4bb73d8d2aa Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 20 Apr 2021 17:15:03 +0000
Subject: [PATCH] Geraete-Liste mit Status (in Arbeit)
---
www/ui/js/app.js | 131 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 120 insertions(+), 11 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 7837d59..98a5675 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -30,6 +30,8 @@
self.addEvtListener('#mi-player', 'click', self.abspieler_liste);
self.addEvtListener('#mi-listen', 'click', self.abspielliste_liste);
self.addEvtListener('#mi-list', 'click', self.titel_liste);
+ self.addEvtListener('#mi-live', 'click', self.livestream_liste);
+ self.addEvtListener('#mi-devices', 'click', self.geraet_liste);
self.fusszeile_umschalten();
self.seitenleiste_umschalten();
@@ -37,6 +39,21 @@
};
/* ---------------- Entitaets-Listen ----------------- */
+
+ this.livestream_selection = function() {
+ document.querySelector('.breadcrumb-behaelter').textContent = '';
+ document.querySelector('.bereich-name').textContent = 'Livestream-Auswahl';
+ self.http_get('../api/store/Livestream/liste/', function(responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/livestream_liste.txt", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.removeClassMulti('selected');
+ t.classList.add('selected');
+ });
+ });
+ });
+ };
// auf der obersten Ebene werden die Kataloge angezeigt,
// darunter der Inhalt des aktuellen Pfades
@@ -55,11 +72,15 @@
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
self.katName = t.textContent;
- self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) {
- var ablageort = JSON.parse(responseText);
- self.ortPfad = ablageort.url;
- self.media_liste();
- });
+ if(self.katName !== "Livestreams") {
+ self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) {
+ var ablageort = JSON.parse(responseText);
+ self.ortPfad = ablageort.url;
+ self.media_liste();
+ });
+ } else {
+ self.livestream_selection();
+ }
});
});
});
@@ -134,6 +155,39 @@
}
};
+ this.geraet_schalt_liste = function() {
+ self.entitaet_liste('Geräte schalten','../api/store/Geraet/liste/',
+ "data/tpl/geraet_schalt_liste.txt", '../api/store/Geraet/',
+ "self.form_geraet_status", function(responseText) {
+ var geraet = JSON.parse(responseText);
+ self.geraet_status_form(geraet);
+ }, function() {
+ self.addEvtListener('#ein-btn', 'click', function (event) {
+ var geraetName = event.target.attributes.gname.nodeValue;
+ //var geraetName = document.querySelector('.schalt-geraet-name').textContent;
+ self.http_get('../api/gstrg/geraet/' + geraetName + "/ein", function(responseText) {
+ console.log(responseText);
+ });
+ });
+ self.addEvtListener('#aus-btn', 'click', function (event) {
+ var geraetName = event.target.attributes.gname.nodeValue;
+ //var geraetName = document.querySelector('.schalt-geraet-name').textContent;
+ self.http_get('../api/gstrg/geraet/' + geraetName + "/aus", function(responseText) {
+ console.log(responseText);
+ });
+ });
+ });
+ };
+
+ this.geraet_liste = function() {
+ self.entitaet_liste('Geräte','../api/store/Geraet/liste/',
+ "data/tpl/geraet_liste.txt", '../api/store/Geraet/',
+ "self.geraet_form", function(responseText) {
+ var geraet = JSON.parse(responseText);
+ self.geraet_form(geraet);
+ });
+ };
+
this.ablageort_liste = function() {
self.entitaet_liste('Kataloge','../api/store/Ablageort/liste/',
"data/tpl/ablageort_liste.txt", '../api/store/Ablageort/',
@@ -158,6 +212,15 @@
"self.abspieler_form", function(responseText) {
var abspieler = JSON.parse(responseText);
self.abspieler_form(abspieler);
+ });
+ };
+
+ this.livestream_liste = function() {
+ self.entitaet_liste('Livestream','../api/store/Livestream/liste/',
+ "data/tpl/livestream_liste.txt", '../api/store/Livestream/',
+ "self.livestream_form", function(responseText) {
+ var livestream = JSON.parse(responseText);
+ self.livestream_form(livestream);
});
};
@@ -191,6 +254,30 @@
'#abspieler-name', function() {
self.abspieler_auswahl_fuellen();
self.abspieler_liste();
+ });
+ };
+
+ this.livestream_form = function(ls) {
+ self.entitaet_form('Livestream', ls, ls.name,
+ "data/tpl/form_livestream.txt", '../api/store/Livestream/',
+ '#livestream-name', function() {
+ self.livestream_liste();
+ });
+ };
+
+ this.geraet_form = function(ge) {
+ self.entitaet_form('Gerät', ge, ge.name,
+ "data/tpl/form_geraet.txt", '../api/store/Geraet/',
+ '#geraet-name', function() {
+ self.geraet_liste();
+ });
+ };
+
+ this.geraet_status_form = function(ge) {
+ self.entitaet_form('Gerät', ge, ge.name,
+ "data/tpl/form_geraet_status.txt", '../api/store/Geraet/',
+ '#geraet-name', function() {
+ self.geraet_schalt_liste();
});
};
@@ -322,9 +409,16 @@
url: /media/test/M/Muenchener-Freiheit/01-Ohne-Dich-schlaf-ich-heut-Nacht-nicht-ein.mp3
*/
console.log('plname: ' + playername + ' url: ' + titel.katalogUrl + titel.pfad + titel.name);
- self.http_post('../api/strg/' + playername, JSON.stringify(titel), function(responseText) {
+ self.http_post('../api/strg/' + playername + '/titel', JSON.stringify(titel), function(responseText) {
self.meldung_mit_timeout(responseText, 1500);
- });
+ });
+ } else if(bereichName === 'Livestream-Auswahl') {
+ var streamName = document.querySelector(".selected").textContent;
+ var playername = document.querySelector('#abspieler').value;
+ var stream = new Livestream(streamName, '-');
+ self.http_post('../api/strg/' + playername + '/stream', JSON.stringify(stream), function(responseText) {
+ self.meldung_mit_timeout(responseText, 1500);
+ });
} else {
var abs = document.querySelector('#abspieler').value;
var lst = document.querySelector('#playlist').value;
@@ -414,7 +508,7 @@
* self.ablageort_form(ablageort);
* });
*/
- this.entitaet_liste = function(bname, listUrl, tpl, storeUrl, formFunc, cb) {
+ this.entitaet_liste = function(bname, listUrl, tpl, storeUrl, formFunc, cb, customListCode) {
self.reset_top_buttons();
document.querySelector('.bereich-name').textContent = bname;
var bb = document.querySelector('.breadcrumb-behaelter');
@@ -429,7 +523,12 @@
//self.addEvtListener('#neu-btn', 'click', function (event) {
self.addEvtListener('#top-neu-btn', 'click', function(event) {
eval(formFunc + "(this)");
- });
+ });
+ if(typeof(customListCode) !== 'function') {
+ // ..
+ } else {
+ customListCode();
+ }
});
});
};
@@ -477,8 +576,6 @@
event.preventDefault();
const data = new FormData(event.target);
const value = Object.fromEntries(data.entries());
- //console.log({ value });
- //console.log(JSON.stringify(value));
var daten = JSON.stringify(value);
var formkey = document.querySelector(keySelector).value;
formkey = formkey.replace(' ', '').replace(/[\W]+/g, '');
@@ -772,6 +869,11 @@
this.url = u;
}
+function Livestream(n, u) {
+ this.name = n;
+ this.url = u;
+}
+
function Abspielliste(n) {
this.name = n;
}
@@ -783,4 +885,11 @@
this.interpret = i;
this.titelAnzName = t;
this.album = a;
+}
+
+function Geraet(n, e, a, s) {
+ this.name = n;
+ this.einUrl = e;
+ this.ausUrl = a;
+ this.statusUrl = s;
}
\ No newline at end of file
--
Gitblit v1.9.3