replaced DateTime with DateRangePicker for Store reports in Web UI
13621160019@163.com
parent
b9451abfec
commit
520efe9ba7
|
|
@ -12,9 +12,8 @@ import {
|
||||||
FormGroup,
|
FormGroup,
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import loadable from '@loadable/component';
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
|
|
@ -25,6 +24,8 @@ import { toast } from 'react-toastify';
|
||||||
import ButtonIcon from '../../common/ButtonIcon';
|
import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
|
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
@ -49,14 +50,33 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
|
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
|
||||||
const [storeList, setStoreList] = useState([]);
|
const [storeList, setStoreList] = useState([]);
|
||||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
|
||||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
|
||||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||||
|
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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(false);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(false);
|
||||||
|
|
@ -115,29 +135,32 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
setExportButtonHidden(true);
|
setExportButtonHidden(true);
|
||||||
setSubmitButtonDisabled(false);
|
setSubmitButtonDisabled(false);
|
||||||
}
|
}
|
||||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
// Callback fired when value changed
|
||||||
setReportingPeriodBeginsDatetime(newDateTime);
|
let onReportingPeriodChange = (DateRange) => {
|
||||||
}
|
if(DateRange == null) {
|
||||||
|
setReportingPeriodDateRange([null, null]);
|
||||||
|
} else {
|
||||||
|
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]]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
// Callback fired when value clean
|
||||||
setReportingPeriodEndsDatetime(newDateTime);
|
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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
console.log('handleSubmit');
|
console.log('handleSubmit');
|
||||||
console.log(selectedSpaceID);
|
console.log(selectedSpaceID);
|
||||||
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -152,8 +175,8 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
let isResponseOK = false;
|
let isResponseOK = false;
|
||||||
fetch(APIBaseURL + '/reports/storebatch?' +
|
fetch(APIBaseURL + '/reports/storebatch?' +
|
||||||
'spaceid=' + selectedSpaceID +
|
'spaceid=' + selectedSpaceID +
|
||||||
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -279,26 +302,19 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
|
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<FormGroup className="form-group">
|
||||||
<Label className={labelClasses} for="reportingPeriodBeginsDatetime">
|
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||||
{t('Reporting Period Begins')}
|
<br/>
|
||||||
</Label>
|
<DateRangePicker
|
||||||
<Datetime id='reportingPeriodBeginsDatetime'
|
id='reportingPeriodDateRangePicker'
|
||||||
value={reportingPeriodBeginsDatetime}
|
format="yyyy-MM-dd HH:mm:ss"
|
||||||
onChange={onReportingPeriodBeginsDatetimeChange}
|
value={reportingPeriodDateRange}
|
||||||
isValidDate={getValidReportingPeriodBeginsDatetimes}
|
onChange={onReportingPeriodChange}
|
||||||
closeOnSelect={true} />
|
size="md"
|
||||||
</FormGroup>
|
style={dateRangePickerStyle}
|
||||||
</Col>
|
onClean={onReportingPeriodClean}
|
||||||
<Col xs={6} sm={3}>
|
locale={dateRangePickerLocale}
|
||||||
<FormGroup className="form-group">
|
placeholder={t("Select Date Range")}
|
||||||
<Label className={labelClasses} for="reportingPeriodEndsDatetime">
|
/>
|
||||||
{t('Reporting Period Ends')}
|
|
||||||
</Label>
|
|
||||||
<Datetime id='reportingPeriodEndsDatetime'
|
|
||||||
value={reportingPeriodEndsDatetime}
|
|
||||||
onChange={onReportingPeriodEndsDatetimeChange}
|
|
||||||
isValidDate={getValidReportingPeriodEndsDatetimes}
|
|
||||||
closeOnSelect={true} />
|
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,15 @@ import {
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import CountUp from 'react-countup';
|
import CountUp from 'react-countup';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
import CardSummary from '../common/CardSummary';
|
import CardSummary from '../common/CardSummary';
|
||||||
import LineChart from '../common/LineChart';
|
import LineChart from '../common/LineChart';
|
||||||
import SharePie from '../common/SharePie';
|
import SharePie from '../common/SharePie';
|
||||||
import loadable from '@loadable/component';
|
|
||||||
import { getCookieValue, createCookie } from '../../../helpers/utils';
|
import { getCookieValue, createCookie } from '../../../helpers/utils';
|
||||||
import withRedirect from '../../../hoc/withRedirect';
|
import withRedirect from '../../../hoc/withRedirect';
|
||||||
import { withTranslation } from 'react-i18next';
|
import { withTranslation } from 'react-i18next';
|
||||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
@ -55,6 +55,8 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
|
|
@ -63,13 +65,27 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
const [selectedStore, setSelectedStore] = useState(undefined);
|
const [selectedStore, setSelectedStore] = useState(undefined);
|
||||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||||
const [periodType, setPeriodType] = useState('daily');
|
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 [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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||||
|
|
@ -212,67 +228,61 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(target.value);
|
console.log(target.value);
|
||||||
setComparisonType(target.value);
|
setComparisonType(target.value);
|
||||||
if (target.value === 'year-over-year') {
|
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') {
|
} 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') {
|
} else if (target.value === 'free-comparison') {
|
||||||
setBasePeriodBeginsDatetimeDisabled(false);
|
setBasePeriodDateRangePickerDisabled(false);
|
||||||
setBasePeriodEndsDatetimeDisabled(false);
|
|
||||||
} else if (target.value === 'none-comparison') {
|
} 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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
|
|
@ -282,10 +292,10 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(selectedStore);
|
console.log(selectedStore);
|
||||||
console.log(comparisonType);
|
console.log(comparisonType);
|
||||||
console.log(periodType);
|
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -301,10 +311,10 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
fetch(APIBaseURL + '/reports/storecost?' +
|
fetch(APIBaseURL + '/reports/storecost?' +
|
||||||
'storeid=' + selectedStore +
|
'storeid=' + selectedStore +
|
||||||
'&periodtype=' + periodType +
|
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -506,7 +516,6 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
console.log(err);
|
console.log(err);
|
||||||
});
|
});
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleExport = e => {
|
const handleExport = e => {
|
||||||
|
|
@ -601,52 +610,36 @@ const StoreCost = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,9 @@ import {
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import CountUp from 'react-countup';
|
import CountUp from 'react-countup';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import loadable from '@loadable/component';
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
|
|
@ -31,11 +30,11 @@ import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
||||||
const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
let current_moment = moment();
|
let current_moment = moment();
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
@ -56,6 +55,8 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
|
|
@ -64,13 +65,27 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
const [selectedStore, setSelectedStore] = useState(undefined);
|
const [selectedStore, setSelectedStore] = useState(undefined);
|
||||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||||
const [periodType, setPeriodType] = useState('daily');
|
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 [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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||||
|
|
@ -216,67 +231,61 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(target.value);
|
console.log(target.value);
|
||||||
setComparisonType(target.value);
|
setComparisonType(target.value);
|
||||||
if (target.value === 'year-over-year') {
|
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') {
|
} 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') {
|
} else if (target.value === 'free-comparison') {
|
||||||
setBasePeriodBeginsDatetimeDisabled(false);
|
setBasePeriodDateRangePickerDisabled(false);
|
||||||
setBasePeriodEndsDatetimeDisabled(false);
|
|
||||||
} else if (target.value === 'none-comparison') {
|
} 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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
|
|
@ -284,11 +293,12 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log('handleSubmit');
|
console.log('handleSubmit');
|
||||||
console.log(selectedSpaceID);
|
console.log(selectedSpaceID);
|
||||||
console.log(selectedStore);
|
console.log(selectedStore);
|
||||||
|
console.log(comparisonType);
|
||||||
console.log(periodType);
|
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -304,10 +314,10 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
fetch(APIBaseURL + '/reports/storeenergycategory?' +
|
fetch(APIBaseURL + '/reports/storeenergycategory?' +
|
||||||
'storeid=' + selectedStore +
|
'storeid=' + selectedStore +
|
||||||
'&periodtype=' + periodType +
|
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -475,7 +485,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
dataField: 'startdatetime',
|
dataField: 'startdatetime',
|
||||||
text: t('Datetime'),
|
text: t('Datetime'),
|
||||||
sort: true
|
sort: true
|
||||||
})
|
});
|
||||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||||
let unit = json['reporting_period']['units'][index];
|
let unit = json['reporting_period']['units'][index];
|
||||||
detailed_column_list.push({
|
detailed_column_list.push({
|
||||||
|
|
@ -489,7 +499,7 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
setDetailedDataTableColumns(detailed_column_list);
|
setDetailedDataTableColumns(detailed_column_list);
|
||||||
|
|
||||||
|
|
@ -603,52 +613,36 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
|
||||||
|
|
@ -13,16 +13,15 @@ import {
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import CountUp from 'react-countup';
|
import CountUp from 'react-countup';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
import CardSummary from '../common/CardSummary';
|
import CardSummary from '../common/CardSummary';
|
||||||
import SharePie from '../common/SharePie';
|
|
||||||
import LineChart from '../common/LineChart';
|
import LineChart from '../common/LineChart';
|
||||||
import loadable from '@loadable/component';
|
import SharePie from '../common/SharePie';
|
||||||
import { getCookieValue, createCookie } from '../../../helpers/utils';
|
import { getCookieValue, createCookie } from '../../../helpers/utils';
|
||||||
import withRedirect from '../../../hoc/withRedirect';
|
import withRedirect from '../../../hoc/withRedirect';
|
||||||
import { withTranslation } from 'react-i18next';
|
import { withTranslation } from 'react-i18next';
|
||||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
@ -55,6 +55,8 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
|
|
@ -63,13 +65,27 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
const [selectedStore, setSelectedStore] = useState(undefined);
|
const [selectedStore, setSelectedStore] = useState(undefined);
|
||||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||||
const [periodType, setPeriodType] = useState('daily');
|
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 [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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||||
|
|
@ -164,7 +180,6 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
|
|
||||||
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
|
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
|
||||||
|
|
||||||
|
|
||||||
let onSpaceCascaderChange = (value, selectedOptions) => {
|
let onSpaceCascaderChange = (value, selectedOptions) => {
|
||||||
setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
|
setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
|
||||||
setSelectedSpaceID(value[value.length - 1]);
|
setSelectedSpaceID(value[value.length - 1]);
|
||||||
|
|
@ -211,67 +226,61 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(target.value);
|
console.log(target.value);
|
||||||
setComparisonType(target.value);
|
setComparisonType(target.value);
|
||||||
if (target.value === 'year-over-year') {
|
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') {
|
} 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') {
|
} else if (target.value === 'free-comparison') {
|
||||||
setBasePeriodBeginsDatetimeDisabled(false);
|
setBasePeriodDateRangePickerDisabled(false);
|
||||||
setBasePeriodEndsDatetimeDisabled(false);
|
|
||||||
} else if (target.value === 'none-comparison') {
|
} 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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
|
|
@ -279,11 +288,12 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log('handleSubmit');
|
console.log('handleSubmit');
|
||||||
console.log(selectedSpaceID);
|
console.log(selectedSpaceID);
|
||||||
console.log(selectedStore);
|
console.log(selectedStore);
|
||||||
|
console.log(comparisonType);
|
||||||
console.log(periodType);
|
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -299,10 +309,10 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
fetch(APIBaseURL + '/reports/storeenergyitem?' +
|
fetch(APIBaseURL + '/reports/storeenergyitem?' +
|
||||||
'storeid=' + selectedStore +
|
'storeid=' + selectedStore +
|
||||||
'&periodtype=' + periodType +
|
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -436,7 +446,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
dataField: 'startdatetime',
|
dataField: 'startdatetime',
|
||||||
text: t('Datetime'),
|
text: t('Datetime'),
|
||||||
sort: true
|
sort: true
|
||||||
})
|
});
|
||||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||||
let unit = json['reporting_period']['units'][index];
|
let unit = json['reporting_period']['units'][index];
|
||||||
detailed_column_list.push({
|
detailed_column_list.push({
|
||||||
|
|
@ -450,7 +460,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
setDetailedDataTableColumns(detailed_column_list);
|
setDetailedDataTableColumns(detailed_column_list);
|
||||||
|
|
||||||
|
|
@ -489,6 +499,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<div>
|
<div>
|
||||||
|
|
@ -563,52 +574,36 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
@ -665,6 +660,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
data={storeLineChartData}
|
data={storeLineChartData}
|
||||||
options={storeLineChartOptions}>
|
options={storeLineChartOptions}>
|
||||||
</LineChart>
|
</LineChart>
|
||||||
|
|
||||||
<LineChart reportingTitle={t('Related Parameters')}
|
<LineChart reportingTitle={t('Related Parameters')}
|
||||||
baseTitle=''
|
baseTitle=''
|
||||||
labels={parameterLineChartLabels}
|
labels={parameterLineChartLabels}
|
||||||
|
|
@ -674,6 +670,7 @@ const StoreEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
<br />
|
<br />
|
||||||
<DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
|
<DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
|
||||||
</DetailedDataTable>
|
</DetailedDataTable>
|
||||||
|
|
||||||
</Fragment>
|
</Fragment>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,9 @@ import {
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import CountUp from 'react-countup';
|
import CountUp from 'react-countup';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import loadable from '@loadable/component';
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
|
|
@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
@ -55,6 +55,8 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
|
|
@ -63,20 +65,33 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
const [selectedStore, setSelectedStore] = useState(undefined);
|
const [selectedStore, setSelectedStore] = useState(undefined);
|
||||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||||
const [periodType, setPeriodType] = useState('daily');
|
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 [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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||||
const [exportButtonHidden, setExportButtonHidden] = useState(true);
|
const [exportButtonHidden, setExportButtonHidden] = useState(true);
|
||||||
|
|
||||||
|
|
||||||
//Results
|
//Results
|
||||||
const [cardSummaryList, setCardSummaryList] = useState([]);
|
const [cardSummaryList, setCardSummaryList] = useState([]);
|
||||||
const [storeLineChartLabels, setStoreLineChartLabels] = useState([]);
|
const [storeLineChartLabels, setStoreLineChartLabels] = useState([]);
|
||||||
|
|
@ -210,67 +225,61 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(target.value);
|
console.log(target.value);
|
||||||
setComparisonType(target.value);
|
setComparisonType(target.value);
|
||||||
if (target.value === 'year-over-year') {
|
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') {
|
} 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') {
|
} else if (target.value === 'free-comparison') {
|
||||||
setBasePeriodBeginsDatetimeDisabled(false);
|
setBasePeriodDateRangePickerDisabled(false);
|
||||||
setBasePeriodEndsDatetimeDisabled(false);
|
|
||||||
} else if (target.value === 'none-comparison') {
|
} 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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
|
|
@ -278,11 +287,12 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log('handleSubmit');
|
console.log('handleSubmit');
|
||||||
console.log(selectedSpaceID);
|
console.log(selectedSpaceID);
|
||||||
console.log(selectedStore);
|
console.log(selectedStore);
|
||||||
|
console.log(comparisonType);
|
||||||
console.log(periodType);
|
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -298,10 +308,10 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
fetch(APIBaseURL + '/reports/storeload?' +
|
fetch(APIBaseURL + '/reports/storeload?' +
|
||||||
'storeid=' + selectedStore +
|
'storeid=' + selectedStore +
|
||||||
'&periodtype=' + periodType +
|
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -407,7 +417,7 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
dataField: 'startdatetime',
|
dataField: 'startdatetime',
|
||||||
text: t('Datetime'),
|
text: t('Datetime'),
|
||||||
sort: true
|
sort: true
|
||||||
})
|
});
|
||||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||||
let unit = json['reporting_period']['units'][index];
|
let unit = json['reporting_period']['units'][index];
|
||||||
detailed_column_list.push({
|
detailed_column_list.push({
|
||||||
|
|
@ -547,52 +557,36 @@ const StoreLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,9 @@ import {
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import CountUp from 'react-countup';
|
import CountUp from 'react-countup';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import loadable from '@loadable/component';
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
@ -55,6 +55,8 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
|
|
@ -63,13 +65,27 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
const [selectedStore, setSelectedStore] = useState(undefined);
|
const [selectedStore, setSelectedStore] = useState(undefined);
|
||||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||||
const [periodType, setPeriodType] = useState('daily');
|
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 [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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||||
|
|
@ -214,67 +230,61 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(target.value);
|
console.log(target.value);
|
||||||
setComparisonType(target.value);
|
setComparisonType(target.value);
|
||||||
if (target.value === 'year-over-year') {
|
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') {
|
} 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') {
|
} else if (target.value === 'free-comparison') {
|
||||||
setBasePeriodBeginsDatetimeDisabled(false);
|
setBasePeriodDateRangePickerDisabled(false);
|
||||||
setBasePeriodEndsDatetimeDisabled(false);
|
|
||||||
} else if (target.value === 'none-comparison') {
|
} 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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
|
|
@ -282,11 +292,12 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log('handleSubmit');
|
console.log('handleSubmit');
|
||||||
console.log(selectedSpaceID);
|
console.log(selectedSpaceID);
|
||||||
console.log(selectedStore);
|
console.log(selectedStore);
|
||||||
|
console.log(comparisonType);
|
||||||
console.log(periodType);
|
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -302,10 +313,10 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
fetch(APIBaseURL + '/reports/storesaving?' +
|
fetch(APIBaseURL + '/reports/storesaving?' +
|
||||||
'storeid=' + selectedStore +
|
'storeid=' + selectedStore +
|
||||||
'&periodtype=' + periodType +
|
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -437,7 +448,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
dataField: 'startdatetime',
|
dataField: 'startdatetime',
|
||||||
text: t('Datetime'),
|
text: t('Datetime'),
|
||||||
sort: true
|
sort: true
|
||||||
})
|
});
|
||||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||||
let unit = json['reporting_period']['units'][index];
|
let unit = json['reporting_period']['units'][index];
|
||||||
detailed_column_list.push({
|
detailed_column_list.push({
|
||||||
|
|
@ -451,7 +462,7 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
setDetailedDataTableColumns(detailed_column_list);
|
setDetailedDataTableColumns(detailed_column_list);
|
||||||
|
|
||||||
|
|
@ -565,52 +576,36 @@ const StoreSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
|
||||||
|
|
@ -13,10 +13,9 @@ import {
|
||||||
Input,
|
Input,
|
||||||
Label,
|
Label,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
Spinner,
|
Spinner
|
||||||
} from 'reactstrap';
|
} from 'reactstrap';
|
||||||
import CountUp from 'react-countup';
|
import CountUp from 'react-countup';
|
||||||
import Datetime from 'react-datetime';
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import loadable from '@loadable/component';
|
import loadable from '@loadable/component';
|
||||||
import Cascader from 'rc-cascader';
|
import Cascader from 'rc-cascader';
|
||||||
|
|
@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
||||||
import { APIBaseURL } from '../../../config';
|
import { APIBaseURL } from '../../../config';
|
||||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||||
|
import { DateRangePicker } from 'rsuite';
|
||||||
|
import { endOfDay} from 'date-fns';
|
||||||
|
|
||||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||||
|
|
||||||
|
|
@ -54,6 +54,8 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
// State
|
// State
|
||||||
// Query Parameters
|
// Query Parameters
|
||||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||||
|
|
@ -62,13 +64,27 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
const [selectedStore, setSelectedStore] = useState(undefined);
|
const [selectedStore, setSelectedStore] = useState(undefined);
|
||||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||||
const [periodType, setPeriodType] = useState('daily');
|
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 [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
|
// buttons
|
||||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||||
|
|
@ -208,67 +224,61 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log(target.value);
|
console.log(target.value);
|
||||||
setComparisonType(target.value);
|
setComparisonType(target.value);
|
||||||
if (target.value === 'year-over-year') {
|
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') {
|
} 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') {
|
} else if (target.value === 'free-comparison') {
|
||||||
setBasePeriodBeginsDatetimeDisabled(false);
|
setBasePeriodDateRangePickerDisabled(false);
|
||||||
setBasePeriodEndsDatetimeDisabled(false);
|
|
||||||
} else if (target.value === 'none-comparison') {
|
} 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
|
// Handler
|
||||||
const handleSubmit = e => {
|
const handleSubmit = e => {
|
||||||
|
|
@ -276,11 +286,12 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
console.log('handleSubmit');
|
console.log('handleSubmit');
|
||||||
console.log(selectedSpaceID);
|
console.log(selectedSpaceID);
|
||||||
console.log(selectedStore);
|
console.log(selectedStore);
|
||||||
|
console.log(comparisonType);
|
||||||
console.log(periodType);
|
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
|
// disable submit button
|
||||||
setSubmitButtonDisabled(true);
|
setSubmitButtonDisabled(true);
|
||||||
|
|
@ -296,10 +307,10 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
fetch(APIBaseURL + '/reports/storestatistics?' +
|
fetch(APIBaseURL + '/reports/storestatistics?' +
|
||||||
'storeid=' + selectedStore +
|
'storeid=' + selectedStore +
|
||||||
'&periodtype=' + periodType +
|
'&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',
|
method: 'GET',
|
||||||
headers: {
|
headers: {
|
||||||
"Content-type": "application/json",
|
"Content-type": "application/json",
|
||||||
|
|
@ -412,7 +423,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
dataField: 'startdatetime',
|
dataField: 'startdatetime',
|
||||||
text: t('Datetime'),
|
text: t('Datetime'),
|
||||||
sort: true
|
sort: true
|
||||||
})
|
});
|
||||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||||
let unit = json['reporting_period']['units'][index];
|
let unit = json['reporting_period']['units'][index];
|
||||||
detailed_column_list.push({
|
detailed_column_list.push({
|
||||||
|
|
@ -426,7 +437,7 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
setDetailedDataTableColumns(detailed_column_list);
|
setDetailedDataTableColumns(detailed_column_list);
|
||||||
|
|
||||||
|
|
@ -540,52 +551,36 @@ const StoreStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs={6} sm={3}>
|
<Col xs={6} sm={3}>
|
||||||
<FormGroup className="form-group">
|
<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>
|
</FormGroup>
|
||||||
</Col>
|
</Col>
|
||||||
<Col xs="auto">
|
<Col xs="auto">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue