Merge branch 'develop'

MyEMS · Jun 30, 2024 · f5d2c46 · f5d2c46
2 parents 9b88925 + dac4ba1
commit f5d2c46
Show file tree

Hide file tree

Showing 13 changed files with 1,240 additions and 1,161 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - set data result hidden by default for shopfloor reports in myems-web
 - set data result hidden by default for store reports in myems-web
 - set data result hidden by default for tenant reports in myems-web
+- set data result hidden by default for combined equipment reports in myems-web
 ### Fixed
 - added check relations statements to point on_delete action in myems-api
 - fixed issue of on_delete action in myems-api

diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentBatch.js
@@ -101,6 +101,7 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(false);
   const [spinnerHidden, setSpinnerHidden] = useState(true);
   const [exportButtonHidden, setExportButtonHidden] = useState(true);
+  const [resultDataHidden, setResultDataHidden] = useState(true);
 
   //Results
   const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([
@@ -196,6 +197,8 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
     setSpinnerHidden(false);
     // hide export button
     setExportButtonHidden(true);
+    // hide result data
+    setResultDataHidden(true);
 
     // Reinitialize tables
     setCombinedEquipmentList([]);
@@ -284,6 +287,8 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
           setSpinnerHidden(true);
           // show export button
           setExportButtonHidden(false);
+          // show result data
+          setResultDataHidden(false);
         } else {
           toast.error(t(json.description));
         }
@@ -401,12 +406,14 @@ const CombinedEquipmentBatch = ({ setRedirect, setRedirectUrl, t }) => {
           </Form>
         </CardBody>
       </Card>
-      <DetailedDataTable
-        data={combinedEquipmentList}
-        title={t('Detailed Data')}
-        columns={detailedDataTableColumns}
-        pagesize={50}
-      />
+      <div style={{visibility: resultDataHidden ? 'hidden' : 'visible'}}>
+        <DetailedDataTable
+          data={combinedEquipmentList}
+          title={t('Detailed Data')}
+          columns={detailedDataTableColumns}
+          pagesize={50}
+        />
+      </div>
     </Fragment>
   );
 };

