Merge branch 'develop'

web/src/components/MyEMS/Meter/MeterBatch.js

@@ -297,7 +297,7 @@ const MeterBatch = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Meter/MeterCarbon.js

@@ -533,8 +533,7 @@ const MeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}
+                <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}

web/src/components/MyEMS/Meter/MeterCost.js

@@ -533,8 +533,7 @@ const MeterCost = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}

web/src/components/MyEMS/Meter/MeterEnergy.js

@@ -30,7 +30,7 @@ import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
 import { DateRangePicker } from 'rsuite';
-import { startOfDay, endOfDay, addDays, subDays } from 'date-fns';
+import { endOfDay} from 'date-fns';
 
 
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
@@ -542,9 +542,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period')}{t('(Optional)')}
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}
@@ -561,7 +559,7 @@ const MeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Meter/MeterSubmetersBalance.js

@@ -466,7 +466,7 @@ const MeterSubmetersBalance = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Meter/MeterTracking.js

@@ -351,7 +351,7 @@ const MeterTracking = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Meter/MeterTrend.js

@@ -430,7 +430,7 @@ const MeterTrend = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Meter/OfflineMeterCost.js

@@ -509,8 +509,7 @@ const OfflineMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}

web/src/components/MyEMS/Meter/OfflineMeterEnergy.js

@@ -510,9 +510,7 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period')}{t('(Optional)')}
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}
@@ -529,7 +527,7 @@ const OfflineMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Meter/VirtualMeterCarbon.js

@@ -508,8 +508,7 @@ const VirtualMeterCarbon = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}

web/src/components/MyEMS/Meter/VirtualMeterCost.js

@@ -509,8 +509,7 @@ const VirtualMeterCost = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}

web/src/components/MyEMS/Meter/VirtualMeterEnergy.js

@@ -509,9 +509,7 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period')}{t('(Optional)')}
-                  </Label>
                   <DateRangePicker 
                     id='basePeriodDateRangePicker'
                     readOnly={basePeriodDateRangePickerDisabled}
@@ -528,7 +526,7 @@ const VirtualMeterEnergy = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses}>{t('Reporting Period')}</Label>
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
                   <br/>
                   <DateRangePicker
                     id='reportingPeriodDateRangePicker'

web/src/components/MyEMS/Space/SpaceCost.js

@@ -16,22 +16,23 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
+import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
 import CardSummary from '../common/CardSummary';
 import LineChart from '../common/LineChart';
 import SharePie from '../common/SharePie';
-import loadable from '@loadable/component';
 import { getCookieValue, createCookie } from '../../../helpers/utils';
 import withRedirect from '../../../hoc/withRedirect';
 import { withTranslation } from 'react-i18next';
 import { toast } from 'react-toastify';
 import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
+import uuid from 'uuid/v1';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-import uuid from 'uuid/v1';
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable'));
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
@@ -57,18 +58,32 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
     }
   });
   // State
-
+  // Query Parameters
   const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -146,67 +161,61 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -215,10 +224,10 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -235,10 +244,10 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spacecost?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -611,52 +620,36 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">
@@ -737,6 +730,7 @@ const SpaceCost = ({ setRedirect, setRedirectUrl, t }) => {
         data={parameterLineChartData}
         options={parameterLineChartOptions}>
       </LineChart>
+
       <DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
       </DetailedDataTable>
       <br />

web/src/components/MyEMS/Space/SpaceEfficiency.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
 
@@ -60,13 +60,27 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -131,72 +145,65 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
     setSelectedSpaceID(value[value.length - 1]);
   }
 
