From a29f5ca76074f014d2a82390610797907528efc1 Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 21 Apr 2021 06:37:03 +0000 Subject: [PATCH] Unterscheidung und Verarbeitung Geraete-Liste mit allen Angaben (auch Status) oder nur Name --- www/ui/js/app.js | 488 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 336 insertions(+), 152 deletions(-) diff --git a/www/ui/js/app.js b/www/ui/js/app.js index f4aaa0e..5051dd6 100644 --- a/www/ui/js/app.js +++ b/www/ui/js/app.js @@ -6,6 +6,7 @@ var mediaPfad; var katUrl; var selTitel; + var katName; this.init = function () { self.mediaPfad = '/'; @@ -15,9 +16,9 @@ self.appMenu.init( "data/menu/", "hauptmenue.json", - "data/tpl/app-menu.tpl", + "data/tpl/app-menu.txt", ".west", - "8em"); + "6em"); document.querySelector('.hamburger').addEventListener('click', function (e) { self.menue_umschalten(); @@ -29,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(); @@ -36,34 +39,80 @@ }; /* ---------------- 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 this.media_liste = function() { - self.reset_top_buttons(); + self.reset_top_buttons(); + //console.log("ortPfad: " + self.ortPfad + ", mediaPfad: " + self.mediaPfad); + document.querySelector('.bereich-name').textContent = ''; if(self.ortPfad === '/') { + var bb = document.querySelector('.breadcrumb-behaelter'); + bb.textContent = "Kataloge"; // Kataloge listen self.http_get('../api/store/Ablageort/liste/', function (responseText) { //document.querySelector('#top-up-btn').removeEventListener('click', self.media_liste_herauf); - self.vorlage_laden_und_fuellen("data/tpl/katalog_root_liste.tpl", JSON.parse(responseText), function (html) { + self.vorlage_laden_und_fuellen("data/tpl/katalog_root_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.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) { - var ablageort = JSON.parse(responseText); - self.ortPfad = ablageort.url; - self.media_liste(); - }); + self.katName = t.textContent; + 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(); + } }); }); }); } else { + var bb = document.querySelector('.breadcrumb-behaelter'); + var brPfad = self.katName + self.mediaPfad; + var breadcrumbs = brPfad.split('/'); + var brLinks = ""; + var brLinkPfad = ""; + for(var index = 0; index < breadcrumbs.length; index++) { + // <a class="breadcrumb-link" href="#">breadcrumbs[index]</a> + if(index === 0) { + brLinkPfad = '/'; + } else { + brLinkPfad = brLinkPfad + '/' + breadcrumbs[index]; + } + brLinks = brLinks + "<a brlink='" + brLinkPfad + "' class='breadcrumb-link' href='#'>" + breadcrumbs[index] + "</a>"; + //console.log(' breadcrumbs[' + index + ']: ' + breadcrumbs[index]); + } + bb.innerHTML = brLinks; + self.addEvtListener('.breadcrumb-link', 'click', function(event) { + //console.log(event.target.attributes.brlink.nodeValue); + var neuerPfad = event.target.attributes.brlink.nodeValue; + self.mediaPfad = neuerPfad; + self.media_liste(); + }); var url = '..' + self.ortPfad + self.mediaPfad; if(!url.endsWith('/')) { url = url + '/'; } self.http_get(url, function(responseText) { - self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.tpl", JSON.parse(responseText), function (html) { + self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.txt", JSON.parse(responseText), function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; self.addEvtListener('.entity-eintrag', 'click', function (event) { var t = event.target; @@ -77,7 +126,8 @@ self.media_liste(); } else { if(t.classList.contains('selected')) { - self.addSelectedTitel(); + t.classList.add('added-to-playlist'); + self.titelDazu(); } else { self.removeClassMulti('selected'); t.classList.add('selected'); @@ -105,9 +155,44 @@ } }; + 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('../api/store/Ablageort/liste/', - "data/tpl/ablageort_liste.tpl", '../api/store/Ablageort/', + self.entitaet_liste('Kataloge','../api/store/Ablageort/liste/', + "data/tpl/ablageort_liste.txt", '../api/store/Ablageort/', "self.ablageort_form", function(responseText) { var ablageort = JSON.parse(responseText); self.ablageort_form(ablageort); @@ -115,8 +200,8 @@ }; this.prefs_liste = function() { - self.entitaet_liste('../api/store/Einstellung/liste/', - "data/tpl/einstellung_liste.tpl", '../api/store/Einstellung/', + self.entitaet_liste('Einstellungen','../api/store/Einstellung/liste/', + "data/tpl/einstellung_liste.txt", '../api/store/Einstellung/', "self.prefs_form", function(responseText) { var einstellung = JSON.parse(responseText); self.prefs_form(einstellung); @@ -124,18 +209,28 @@ }; this.abspieler_liste = function() { - self.entitaet_liste('../api/store/Abspieler/liste/', - "data/tpl/abspieler_liste.tpl", '../api/store/Abspieler/', + self.entitaet_liste('Abspieler','../api/store/Abspieler/liste/', + "data/tpl/abspieler_liste.txt", '../api/store/Abspieler/', "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); + }); + }; + this.abspielliste_liste = function() { - self.entitaet_liste('../api/store/Abspielliste/liste/', - "data/tpl/abspielliste_liste.tpl", '../api/store/Abspielliste/', + self.entitaet_liste('Abspielliste','../api/store/Abspielliste/liste/', + "data/tpl/abspielliste_liste.txt", '../api/store/Abspielliste/', "self.abspielliste_form", function(responseText) { + //console.log("responseTest: '" + responseText + "'"); var abspielliste = JSON.parse(responseText); self.abspielliste_form(abspielliste); }); @@ -144,97 +239,56 @@ /* -------------------- Entitaets-Formulare ------------------ */ this.abspielliste_form = function(al) { - self.entitaet_form(al, al.name, - "data/tpl/form_abspielliste.tpl", '../api/store/Abspielliste/', - '#abspielliste-name', function() { + self.entitaet_form('Abspielliste', al, al.name, + "data/tpl/form_abspielliste.txt", '../api/store/Abspielliste/', + '#abspielliste-name', function(event) { + if(event !== undefined) { + event.preventDefault(); + } self.abspielliste_auswahl_fuellen(); self.abspielliste_liste(); }); - /* - self.vorlage_laden_und_fuellen("data/tpl/form_abspielliste.tpl", al, function (html) { - document.querySelector(".zentraler-inhalt").innerHTML = html; - const form = document.querySelector('form'); - form.addEventListener('submit', function(event) { - self.handle_submit(event, al.name, '../api/store/Abspielliste/', '#abspielliste-name', function() { - self.abspielliste_auswahl_fuellen(); - self.abspielliste_liste(); - }); - }); - self.addEvtListener('#cancel-btn', 'click', function () { - //document.querySelector(".zentraler-inhalt").innerHTML = ''; - self.abspielliste_liste(); - }); - self.addEvtListener('#loeschen-btn', 'click', function(event) { - event.preventDefault(); - self.handle_del_btn('#abspielliste-name', '../api/store/Abspielliste/', function() { - self.abspielliste_auswahl_fuellen(); - self.abspielliste_liste(); - }); - }); - }); - */ }; this.abspieler_form = function(pl) { - self.entitaet_form(pl, pl.key, - "data/tpl/form_abspieler.tpl", '../api/store/Abspieler/', + self.entitaet_form('Abspieler', pl, pl.key, + "data/tpl/form_abspieler.txt", '../api/store/Abspieler/', '#abspieler-name', function() { self.abspieler_auswahl_fuellen(); self.abspieler_liste(); }); - /* - self.vorlage_laden_und_fuellen("data/tpl/form_abspieler.tpl", pl, function (html) { - document.querySelector(".zentraler-inhalt").innerHTML = html; - const form = document.querySelector('form'); - form.addEventListener('submit', function(event) { - self.handle_submit(event, pl.key, '../api/store/Abspieler/', '#abspieler-name', function() { - self.abspieler_auswahl_fuellen(); - self.abspieler_liste(); - }); - }); - self.addEvtListener('#cancel-btn', 'click', function () { - //document.querySelector(".zentraler-inhalt").innerHTML = ''; - self.abspieler_liste(); - }); - self.addEvtListener('#loeschen-btn', 'click', function(event) { - event.preventDefault(); - self.handle_del_btn('#abspieler-name', '../api/store/Abspieler/', 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(); + }); }; this.prefs_form = function(k) { - self.entitaet_form(k, k.key, - "data/tpl/form_einstellung.tpl", '../api/store/Einstellung/', + self.entitaet_form('Einstellung', k, k.key, + "data/tpl/form_einstellung.txt", '../api/store/Einstellung/', '#einstellung-key', function() { self.prefs_liste(); }); - /* - self.vorlage_laden_und_fuellen("data/tpl/form_einstellung.tpl", k, function (html) { - document.querySelector(".zentraler-inhalt").innerHTML = html; - const form = document.querySelector('form'); - form.addEventListener('submit', function(event) { - self.handle_submit(event, k.key, '../api/store/Einstellung/', '#einstellung-key', function() { - self.prefs_liste(); - }); - }); - self.addEvtListener('#cancel-btn', 'click', function (event) { - //document.querySelector(".zentraler-inhalt").innerHTML = ''; - event.preventDefault(); - self.prefs_liste(); - }); - self.addEvtListener('#loeschen-btn', 'click', function(event) { - event.preventDefault(); - self.handle_del_btn('#einstellung-key', '../api/store/Einstellung/', function() { - self.prefs_liste(); - }); - }); - }); - */ }; /* @@ -246,45 +300,24 @@ * @returns {undefined} kein Rueckgabewert */ this.ablageort_form = function(ort) { - self.entitaet_form(ort, ort.name, - "data/tpl/form_ablageort.tpl", '../api/store/Ablageort/', + self.entitaet_form('Katalog', ort, ort.name, + "data/tpl/form_ablageort.txt", '../api/store/Ablageort/', '#ablageort-name', function() { self.ablageort_liste(); }); - /* - self.vorlage_laden_und_fuellen("data/tpl/form_ablageort.tpl", ort, function (html) { - document.querySelector(".zentraler-inhalt").innerHTML = html; - const form = document.querySelector('form'); - form.addEventListener('submit', function(event) { - self.handle_submit(event, ort.name, '../api/store/Ablageort/', '#ablageort-name', function() { - self.ablageort_liste(); - }); - }); - self.addEvtListener('#cancel-btn', 'click', function () { - //document.querySelector(".zentraler-inhalt").innerHTML = ''; - self.ablageort_liste(); - }); - self.addEvtListener('#loeschen-btn', 'click', function(event) { - event.preventDefault(); - self.handle_del_btn('#ablageort-name', '../api/store/Ablageort/', function() { - self.ablageort_liste(); - }); - }); - }); - */ }; /* ------------------------------- UI-Dynamik ----------------------- */ self.reset_top_buttons = function() { - self.vorlage_laden_und_fuellen("data/tpl/top_btns.tpl", '', function (html) { + self.vorlage_laden_und_fuellen("data/tpl/top_btns.txt", '', function (html) { document.querySelector(".top-btns").innerHTML = html; }); }; this.abspieler_auswahl_fuellen = function() { - self.http_get('../api/store/Abspieler/', function (responseText) { - self.vorlage_laden_und_fuellen("data/tpl/abs_sel.tpl", JSON.parse(responseText), function (html) { + self.http_get('../api/store/Abspieler/liste/', function (responseText) { + self.vorlage_laden_und_fuellen("data/tpl/abs_sel.txt", JSON.parse(responseText), function (html) { document.querySelector(".abs-sel").innerHTML = html; }); }); @@ -292,40 +325,42 @@ this.abspielliste_auswahl_fuellen = function() { self.http_get('../api/store/Abspielliste/', function (responseText) { - self.vorlage_laden_und_fuellen("data/tpl/pl_sel.tpl", JSON.parse(responseText), function (html) { + self.vorlage_laden_und_fuellen("data/tpl/pl_sel.txt", JSON.parse(responseText), function (html) { document.querySelector(".pl-sel").innerHTML = html; + self.addEvtListener('#playlist', 'change', function() { + self.titel_liste(); + }); }); }); }; - this.addSelectedTitel = function() { - var elem = document.querySelector(".selected"); - var titelName = elem.textContent; - 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); - } - var plname = document.querySelector('#playlist').value; - self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) { - self.meldung_mit_timeout(responseText, 1500); - }); - }; - /* Unterer Einblendbereich */ this.dialog_unten_zeigen = function() { - self.vorlage_laden_und_fuellen("data/tpl/ctrl.tpl", "", function (html) { + self.vorlage_laden_und_fuellen("data/tpl/ctrl.txt", "", function (html) { var dlg = document.querySelector(".dialog-unten"); dlg.style.height = '4.5em'; dlg.innerHTML = html; self.abspieler_auswahl_fuellen(); self.abspielliste_auswahl_fuellen(); - self.addEvtListener('#dazu-btn', 'click', self.addSelectedTitel); + self.addEvtListener('#dazu-btn', 'click', self.titelDazu); + self.addEvtListener('#play-btn', 'click', self.play); + self.addEvtListener('#stop-btn', 'click', function() { + self.kommando('stop'); + }); + self.addEvtListener('#pause-btn', 'click', function() { + self.kommando('pause'); + }); + self.addEvtListener('#weiter-btn', 'click', function() { + self.kommando('weiter'); + }); + +/* + <button class="ctrl-btn ctrl-item" id="hier-btn" title="hier spielen"><i class="icon-tablet"></i></button> + */ + + self.addEvtListener('#weg-btn', 'click', self.titelWeg); + self.addEvtListener('#leeren-btn', 'click', self.alleTitelEntfernen); self.media_liste(); }); }; @@ -335,8 +370,11 @@ this.titel_liste = function() { self.reset_top_buttons(); var plname = document.querySelector('#playlist').value; + document.querySelector('.bereich-name').textContent = 'Abspielliste ' + plname; + var bb = document.querySelector('.breadcrumb-behaelter'); + bb.textContent = ""; self.http_get('../api/alist/' + plname, function (responseText) { - self.vorlage_laden_und_fuellen("data/tpl/titel_liste.tpl", JSON.parse(responseText), function (html) { + self.vorlage_laden_und_fuellen("data/tpl/titel_liste.txt", JSON.parse(responseText), function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; self.addEvtListener('.entity-eintrag', 'click', function (event) { var t = event.target; @@ -347,11 +385,123 @@ }); }; + /* ------------- Media-Steuerung ------------------------- */ + + this.play = function() { + var bereichName = document.querySelector('.bereich-name').textContent; + if(bereichName === '') { + 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; + 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); + } + */ + var playername = document.querySelector('#abspieler').value; + /* + HTTP POST /mz/api/strg/abspieler/play mit Titel im Body + + 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 + '/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; + console.log( + "play playlist.value: " + document.querySelector('#playlist').value + + ", abspieler.value: " + document.querySelector('#abspieler').value); + self.http_get('../api/strg/' + abs + '/play/liste/' + lst, function(responseText) { + self.meldung_mit_timeout(responseText, 1500); + }); + } + }; + + this.kommando = function(kommando) { + var abs = document.querySelector('#abspieler').value; + self.http_get('../api/strg/' + abs + '/' + kommando, function(responseText) { + self.meldung_mit_timeout(responseText, 1500); + }); + }; + + /* ------------- Verwaltungsfunktionen Abspielliste -------------------- */ + + self.alleTitelEntfernen = function() { + var plname = document.querySelector('#playlist').value; + self.http_delete('../api/alist/' + plname + '/alle', '', function(responseText) { + // DELETE http://localhost:9090/mz/api/alist/liste1/0 + //self.meldung_mit_timeout(responseText, 1500); + self.titel_liste(); + }); + }; + + this.titelDazu = function() { + 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; + 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); + } + */ + var plname = document.querySelector('#playlist').value; + self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) { + //self.meldung_mit_timeout(responseText, 1500); + }); + }; + + this.titelWeg = function() { + var elem = document.querySelector(".selected"); + var parentElem = elem.parentNode; + //console.log("elem: " + elem.nodeName + ", parent: " + parentElem.nodeName + ", len: " + parentElem.childNodes.length); + var liElems = parentElem.getElementsByTagName(elem.nodeName); // nur die LI Elemente + //console.log("liElems.anz: " + liElems.length); + var gefunden = false; + for(var i = 0; i < liElems.length && !gefunden; i++) { + //console.log(liElems.item(i).textContent); + if(liElems.item(i).classList.contains("selected")) { + gefunden = true; + var index = i; + //console.log(elem.textContent + ' hat Index ' + i); + } + } + // /mz/api/alist/[pl-name]/[nr] + var plname = document.querySelector('#playlist').value; + self.http_delete('../api/alist/' + plname + '/' + index,'', function(responseText) { + // DELETE http://localhost:9090/mz/api/alist/liste1/0 + //self.meldung_mit_timeout(responseText, 1500); + self.titel_liste(); + }); + + }; + /* ------------- Helfer fuer Entitaets-Formulare ----------------------- */ /* * url: '../api/store/Ablageort/liste/' - * tpl: "data/tpl/ablageort_liste.tpl" + * tpl: "data/tpl/ablageort_liste.txt" * storeUrl: '../api/store/Ablageort/' * formFunc: "self.ablageort_form" * cb: etwas wie @@ -360,8 +510,11 @@ * self.ablageort_form(ablageort); * }); */ - this.entitaet_liste = function(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'); + bb.textContent = ""; self.http_get(listUrl, function (responseText) { self.vorlage_laden_und_fuellen(tpl, JSON.parse(responseText), function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; @@ -372,7 +525,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(); + } }); }); }; @@ -380,7 +538,7 @@ /* * dat: gefuelltes Datenobjekt bei Aenderung * key: der alte schluesselbegriff bei Aenderung (z.B. al.name) - * tpl: "data/tpl/form_abspielliste.tpl" + * tpl: "data/tpl/form_abspielliste.txt" * url: '../api/store/Abspielliste/' * selector: '#abspielliste-name' * cbOk: etwas wie @@ -396,7 +554,8 @@ * }); */ - this.entitaet_form = function(dat, key, tpl, url, selector, cb) { + this.entitaet_form = function(bname, dat, key, tpl, url, selector, cb) { + document.querySelector('.bereich-name').textContent = bname; self.vorlage_laden_und_fuellen(tpl, dat, function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; const form = document.querySelector('form'); @@ -419,8 +578,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, ''); @@ -448,10 +605,10 @@ this.handle_del_btn = function(selectorKey, delUrl, cb) { var pkey = document.querySelector(selectorKey).value; var dlgdata = {"del-elem": pkey}; - self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.tpl', dlgdata, function() { + self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.txt', dlgdata, function() { self.addEvtListener('#nein-btn', 'click', self.dialog_schliessen); self.addEvtListener('#ja-btn', 'click', function(event) { - console.log("loeschen geklickt."); + //console.log("loeschen geklickt."); self.http_delete(delUrl + pkey, '', function (responseText) { self.dialog_schliessen(); if(typeof(cb) !== 'function') { @@ -473,6 +630,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 ----------------- */ @@ -489,7 +660,7 @@ }; this.http_delete = function (u, data, cb) { - console.log("delete " + u); + // console.log("delete " + u); self.http_call('DELETE', u, data, cb); }; @@ -519,7 +690,7 @@ }; this.info_dialog_zeigen = function () { - self.dialog_laden_und_zeigen('data/tpl/dlg-info.tpl', ''); + self.dialog_laden_und_zeigen('data/tpl/dlg-info.txt', ''); self.menue_umschalten(); }; @@ -700,6 +871,11 @@ this.url = u; } +function Livestream(n, u) { + this.name = n; + this.url = u; +} + function Abspielliste(n) { this.name = n; } @@ -711,4 +887,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