@@ -192,12 +382,11 @@ getEventInjectionCode(nodeName) {
`;
}
- /**
- * Get client-side HTML injection code
- */
getHtmlInjectionCode(nodeName) {
- const htmlTemplate = this.getHtmlTemplate().replace(/`/g, '\\`').replace(/\$/g, '\\$');
-
+ const htmlTemplate = this.getHtmlTemplate()
+ .replace(/`/g, '\\`')
+ .replace(/\$/g, '\\$');
+
return `
// Asset HTML injection for ${nodeName}
window.EVOLV.nodes.${nodeName}.assetMenu.injectHtml = function() {
@@ -210,33 +399,53 @@ getEventInjectionCode(nodeName) {
`;
}
- /**
- * Returns the JS that injects the saveEditor function
- */
getSaveInjectionCode(nodeName) {
return `
- // Asset Save injection for ${nodeName}
+ // Asset save handler for ${nodeName}
window.EVOLV.nodes.${nodeName}.assetMenu.saveEditor = function(node) {
- console.log('Saving asset properties for ${nodeName}…');
- const fields = ['supplier','category','assetType','model','unit'];
- const errors = [];
- fields.forEach(f => {
- const el = document.getElementById(\`node-input-\${f}\`);
- node[f] = el ? el.value : '';
- });
- if (node.assetType && !node.unit) errors.push('Unit must be set when type is specified.');
- if (!node.unit) errors.push('Unit is required.');
- errors.forEach(e=>RED.notify(e,'error'));
-
- // --- DEBUG: show exactly what was saved ---
- const saved = fields.reduce((o,f) => { o[f] = node[f]; return o; }, {});
- console.log('→ assetMenu.saveEditor result:', saved);
+ console.log('Saving asset properties for ${nodeName}');
+ const menuAsset = window.EVOLV.nodes.${nodeName}.menuData.asset || {};
+ const categories = menuAsset.categories || {};
+ const defaultCategory = menuAsset.defaultCategory || Object.keys(categories)[0] || null;
+ const resolveCategoryKey = () => {
+ if (node.softwareType && categories[node.softwareType]) {
+ return node.softwareType;
+ }
+ if (node.category && categories[node.category]) {
+ return node.category;
+ }
+ return defaultCategory || '';
+ };
- return errors.length===0;
+ node.category = resolveCategoryKey();
+
+ const fields = ['supplier', 'assetType', 'model', 'unit'];
+ const errors = [];
+
+ fields.forEach((field) => {
+ const el = document.getElementById(\`node-input-\${field}\`);
+ node[field] = el ? el.value : '';
+ });
+
+ if (node.assetType && !node.unit) {
+ errors.push('Unit must be set when a type is specified.');
+ }
+ if (!node.unit) {
+ errors.push('Unit is required.');
+ }
+
+ errors.forEach((msg) => RED.notify(msg, 'error'));
+
+ const saved = fields.reduce((acc, field) => {
+ acc[field] = node[field];
+ return acc;
+ }, {});
+ console.log('[AssetMenu] save result:', saved);
+
+ return errors.length === 0;
};
`;
}
-
}
module.exports = AssetMenu;
diff --git a/src/menu/asset_DEPRECATED.js b/src/menu/asset_DEPRECATED.js
new file mode 100644
index 0000000..5f0fa3c
--- /dev/null
+++ b/src/menu/asset_DEPRECATED.js
@@ -0,0 +1,243 @@
+// asset.js
+const fs = require('fs');
+const path = require('path');
+
+
+class AssetMenu {
+ /** Define path where to find data of assets in constructor for now */
+ constructor(relPath = '../../datasets/assetData') {
+ this.baseDir = path.resolve(__dirname, relPath);
+ this.assetData = this._loadJSON('assetData');
+ }
+
+ _loadJSON(...segments) {
+ const filePath = path.resolve(this.baseDir, ...segments) + '.json';
+ try {
+ return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+ } catch (err) {
+ throw new Error(`Failed to load ${filePath}: ${err.message}`);
+ }
+ }
+
+ /**
+ * ADD THIS METHOD
+ * Compiles all menu data from the file system into a single nested object.
+ * This is run once on the server to pre-load everything.
+ * @returns {object} A comprehensive object with all menu options.
+ */
+ getAllMenuData() {
+ // load the raw JSON once
+ const data = this._loadJSON('assetData');
+ const allData = {};
+
+ data.suppliers.forEach(sup => {
+ allData[sup.name] = {};
+ sup.categories.forEach(cat => {
+ allData[sup.name][cat.name] = {};
+ cat.types.forEach(type => {
+ // here: store the full array of model objects, not just names
+ allData[sup.name][cat.name][type.name] = type.models;
+ });
+ });
+ });
+
+ return allData;
+ }
+
+ /**
+ * Convert the static initEditor function to a string that can be served to the client
+ * @param {string} nodeName - The name of the node type
+ * @returns {string} JavaScript code as a string
+ */
+getClientInitCode(nodeName) {
+ // step 1: get the two helper strings
+ const htmlCode = this.getHtmlInjectionCode(nodeName);
+ const dataCode = this.getDataInjectionCode(nodeName);
+ const eventsCode = this.getEventInjectionCode(nodeName);
+ const saveCode = this.getSaveInjectionCode(nodeName);
+
+
+ return `
+ // --- AssetMenu for ${nodeName} ---
+ window.EVOLV.nodes.${nodeName}.assetMenu =
+ window.EVOLV.nodes.${nodeName}.assetMenu || {};
+
+ ${htmlCode}
+ ${dataCode}
+ ${eventsCode}
+ ${saveCode}
+
+ // wire it all up when the editor loads
+ window.EVOLV.nodes.${nodeName}.assetMenu.initEditor = function(node) {
+ // ------------------ BELOW sequence is important! -------------------------------
+ console.log('Initializing asset properties for ${nodeName}…');
+ this.injectHtml();
+ // load the data and wire up events
+ // this will populate the fields and set up the event listeners
+ this.wireEvents(node);
+ // this will load the initial data into the fields
+ // this is important to ensure the fields are populated correctly
+ this.loadData(node);
+ };
+ `;
+
+}
+
+getDataInjectionCode(nodeName) {
+ return `
+ // Asset Data loader for ${nodeName}
+ window.EVOLV.nodes.${nodeName}.assetMenu.loadData = function(node) {
+ const data = window.EVOLV.nodes.${nodeName}.menuData.asset;
+ const elems = {
+ supplier: document.getElementById('node-input-supplier'),
+ category: document.getElementById('node-input-category'),
+ type: document.getElementById('node-input-assetType'),
+ model: document.getElementById('node-input-model'),
+ unit: document.getElementById('node-input-unit')
+ };
+ function populate(el, opts, sel) {
+ const old = el.value;
+ el.innerHTML = '
';
+ (opts||[]).forEach(o=>{
+ const opt = document.createElement('option');
+ opt.value = o; opt.textContent = o;
+ el.appendChild(opt);
+ });
+ el.value = sel||"";
+ if(el.value!==old) el.dispatchEvent(new Event('change'));
+ }
+ // initial population
+ populate(elems.supplier, Object.keys(data), node.supplier);
+ };
+ `
+ }
+
+getEventInjectionCode(nodeName) {
+ return `
+ // Asset Event wiring for ${nodeName}
+ window.EVOLV.nodes.${nodeName}.assetMenu.wireEvents = function(node) {
+ const data = window.EVOLV.nodes.${nodeName}.menuData.asset;
+ const elems = {
+ supplier: document.getElementById('node-input-supplier'),
+ category: document.getElementById('node-input-category'),
+ type: document.getElementById('node-input-assetType'),
+ model: document.getElementById('node-input-model'),
+ unit: document.getElementById('node-input-unit')
+ };
+ function populate(el, opts, sel) {
+ const old = el.value;
+ el.innerHTML = '
';
+ (opts||[]).forEach(o=>{
+ const opt = document.createElement('option');
+ opt.value = o; opt.textContent = o;
+ el.appendChild(opt);
+ });
+ el.value = sel||"";
+ if(el.value!==old) el.dispatchEvent(new Event('change'));
+ }
+ elems.supplier.addEventListener('change', ()=>{
+ populate(elems.category,
+ elems.supplier.value? Object.keys(data[elems.supplier.value]||{}) : [],
+ node.category);
+ });
+ elems.category.addEventListener('change', ()=>{
+ const s=elems.supplier.value, c=elems.category.value;
+ populate(elems.type,
+ (s&&c)? Object.keys(data[s][c]||{}) : [],
+ node.assetType);
+ });
+ elems.type.addEventListener('change', ()=>{
+ const s=elems.supplier.value, c=elems.category.value, t=elems.type.value;
+ const md = (s&&c&&t)? data[s][c][t]||[] : [];
+ populate(elems.model, md.map(m=>m.name), node.model);
+ });
+ elems.model.addEventListener('change', ()=>{
+ const s=elems.supplier.value, c=elems.category.value, t=elems.type.value, m=elems.model.value;
+ const md = (s&&c&&t)? data[s][c][t]||[] : [];
+ const entry = md.find(x=>x.name===m);
+ populate(elems.unit, entry? entry.units : [], node.unit);
+ });
+ };
+ `
+ }
+
+/**
+ * Generate HTML template for asset fields
+ */
+ getHtmlTemplate() {
+ return `
+
+
+
Asset selection
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `;
+ }
+
+ /**
+ * Get client-side HTML injection code
+ */
+ getHtmlInjectionCode(nodeName) {
+ const htmlTemplate = this.getHtmlTemplate().replace(/`/g, '\\`').replace(/\$/g, '\\$');
+
+ return `
+ // Asset HTML injection for ${nodeName}
+ window.EVOLV.nodes.${nodeName}.assetMenu.injectHtml = function() {
+ const placeholder = document.getElementById('asset-fields-placeholder');
+ if (placeholder && !placeholder.hasChildNodes()) {
+ placeholder.innerHTML = \`${htmlTemplate}\`;
+ console.log('Asset HTML injected successfully');
+ }
+ };
+ `;
+ }
+
+ /**
+ * Returns the JS that injects the saveEditor function
+ */
+ getSaveInjectionCode(nodeName) {
+ return `
+ // Asset Save injection for ${nodeName}
+ window.EVOLV.nodes.${nodeName}.assetMenu.saveEditor = function(node) {
+ console.log('Saving asset properties for ${nodeName}…');
+ const fields = ['supplier','category','assetType','model','unit'];
+ const errors = [];
+ fields.forEach(f => {
+ const el = document.getElementById(\`node-input-\${f}\`);
+ node[f] = el ? el.value : '';
+ });
+ if (node.assetType && !node.unit) errors.push('Unit must be set when type is specified.');
+ if (!node.unit) errors.push('Unit is required.');
+ errors.forEach(e=>RED.notify(e,'error'));
+
+ // --- DEBUG: show exactly what was saved ---
+ const saved = fields.reduce((o,f) => { o[f] = node[f]; return o; }, {});
+ console.log('→ assetMenu.saveEditor result:', saved);
+
+ return errors.length===0;
+ };
+ `;
+ }
+
+}
+
+module.exports = AssetMenu;
diff --git a/src/menu/index.js b/src/menu/index.js
index a6def7f..1a051d2 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -2,13 +2,17 @@ const AssetMenu = require('./asset.js');
const { TagcodeApp, DynamicAssetMenu } = require('./tagcodeApp.js');
const LoggerMenu = require('./logger.js');
const PhysicalPositionMenu = require('./physicalPosition.js');
+const ConfigManager = require('../configs');
class MenuManager {
constructor() {
this.registeredMenus = new Map();
+ this.configManager = new ConfigManager('../configs');
// Register factory functions
- this.registerMenu('asset', () => new AssetMenu()); // static menu to be replaced by dynamic one but later
+ this.registerMenu('asset', (nodeName) => new AssetMenu({
+ softwareType: this._getSoftwareType(nodeName)
+ })); // static menu to be replaced by dynamic one but later
//this.registerMenu('asset', (nodeName) => new DynamicAssetMenu(nodeName, new TagcodeApp()));
this.registerMenu('logger', () => new LoggerMenu());
this.registerMenu('position', () => new PhysicalPositionMenu());
@@ -23,6 +27,20 @@ class MenuManager {
this.registeredMenus.set(menuType, menuFactory);
}
+ _getSoftwareType(nodeName) {
+ if (!nodeName) {
+ return null;
+ }
+
+ try {
+ const config = this.configManager.getConfig(nodeName);
+ return config?.functionality?.softwareType || nodeName;
+ } catch (error) {
+ console.warn(`Unable to determine softwareType for ${nodeName}: ${error.message}`);
+ return nodeName;
+ }
+ }
+
/**
* Create a complete endpoint script with data and initialization functions
* @param {string} nodeName - The name of the node type
@@ -54,7 +72,7 @@ class MenuManager {
try {
const handler = instantiatedMenus.get(menuType);
if (handler && typeof handler.getAllMenuData === 'function') {
- menuData[menuType] = handler.getAllMenuData();
+ menuData[menuType] = handler.getAllMenuData(nodeName);
} else {
// Provide default empty data if method doesn't exist
menuData[menuType] = {};
@@ -172,4 +190,4 @@ class MenuManager {
}
}
-module.exports = MenuManager;
\ No newline at end of file
+module.exports = MenuManager;
From d52a1827e3160b8a09f1c310276c636d4db26ee1 Mon Sep 17 00:00:00 2001
From: znetsixe <73483679+znetsixe@users.noreply.github.com>
Date: Thu, 20 Nov 2025 11:09:26 +0100
Subject: [PATCH 10/10] Added min height based on | fixed dynamic speed in
%/sec
---
src/configs/pumpingStation.json | 17 +++++++++++++++
src/state/movementManager.js | 38 ++++++++++++++++++++++-----------
src/state/stateConfig.json | 2 +-
3 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/src/configs/pumpingStation.json b/src/configs/pumpingStation.json
index d8ea505..5adf4a0 100644
--- a/src/configs/pumpingStation.json
+++ b/src/configs/pumpingStation.json
@@ -299,6 +299,23 @@
"description": "Reference height to use to identify the height vs other basins with. This will say something more about the expected pressure loss in m head"
}
},
+ "minHeightBasedOn": {
+ "default": "outlet",
+ "rules": {
+ "type": "enum",
+ "values": [
+ {
+ "value": "inlet",
+ "description": "Minimum height is based on inlet elevation."
+ },
+ {
+ "value": "outlet",
+ "description": "Minimum height is based on outlet elevation."
+ }
+ ],
+ "description": "Basis for minimum height check: inlet or outlet."
+ }
+ },
"staticHead": {
"default": 12,
"rules": {
diff --git a/src/state/movementManager.js b/src/state/movementManager.js
index 424c628..f949f48 100644
--- a/src/state/movementManager.js
+++ b/src/state/movementManager.js
@@ -81,11 +81,8 @@ class movementManager {
const direction = targetPosition > this.currentPosition ? 1 : -1;
const distance = Math.abs(targetPosition - this.currentPosition);
- // Speed is a fraction [0,1] of full-range per second
- this.speed = Math.min(Math.max(this.speed, 0), 1);
- const fullRange = this.maxPosition - this.minPosition;
- const velocity = this.speed * fullRange; // units per second
- if (velocity === 0) {
+ const velocity = this.getVelocity(); // units per second
+ if (velocity <= 0) {
return reject(new Error("Movement aborted: zero speed"));
}
@@ -154,11 +151,11 @@ class movementManager {
const direction = targetPosition > this.currentPosition ? 1 : -1;
const distance = Math.abs(targetPosition - this.currentPosition);
- // Ensure speed is a percentage [0, 1]
- this.speed = Math.min(Math.max(this.speed, 0), 1);
-
- // Calculate duration based on percentage of distance per second
- const duration = 1 / this.speed; // 1 second for 100% of the distance
+ const velocity = this.getVelocity();
+ if (velocity <= 0) {
+ return reject(new Error("Movement aborted: zero speed"));
+ }
+ const duration = distance / velocity;
this.timeleft = duration; //set this so other classes can use it
this.logger.debug(
@@ -217,13 +214,16 @@ class movementManager {
const direction = targetPosition > this.currentPosition ? 1 : -1;
const totalDistance = Math.abs(targetPosition - this.currentPosition);
const startPosition = this.currentPosition;
- this.speed = Math.min(Math.max(this.speed, 0), 1);
+ const velocity = this.getVelocity();
+ if (velocity <= 0) {
+ return reject(new Error("Movement aborted: zero speed"));
+ }
const easeFunction = (t) =>
t < 0.5 ? 4 * t * t * t : 1 - Math.pow(-2 * t + 2, 3) / 2;
let elapsedTime = 0;
- const duration = totalDistance / this.speed;
+ const duration = totalDistance / velocity;
this.timeleft = duration;
const interval = this.interval;
@@ -273,6 +273,20 @@ class movementManager {
constrain(value) {
return Math.min(Math.max(value, this.minPosition), this.maxPosition);
}
+
+ getNormalizedSpeed() {
+ const rawSpeed = Number.isFinite(this.speed) ? this.speed : 0;
+ const clampedSpeed = Math.max(0, rawSpeed);
+ const hasMax = Number.isFinite(this.maxSpeed) && this.maxSpeed > 0;
+ const effectiveSpeed = hasMax ? Math.min(clampedSpeed, this.maxSpeed) : clampedSpeed;
+ return effectiveSpeed / 100; // convert %/s -> fraction of range per second
+ }
+
+ getVelocity() {
+ const normalizedSpeed = this.getNormalizedSpeed();
+ const fullRange = this.maxPosition - this.minPosition;
+ return normalizedSpeed * fullRange;
+ }
}
module.exports = movementManager;
diff --git a/src/state/stateConfig.json b/src/state/stateConfig.json
index 8a0b39b..548e797 100644
--- a/src/state/stateConfig.json
+++ b/src/state/stateConfig.json
@@ -127,7 +127,7 @@
}
},
"maxSpeed": {
- "default": 10,
+ "default": 1000,
"rules": {
"type": "number",
"description": "Maximum speed setting."