-
   let onComparisonTypeChange = ({ target }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -205,10 +212,10 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
         
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -224,10 +231,10 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spaceefficiency?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -447,52 +454,36 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">

web/src/components/MyEMS/Space/SpaceEnergyCategory.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -26,17 +25,18 @@ import SharePie from '../common/SharePie';
 import { getCookieValue, createCookie } from '../../../helpers/utils';
 import withRedirect from '../../../hoc/withRedirect';
 import { withTranslation } from 'react-i18next';
-import { periodTypeOptions } from '../common/PeriodTypeOptions';
-import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
 import { toast } from 'react-toastify';
 import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import uuid from 'uuid/v1';
+import { periodTypeOptions } from '../common/PeriodTypeOptions';
+import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable'));
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
 
-
 const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
   let current_moment = moment();
   useEffect(() => {
@@ -65,13 +65,27 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -115,7 +129,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
       body: null,
 
     }).then(response => {
-      console.log(response)
+      console.log(response);
       if (response.ok) {
         isResponseOK = true;
         // enable submit button
@@ -123,15 +137,15 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
       }
       return response.json();
     }).then(json => {
-      console.log(json)
+      console.log(json);
       if (isResponseOK) {
         // rename keys 
         json = JSON.parse(JSON.stringify([json]).split('"id":').join('"value":').split('"name":').join('"label":'));
         setCascaderOptions(json);
-        setSelectedSpaceName([json[0]].map(o => o.label))
+        setSelectedSpaceName([json[0]].map(o => o.label));
         setSelectedSpaceID([json[0]].map(o => o.value));
       } else {
-        toast.error(json.description)
+        toast.error(json.description);
       }
     }).catch(err => {
       console.log(err);
@@ -143,7 +157,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
   
   let onSpaceCascaderChange = (value, selectedOptions) => {
     console.log(value, selectedOptions);
-    setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'))
+    setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
     setSelectedSpaceID(value[value.length - 1]);
   }
 
@@ -151,68 +165,61 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-  
 
   // Handler
   const handleSubmit = e => {
@@ -221,10 +228,10 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -241,10 +248,10 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spaceenergycategory?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -371,7 +378,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
           timestamps['a' + index] = currentValue;
         });
         setSpaceLineChartLabels(timestamps);
-        
+
         let values = {}
         json['reporting_period']['values'].forEach((currentValue, index) => {
           values['a' + index] = currentValue;
@@ -384,7 +391,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
           names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
         });
         setSpaceLineChartOptions(names);
-       
+
         timestamps = {}
         json['parameters']['timestamps'].forEach((currentValue, index) => {
           timestamps['a' + index] = currentValue;
@@ -406,7 +413,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
           names.push({ 'value': 'a' + index, 'label': currentValue });
         });
         setParameterLineChartOptions(names);
-        
+
         let detailed_value_list = [];
         if (json['reporting_period']['timestamps'].length > 0) {
           json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
@@ -499,8 +506,7 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
         setSpinnerHidden(true);
         // show export button
         setExportButtonHidden(false)
-      
+
-        
       } else {
         toast.error(json.description)
       }
@@ -585,52 +591,36 @@ const SpaceEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">

web/src/components/MyEMS/Space/SpaceEnergyItem.js

@@ -16,13 +16,12 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
+import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
 import CardSummary from '../common/CardSummary';
-import SharePie from '../common/SharePie';
 import LineChart from '../common/LineChart';
-import loadable from '@loadable/component';
+import SharePie from '../common/SharePie';
 import { getCookieValue, createCookie } from '../../../helpers/utils';
 import withRedirect from '../../../hoc/withRedirect';
 import { withTranslation } from 'react-i18next';
@@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable'));
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
@@ -62,13 +62,27 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -128,6 +142,7 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
     });
 
   }, []);
+
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
 
   let onSpaceCascaderChange = (value, selectedOptions) => {
@@ -141,67 +156,61 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -210,10 +219,10 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -230,10 +239,10 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spaceenergyitem?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -518,52 +527,36 @@ const SpaceEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">

web/src/components/MyEMS/Space/SpaceIncome.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable'));
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
@@ -62,13 +62,27 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -129,81 +143,74 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
     });
 
   }, []);
+
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
   
-
   let onSpaceCascaderChange = (value, selectedOptions) => {
     console.log(value, selectedOptions);
     setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
     setSelectedSpaceID(value[value.length - 1]);
   }
 
