node-red-contrib-energymeterplus 0.0.4 → 0.0.6

package/energyMeterPlus.html

@@ -1,24 +1,56 @@
 <script type="text/javascript">
-    RED.nodes.registerType('energyMeterPlus',{
-        category: 'energy',  // palette section name
-        color: '#5cb85c',  // green background
+    RED.nodes.registerType('energyMeterPlus', {
+        category: 'energy',
+        color: '#228B22',
         defaults: {
             name: {value:""},
-            unitCost: {value:""},          
-            filePath: {value:""},           
-            baselineCorrection: {value:""}  
+            baselineDaily: {value:0},
+            baselineWeekly: {value:0},
+            baselineMonthly: {value:0},
+            baselineYearly: {value:0},
+            costPerUnit: {value:0.15},
+            filepath: {value:"/config/energymeterplus.json"},
+            inputUnit: {value:"kW"}
         },
         inputs:1,
         outputs:1,
-        icon:"smartmeter.png",
+        icon: "smartmeter.png",
         label: function() {
-            return this.name||"energyMeterPlus";
-        },
-        oneditprepare: function() {
-            // Add labels to the fields
-            $("#node-input-unitCost").attr("placeholder","Enter cost per kWh");
-            $("#node-input-filePath").attr("placeholder","Path to JSON file (e.g. C:/Users/Francis/Documents/energy.json)");
-            $("#node-input-baselineCorrection").attr("placeholder","Baseline correction in JSON (e.g. {\"daily\":10,\"weekly\":50})");
+            return this.name || "energyMeterPlus";
         }
     });
 </script>
+
+<script type="text/x-red" data-template-name="energyMeterPlus">
+    <div class="form-row">
+        <label for="node-input-baselineDaily">Baseline Daily (kWh)</label>
+        <input type="number" id="node-input-baselineDaily">
+    </div>
+    <div class="form-row">
+        <label for="node-input-baselineWeekly">Baseline Weekly (kWh)</label>
+        <input type="number" id="node-input-baselineWeekly">
+    </div>
+    <div class="form-row">
+        <label for="node-input-baselineMonthly">Baseline Monthly (kWh)</label>
+        <input type="number" id="node-input-baselineMonthly">
+    </div>
+    <div class="form-row">
+        <label for="node-input-baselineYearly">Baseline Yearly (kWh)</label>
+        <input type="number" id="node-input-baselineYearly">
+    </div>
+    <div class="form-row">
+        <label for="node-input-costPerUnit">Cost per Unit</label>
+        <input type="number" id="node-input-costPerUnit" step="0.01">
+    </div>
+    <div class="form-row">
+        <label for="node-input-filepath">Filepath</label>
+        <input type="text" id="node-input-filepath">
+    </div>
+    <div class="form-row">
+        <label for="node-input-inputUnit">Input Unit</label>
+        <select id="node-input-inputUnit">
+            <option value="kW">kW</option>
+            <option value="W">W</option>
+        </select>
+    </div>
+</script>

package/energyMeterPlus.js

@@ -5,41 +5,38 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         var node = this;
 
+        // Config values
         let unitCost = Number(config.unitCost) || 0;
         let filePath = config.filePath || "/addon_configs/a0d7b954_nodered/node_red/solarGen_data.json";
-        let baselineCorrection = config.baselineCorrection || "";
+        let inputUnit = config.inputUnit || "kW";
+
+        // Numeric baseline corrections
+        let baselineDaily   = Number(config.baselineDaily)   || 0;
+        let baselineWeekly  = Number(config.baselineWeekly)  || 0;
+        let baselineMonthly = Number(config.baselineMonthly) || 0;
+        let baselineYearly  = Number(config.baselineYearly)  || 0;
 
         // Baseline counters
-        let baseline = { daily: 0, weekly: 0, monthly: 0, yearly: 0 };
+        let baseline = { daily: baselineDaily, weekly: baselineWeekly, monthly: baselineMonthly, yearly: baselineYearly };
         let lastCheck = new Date();
 
-        // Apply correction if provided
-        if (baselineCorrection) {
-            try {
-                let correction = JSON.parse(baselineCorrection);
-                baseline = { ...baseline, ...correction };
-            } catch (err) {
-                node.error("Invalid baseline correction JSON");
-            }
-        }
-
         // Function to handle rollover
         function checkRollover() {
             let now = new Date();
 
             // Daily rollover
             if (now.getDate() !== lastCheck.getDate()) {
-                baseline.daily = 0;
+                baseline.daily = baselineDaily;
             }
 
             // Weekly rollover (Sunday = 0)
             if (now.getDay() === 0 && lastCheck.getDay() !== 0) {
-                baseline.weekly = 0;
+                baseline.weekly = baselineWeekly;
             }
 
             // Monthly rollover
             if (now.getMonth() !== lastCheck.getMonth()) {
-                baseline.monthly = 0;
+                baseline.monthly = baselineMonthly;
             }
 
             // Yearly rollover
@@ -51,7 +48,7 @@ module.exports = function(RED) {
                 } catch (err) {
                     node.error("Failed to archive yearly file: " + err);
                 }
-                baseline.yearly = 0;
+                baseline.yearly = baselineYearly;
             }
 
             lastCheck = now;
@@ -61,19 +58,20 @@ module.exports = function(RED) {
         setInterval(checkRollover, 60000);
 
         node.on('input', function(msg) {
-            let power = Number(msg.payload) || 0;
+            let factor = (inputUnit === "W") ? 0.001 : 1;
+            let power = Number(msg.payload) * factor || 0;
 
             // Add to counters
-            baseline.daily += power;
-            baseline.weekly += power;
+            baseline.daily   += power;
+            baseline.weekly  += power;
             baseline.monthly += power;
-            baseline.yearly += power;
+            baseline.yearly  += power;
 
             // Calculate costs
-            let daily_cost   = baseline.daily * unitCost;
-            let weekly_cost  = baseline.weekly * unitCost;
+            let daily_cost   = baseline.daily   * unitCost;
+            let weekly_cost  = baseline.weekly  * unitCost;
             let monthly_cost = baseline.monthly * unitCost;
-            let yearly_cost  = baseline.yearly * unitCost;
+            let yearly_cost  = baseline.yearly  * unitCost;
 
             // Build Output
             msg.payload = {
@@ -97,5 +95,8 @@ module.exports = function(RED) {
             node.send(msg);
         });
     }
-    RED.nodes.registerType("energyMeterPlus", EnergyMeterPlus);
+
+    RED.nodes.registerType("energyMeterPlus", EnergyMeterPlus, {
+        color: "#228B22" // Forest Green node color
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-energymeterplus",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "A node-red energy meter node with editable baseline data, milestone summary, and cost calculation",
   "author": "Arcfrankye",
   "license": "MIT",