updated nash research

OSU-Sustainability-Office · Jan 18, 2024 · 02d9f15 · 02d9f15
1 parent 941442c
commit 02d9f15
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 140 deletions.
diff --git a/backend/dependencies/nodejs/models/meter.js b/backend/dependencies/nodejs/models/meter.js
@@ -73,8 +73,8 @@ class Meter {
 
  const map = {
  accumulated_real: 'Net Energy Usage (kWh)',
- real_power: 'Real Power (W)',
- reactive_power: 'Reactive Power (VAR)',
+ real_power: 'Real Power (kW)',
+ reactive_power: 'Reactive Power (kVAR)',
  apparent_power: 'Apparent Power (VA)',
  real_a: 'Real Power, Phase A (kW)',
  real_b: 'Real Power, Phase B (kW)',

diff --git a/src/components/view/modals/download_data.vue b/src/components/view/modals/download_data.vue
@@ -222,8 +222,8 @@ export default {
  let zip = new JSZip()
  const map = {
  accumulated_real: 'Net Energy Usage (kWh)',
- real_power: 'Real Power (W)',
- reactive_power: 'Reactive Power (VAR)',
+ real_power: 'Real Power (kW)',
+ reactive_power: 'Reactive Power (kVAR)',
  apparent_power: 'Apparent Power (VA)',
  real_a: 'Real Power, Phase A (kW)',
  real_b: 'Real Power, Phase B (kW)',

diff --git a/src/store/chart.module.js b/src/store/chart.module.js
@@ -241,8 +241,8 @@ const getters = {
  if (state.point) {
  const map = {
  accumulated_real: 'Net Energy Usage (kWh)',
- real_power: 'Real Power (W)',
- reactive_power: 'Reactive Power (VAR)',
+ real_power: 'Real Power (kW)',
+ reactive_power: 'Reactive Power (kVAR)',
  apparent_power: 'Apparent Power (VA)',
  real_a: 'Real Power, Phase A (kW)',
  real_b: 'Real Power, Phase B (kW)',
@@ -286,8 +286,8 @@ const getters = {
  unitString (state) {
  const map = {
  accumulated_real: 'kWh',
- real_power: 'W',
- reactive_power: 'VAR',
+ real_power: 'kW',
+ reactive_power: 'kVAR',
  apparent_power: 'VA',
  real_a: 'kW',
  real_b: 'kW',

diff --git a/src/store/chart_modifiers/line_bar/base.js b/src/store/chart_modifiers/line_bar/base.js
@@ -77,6 +77,12 @@ export default class LineBaseModifier {
  x: new Date((i + delta + offset) * 1000),
  y: accumulator
  })
+ // console.log(accumulator)
+ // console.log(Math.abs(accumulator))
+ // console.log(payload.point)
+ // Maybe use Math.abs(accumulator) to flip sign
+ // Maybe use payload.point to determine if we need to flip sign
+ // See PR for other comments
  } catch (error) {
  console.log(error)
  }