-
   let onComparisonTypeChange = ({ target }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -212,10 +219,10 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -232,10 +239,10 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spaceincome?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -535,52 +542,36 @@ const SpaceIncome = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">

web/src/components/MyEMS/Space/SpaceLoad.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -30,6 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
 
@@ -60,13 +61,27 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -122,81 +137,74 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
     });
 
   }, []);
+
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
   
-
   let onSpaceCascaderChange = (value, selectedOptions) => {
     console.log(value, selectedOptions);
     setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
     setSelectedSpaceID(value[value.length - 1]);
   }
 
-
   let onComparisonTypeChange = ({ target }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -205,10 +213,10 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -216,7 +224,7 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
     setSpinnerHidden(false);
     // hide export button
     setExportButtonHidden(true)
-    
+
     // Reinitialize tables
     setDetailedDataTableData([]);
 
@@ -224,10 +232,10 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spaceload?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -267,7 +275,7 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
           timestamps['a' + index] = currentValue;
         });
         setSpaceLineChartLabels(timestamps);
-        
+
         let values = {}
         json['reporting_period']['sub_maximums'].forEach((currentValue, index) => {
           values['a' + index] = currentValue;
@@ -457,52 +465,36 @@ const SpaceLoad = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">

web/src/components/MyEMS/Space/SpaceOutput.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable'));
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
@@ -55,18 +55,35 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('token', token, 1000 * 60 * 60 * 8);
     }
   });
+
+
   // State
+  // Query Parameters
   const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -88,8 +105,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
   
   const [childSpacesTableData, setChildSpacesTableData] = useState([]);
   const [childSpacesTableColumns, setChildSpacesTableColumns] = useState([{dataField: 'name', text: t('Child Spaces'), sort: true }]);
-  const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);  
+  const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
-
 
   useEffect(() => {
     let isResponseOK = false;
@@ -126,7 +142,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
     });
 
   }, []);
-  
+
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
   
   let onSpaceCascaderChange = (value, selectedOptions) => {
@@ -135,72 +151,65 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
     setSelectedSpaceID(value[value.length - 1]);
   }
 
-
   let onComparisonTypeChange = ({ target }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -209,10 +218,10 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -229,10 +238,10 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spaceoutput?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -266,7 +275,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
           timestamps['a' + index] = currentValue;
         });
         setSpaceLineChartLabels(timestamps);
-        
+
         let values = {}
         json['reporting_period']['values'].forEach((currentValue, index) => {
           values['a' + index] = currentValue;
@@ -279,7 +288,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
           names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
         });
         setSpaceLineChartOptions(names);
-       
+
         timestamps = {}
         json['parameters']['timestamps'].forEach((currentValue, index) => {
           timestamps['a' + index] = currentValue;
@@ -301,7 +310,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
           names.push({ 'value': 'a' + index, 'label': currentValue });
         });
         setParameterLineChartOptions(names);
-      
+
         let detailed_value_list = [];
         if (json['reporting_period']['timestamps'].length > 0) {
           json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
@@ -346,7 +355,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
           })
         });
         setDetailedDataTableColumns(detailed_column_list);
-        
+
         let child_space_value_list = [];
         if (json['child_space']['child_space_names_array'].length > 0) {
           json['child_space']['child_space_names_array'][0].forEach((currentSpaceName, spaceIndex) => {
@@ -385,7 +394,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
         });
 
         setChildSpacesTableColumns(child_space_column_list);
-        
+
         setExcelBytesBase64(json['excel_bytes_base64']);
       
         // enable submit button
@@ -394,7 +403,7 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
         setSpinnerHidden(true);
         // show export button
         setExportButtonHidden(false)
-      
+
       } else {
         toast.error(json.description)
       }
@@ -419,7 +428,6 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
             document.body.removeChild(link);
         });
   };
