linse/seweb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure instrument and device are availabel separately

Browse Source 
- added comment to the alert to be modified
  ("You changed a field without pressing the return key.")
This commit is contained in:
zolliker
2025-04-30 14:46:22 +02:00
parent ae7ed7bdd8
commit e51942c97f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/jsFiles/SEAWebClientCommunication.js
View File

@ -72,12 +72,18 @@ function handleUpdateMessage(src, message) {
clientID = message.id; clientID = message.id;
if ("device" in message) { if ("device" in message) {
if (message.device == "_inst_select") { if (message.device == "_inst_select") {
clientTitle = "select instrument"; window.clientTitle = "select instrument";
console.log('IDselect') console.log('IDselect')
pushInitCommand("getblock?path=_inst_select&", "instrument selection"); pushInitCommand("getblock?path=_inst_select&", "instrument selection");
sizeChange(); sizeChange();
} else { } else {
clientTitle = message.instrument + " " + message.device; if (message.instrument) {
window.instrument = message.instrument;
}
if (message.device) {
window.device = message.device;
}
window.clientTitle = window.instrument + " " + window.device;
// console.log('loadBlocks', message); // console.log('loadBlocks', message);
loadFirstBlocks(); loadFirstBlocks();
} }

6
client/jsFiles/SEAWebClientMain.js
View File

@ -182,7 +182,11 @@ 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) {
alertify.confirm("WRITE PERMISSION", "You are working on <b>"+ clientTitle + "</b>. Are You sure you want to change things here?", // TODO: here instead of asking "Please confirm we are on <instrument>", do not show the instrument,
// ask the user "Please confrim the instrument:" and check it the entered instrument is correct
// (case insensitive)
alertify.confirm("WRITE PERMISSION", "Current device: <b>"+ window.device
+ "</b>. Please confirm we are on <b>" + window.instrument + "</b>",
function () { function () {
// User decided to proceed. // User decided to proceed.
prompt = false; prompt = false;