From 2af7d6512096c84b028011503246ce86deec540f Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 21 Apr 2021 12:59:07 +0000 Subject: [PATCH] Vorlagencache aktiviert --- www/ui/js/app.js | 108 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 92 insertions(+), 16 deletions(-) diff --git a/www/ui/js/app.js b/www/ui/js/app.js index 5be012f..441b7ac 100644 --- a/www/ui/js/app.js +++ b/www/ui/js/app.js @@ -31,6 +31,8 @@ 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(); @@ -43,7 +45,7 @@ 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) { + self.html_erzeugen("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; @@ -66,7 +68,7 @@ // 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.txt", JSON.parse(responseText), function (html) { + self.html_erzeugen("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; @@ -111,7 +113,7 @@ url = url + '/'; } self.http_get(url, function(responseText) { - self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.txt", JSON.parse(responseText), function (html) { + self.html_erzeugen("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; @@ -154,6 +156,47 @@ } }; + this.ein_aus_btn = function() { + self.addEvtListener('#ein-aus-btn', 'click', function (event) { + var geraetName = event.target.attributes.gname.nodeValue; + var nameElem = event.target.parentNode.querySelector('.schalt-geraet-name'); + if(nameElem.classList.contains('schalt-geraet-true')) { + // ausschalten + self.http_get('../api/gstrg/geraet/' + geraetName + "/aus", function(responseText) { + // console.log(responseText); + self.geraet_schalt_liste(); + }); + } else { + // einschalten + self.http_get('../api/gstrg/geraet/' + geraetName + "/ein", function(responseText) { + // console.log(responseText); + self.geraet_schalt_liste(); + }); + } + }); + }; + + 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) {*/ + self.entitaet_liste('Geräte schalten','../api/store/Geraet/listealles/', + "data/tpl/geraet_schalt_liste.txt", '../api/store/Geraet/', + "", function(responseText) { + //var geraet = JSON.parse(responseText); + //self.geraet_status_form(geraet); + }, self.ein_aus_btn); + }; + + 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/', @@ -231,6 +274,22 @@ }); }; + 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('Einstellung', k, k.key, "data/tpl/form_einstellung.txt", '../api/store/Einstellung/', @@ -258,14 +317,14 @@ /* ------------------------------- UI-Dynamik ----------------------- */ self.reset_top_buttons = function() { - self.vorlage_laden_und_fuellen("data/tpl/top_btns.txt", '', function (html) { + self.html_erzeugen("data/tpl/top_btns.txt", '', function (html) { document.querySelector(".top-btns").innerHTML = html; }); }; this.abspieler_auswahl_fuellen = function() { self.http_get('../api/store/Abspieler/liste/', function (responseText) { - self.vorlage_laden_und_fuellen("data/tpl/abs_sel.txt", JSON.parse(responseText), function (html) { + self.html_erzeugen("data/tpl/abs_sel.txt", JSON.parse(responseText), function (html) { document.querySelector(".abs-sel").innerHTML = html; }); }); @@ -273,7 +332,7 @@ this.abspielliste_auswahl_fuellen = function() { self.http_get('../api/store/Abspielliste/', function (responseText) { - self.vorlage_laden_und_fuellen("data/tpl/pl_sel.txt", JSON.parse(responseText), function (html) { + self.html_erzeugen("data/tpl/pl_sel.txt", JSON.parse(responseText), function (html) { document.querySelector(".pl-sel").innerHTML = html; self.addEvtListener('#playlist', 'change', function() { self.titel_liste(); @@ -285,9 +344,9 @@ /* Unterer Einblendbereich */ this.dialog_unten_zeigen = function() { - self.vorlage_laden_und_fuellen("data/tpl/ctrl.txt", "", function (html) { + self.html_erzeugen("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(); @@ -309,6 +368,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_selection); + self.addEvtListener('#switch-btn', 'click', self.geraet_schalt_liste); + self.media_liste(); }); }; @@ -322,7 +387,7 @@ 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.txt", JSON.parse(responseText), function (html) { + self.html_erzeugen("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; @@ -457,14 +522,14 @@ * var ablageort = JSON.parse(responseText); * 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'); bb.textContent = ""; self.http_get(listUrl, function (responseText) { - self.vorlage_laden_und_fuellen(tpl, JSON.parse(responseText), function (html) { + self.html_erzeugen(tpl, JSON.parse(responseText), function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; self.addEvtListener('.entity-eintrag', 'click', function (event) { var t = event.target; @@ -473,7 +538,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(); + } }); }); }; @@ -499,7 +569,7 @@ 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) { + self.html_erzeugen(tpl, dat, function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; const form = document.querySelector('form'); form.addEventListener('submit', function(event) { @@ -521,8 +591,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, ''); @@ -832,4 +900,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