From 5c621434b008d1671accfc4b9c9c9016a256fd9f Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 09:42:16 +0000
Subject: [PATCH] Ein/Aus-Schalter verbessert
---
www/ui/js/app.js | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 3825b66..4d1d0cf 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -32,6 +32,7 @@
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();
@@ -156,20 +157,36 @@
};
this.geraet_schalt_liste = function() {
- self.entitaet_liste('Geräte schalten','../api/store/Geraet/liste/',
+ 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) {
+ self.addEvtListener('#ein-aus-btn', 'click', function (event) {
var geraetName = event.target.attributes.gname.nodeValue;
- //var geraetName = document.querySelector('.schalt-geraet-name').textContent;
+ 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();
+ });
+ }
+ /*
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;
@@ -177,7 +194,8 @@
// console.log(responseText);
self.geraet_schalt_liste();
});
- });
+ });
+ */
});
};
@@ -339,7 +357,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();
@@ -361,6 +379,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();
});
};
@@ -889,9 +913,10 @@
this.album = a;
}
-function Geraet(n, e, a, s) {
+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