-  
 
   return (
     <Fragment>
@@ -480,52 +488,36 @@ const SpaceOutput = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">

web/src/components/MyEMS/Space/SpaceSaving.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -31,12 +30,12 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable'));
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
 
-
 const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
   let current_moment = moment();
   useEffect(() => {
@@ -63,13 +62,27 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -142,72 +155,65 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
     setSelectedSpaceID(value[value.length - 1]);
   }
 
-
   let onComparisonTypeChange = ({ target }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -216,10 +222,10 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -236,10 +242,10 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spacesaving?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -255,7 +261,8 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
       return response.json();
     }).then(json => {
       if (isResponseOK) {
-        console.log(json)
+        console.log(json);
+
         let cardSummaryArray = []
         json['reporting_period']['names'].forEach((currentValue, index) => {
           let cardSummaryItem = {}
@@ -426,7 +433,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
         });
 
         setChildSpacesTableColumns(child_space_column_list);
-        
+
         setExcelBytesBase64(json['excel_bytes_base64']);
       
         // enable submit button
@@ -435,7 +442,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
         setSpinnerHidden(true);
         // show export button
         setExportButtonHidden(false)
-        
+
       } else {
         toast.error(json.description)
       }
@@ -460,8 +467,6 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
             document.body.removeChild(link);
         });
   };
-  
-
 
   return (
     <Fragment>
@@ -522,52 +527,36 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">
@@ -649,6 +638,7 @@ const SpaceSaving = ({ setRedirect, setRedirectUrl, t }) => {
         data={parameterLineChartData}
         options={parameterLineChartOptions}>
       </LineChart>
+
       <DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
       </DetailedDataTable>
       <br />

web/src/components/MyEMS/Space/SpaceStatistics.js

@@ -16,7 +16,6 @@ import {
   Spinner
 } from 'reactstrap';
 import CountUp from 'react-countup';
-import Datetime from 'react-datetime';
 import moment from 'moment';
 import loadable from '@loadable/component';
 import Cascader from 'rc-cascader';
@@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
 import { APIBaseURL } from '../../../config';
 import { periodTypeOptions } from '../common/PeriodTypeOptions';
 import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
-
+import { DateRangePicker } from 'rsuite';
+import { endOfDay} from 'date-fns';
 
 const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
 
@@ -55,19 +55,35 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
       createCookie('token', token, 1000 * 60 * 60 * 8);
     }
   });
+
+
   // State
   // Query Parameters
   const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
   const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
   const [comparisonType, setComparisonType] = useState('month-on-month');
   const [periodType, setPeriodType] = useState('daily');
-  const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
-  const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
-  const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
-  const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
-  const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
-  const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
   const [cascaderOptions, setCascaderOptions] = useState(undefined);
+  const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
+  const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
+  const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
+  const dateRangePickerLocale = {
+    sunday: t('sunday'),
+    monday: t('monday'),
+    tuesday: t('tuesday'),
+    wednesday: t('wednesday'),
+    thursday: t('thursday'),
+    friday: t('friday'),
+    saturday: t('saturday'),
+    ok: t('ok'),
+    today: t('today'),
+    yesterday: t('yesterday'),
+    hours: t('hours'),
+    minutes: t('minutes'),
+    seconds: t('seconds'),
+    last7Days: t('last7Days')
+  };
+  const dateRangePickerStyle = { display: 'block', zIndex: 10};
   
   // buttons
   const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
@@ -123,81 +139,74 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
     });
 
   }, []);
+
   const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
   
-
   let onSpaceCascaderChange = (value, selectedOptions) => {
     console.log(value, selectedOptions);
     setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
     setSelectedSpaceID(value[value.length - 1]);
   }
 
-
   let onComparisonTypeChange = ({ target }) => {
     console.log(target.value);
     setComparisonType(target.value);
     if (target.value === 'year-over-year') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
     } else if (target.value === 'month-on-month') {
-      setBasePeriodBeginsDatetimeDisabled(true);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
+      setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
-      setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
+        moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
-      setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
     } else if (target.value === 'free-comparison') {
-      setBasePeriodBeginsDatetimeDisabled(false);
+      setBasePeriodDateRangePickerDisabled(false);
-      setBasePeriodEndsDatetimeDisabled(false);
     } else if (target.value === 'none-comparison') {
-      setBasePeriodBeginsDatetime(undefined);
+      setBasePeriodDateRange([null, null]);
-      setBasePeriodEndsDatetime(undefined);
+      setBasePeriodDateRangePickerDisabled(true);
-      setBasePeriodBeginsDatetimeDisabled(true);
-      setBasePeriodEndsDatetimeDisabled(true);
     }
