update solar label prelim work (#308)

* update solar label prelim work * solar meter class update * fix comments and remove references to other energy types --------- Co-authored-by: s-egge <ssteele836@gmail.com>
OSU-Sustainability-Office · Mar 31, 2024 · 4cd4eca · 4cd4eca
1 parent 86c7cac
commit 4cd4eca
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/backend/dependencies/nodejs/meter_classes.js b/backend/dependencies/nodejs/meter_classes.js
@@ -155,11 +155,8 @@ module.exports = {
  6: 'cphase_c'
  },
  9990001: {
- // Tesla Solar City Solar Panels
- 0: 'current',
- 1: 'voltage',
- 2: 'energy_change',
- 3: 'total_energy'
+ // Solar Panels (SEC, OSU Operations, deprecated Tesla panels)
+ 2: 'energy_change'
  },
  9990002: {
  // Pacific Power Meters

diff --git a/backend/dependencies/nodejs/models/meter.js b/backend/dependencies/nodejs/models/meter.js
@@ -100,10 +100,7 @@ class Meter {
  apparent_b: 'Apparent Power, Phase B (VA)',
  apparent_c: 'Apparent Power, Phase C (VA)',
  baseline_percentage: 'Percentage (%)',
- total_energy: 'Lifetime Cumulative Energy (kWh)',
- energy_change: 'Energy In Interval (kWh)',
- voltage: 'Voltage (V)',
- current: 'Current (A)'
+ energy_change: 'Energy Produced (kWh)'
  }
  const points = Object.values(meterClasses[this.classInt])
  for (let point of points) {
@@ -115,7 +112,7 @@ class Meter {
  this.type = 'Gas'
  } else if (points.indexOf('accumulated_real') >= 0) {
  this.type = 'Electricity'
- } else if (points.indexOf('total_energy') >= 0) {
+ } else if (points.indexOf('energy_change') >= 0) {
  this.type = 'Solar Panel'
  }
  return this

diff --git a/src/store/chart.module.js b/src/store/chart.module.js
@@ -286,10 +286,7 @@ const getters = {
  apparent_b: 'Apparent Power, Phase B (VA)',
  apparent_c: 'Apparent Power, Phase C (VA)',
  baseline_percentage: 'Percentage (%)',
- total_energy: 'Lifetime Cumulative Energy (kWh)',
- energy_change: 'Energy In Interval (kWh)',
- voltage: 'Voltage (V)',
- current: 'Current (A)'
+ energy_change: 'Energy Produced (kWh)'
  }
  return map[state.point]
  } else {
@@ -331,10 +328,7 @@ const getters = {
  apparent_b: 'VA',
  apparent_c: 'VA',
  baseline_percentage: '%',
- total_energy: 'kWh',
- energy_change: 'kWh',
- voltage: 'V',
- current: 'A'
+ energy_change: 'kWh'
  }
  return map[state.point]
  }

diff --git a/src/store/meter_group.module.js b/src/store/meter_group.module.js
@@ -94,7 +94,6 @@ const actions = {
  payload.point !== 'accumulated_real' &&
  payload.point !== 'total' &&
  payload.point !== 'cubic_feet' &&
-
  // PacificPower meters are accumulated_real by the time they get here,
  // but may as well handle solar meters in the future anyways
  payload.point !== 'energy_change' &&