Merge branch 'develop'

MyEMS · Jul 23, 2024 · 050565c · 050565c
2 parents 53eafe2 + bea1e3c
commit 050565c
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 0 deletions.
diff --git a/...rc/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationReportingEnergy.js b/...rc/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationReportingEnergy.js
@@ -647,6 +647,38 @@ const EnergyStoragePowerStationReportingEnergy = ({ setRedirect, setRedirectUrl,
  DateRange[1] = endOfDay(DateRange[1]);
  }
  setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+ const dateDifferenceInSeconds = moment(DateRange[1]).valueOf() / 1000 - moment(DateRange[0]).valueOf() / 1000;
+ if (periodType === 'hourly') {
+ if (dateDifferenceInSeconds > 3 * 365 * 24 * 60 * 60) {
+ // more than 3 years
+ setPeriodType('yearly');
+ document.getElementById('periodType').value = 'yearly';
+ } else if (dateDifferenceInSeconds > 6 * 30 * 24 * 60 * 60) {
+ // more than 6 months
+ setPeriodType('monthly');
+ document.getElementById('periodType').value = 'monthly';
+ } else if (dateDifferenceInSeconds > 30 * 24 * 60 * 60) {
+ // more than 30 days
+ setPeriodType('daily');
+ document.getElementById('periodType').value = 'daily';
+ }
+ } else if (periodType === 'daily') {
+ if (dateDifferenceInSeconds >= 3 * 365 * 24 * 60 * 60) {
+ // more than 3 years
+ setPeriodType('yearly');
+ document.getElementById('periodType').value = 'yearly';
+ } else if (dateDifferenceInSeconds >= 6 * 30 * 24 * 60 * 60) {
+ // more than 6 months
+ setPeriodType('monthly');
+ document.getElementById('periodType').value = 'monthly';
+ }
+ } else if (periodType === 'monthly') {
+ if (dateDifferenceInSeconds >= 3 * 365 * 24 * 60 * 60) {
+ // more than 3 years
+ setPeriodType('yearly');
+ document.getElementById('periodType').value = 'yearly';
+ }
+ }
  if (comparisonType === 'year-over-year') {
  setBasePeriodDateRange([
  moment(DateRange[0])

diff --git a/...c/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationReportingRevenue.js b/...c/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationReportingRevenue.js
@@ -646,6 +646,38 @@ const EnergyStoragePowerStationReportingRevenue = ({ setRedirect, setRedirectUrl
  DateRange[1] = endOfDay(DateRange[1]);
  }
  setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+ const dateDifferenceInSeconds = moment(DateRange[1]).valueOf() / 1000 - moment(DateRange[0]).valueOf() / 1000;
+ if (periodType === 'hourly') {
+ if (dateDifferenceInSeconds > 3 * 365 * 24 * 60 * 60) {
+ // more than 3 years
+ setPeriodType('yearly');
+ document.getElementById('periodType').value = 'yearly';
+ } else if (dateDifferenceInSeconds > 6 * 30 * 24 * 60 * 60) {
+ // more than 6 months
+ setPeriodType('monthly');
+ document.getElementById('periodType').value = 'monthly';
+ } else if (dateDifferenceInSeconds > 30 * 24 * 60 * 60) {
+ // more than 30 days
+ setPeriodType('daily');
+ document.getElementById('periodType').value = 'daily';
+ }
+ } else if (periodType === 'daily') {
+ if (dateDifferenceInSeconds >= 3 * 365 * 24 * 60 * 60) {
+ // more than 3 years
+ setPeriodType('yearly');
+ document.getElementById('periodType').value = 'yearly';
+ } else if (dateDifferenceInSeconds >= 6 * 30 * 24 * 60 * 60) {
+ // more than 6 months
+ setPeriodType('monthly');
+ document.getElementById('periodType').value = 'monthly';
+ }
+ } else if (periodType === 'monthly') {
+ if (dateDifferenceInSeconds >= 3 * 365 * 24 * 60 * 60) {
+ // more than 3 years
+ setPeriodType('yearly');
+ document.getElementById('periodType').value = 'yearly';
+ }
+ }
  if (comparisonType === 'year-over-year') {
  setBasePeriodDateRange([
  moment(DateRange[0])