-  }
+  };
 
-  let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setBasePeriodBeginsDatetime(newDateTime);
+  let onBasePeriodChange = (DateRange) => {
-  }
+    if(DateRange == null) {
-
+      setBasePeriodDateRange([null, null]);
-  let onBasePeriodEndsDatetimeChange = (newDateTime) => {
+    } else {
-    setBasePeriodEndsDatetime(newDateTime);
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
-  }
+        // if the user did not change time value, set the default time to the end of day
-
+        DateRange[1] = endOfDay(DateRange[1]);
-  let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
+      }
-    setReportingPeriodBeginsDatetime(newDateTime);
+      setBasePeriodDateRange([DateRange[0], DateRange[1]]);
-    if (comparisonType === 'year-over-year') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
-    } else if (comparisonType === 'month-on-month') {
-      setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
     }
-  }
+  };
 
-  let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
+  // Callback fired when value changed
-    setReportingPeriodEndsDatetime(newDateTime);
+  let onReportingPeriodChange = (DateRange) => {
-    if (comparisonType === 'year-over-year') {
+    if(DateRange == null) {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
+      setReportingPeriodDateRange([null, null]);
-    } else if (comparisonType === 'month-on-month') {
+    } else {
-      setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
+      if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
+        // if the user did not change time value, set the default time to the end of day
+        DateRange[1] = endOfDay(DateRange[1]);
+      }
+      setReportingPeriodDateRange([DateRange[0], DateRange[1]]);
+      if (comparisonType === 'year-over-year') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'years').toDate(), moment(DateRange[1]).clone().subtract(1, 'years').toDate()]);
+      } else if (comparisonType === 'month-on-month') {
+        setBasePeriodDateRange([moment(DateRange[0]).clone().subtract(1, 'months').toDate(), moment(DateRange[1]).clone().subtract(1, 'months').toDate()]);
+      }
     }
-  }
+  };
 
-  var getValidBasePeriodBeginsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onBasePeriodClean = event => {
-  }
+    setBasePeriodDateRange([null, null]);
+  };
 
