From 96031786dbecbb4e10248fcd1579c7e3b8ea22d7 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 25 Apr 2021 08:22:59 +0000
Subject: [PATCH] Entitaetsnamen ohne Blanks, Link zu Produktseite in Info-Dialog, SimpleFormatter in logging.properties angepasst

---
 publish/logging.properties   |    1 +
 www/ui/data/tpl/dlg-info.txt |    2 +-
 www/ui/js/app.js             |   24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/publish/logging.properties b/publish/logging.properties
index b2b4cf7..09ce6a1 100644
--- a/publish/logging.properties
+++ b/publish/logging.properties
@@ -55,6 +55,7 @@
 #     <level>: <log message> [<date/time>]
 #
 # java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
+java.util.logging.SimpleFormatter.format=[%1$tc] %4$s: %5$s %n
 
 ############################################################
 # Facility specific properties.
diff --git a/www/ui/data/tpl/dlg-info.txt b/www/ui/data/tpl/dlg-info.txt
index 65ff7f0..3604fc0 100644
--- a/www/ui/data/tpl/dlg-info.txt
+++ b/www/ui/data/tpl/dlg-info.txt
@@ -3,6 +3,6 @@
   <div class="dlg-behaelter">
     <div class="dlg-info-app-titel">Tango</div>
     <div class="dlg-info-app-info">Die Mediazentrale von <a href='https://uhilger.de'>Ulrich Hilger</a>.</div>
-    <div class="dlg-info-app-info">Weitere Infos auf der <a href=''>Produktseite</a>.</div>
+    <div class="dlg-info-app-info">Weitere Infos auf der <a href='https://uhilger.de/data/pg/tango/'>Produktseite</a>.</div>
   </div>
 </div>
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index 0bb5976..7f91809 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();
     });
   };
@@ -589,13 +589,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 +609,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