From a27c6822a00a1251d75c154627eab783c43fcddb Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 08:45:53 +0000
Subject: [PATCH] Menues und Symbolleisten vereinheitlicht
---
www/ui/js/app.js | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 152 insertions(+), 15 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 70b6eee..bb29ba2 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -18,7 +18,7 @@
"hauptmenue.json",
"data/tpl/app-menu.txt",
".west",
- "8em");
+ "6em");
document.querySelector('.hamburger').addEventListener('click', function (e) {
self.menue_umschalten();
@@ -30,6 +30,9 @@
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.addEvtListener('#mi-switch', 'click', self.geraet_schalt_liste);
self.fusszeile_umschalten();
self.seitenleiste_umschalten();
@@ -37,6 +40,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 +73,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 +156,41 @@
}
};
+ this.geraet_schalt_liste = function() {
+ self.entitaet_liste('Geräte schalten','../api/store/Geraet/listealles/',
+ "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.geraet_schalt_liste();
+ });
+ });
+ 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);
+ self.geraet_schalt_liste();
+ });
+ });
+ });
+ };
+
+ 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 +215,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 +257,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();
});
};
@@ -250,7 +340,7 @@
this.dialog_unten_zeigen = function() {
self.vorlage_laden_und_fuellen("data/tpl/ctrl.txt", "", function (html) {
var dlg = document.querySelector(".dialog-unten");
- dlg.style.height = '4.5em';
+ dlg.style.height = '10em';
dlg.innerHTML = html;
self.abspieler_auswahl_fuellen();
self.abspielliste_auswahl_fuellen();
@@ -272,6 +362,12 @@
self.addEvtListener('#weg-btn', 'click', self.titelWeg);
self.addEvtListener('#leeren-btn', 'click', self.alleTitelEntfernen);
+
+ self.addEvtListener('#media-btn', 'click', self.media_liste);
+ self.addEvtListener('#plst-btn', 'click', self.titel_liste);
+ self.addEvtListener('#live-btn', 'click', self.livestream_liste);
+ self.addEvtListener('#switch-btn', 'click', self.geraet_schalt_liste);
+
self.media_liste();
});
};
@@ -301,8 +397,9 @@
this.play = function() {
var bereichName = document.querySelector('.bereich-name').textContent;
if(bereichName === '') {
- var elem = document.querySelector(".selected");
+ var titel = self.titelErmitteln(document.querySelector(".selected"));
//var titelName = elem.textContent;
+ /*
var titelName = elem.attributes.dateiName.nodeValue;
var album = elem.attributes.album.nodeValue;
var interpret = elem.attributes.interpret.nodeValue;
@@ -313,6 +410,7 @@
} else {
titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
}
+ */
var playername = document.querySelector('#abspieler').value;
/*
HTTP POST /mz/api/strg/abspieler/play mit Titel im Body
@@ -320,9 +418,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;
@@ -354,8 +459,9 @@
};
this.titelDazu = function() {
- var elem = document.querySelector(".selected");
+ var titel = self.titelErmitteln(document.querySelector(".selected"));
//var titelName = elem.textContent;
+ /*
var titelName = elem.attributes.dateiName.nodeValue;
var album = elem.attributes.album.nodeValue;
var interpret = elem.attributes.interpret.nodeValue;
@@ -366,6 +472,7 @@
} else {
titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
}
+ */
var plname = document.querySelector('#playlist').value;
self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) {
//self.meldung_mit_timeout(responseText, 1500);
@@ -410,7 +517,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');
@@ -425,7 +532,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();
+ }
});
});
};
@@ -473,8 +585,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, '');
@@ -526,6 +636,20 @@
this.removeClassMulti = function(selector) {
document.querySelectorAll('.' + selector).forEach(elem => { elem.classList.remove(selector); });
+ };
+
+ self.titelErmitteln = function(elem) {
+ var titelName = elem.attributes.dateiName.nodeValue;
+ var album = elem.attributes.album.nodeValue;
+ var interpret = elem.attributes.interpret.nodeValue;
+ var anzName = elem.attributes.titelAnzName.nodeValue;
+ var titel;
+ if(self.mediaPfad.endsWith('/')) {
+ titel = new Titel(titelName, self.mediaPfad, self.ortPfad, interpret, anzName, album);
+ } else {
+ titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
+ }
+ return titel;
};
/* --------------------- asynchroner HTTP Client ----------------- */
@@ -754,6 +878,11 @@
this.url = u;
}
+function Livestream(n, u) {
+ this.name = n;
+ this.url = u;
+}
+
function Abspielliste(n) {
this.name = n;
}
@@ -765,4 +894,12 @@
this.interpret = i;
this.titelAnzName = t;
this.album = a;
+}
+
+function Geraet(n, e, a, s, st) {
+ this.name = n;
+ this.einUrl = e;
+ this.ausUrl = a;
+ this.statusUrl = s;
+ this.status = st;
}
\ No newline at end of file
--
Gitblit v1.9.3