modules-Block: prepared different input options, grid-element: panel-background added -> icon always visible

This commit is contained in:
Daniel
2025-04-30 16:43:57 +02:00
committed by Markus Zolliker
parent 43624b4222
commit 70b40646ef
4 changed files with 31 additions and 32 deletions

View File

@ -276,7 +276,6 @@ function updateStatus(component) {
} }
function updateValue(component) { function updateValue(component) {
let matches = document.getElementsByName(component.name); let matches = document.getElementsByName(component.name);
for (var j = 0; j < matches.length; j++) { for (var j = 0; j < matches.length; j++) {
let elem = matches[j]; let elem = matches[j];
@ -285,9 +284,9 @@ function updateValue(component) {
let text = htmlEscape(component.formatted); let text = htmlEscape(component.formatted);
if (text) { if (text) {
elem.innerHTML = text; elem.innerHTML = text;
// elem.innerHTML = ' ein etwas zu langer, nein viel zu langer Text...';
} }
} else if (type == "input") { }
else if (type == "input") {
let row = elem.closest('div'); let row = elem.closest('div');
row.classList.remove('row-waiting-for-answer'); row.classList.remove('row-waiting-for-answer');
@ -304,8 +303,6 @@ function updateValue(component) {
} else if (type == "checkbox") { } else if (type == "checkbox") {
let row = elem.closest('div'); let row = elem.closest('div');
row.classList.remove('row-waiting-for-answer'); row.classList.remove('row-waiting-for-answer');
console.log('receive: ', component.value);
if (component.value == 'False' || component.value == 'false' || component.value == 0) { if (component.value == 'False' || component.value == 'false' || component.value == 0) {
elem.checked = false; elem.checked = false;
} else { } else {

View File

@ -7,7 +7,6 @@ var prompt = false // True while a prompt is opened.
// COMMUNICATION // COMMUNICATION
function getGroup(s, name) { function getGroup(s, name) {
console.log('name: ',name, ', id: '.ClientID);
reqJSON(s, "http://" + hostPort + "/getblock?path=" + name reqJSON(s, "http://" + hostPort + "/getblock?path=" + name
+ "&id=" + clientID, successHandler, errorHandler); + "&id=" + clientID, successHandler, errorHandler);
} }
@ -155,7 +154,8 @@ function createRightColumnForModules(component) {
component.type == 'pushbutton' || component.type == 'pushbutton' ||
component.type == 'checkbox' || component.type == 'checkbox' ||
component.type == 'enum' component.type == 'enum'
) { ) {
console.log(component.type);
let input_element = createType(component); let input_element = createType(component);
if (component.type != 'pushbutton') { if (component.type != 'pushbutton') {
let icon_edit = createIconEdit(input_element); let icon_edit = createIconEdit(input_element);
@ -254,7 +254,7 @@ function createPushbutton(component) {
button.onclick = function () { button.onclick = function () {
let row = button.closest('div'); let row = button.closest('div');
row.classList.add('row-waiting-for-answer'); // row.classList.add('row-waiting-for-answer');
sendCommand(s, component.command); sendCommand(s, component.command);
} }
let elem = document.createElement('span'); let elem = document.createElement('span');
@ -380,10 +380,8 @@ function createCheckbox(component) {
} }
function handleCheckbox() { function handleCheckbox() {
console.log('handle checkbox');
let row = input.closest('div'); let row = input.closest('div');
row.classList.add('row-waiting-for-answer'); row.classList.add('row-waiting-for-answer');
console.log('send ', input.checked);
sendCommand(s, component.command + " " + input.checked); sendCommand(s, component.command + " " + input.checked);
// hideInputElements(); // hideInputElements();
}; };
@ -466,21 +464,21 @@ function resizeTextfield(input) {
// CONTENT // CONTENT
function appendToGridElement(s, title, type, content) { function appendToGridElement(s, title, type, content) {
var panel = document.createElement('div'); let panel = document.createElement('div');
panel.classList.add("panel"); panel.classList.add("panel");
titlewrapper = document.createElement('span'); titlewrapper = document.createElement('span');
titlewrapper.innerHTML = title; titlewrapper.innerHTML = title;
panel.appendChild(titlewrapper); panel.appendChild(titlewrapper);
var gridContainer = document.createElement('div'); let gridContainer = document.createElement('div');
gridContainer.classList.add("grid-container"); gridContainer.classList.add("grid-container");
// Store type so it can be found easiely later. // Store type so it can be found easiely later.
gridContainer.slideType = type; gridContainer.slideType = type;
gridContainer.appendChild(panel); gridContainer.appendChild(panel);
gridContainer.appendChild(content); gridContainer.appendChild(content);
var gridelements = document.getElementsByClassName('grid-element'); let gridelements = document.getElementsByClassName('grid-element');
gridelements[s].innerHTML = ""; gridelements[s].innerHTML = "";
gridelements[s].appendChild(gridContainer); gridelements[s].appendChild(gridContainer);
} }

View File

@ -182,27 +182,26 @@ window.onload = function() {
let array_icon_edit = document.getElementsByClassName('icon-edit'); let array_icon_edit = document.getElementsByClassName('icon-edit');
let array_button = document.getElementsByClassName('input-element-button'); let array_button = document.getElementsByClassName('input-element-button');
if (writePermission == false) { if (writePermission == false) {
// TODO: here instead of asking "Please confirm we are on <instrument>", do not show the instrument, alertify.prompt( 'WRITE PERMISSION', "Please enter the name of the instrument you want to work on."
// ask the user "Please confrim the instrument:" and check it the entered instrument is correct , function(evt, value) {
// (case insensitive) // User decided to proceed
alertify.confirm("WRITE PERMISSION", "Current device: <b>"+ window.device if (clientTitle.includes(value)) {
+ "</b>. Please confirm we are on <b>" + window.instrument + "</b>", writePermission = true;
function () { icon_lock_container.innerHTML = '<img class = "icon-main icon-lock" src="res/icon_lock_open.png">';
// User decided to proceed. for(i = 0; i < array_icon_edit.length; i++) {
prompt = false; array_icon_edit[i].classList.remove('icon-edit-hidden');
}
writePermission = true; for(i = 0; i < array_button.length; i++) {
icon_lock_container.innerHTML = '<img class = "icon-main icon-lock" src="res/icon_lock_open.png">'; array_button[i].classList.remove('input-element-button-hidden');
for(i = 0; i < array_icon_edit.length; i++) { }
array_icon_edit[i].classList.remove('icon-edit-hidden'); } else {
} console.log(clientTitle);
for(i = 0; i < array_button.length; i++) {
array_button[i].classList.remove('input-element-button-hidden');
} }
// prompt = false;
} }
, function () { , function() {
// User decided to cancel // User decided to cancel
prompt = false; prompt = false;
}); });
} else { } else {
writePermission = false; writePermission = false;

View File

@ -16,9 +16,14 @@ function createGrid() {
// 4 - log // 4 - log
var elements = []; var elements = [];
for (var i = 0; i < 4; i++) { for (var i = 0; i < 4; i++) {
var element = document.createElement('div'); let element = document.createElement('div');
element.classList.add("grid-element"); element.classList.add("grid-element");
element.classList.add("grid-element-"+i); element.classList.add("grid-element-"+i);
let panel_background = document.createElement('div');
panel_background.classList.add("panel");
element.appendChild(panel_background);
document.getElementById("center").appendChild(element); document.getElementById("center").appendChild(element);
elements.push(element); elements.push(element);
} }