From 588e421cae971fd7e05d50302b7b3a1a64a8df1c Mon Sep 17 00:00:00 2001 From: s-egge Date: Tue, 24 Sep 2024 11:37:45 -0700 Subject: [PATCH 1/2] Update chart.module.js --- src/store/chart.module.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/store/chart.module.js b/src/store/chart.module.js index 06a02456..e89bf6c6 100644 --- a/src/store/chart.module.js +++ b/src/store/chart.module.js @@ -75,6 +75,15 @@ const actions = { await chartModifier.postGetData(chartData, reqPayload, this, store) + // fix LINC meter being off by factor of 10 + // TODO: look into fixing data as it goes into the database instead of here + // See this issue for more info: https://github.com/OSU-Sustainability-Office/energy-dashboard/issues/341 + if (store.getters.meterGroupPath.split('_')[2] === '199' && store.getters.point === 'accumulated_real') { + chartData.data.map(d => { + d.y = d.y * 10 + }) + } + // fix PacificPower meters chart being filled by the energy_change chart modifier if (isPacificPowerMeter) { chartData.fill = false From 182fd0b78d61990693ebdf80675bebe176476694 Mon Sep 17 00:00:00 2001 From: s-egge Date: Tue, 24 Sep 2024 12:06:30 -0700 Subject: [PATCH 2/2] Docker compose format change --- .github/workflows/gh-deploy.yml | 6 +++--- .github/workflows/test-build-s3.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gh-deploy.yml b/.github/workflows/gh-deploy.yml index 8ef7dcd5..30fba8e9 100644 --- a/.github/workflows/gh-deploy.yml +++ b/.github/workflows/gh-deploy.yml @@ -14,9 +14,9 @@ jobs: - name: unit tests working-directory: backend run: | - docker-compose build - docker-compose run --rm test - docker-compose down + docker compose build + docker compose run --rm test + docker compose down build-deploy-gh-pages: name: Build / Deploy to gh-pages diff --git a/.github/workflows/test-build-s3.yml b/.github/workflows/test-build-s3.yml index 5ba8bd91..12c5d02d 100644 --- a/.github/workflows/test-build-s3.yml +++ b/.github/workflows/test-build-s3.yml @@ -14,9 +14,9 @@ jobs: - name: unit tests working-directory: backend run: | - docker-compose build - docker-compose run --rm test - docker-compose down + docker compose build + docker compose run --rm test + docker compose down build-deploy-s3: name: Build / Deploy to S3 Test Build