-  var getValidBasePeriodEndsDatetimes = function (currentDate) {
+  // Callback fired when value clean
-    return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
+  let onReportingPeriodClean = event => {
-  }
+    setReportingPeriodDateRange([null, null]);
-
+  };
-  var getValidReportingPeriodBeginsDatetimes = function (currentDate) {
-    return currentDate.isBefore(moment(reportingPeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
-
-  var getValidReportingPeriodEndsDatetimes = function (currentDate) {
-    return currentDate.isAfter(moment(reportingPeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
-  }
 
   // Handler
   const handleSubmit = e => {
@@ -206,10 +215,10 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
     console.log(selectedSpaceID);
     console.log(comparisonType);
     console.log(periodType);
-    console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
+    console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
-    console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
-    console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
+    console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
     
     // disable submit button
     setSubmitButtonDisabled(true);
@@ -217,7 +226,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
     setSpinnerHidden(false);
     // hide export button
     setExportButtonHidden(true)
-    
+
     // Reinitialize tables
     setDetailedDataTableData([]);
 
@@ -225,10 +234,10 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
     fetch(APIBaseURL + '/reports/spacestatistics?' +
       'spaceid=' + selectedSpaceID +
       '&periodtype=' + periodType +
-      '&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
+      '&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
-      '&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
+      '&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
-      '&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
+      '&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
       method: 'GET',
       headers: {
         "Content-type": "application/json",
@@ -244,7 +253,8 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
       return response.json();
     }).then(json => {
       if (isResponseOK) {
-        console.log(json)
+        console.log(json);
+
         let cardSummaryArray = []
         json['reporting_period']['names'].forEach((currentValue, index) => {
           let cardSummaryItem = {}
@@ -277,7 +287,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
           timestamps['a' + index] = currentValue;
         });
         setSpaceLineChartLabels(timestamps);
-        
+
         let values = {}
         json['reporting_period']['values'].forEach((currentValue, index) => {
           values['a' + index] = currentValue;
@@ -290,7 +300,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
           names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
         });
         setSpaceLineChartOptions(names);
-      
+
         timestamps = {}
         json['parameters']['timestamps'].forEach((currentValue, index) => {
           timestamps['a' + index] = currentValue;
@@ -312,7 +322,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
           names.push({ 'value': 'a' + index, 'label': currentValue });
         });
         setParameterLineChartOptions(names);
-      
+
         let detailed_value_list = [];
         if (json['reporting_period']['timestamps'].length > 0) {
           json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
@@ -453,52 +463,36 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodBeginsDatetime">
+                  <Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
-                    {t('Base Period Begins')}{t('(Optional)')}
+                  <DateRangePicker 
-                  </Label>
+                    id='basePeriodDateRangePicker'
-                  <Datetime id='basePeriodBeginsDatetime'
+                    readOnly={basePeriodDateRangePickerDisabled}
-                    value={basePeriodBeginsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
+                    value={basePeriodDateRange}
-                    onChange={onBasePeriodBeginsDatetimeChange}
+                    onChange={onBasePeriodChange}
-                    isValidDate={getValidBasePeriodBeginsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
+                    onClean={onBasePeriodClean}
+                    locale={dateRangePickerLocale}
+                    placeholder={t("Select Date Range")}
+                   />
                 </FormGroup>
               </Col>
               <Col xs={6} sm={3}>
                 <FormGroup className="form-group">
-                  <Label className={labelClasses} for="basePeriodEndsDatetime">
+                  <Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
-                    {t('Base Period Ends')}{t('(Optional)')}
+                  <br/>
-                  </Label>
+                  <DateRangePicker
-                  <Datetime id='basePeriodEndsDatetime'
+                    id='reportingPeriodDateRangePicker'
-                    value={basePeriodEndsDatetime}
+                    format="yyyy-MM-dd HH:mm:ss"
-                    inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
+                    value={reportingPeriodDateRange}
-                    onChange={onBasePeriodEndsDatetimeChange}
+                    onChange={onReportingPeriodChange}
-                    isValidDate={getValidBasePeriodEndsDatetimes}
+                    size="md"
-                    closeOnSelect={true} />
+                    style={dateRangePickerStyle}
-                </FormGroup>
+                    onClean={onReportingPeriodClean}
-              </Col>
+                    locale={dateRangePickerLocale}
-              <Col xs={6} sm={3}>
+                    placeholder={t("Select Date Range")}
-                <FormGroup className="form-group">
+                  />
-                  <Label className={labelClasses} for="reportingPeriodBeginsDatetime">
-                    {t('Reporting Period Begins')}
-                  </Label>
-                  <Datetime id='reportingPeriodBeginsDatetime'
-                    value={reportingPeriodBeginsDatetime}
-                    onChange={onReportingPeriodBeginsDatetimeChange}
-                    isValidDate={getValidReportingPeriodBeginsDatetimes}
-                    closeOnSelect={true} />
-                </FormGroup>
-              </Col>
-              <Col xs={6} sm={3}>
-                <FormGroup className="form-group">
-                  <Label className={labelClasses} for="reportingPeriodEndsDatetime">
-                    {t('Reporting Period Ends')}
-                  </Label>
-                  <Datetime id='reportingPeriodEndsDatetime'
-                    value={reportingPeriodEndsDatetime}
-                    onChange={onReportingPeriodEndsDatetimeChange}
-                    isValidDate={getValidReportingPeriodEndsDatetimes}
-                    closeOnSelect={true} />
                 </FormGroup>
               </Col>
               <Col xs="auto">
@@ -598,6 +592,7 @@ const SpaceStatistics = ({ setRedirect, setRedirectUrl, t }) => {
         data={parameterLineChartData}
         options={parameterLineChartOptions}>
       </LineChart>
+
       <DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
       </DetailedDataTable>
       <br />