From 5ac1889af05989015774055d57dc12738968681e Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Fri, 18 Feb 2022 20:01:12 +0800
Subject: [PATCH] added rsuite/DateRangePicker to MeterEnergy

---
 web/src/App.js                                |  2 +
 web/src/components/MyEMS/Meter/MeterEnergy.js | 56 +++++++------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/web/src/App.js b/web/src/App.js
index 96fca6da..a96c6bf9 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -2,10 +2,12 @@ import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import Layout from './layouts/Layout';
 
+import 'rsuite/dist/rsuite.min.css';
 import 'react-toastify/dist/ReactToastify.min.css';
 import 'react-datetime/css/react-datetime.css';
 import 'react-image-lightbox/style.css';
 
+
 const App = () => {
   return (
     <Router basename={process.env.PUBLIC_URL}>
diff --git a/web/src/components/MyEMS/Meter/MeterEnergy.js b/web/src/components/MyEMS/Meter/MeterEnergy.js
index 13fb6e7b..c3f30f24 100644
--- a/web/src/components/MyEMS/Meter/MeterEnergy.js
+++ b/web/src/components/MyEMS/Meter/MeterEnergy.js
@@ -31,8 +31,7 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-import DateTimeRangeContainer from 'react-advanced-datetimerange-picker';
-import { FormControl } from 'react-bootstrap';
+import { DateRangePicker } from 'rsuite';
 
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
 const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
@@ -104,18 +103,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
   ]);
   const [detailedDataTableData, setDetailedDataTableData] = useState([]);
   const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
-  const [local, setLocal] = useState({
-    format: 'MM/DD/YYYY HH:mm:ss A',
-    sundayFirst: false
-  });
-  const [ranges, setRanges] = useState({
-    'Today Only': [moment(reportingPeriodEndsDatetime).subtract('1','days'), moment(reportingPeriodEndsDatetime)],
-    'Yesterday Only': [
-      moment().subtract(2, 'days'),
-      moment().subtract(1, 'days')
-    ],
-    'Last 3 Days': [moment().subtract(3, 'days'), moment()],
-  });
+  const [values, setValues] = useState([reportingPeriodBeginsDatetime.toDate(), reportingPeriodEndsDatetime.toDate()]);
 
   useEffect(() => {
     let isResponseOK = false;
@@ -303,7 +291,10 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
     setBasePeriodEndsDatetime(newDateTime);
   };
 
-  let applyCallback = (startDate, endDate) => {
+  let onChange = (DateRange) => {
+    let startDate = moment(DateRange[0]);
+    let endDate = moment(DateRange[1]);
+    setValues([DateRange[0], DateRange[1]]);
     setReportingPeriodBeginsDatetime(startDate);
     if (comparisonType === 'year-over-year') {
       setBasePeriodBeginsDatetime(startDate.clone().subtract(1, 'years'));
@@ -318,6 +309,10 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
     }
   };
 
+  let onClean = event => {
+    setValues([]);
+  };
+
   var getValidBasePeriodBeginsDatetimes = function(currentDate) {
     return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
   };
@@ -622,26 +617,17 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>
-                    {t('Reporting Period')}
-                  </Label>
-                  <DateTimeRangeContainer
-                    start={reportingPeriodBeginsDatetime}
-                    end={reportingPeriodEndsDatetime}
-                    local={local}
-                    twelveHoursClock={true}
-                    applyCallback={applyCallback}
-                    ranges={ranges}
-                  >
-                    <FormControl
-                      id="formControlsTextA"
-                      type="text"
-                      label="Text"
-                      value={reportingPeriodBeginsDatetime.format('DD/MM/YYYY HH:mm:ss A')  + " ~ " +
-                        reportingPeriodEndsDatetime.format('DD/MM/YYYY HH:mm:ss A')
-                      }
-                    />
-                  </DateTimeRangeContainer>
+                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <br/>
+                  <DateRangePicker
+                    format="MM/dd/yyyy hh:mm:ss aa"
+                    value={values}
+                    size="sm"
+                    onChange={onChange}
+                    showMeridian
+                    placeholder="Select Date Range"
+                    onClean={onClean}
+                  />
                 </FormGroup>
               </Col>
               <Col xs="auto">