From eefd252e24fd8cdea9fbf6becb605a679e8b2f18 Mon Sep 17 00:00:00 2001
From: ulrich@undisclosed
Date: Fri, 15 May 2020 12:48:26 +0000
Subject: [PATCH] Code aufgeraeumt
---
web/ui2/js/app.js | 158 +++++++++++++++++++++++++++++++---------------------
1 files changed, 94 insertions(+), 64 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 56ea01c..6013ed8 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -1,12 +1,24 @@
function NutzerApp() {
var self = this;
- var appMenu;
+ //var appMenu;
var vorlagen;
- var api;
+ //var api;
var userid;
- var pfad = '';
+ //var pfad = '';
var loc;
- var modus = 'kacheln';
+ //var modus = 'kacheln';
+
+ this.init = function () {
+ self.vorlagen = new Vorlagen();
+ var dlg = document.querySelector(".dialog");
+ dlg.style.flexBasis = '0em';
+ document.querySelector('#nutzer-neu-btn').addEventListener('click', self.nutzer_neu_dialog_zeigen);
+ document.querySelector('.west').style.flexBasis = '0em';
+ document.querySelector('.ost').style.flexBasis = '0em';
+ self.get_login();
+ self.get_user_list();
+ self.loc = window.location.protocol + '//' + window.location.host;
+ };
this.datei_neuer_text = function () {
self.meldung_mit_timeout("Neuer Text", 1500);
@@ -14,6 +26,16 @@
/* Nutzerverwaltung */
+ this.nutzer_neu_dialog_zeigen = function () {
+ self.dialog_zeigen('data/tpl/dlg-nutzer-neu.tpl', '', function(){
+ var btn = document.getElementById('nutzer-speichern-btn');
+ if(btn !== null) {
+ btn.addEventListener('click', self.nutzer_speichern);
+ }
+ });
+ //self.menue_umschalten();
+ };
+
this.nutzerliste_klick = function(event) {
var target = event.target;
var gewaehlterNutzer = document.querySelector(".nutzer-gewaehlt");
@@ -45,38 +67,8 @@
return user;
};
- /* Funktionen aus App-Vorlage */
-
- this.init = function () {
- self.vorlagen = new Vorlagen();
- self.appMenu = new AppMenu();
- self.appMenu.init(
- "data/menu/",
- "hauptmenue.json",
- "data/tpl/app-menu.tpl",
- ".west",
- "8em");
- document.querySelector('.hamburger').addEventListener('click', function (e) {
- self.menue_umschalten();
- });
- var dlg = document.querySelector(".dialog");
- dlg.style.flexBasis = '0em';
- self.seitenleiste_umschalten();
- self.get_login();
- self.get_user_list();
- self.loc = window.location.protocol + '//' + window.location.host;
- };
-
- this.login_zeigen = function() {
- self.meldung_mit_timeout("Benutzer: " + self.userid, 1500);
- };
+ /* Rollen erteilen und entziehen */
- this.menue_umschalten = function () {
- var ham = document.querySelector(".hamburger");
- ham.classList.toggle("is-active"); // hamburger-icon umschalten
- self.appMenu.toggle(); // menue oeffnen/schliessen
- };
-
this.rollen_dialog_zeigen = function(nutzerId) {
var m = 'getUserRoleNames';
var u = '../svc/' + m + '?p=' + nutzerId;
@@ -86,7 +78,8 @@
JSON.parse(antwort),
function (html) {
document.querySelector("#nutzer").innerHTML = html;
- document.querySelector("#nutzer-id").textContent = nutzerId;
+ document.querySelector("#nutzer-id").textContent = nutzerId;
+ self.addEvtListener('.granted-role-btn', 'click', self.revoke_role_klick);
var m = 'getRoleNamesGranted';
var u = '../svc/' + m;
self.http_get(u, function (antwort2) {
@@ -95,25 +88,57 @@
JSON.parse(antwort2),
function (html) {
document.querySelector(".alle-rollen-behaelter").innerHTML = html;
+ document.querySelector('.zurueck-btn').addEventListener('click', function (e) {
+ self.get_user_list();
+ });
+ self.addEvtListener('.avl-role-btn', 'click', self.grant_role_klick);
});
});
});
- });
+ });
+ document.querySelector('.zurueck-btn').style.color = 'black';
};
+
+ this.grant_role_klick = function(event) {
+ self.alter_role(event, 'grantRole', function(roleId) {
+ var btn = document.createElement("button");
+ btn.type = "button";
+ btn.classList.add("granted-role-btn");
+ btn.id = roleId;
+ btn.textContent = roleId;
+ document.querySelector('.rollen-behaelter').appendChild(btn);
+ });
+ };
+
+ this.revoke_role_klick = function(event) {
+ self.alter_role(event, 'revokeRole', function(roleId) {
+ var btn = document.querySelector("#" + roleId);
+ btn.parentNode.removeChild(btn);
+ });
+ };
+
+ this.alter_role = function(event, method, updateCallback) {
+ var target = event.target;
+ var nutzerId = document.querySelector("#nutzer-id").textContent;
+ var roleId = target.textContent;
+ var u = '../svc/' + method;
+ var data = "p=" + self.serialisieren(new UserRole(nutzerId, roleId));
+ self.http_post(u, data, function (antwort) {
+ updateCallback(roleId);
+ });
+ };
+
+
+
+ /* Funktionen aus App-Vorlage */
+
+ this.login_zeigen = function() {
+ self.meldung_mit_timeout("Benutzer: " + self.userid, 1500);
+ };
+
this.info_dialog_zeigen = function () {
self.dialog_zeigen('data/tpl/dlg-info.tpl', '');
- self.menue_umschalten();
- };
-
- this.nutzer_neu_dialog_zeigen = function () {
- self.dialog_zeigen('data/tpl/dlg-nutzer-neu.tpl', '', function(){
- var btn = document.getElementById('nutzer-speichern-btn');
- if(btn !== null) {
- btn.addEventListener('click', self.nutzer_speichern);
- }
- });
- self.menue_umschalten();
};
this.seitenleiste_umschalten = function () {
@@ -125,7 +150,6 @@
ostDiv.classList.add('ost-open');
ostDiv.style.flexBasis = '6em';
}
- //self.menue_umschalten();
};
this.fusszeile_umschalten = function () {
@@ -137,7 +161,6 @@
suedDiv.classList.add('sued-open');
suedDiv.style.height = '1.5em';
}
- self.menue_umschalten();
};
this.meldung_mit_timeout = function (meldung, timeout) {
@@ -206,21 +229,16 @@
var m = 'getUserNameList';
var u = '../svc/' + m;
self.http_get(u, function (antwort) {
- self.vorlagen.html_erzeugen(
- 'data/tpl/inhalt.tpl',
- JSON.parse(antwort),
- function (h) {
- var elem = document.getElementById('nutzer');
- elem.innerHTML = h;
-
- var absaetze = document.querySelectorAll('p.nutzer-liste-eintrag');
- var index;
- for (index = 0; index < absaetze.length; index++) {
- absaetze[index].addEventListener("click", self.nutzerliste_klick);
- }
-
+ self.vorlagen.html_erzeugen(
+ 'data/tpl/inhalt.tpl',
+ JSON.parse(antwort),
+ function (h) {
+ var elem = document.getElementById('nutzer');
+ elem.innerHTML = h;
+ self.addEvtListener('p.nutzer-liste-eintrag', 'click', self.nutzerliste_klick);
+ document.querySelector('.zurueck-btn').style.color = '#eee';
+ });
});
- });
};
this.neuen_nutzer_speichern = function(u) {
@@ -285,6 +303,14 @@
this.serialisieren = function(obj) {
return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}';
};
+
+ this.addEvtListener = function(selector, eventName, func) {
+ var elems = document.querySelectorAll(selector);
+ var index;
+ for (index = 0; index < elems.length; index++) {
+ elems[index].addEventListener(eventName, func);
+ }
+ };
}
@@ -299,3 +325,7 @@
this.email = em;
}
+function UserRole(u, r) {
+ this.userId = u;
+ this.role = r;
+}
\ No newline at end of file
--
Gitblit v1.9.3