From 34c03f5eff6aa63917b3ab74cc69ce80691e8f41 Mon Sep 17 00:00:00 2001
From: ulrich <ulrich@ulrich-vaio>
Date: Mon, 26 Apr 2021 21:52:10 +0000
Subject: [PATCH] Weiterspielen repariert

---
 www/ui/js/app.js |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 0bb5976..af2c49d 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -248,7 +248,7 @@
   this.abspielliste_form = function(al) {
     self.entitaet_form('Abspielliste', al, al.name,
       "data/tpl/form_abspielliste.txt", '../api/store/Abspielliste/',
-      '#abspielliste-name', function(event) {
+      '#abspielliste-name', 'name', function(event) {
           if(event !== undefined) {
             event.preventDefault();
           }
@@ -260,7 +260,7 @@
   this.abspieler_form = function(pl) {
     self.entitaet_form('Abspieler', pl, pl.key,
       "data/tpl/form_abspieler.txt", '../api/store/Abspieler/',
-      '#abspieler-name', function() { 
+      '#abspieler-name', 'name', function() { 
           self.abspieler_auswahl_fuellen();
           self.abspieler_liste();
     });
@@ -269,7 +269,7 @@
   this.livestream_form = function(ls) {
     self.entitaet_form('Livestream', ls, ls.name,
       "data/tpl/form_livestream.txt", '../api/store/Livestream/',
-      '#livestream-name', function() { 
+      '#livestream-name', 'name', function() { 
           self.livestream_liste();
     });
   };
@@ -277,7 +277,7 @@
   this.geraet_form = function(ge) {
     self.entitaet_form('Gerät', ge, ge.name,
       "data/tpl/form_geraet.txt", '../api/store/Geraet/',
-      '#geraet-name', function() { 
+      '#geraet-name', 'name', function() { 
           self.geraet_liste();
     });
   };
@@ -285,7 +285,7 @@
   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() { 
+      '#geraet-name', 'name', function() { 
           self.geraet_schalt_liste();
     });
   };
@@ -293,7 +293,7 @@
   this.prefs_form = function(k) {
     self.entitaet_form('Einstellung', k, k.key,
       "data/tpl/form_einstellung.txt", '../api/store/Einstellung/',
-      '#einstellung-key', function() { 
+      '#einstellung-key', 'key', function() { 
           self.prefs_liste();
     });
   };
@@ -309,7 +309,7 @@
   this.ablageort_form = function(ort) {
     self.entitaet_form('Katalog', ort, ort.name,
       "data/tpl/form_ablageort.txt", '../api/store/Ablageort/',
-      '#ablageort-name', function() { 
+      '#ablageort-name', 'name', function() { 
         self.ablageort_liste();
     });
   };
@@ -358,9 +358,7 @@
       self.addEvtListener('#pause-btn', 'click', function() {
         self.kommando('pause');
       });
-      self.addEvtListener('#weiter-btn', 'click', function() {
-        self.kommando('weiter');
-      });
+      self.addEvtListener('#weiter-btn', 'click', self.weiter);
 
       self.addEvtListener('#hier-btn', 'click', self.hier_spielen);
       
@@ -408,14 +406,14 @@
       var titel = self.titelErmitteln(document.querySelector(".selected"));
       var playername = document.querySelector('#abspieler').value;
       console.log('plname: ' + playername + ' url: ' + titel.katalogUrl + titel.pfad + titel.name);
-      self.http_post('../api/strg/' + playername + '/titel', JSON.stringify(titel), function(responseText) {
+      self.http_post('../api/strg/' + playername + '/play/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.http_post('../api/strg/' + playername + '/play/stream', JSON.stringify(stream), function(responseText) {
         self.meldung_mit_timeout(responseText, 1500);
       });   
     } else {
@@ -427,6 +425,18 @@
       self.http_get('../api/strg/' + abs + '/play/liste/' + lst, function(responseText) {
         self.meldung_mit_timeout(responseText, 1500);
       });
+    }
+  };
+  
+  this.weiter = function() {
+    var bereichName = document.querySelector('.bereich-name').textContent;
+    if(bereichName === '') {
+      var titel = self.titelErmitteln(document.querySelector(".selected"));
+      var playername = document.querySelector('#abspieler').value;
+      console.log('plname: ' + playername + ' url: ' + titel.katalogUrl + titel.pfad + titel.name);
+      self.http_post('../api/strg/' + playername + '/weiter/titel', JSON.stringify(titel), function(responseText) {
+        self.meldung_mit_timeout(responseText, 1500);
+      });   
     }
   };
   
@@ -589,13 +599,13 @@
    *     });
    */
 
-  this.entitaet_form = function(bname, dat, key, tpl, url, selector, cb) {
+  this.entitaet_form = function(bname, dat, key, tpl, url, selector, keyname, cb) {
     document.querySelector('.bereich-name').textContent = bname;
     self.html_erzeugen(tpl, dat, function (html) {
       document.querySelector(".zentraler-inhalt").innerHTML = html;
       const form = document.querySelector('form');      
       form.addEventListener('submit', function(event) {
-        self.handle_submit(event, key, url, selector, cb);
+        self.handle_submit(event, key, url, selector, keyname, cb);
       });
       self.addEvtListener('#cancel-btn', 'click', cb);
       self.addEvtListener('#loeschen-btn', 'click', function(event) {
@@ -609,13 +619,15 @@
    * existingKey: wenn die Entitaet existiert und geandert werden soll
    *                 leer, wenn neue Entitaet 
    */
-  this.handle_submit = function(event, existingKey, putUrl, keySelector, cb) {
+  this.handle_submit = function(event, existingKey, putUrl, keySelector, keyname, cb) {
     event.preventDefault();
     const data = new FormData(event.target);
     const value = Object.fromEntries(data.entries());
-    var daten = JSON.stringify(value);
     var formkey = document.querySelector(keySelector).value;
-    formkey = formkey.replace(' ', '').replace(/[\W]+/g, '');
+    formkey = formkey.replace(' ', '');
+    formkey = formkey.replace(/[\W]+/g, '');
+    value[keyname] = formkey;
+    var daten = JSON.stringify(value);
     if(typeof existingKey === "undefined" ||  existingKey.length < 1) {
       // neu
       self.http_put(putUrl + formkey, daten, function (responseText) {

--
Gitblit v1.9.3