diff --git a/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js b/myems-web/src/components/MyEMS/CombinedEquipment/CombinedEquipmentCarbon.js
@@ -122,7 +122,7 @@ const CombinedEquipmentCarbon = ({ setRedirect, setRedirectUrl, t }) => {
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
   const [spinnerHidden, setSpinnerHidden] = useState(true);
   const [exportButtonHidden, setExportButtonHidden] = useState(true);
-
+  const [resultDataHidden, setResultDataHidden] = useState(true);
   //Results
   const [timeOfUseShareData, setTimeOfUseShareData] = useState([]);
   const [carbonShareData, setCarbonShareData] = useState([]);
@@ -432,6 +432,8 @@ const CombinedEquipmentCarbon = ({ setRedirect, setRedirectUrl, t }) => {
     setSpinnerHidden(false);
     // hide export button
     setExportButtonHidden(true);
+    // hide result data
+    setResultDataHidden(true);
 
     // Reinitialize tables
     setDetailedDataTableData([]);
@@ -909,6 +911,8 @@ const CombinedEquipmentCarbon = ({ setRedirect, setRedirectUrl, t }) => {
           setSpinnerHidden(true);
           // show export button
           setExportButtonHidden(false);
+          // show result data
+          setResultDataHidden(false);
         } else {
           toast.error(t(json.description));
         }
@@ -1097,97 +1101,99 @@ const CombinedEquipmentCarbon = ({ setRedirect, setRedirectUrl, t }) => {
           </Form>
         </CardBody>
       </Card>
-      <div className="card-deck">
-        {cardSummaryList.map(cardSummaryItem => (
-          <CardSummary
-            key={cardSummaryItem['name']}
-            rate={cardSummaryItem['increment_rate']}
-            title={t('Reporting Period Carbon Dioxide Emissions CATEGORY UNIT', {
-              CATEGORY: cardSummaryItem['name'],
-              UNIT: '(' + cardSummaryItem['unit'] + ')'
-            })}
-            color="success"
-          >
-            {cardSummaryItem['subtotal'] && (
-              <CountUp
-                end={cardSummaryItem['subtotal']}
-                duration={2}
-                prefix=""
-                separator=","
-                decimal="."
-                decimals={2}
-              />
-            )}
-          </CardSummary>
-        ))}
+      <div style={{visibility: resultDataHidden ? 'hidden' : 'visible'}}>
+        <div className="card-deck">
+          {cardSummaryList.map(cardSummaryItem => (
+            <CardSummary
+              key={cardSummaryItem['name']}
+              rate={cardSummaryItem['increment_rate']}
+              title={t('Reporting Period Carbon Dioxide Emissions CATEGORY UNIT', {
+                CATEGORY: cardSummaryItem['name'],
+                UNIT: '(' + cardSummaryItem['unit'] + ')'
+              })}
+              color="success"
+            >
+              {cardSummaryItem['subtotal'] && (
+                <CountUp
+                  end={cardSummaryItem['subtotal']}
+                  duration={2}
+                  prefix=""
+                  separator=","
+                  decimal="."
+                  decimals={2}
+                />
+              )}
+            </CardSummary>
+          ))}
+        </div>
+        <Row noGutters>
+          <Col className="mb-3 pr-lg-2 mb-3">
+            <SharePie data={timeOfUseShareData} title={t('Electricity Carbon Dioxide Emissions by Time-Of-Use')} />
+          </Col>
+          <Col className="mb-3 pr-lg-2 mb-3">
+            <SharePie data={carbonShareData} title={t('Carbon Dioxide Emissions by Energy Category')} />
+          </Col>
+        </Row>
+
+        <MultiTrendChart
+          reportingTitle={{
+            name: 'Reporting Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
+            substitute: ['CATEGORY', 'VALUE', 'UNIT'],
+            CATEGORY: combinedEquipmentBaseAndReportingNames,
+            VALUE: combinedEquipmentReportingSubtotals,
+            UNIT: combinedEquipmentBaseAndReportingUnits
+          }}
+          baseTitle={{
+            name: 'Base Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
+            substitute: ['CATEGORY', 'VALUE', 'UNIT'],
+            CATEGORY: combinedEquipmentBaseAndReportingNames,
+            VALUE: combinedEquipmentBaseSubtotals,
+            UNIT: combinedEquipmentBaseAndReportingUnits
+          }}
+          reportingTooltipTitle={{
+            name: 'Reporting Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
+            substitute: ['CATEGORY', 'VALUE', 'UNIT'],
+            CATEGORY: combinedEquipmentBaseAndReportingNames,
+            VALUE: null,
+            UNIT: combinedEquipmentBaseAndReportingUnits
+          }}
+          baseTooltipTitle={{
+            name: 'Base Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
+            substitute: ['CATEGORY', 'VALUE', 'UNIT'],
+            CATEGORY: combinedEquipmentBaseAndReportingNames,
+            VALUE: null,
+            UNIT: combinedEquipmentBaseAndReportingUnits
+          }}
+          reportingLabels={combinedEquipmentReportingLabels}
+          reportingData={combinedEquipmentReportingData}
+          baseLabels={combinedEquipmentBaseLabels}
+          baseData={combinedEquipmentBaseData}
+          rates={combinedEquipmentReportingRates}
+          options={combinedEquipmentReportingOptions}
+        />
+
+        <MultipleLineChart
+          reportingTitle={t('Operating Characteristic Curve')}
+          baseTitle=""
+          labels={parameterLineChartLabels}
+          data={parameterLineChartData}
+          options={parameterLineChartOptions}
+        />
+
+        <br />
+        <DetailedDataTable
+          data={detailedDataTableData}
+          title={t('Detailed Data')}
+          columns={detailedDataTableColumns}
+          pagesize={50}
+        />
+        <br />
+        <AssociatedEquipmentTable
+          data={associatedEquipmentTableData}
+          title={t('Associated Equipment Data')}
+          columns={associatedEquipmentTableColumns}
+        />
       </div>
-      <Row noGutters>
-        <Col className="mb-3 pr-lg-2 mb-3">
-          <SharePie data={timeOfUseShareData} title={t('Electricity Carbon Dioxide Emissions by Time-Of-Use')} />
-        </Col>
-        <Col className="mb-3 pr-lg-2 mb-3">
-          <SharePie data={carbonShareData} title={t('Carbon Dioxide Emissions by Energy Category')} />
-        </Col>
-      </Row>
-
-      <MultiTrendChart
-        reportingTitle={{
-          name: 'Reporting Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
-          substitute: ['CATEGORY', 'VALUE', 'UNIT'],
-          CATEGORY: combinedEquipmentBaseAndReportingNames,
-          VALUE: combinedEquipmentReportingSubtotals,
-          UNIT: combinedEquipmentBaseAndReportingUnits
-        }}
-        baseTitle={{
-          name: 'Base Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
-          substitute: ['CATEGORY', 'VALUE', 'UNIT'],
-          CATEGORY: combinedEquipmentBaseAndReportingNames,
-          VALUE: combinedEquipmentBaseSubtotals,
-          UNIT: combinedEquipmentBaseAndReportingUnits
-        }}
-        reportingTooltipTitle={{
-          name: 'Reporting Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
-          substitute: ['CATEGORY', 'VALUE', 'UNIT'],
-          CATEGORY: combinedEquipmentBaseAndReportingNames,
-          VALUE: null,
-          UNIT: combinedEquipmentBaseAndReportingUnits
-        }}
-        baseTooltipTitle={{
-          name: 'Base Period Carbon Dioxide Emissions CATEGORY VALUE UNIT',
-          substitute: ['CATEGORY', 'VALUE', 'UNIT'],
-          CATEGORY: combinedEquipmentBaseAndReportingNames,
-          VALUE: null,
-          UNIT: combinedEquipmentBaseAndReportingUnits
-        }}
-        reportingLabels={combinedEquipmentReportingLabels}
-        reportingData={combinedEquipmentReportingData}
-        baseLabels={combinedEquipmentBaseLabels}
-        baseData={combinedEquipmentBaseData}
-        rates={combinedEquipmentReportingRates}
-        options={combinedEquipmentReportingOptions}
-      />
-
-      <MultipleLineChart
-        reportingTitle={t('Operating Characteristic Curve')}
-        baseTitle=""
-        labels={parameterLineChartLabels}
-        data={parameterLineChartData}
-        options={parameterLineChartOptions}
-      />
-
-      <br />
-      <DetailedDataTable
-        data={detailedDataTableData}
-        title={t('Detailed Data')}
-        columns={detailedDataTableColumns}
-        pagesize={50}
-      />
-      <br />
-      <AssociatedEquipmentTable
-        data={associatedEquipmentTableData}
-        title={t('Associated Equipment Data')}
-        columns={associatedEquipmentTableColumns}
-      />
     </Fragment>
   );
 };