From 2597cdc3863be2c566c6bba8fe985eaff4a87df6 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Tue, 06 Apr 2021 11:02:29 +0000
Subject: [PATCH] Ablageorte bearbeiten fertig
---
www/ui/js/app.js | 83 +++++++++++------------------------------
1 files changed, 22 insertions(+), 61 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index d242320..691185d 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -9,7 +9,6 @@
function Mediazentrale() {
var self = this;
var appMenu;
- // var vorlagen;
var cache; // mustache templates
this.ablageort_liste = function() {
@@ -18,7 +17,6 @@
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
- //self.meldung_mit_timeout(t.textContent, 1500);
self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText){
ablageort = JSON.parse(responseText);
self.ablageort_form(ablageort);
@@ -40,21 +38,26 @@
self.vorlage_laden_und_fuellen("data/tpl/form_ablageort.tpl", ort, function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('#ok-btn', 'click', function () {
+ var aName = document.querySelector('#ablageort-name').value;
+ aName = aName.replace(' ', '').replace(/[\W]+/g, '');
var a = new Ablageort(
- document.querySelector('#ablageort-name').value,
+ aName,
document.querySelector('#ablageort-ort').value,
document.querySelector('#ablageort-url').value
);
var daten = JSON.stringify(a);
- if(typeof ort === "undefined") {
+ if(typeof ort === "undefined" || ort.name !== aName) {
+ // neu
self.http_post('../api/store/Ablageort', daten, function (responseText) {
// hier die Antwort verarbeiten
});
} else {
+ // aendern
self.http_put('../api/store/Ablageort', daten, function (responseText) {
// hier die Antwort verarbeiten
});
}
+ document.querySelector(".zentraler-inhalt").innerHTML = '';
});
self.addEvtListener('#cancel-btn', 'click', function () {
document.querySelector(".zentraler-inhalt").innerHTML = '';
@@ -67,6 +70,8 @@
self.addEvtListener('#ja-btn', 'click', function() {
self.http_delete('../api/store/Ablageort/' + aoname, '', function (responseText) {
// hier die Antwort verarbeiten
+ self.dialog_schliessen();
+ document.querySelector(".zentraler-inhalt").innerHTML = '';
});
});
});
@@ -95,6 +100,7 @@
};
this.http_delete = function (u, data, cb) {
+ console.log("delete " + u);
self.http_call('DELETE', u, data, cb);
};
@@ -109,18 +115,11 @@
xhr.open(method, url);
if (method === 'GET') {
xhr.send();
- } else if (method === 'POST' || method === 'PUT') {
+ } else if (method === 'POST' || method === 'PUT' || method === 'DELETE') {
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr.send(data);
}
};
-
- this.serialisieren = function (obj) {
- return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}';
- };
-
-
-
/* ab hier aus App-Vorlage */
@@ -233,55 +232,29 @@
self.http_get(vurl, function(antwort) {
self.cache[vurl] = antwort;
self.dialog_zeigen(vurl, msgTpl, cb);
- //self.dialog_zeigen(vurl, antwort, cb);
- //self.vorlage_fuellen(vurl, inhalt, cb);
});
} else {
self.dialog_zeigen(vurl, msgTpl, cb);
- //self.dialog_zeigen(vurl, vorlage, cb);
}
};
this.dialog_zeigen = function (vurl, inhalt, cb) {
var dlg = document.querySelector(".dialog");
- self.html_erzeugen(
- vurl,
- inhalt,
- function (html) {
- //dlg.html(html);
- dlg.style.height = '7em';
- dlg.innerHTML = html;
- document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
- //dlg.slideDown(300);
- if(typeof(cb) !== 'function') {
- // ..
- } else {
- cb();
- }
- });
+ self.html_erzeugen(vurl, inhalt, function (html) {
+ dlg.style.height = '7em';
+ dlg.innerHTML = html;
+ document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
};
-
-
-/*
- this.dialog_zeigen = function (vurl, inhalt) {
- var dlg = document.querySelector(".dialog");
- self.html_erzeugen(
- vurl,
- inhalt,
- function (html) {
- //dlg.html(html);
- dlg.style.height = '5em';
- dlg.innerHTML = html;
- document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
- //dlg.slideDown(300);
- });
- };
-*/
+
self.dialog_schliessen = function () {
document.querySelector('.close-btn').removeEventListener('click', self.dialog_schliessen);
- //$('.dialog').slideUp(300);
var dlg = document.querySelector('.dialog');
- //dlg.style.display = "none";
dlg.style.height = '0';
dlg.innerHTML = '';
};
@@ -314,8 +287,6 @@
};
this.vorlage_fuellen = function (vurl, inhalt, cb) {
- //console.log("vorlage " + self.cache[vurl]);
- //console.log("render " + inhalt);
cb(Mustache.render(self.cache[vurl], inhalt));
};
@@ -328,16 +299,6 @@
Inhalt gefüllt ist
*/
this.vorlage_laden_und_fuellen = function (vurl, inhalt, cb) {
- /*
- $.ajax({
- url: vurl,
- type: "GET",
- dataType : "text"
- }).done(function( vorlage ) {
- self.cache[vurl] = vorlage;
- self.vorlage_fuellen(vurl, inhalt, cb);
- });
- */
var xmlhttp = new XMLHttpRequest();
xmlhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
--
Gitblit v1.9.3