Merge branch 'develop'
13621160019@163.com
commit
79ccffd79c
|
|
@ -12,9 +12,8 @@ import {
|
|||
FormGroup,
|
||||
Input,
|
||||
Label,
|
||||
Spinner,
|
||||
Spinner
|
||||
} from 'reactstrap';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
|
|
@ -25,6 +24,8 @@ import { toast } from 'react-toastify';
|
|||
import ButtonIcon from '../../common/ButtonIcon';
|
||||
import { APIBaseURL } from '../../../config';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -49,15 +50,33 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
const [selectedSpaceID, setSelectedSpaceID] = useState(undefined);
|
||||
const [shopfloorList, setShopfloorList] = useState([]);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
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
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(false);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -67,7 +86,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState(
|
||||
[{dataField: 'name', text: t('Name'), sort: true}, {dataField: 'space', text: t('Space'), sort: true}]);
|
||||
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/spaces/tree', {
|
||||
|
|
@ -115,29 +134,32 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setExportButtonHidden(true);
|
||||
setSubmitButtonDisabled(false);
|
||||
}
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
}
|
||||
};
|
||||
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
e.preventDefault();
|
||||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
|
|
@ -145,15 +167,15 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setShopfloorList([]);
|
||||
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/reports/shopfloorbatch?' +
|
||||
'spaceid=' + selectedSpaceID +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -169,7 +191,7 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json)
|
||||
console.log(json);
|
||||
let shopfloors = [];
|
||||
if (json['shopfloors'].length > 0) {
|
||||
json['shopfloors'].forEach((currentShopfloor, index) => {
|
||||
|
|
@ -278,26 +300,19 @@ const ShopfloorBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
|
|||
|
|
@ -13,16 +13,15 @@ import {
|
|||
Input,
|
||||
Label,
|
||||
CustomInput,
|
||||
Spinner,
|
||||
Spinner
|
||||
} from 'reactstrap';
|
||||
import CountUp from 'react-countup';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
import CardSummary from '../common/CardSummary';
|
||||
import LineChart from '../common/LineChart';
|
||||
import SharePie from '../common/SharePie';
|
||||
import loadable from '@loadable/component';
|
||||
import { getCookieValue, createCookie } from '../../../helpers/utils';
|
||||
import withRedirect from '../../../hoc/withRedirect';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
|||
import { APIBaseURL } from '../../../config';
|
||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -55,6 +55,8 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
|
|
@ -63,14 +65,28 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [selectedShopfloor, setSelectedShopfloor] = useState(undefined);
|
||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||
const [periodType, setPeriodType] = useState('daily');
|
||||
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
|
||||
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
|
||||
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
|
||||
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||
|
||||
const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
|
||||
const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
|
||||
const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
|
||||
const dateRangePickerLocale = {
|
||||
sunday: t('sunday'),
|
||||
monday: t('monday'),
|
||||
tuesday: t('tuesday'),
|
||||
wednesday: t('wednesday'),
|
||||
thursday: t('thursday'),
|
||||
friday: t('friday'),
|
||||
saturday: t('saturday'),
|
||||
ok: t('ok'),
|
||||
today: t('today'),
|
||||
yesterday: t('yesterday'),
|
||||
hours: t('hours'),
|
||||
minutes: t('minutes'),
|
||||
seconds: t('seconds'),
|
||||
last7Days: t('last7Days')
|
||||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -92,7 +108,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
|
||||
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
|
||||
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/spaces/tree', {
|
||||
|
|
@ -212,67 +228,61 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log(target.value);
|
||||
setComparisonType(target.value);
|
||||
if (target.value === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
|
||||
} else if (target.value === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
|
||||
} else if (target.value === 'free-comparison') {
|
||||
setBasePeriodBeginsDatetimeDisabled(false);
|
||||
setBasePeriodEndsDatetimeDisabled(false);
|
||||
setBasePeriodDateRangePickerDisabled(false);
|
||||
} else if (target.value === 'none-comparison') {
|
||||
setBasePeriodBeginsDatetime(undefined);
|
||||
setBasePeriodEndsDatetime(undefined);
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodDateRange([null, null]);
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
let onBasePeriodChange = (DateRange) => {
|
||||
if(DateRange == null) {
|
||||
setBasePeriodDateRange([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]);
|
||||
}
|
||||
setBasePeriodDateRange([DateRange[0], DateRange[1]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
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) {
|
||||
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onBasePeriodClean = event => {
|
||||
setBasePeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
var getValidBasePeriodEndsDatetimes = function (currentDate) {
|
||||
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
|
|
@ -280,11 +290,12 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(selectedShopfloor);
|
||||
console.log(comparisonType);
|
||||
console.log(periodType);
|
||||
console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
|
|
@ -292,7 +303,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setDetailedDataTableData([]);
|
||||
|
||||
|
|
@ -300,10 +311,10 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
fetch(APIBaseURL + '/reports/shopfloorcost?' +
|
||||
'shopfloorid=' + selectedShopfloor +
|
||||
'&periodtype=' + periodType +
|
||||
'&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -319,7 +330,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json)
|
||||
console.log(json);
|
||||
|
||||
let cardSummaryList = []
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
|
|
@ -498,7 +509,7 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(true);
|
||||
// show export button
|
||||
setExportButtonHidden(false);
|
||||
|
||||
|
||||
} else {
|
||||
toast.error(json.description)
|
||||
}
|
||||
|
|
@ -599,52 +610,36 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodBeginsDatetime">
|
||||
{t('Base Period Begins')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodBeginsDatetime'
|
||||
value={basePeriodBeginsDatetime}
|
||||
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
|
||||
onChange={onBasePeriodBeginsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodBeginsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
<Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
|
||||
<DateRangePicker
|
||||
id='basePeriodDateRangePicker'
|
||||
readOnly={basePeriodDateRangePickerDisabled}
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={basePeriodDateRange}
|
||||
onChange={onBasePeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onBasePeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodEndsDatetime">
|
||||
{t('Base Period Ends')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodEndsDatetime'
|
||||
value={basePeriodEndsDatetime}
|
||||
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
|
||||
onChange={onBasePeriodEndsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodEndsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
@ -707,7 +702,6 @@ const ShopfloorCost = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
data={parameterLineChartData}
|
||||
options={parameterLineChartOptions}>
|
||||
</LineChart>
|
||||
|
||||
<br />
|
||||
<DetailedDataTable data={detailedDataTableData} title={t('Detailed Data')} columns={detailedDataTableColumns} pagesize={50} >
|
||||
</DetailedDataTable>
|
||||
|
|
|
|||
|
|
@ -13,10 +13,9 @@ import {
|
|||
Input,
|
||||
Label,
|
||||
CustomInput,
|
||||
Spinner,
|
||||
Spinner
|
||||
} from 'reactstrap';
|
||||
import CountUp from 'react-countup';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
|||
import { APIBaseURL } from '../../../config';
|
||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -55,6 +55,8 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
|
|
@ -63,14 +65,28 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [selectedShopfloor, setSelectedShopfloor] = useState(undefined);
|
||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||
const [periodType, setPeriodType] = useState('daily');
|
||||
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
|
||||
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
|
||||
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
|
||||
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||
|
||||
const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
|
||||
const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
|
||||
const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
|
||||
const dateRangePickerLocale = {
|
||||
sunday: t('sunday'),
|
||||
monday: t('monday'),
|
||||
tuesday: t('tuesday'),
|
||||
wednesday: t('wednesday'),
|
||||
thursday: t('thursday'),
|
||||
friday: t('friday'),
|
||||
saturday: t('saturday'),
|
||||
ok: t('ok'),
|
||||
today: t('today'),
|
||||
yesterday: t('yesterday'),
|
||||
hours: t('hours'),
|
||||
minutes: t('minutes'),
|
||||
seconds: t('seconds'),
|
||||
last7Days: t('last7Days')
|
||||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -95,7 +111,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
|
||||
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
|
||||
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/spaces/tree', {
|
||||
|
|
@ -166,10 +182,9 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
});
|
||||
|
||||
}, []);
|
||||
|
||||
|
||||
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
|
||||
|
||||
|
||||
let onSpaceCascaderChange = (value, selectedOptions) => {
|
||||
setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
|
||||
setSelectedSpaceID(value[value.length - 1]);
|
||||
|
|
@ -216,67 +231,61 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log(target.value);
|
||||
setComparisonType(target.value);
|
||||
if (target.value === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
|
||||
} else if (target.value === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
|
||||
} else if (target.value === 'free-comparison') {
|
||||
setBasePeriodBeginsDatetimeDisabled(false);
|
||||
setBasePeriodEndsDatetimeDisabled(false);
|
||||
setBasePeriodDateRangePickerDisabled(false);
|
||||
} else if (target.value === 'none-comparison') {
|
||||
setBasePeriodBeginsDatetime(undefined);
|
||||
setBasePeriodEndsDatetime(undefined);
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodDateRange([null, null]);
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
let onBasePeriodChange = (DateRange) => {
|
||||
if(DateRange == null) {
|
||||
setBasePeriodDateRange([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]);
|
||||
}
|
||||
setBasePeriodDateRange([DateRange[0], DateRange[1]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
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) {
|
||||
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onBasePeriodClean = event => {
|
||||
setBasePeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
var getValidBasePeriodEndsDatetimes = function (currentDate) {
|
||||
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
|
|
@ -284,11 +293,12 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(selectedShopfloor);
|
||||
console.log(comparisonType);
|
||||
console.log(periodType);
|
||||
console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
|
|
@ -296,7 +306,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setDetailedDataTableData([]);
|
||||
|
||||
|
|
@ -304,10 +314,10 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
fetch(APIBaseURL + '/reports/shopfloorenergycategory?' +
|
||||
'shopfloorid=' + selectedShopfloor +
|
||||
'&periodtype=' + periodType +
|
||||
'&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -324,7 +334,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json);
|
||||
|
||||
|
||||
let cardSummaryArray = []
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let cardSummaryItem = {}
|
||||
|
|
@ -412,7 +422,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
timestamps['a' + index] = currentValue;
|
||||
});
|
||||
setShopfloorLineChartLabels(timestamps);
|
||||
|
||||
|
||||
let values = {}
|
||||
json['reporting_period']['values'].forEach((currentValue, index) => {
|
||||
values['a' + index] = currentValue;
|
||||
|
|
@ -425,7 +435,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
|
||||
});
|
||||
setShopfloorLineChartOptions(names);
|
||||
|
||||
|
||||
timestamps = {}
|
||||
json['parameters']['timestamps'].forEach((currentValue, index) => {
|
||||
timestamps['a' + index] = currentValue;
|
||||
|
|
@ -447,7 +457,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue });
|
||||
});
|
||||
setParameterLineChartOptions(names);
|
||||
|
||||
|
||||
let detailed_value_list = [];
|
||||
if (json['reporting_period']['timestamps'].length > 0) {
|
||||
json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
|
||||
|
|
@ -460,7 +470,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
detailed_value_list.push(detailed_value);
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
let detailed_value = {};
|
||||
detailed_value['id'] = detailed_value_list.length;
|
||||
detailed_value['startdatetime'] = t('Subtotal');
|
||||
|
|
@ -475,7 +485,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
dataField: 'startdatetime',
|
||||
text: t('Datetime'),
|
||||
sort: true
|
||||
})
|
||||
});
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let unit = json['reporting_period']['units'][index];
|
||||
detailed_column_list.push({
|
||||
|
|
@ -489,7 +499,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
setDetailedDataTableColumns(detailed_column_list);
|
||||
|
||||
|
|
@ -501,7 +511,7 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(true);
|
||||
// show export button
|
||||
setExportButtonHidden(false);
|
||||
|
||||
|
||||
} else {
|
||||
toast.error(json.description)
|
||||
}
|
||||
|
|
@ -528,7 +538,6 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
};
|
||||
|
||||
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<div>
|
||||
|
|
@ -603,52 +612,36 @@ const ShopfloorEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodBeginsDatetime">
|
||||
{t('Base Period Begins')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodBeginsDatetime'
|
||||
value={basePeriodBeginsDatetime}
|
||||
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
|
||||
onChange={onBasePeriodBeginsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodBeginsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
<Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
|
||||
<DateRangePicker
|
||||
id='basePeriodDateRangePicker'
|
||||
readOnly={basePeriodDateRangePickerDisabled}
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={basePeriodDateRange}
|
||||
onChange={onBasePeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onBasePeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodEndsDatetime">
|
||||
{t('Base Period Ends')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodEndsDatetime'
|
||||
value={basePeriodEndsDatetime}
|
||||
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
|
||||
onChange={onBasePeriodEndsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodEndsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
|
|||
|
|
@ -13,16 +13,15 @@ import {
|
|||
Input,
|
||||
Label,
|
||||
CustomInput,
|
||||
Spinner,
|
||||
Spinner
|
||||
} from 'reactstrap';
|
||||
import CountUp from 'react-countup';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
import CardSummary from '../common/CardSummary';
|
||||
import SharePie from '../common/SharePie';
|
||||
import LineChart from '../common/LineChart';
|
||||
import loadable from '@loadable/component';
|
||||
import SharePie from '../common/SharePie';
|
||||
import { getCookieValue, createCookie } from '../../../helpers/utils';
|
||||
import withRedirect from '../../../hoc/withRedirect';
|
||||
import { withTranslation } from 'react-i18next';
|
||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
|||
import { APIBaseURL } from '../../../config';
|
||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -55,6 +55,8 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
|
|
@ -63,14 +65,28 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [selectedShopfloor, setSelectedShopfloor] = useState(undefined);
|
||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||
const [periodType, setPeriodType] = useState('daily');
|
||||
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
|
||||
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
|
||||
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
|
||||
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||
|
||||
const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
|
||||
const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
|
||||
const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
|
||||
const dateRangePickerLocale = {
|
||||
sunday: t('sunday'),
|
||||
monday: t('monday'),
|
||||
tuesday: t('tuesday'),
|
||||
wednesday: t('wednesday'),
|
||||
thursday: t('thursday'),
|
||||
friday: t('friday'),
|
||||
saturday: t('saturday'),
|
||||
ok: t('ok'),
|
||||
today: t('today'),
|
||||
yesterday: t('yesterday'),
|
||||
hours: t('hours'),
|
||||
minutes: t('minutes'),
|
||||
seconds: t('seconds'),
|
||||
last7Days: t('last7Days')
|
||||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -164,6 +180,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
|
||||
const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';
|
||||
|
||||
|
||||
let onSpaceCascaderChange = (value, selectedOptions) => {
|
||||
setSelectedSpaceName(selectedOptions.map(o => o.label).join('/'));
|
||||
setSelectedSpaceID(value[value.length - 1]);
|
||||
|
|
@ -210,67 +227,61 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log(target.value);
|
||||
setComparisonType(target.value);
|
||||
if (target.value === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
|
||||
} else if (target.value === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
|
||||
} else if (target.value === 'free-comparison') {
|
||||
setBasePeriodBeginsDatetimeDisabled(false);
|
||||
setBasePeriodEndsDatetimeDisabled(false);
|
||||
setBasePeriodDateRangePickerDisabled(false);
|
||||
} else if (target.value === 'none-comparison') {
|
||||
setBasePeriodBeginsDatetime(undefined);
|
||||
setBasePeriodEndsDatetime(undefined);
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodDateRange([null, null]);
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
let onBasePeriodChange = (DateRange) => {
|
||||
if(DateRange == null) {
|
||||
setBasePeriodDateRange([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]);
|
||||
}
|
||||
setBasePeriodDateRange([DateRange[0], DateRange[1]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
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) {
|
||||
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onBasePeriodClean = event => {
|
||||
setBasePeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
var getValidBasePeriodEndsDatetimes = function (currentDate) {
|
||||
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
|
|
@ -278,11 +289,12 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(selectedShopfloor);
|
||||
console.log(comparisonType);
|
||||
console.log(periodType);
|
||||
console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
|
|
@ -290,7 +302,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setDetailedDataTableData([]);
|
||||
|
||||
|
|
@ -298,10 +310,10 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
fetch(APIBaseURL + '/reports/shopfloorenergyitem?' +
|
||||
'shopfloorid=' + selectedShopfloor +
|
||||
'&periodtype=' + periodType +
|
||||
'&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -314,7 +326,6 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
if (response.ok) {
|
||||
isResponseOK = true;
|
||||
};
|
||||
|
||||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
|
|
@ -408,7 +419,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue });
|
||||
});
|
||||
setParameterLineChartOptions(names);
|
||||
|
||||
|
||||
let detailed_value_list = [];
|
||||
if (json['reporting_period']['timestamps'].length > 0) {
|
||||
json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
|
||||
|
|
@ -436,7 +447,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
dataField: 'startdatetime',
|
||||
text: t('Datetime'),
|
||||
sort: true
|
||||
})
|
||||
});
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let unit = json['reporting_period']['units'][index];
|
||||
detailed_column_list.push({
|
||||
|
|
@ -450,7 +461,7 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
setDetailedDataTableColumns(detailed_column_list);
|
||||
|
||||
|
|
@ -505,7 +516,6 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
<Label className={labelClasses} for="space">
|
||||
{t('Space')}
|
||||
</Label>
|
||||
|
||||
<br />
|
||||
<Cascader options={cascaderOptions}
|
||||
onChange={onSpaceCascaderChange}
|
||||
|
|
@ -564,52 +574,36 @@ const ShopfloorEnergyItem = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodBeginsDatetime">
|
||||
{t('Base Period Begins')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodBeginsDatetime'
|
||||
value={basePeriodBeginsDatetime}
|
||||
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
|
||||
onChange={onBasePeriodBeginsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodBeginsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
<Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
|
||||
<DateRangePicker
|
||||
id='basePeriodDateRangePicker'
|
||||
readOnly={basePeriodDateRangePickerDisabled}
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={basePeriodDateRange}
|
||||
onChange={onBasePeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onBasePeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodEndsDatetime">
|
||||
{t('Base Period Ends')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodEndsDatetime'
|
||||
value={basePeriodEndsDatetime}
|
||||
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
|
||||
onChange={onBasePeriodEndsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodEndsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ import {
|
|||
Spinner,
|
||||
} from 'reactstrap';
|
||||
import CountUp from 'react-countup';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
|
|
@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
|||
import { APIBaseURL } from '../../../config';
|
||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -54,6 +54,8 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
|
|
@ -62,13 +64,27 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [selectedShopfloor, setSelectedShopfloor] = useState(undefined);
|
||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||
const [periodType, setPeriodType] = useState('daily');
|
||||
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
|
||||
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
|
||||
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
|
||||
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||
const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
|
||||
const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
|
||||
const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
|
||||
const dateRangePickerLocale = {
|
||||
sunday: t('sunday'),
|
||||
monday: t('monday'),
|
||||
tuesday: t('tuesday'),
|
||||
wednesday: t('wednesday'),
|
||||
thursday: t('thursday'),
|
||||
friday: t('friday'),
|
||||
saturday: t('saturday'),
|
||||
ok: t('ok'),
|
||||
today: t('today'),
|
||||
yesterday: t('yesterday'),
|
||||
hours: t('hours'),
|
||||
minutes: t('minutes'),
|
||||
seconds: t('seconds'),
|
||||
last7Days: t('last7Days')
|
||||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||
|
|
@ -88,7 +104,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
|
||||
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
|
||||
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/spaces/tree', {
|
||||
|
|
@ -208,67 +224,61 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log(target.value);
|
||||
setComparisonType(target.value);
|
||||
if (target.value === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
|
||||
} else if (target.value === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
|
||||
} else if (target.value === 'free-comparison') {
|
||||
setBasePeriodBeginsDatetimeDisabled(false);
|
||||
setBasePeriodEndsDatetimeDisabled(false);
|
||||
setBasePeriodDateRangePickerDisabled(false);
|
||||
} else if (target.value === 'none-comparison') {
|
||||
setBasePeriodBeginsDatetime(undefined);
|
||||
setBasePeriodEndsDatetime(undefined);
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodDateRange([null, null]);
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
let onBasePeriodChange = (DateRange) => {
|
||||
if(DateRange == null) {
|
||||
setBasePeriodDateRange([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]);
|
||||
}
|
||||
setBasePeriodDateRange([DateRange[0], DateRange[1]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
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) {
|
||||
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onBasePeriodClean = event => {
|
||||
setBasePeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
var getValidBasePeriodEndsDatetimes = function (currentDate) {
|
||||
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
|
|
@ -276,11 +286,12 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(selectedShopfloor);
|
||||
console.log(comparisonType);
|
||||
console.log(periodType);
|
||||
console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
|
|
@ -296,10 +307,10 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
fetch(APIBaseURL + '/reports/shopfloorload?' +
|
||||
'shopfloorid=' + selectedShopfloor +
|
||||
'&periodtype=' + periodType +
|
||||
'&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -315,8 +326,8 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json)
|
||||
|
||||
console.log(json);
|
||||
|
||||
let cardSummaryArray = []
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let cardSummaryItem = {}
|
||||
|
|
@ -339,7 +350,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
timestamps['a' + index] = currentValue;
|
||||
});
|
||||
setShopfloorLineChartLabels(timestamps);
|
||||
|
||||
|
||||
let values = {}
|
||||
json['reporting_period']['sub_maximums'].forEach((currentValue, index) => {
|
||||
values['a' + index] = currentValue;
|
||||
|
|
@ -352,7 +363,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + '/H)'});
|
||||
});
|
||||
setShopfloorLineChartOptions(names);
|
||||
|
||||
|
||||
timestamps = {}
|
||||
json['parameters']['timestamps'].forEach((currentValue, index) => {
|
||||
timestamps['a' + index] = currentValue;
|
||||
|
|
@ -374,7 +385,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue });
|
||||
});
|
||||
setParameterLineChartOptions(names);
|
||||
|
||||
|
||||
let detailed_value_list = [];
|
||||
if (json['reporting_period']['timestamps'].length > 0) {
|
||||
json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
|
||||
|
|
@ -405,7 +416,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
dataField: 'startdatetime',
|
||||
text: t('Datetime'),
|
||||
sort: true
|
||||
})
|
||||
});
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let unit = json['reporting_period']['units'][index];
|
||||
detailed_column_list.push({
|
||||
|
|
@ -443,7 +454,7 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(true);
|
||||
// show export button
|
||||
setExportButtonHidden(false);
|
||||
|
||||
|
||||
} else {
|
||||
toast.error(json.description)
|
||||
}
|
||||
|
|
@ -470,7 +481,6 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
};
|
||||
|
||||
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<div>
|
||||
|
|
@ -545,52 +555,36 @@ const ShopfloorLoad = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodBeginsDatetime">
|
||||
{t('Base Period Begins')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodBeginsDatetime'
|
||||
value={basePeriodBeginsDatetime}
|
||||
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
|
||||
onChange={onBasePeriodBeginsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodBeginsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
<Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
|
||||
<DateRangePicker
|
||||
id='basePeriodDateRangePicker'
|
||||
readOnly={basePeriodDateRangePickerDisabled}
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={basePeriodDateRange}
|
||||
onChange={onBasePeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onBasePeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodEndsDatetime">
|
||||
{t('Base Period Ends')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodEndsDatetime'
|
||||
value={basePeriodEndsDatetime}
|
||||
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
|
||||
onChange={onBasePeriodEndsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodEndsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
|
|||
|
|
@ -13,10 +13,9 @@ import {
|
|||
Input,
|
||||
Label,
|
||||
CustomInput,
|
||||
Spinner,
|
||||
Spinner
|
||||
} from 'reactstrap';
|
||||
import CountUp from 'react-countup';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
|
|
@ -31,7 +30,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
|||
import { APIBaseURL } from '../../../config';
|
||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -55,6 +55,8 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
|
|
@ -63,14 +65,28 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [selectedShopfloor, setSelectedShopfloor] = useState(undefined);
|
||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||
const [periodType, setPeriodType] = useState('daily');
|
||||
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
|
||||
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
|
||||
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
|
||||
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||
|
||||
const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
|
||||
const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
|
||||
const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
|
||||
const dateRangePickerLocale = {
|
||||
sunday: t('sunday'),
|
||||
monday: t('monday'),
|
||||
tuesday: t('tuesday'),
|
||||
wednesday: t('wednesday'),
|
||||
thursday: t('thursday'),
|
||||
friday: t('friday'),
|
||||
saturday: t('saturday'),
|
||||
ok: t('ok'),
|
||||
today: t('today'),
|
||||
yesterday: t('yesterday'),
|
||||
hours: t('hours'),
|
||||
minutes: t('minutes'),
|
||||
seconds: t('seconds'),
|
||||
last7Days: t('last7Days')
|
||||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -94,7 +110,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
|
||||
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
|
||||
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/spaces/tree', {
|
||||
|
|
@ -214,67 +230,61 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log(target.value);
|
||||
setComparisonType(target.value);
|
||||
if (target.value === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
|
||||
} else if (target.value === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
|
||||
} else if (target.value === 'free-comparison') {
|
||||
setBasePeriodBeginsDatetimeDisabled(false);
|
||||
setBasePeriodEndsDatetimeDisabled(false);
|
||||
setBasePeriodDateRangePickerDisabled(false);
|
||||
} else if (target.value === 'none-comparison') {
|
||||
setBasePeriodBeginsDatetime(undefined);
|
||||
setBasePeriodEndsDatetime(undefined);
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodDateRange([null, null]);
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
let onBasePeriodChange = (DateRange) => {
|
||||
if(DateRange == null) {
|
||||
setBasePeriodDateRange([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]);
|
||||
}
|
||||
setBasePeriodDateRange([DateRange[0], DateRange[1]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
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) {
|
||||
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onBasePeriodClean = event => {
|
||||
setBasePeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
var getValidBasePeriodEndsDatetimes = function (currentDate) {
|
||||
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
|
|
@ -282,19 +292,20 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(selectedShopfloor);
|
||||
console.log(comparisonType);
|
||||
console.log(periodType);
|
||||
console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
// show spinner
|
||||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setDetailedDataTableData([]);
|
||||
|
||||
|
|
@ -302,10 +313,10 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
fetch(APIBaseURL + '/reports/shopfloorsaving?' +
|
||||
'shopfloorid=' + selectedShopfloor +
|
||||
'&periodtype=' + periodType +
|
||||
'&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -321,8 +332,8 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json)
|
||||
|
||||
console.log(json);
|
||||
|
||||
let cardSummaryArray = []
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let cardSummaryItem = {}
|
||||
|
|
@ -374,7 +385,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
timestamps['a' + index] = currentValue;
|
||||
});
|
||||
setShopfloorLineChartLabels(timestamps);
|
||||
|
||||
|
||||
let values = {}
|
||||
json['reporting_period']['values_saving'].forEach((currentValue, index) => {
|
||||
values['a' + index] = currentValue;
|
||||
|
|
@ -387,7 +398,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
|
||||
});
|
||||
setShopfloorLineChartOptions(names);
|
||||
|
||||
|
||||
timestamps = {}
|
||||
json['parameters']['timestamps'].forEach((currentValue, index) => {
|
||||
timestamps['a' + index] = currentValue;
|
||||
|
|
@ -409,7 +420,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue });
|
||||
});
|
||||
setParameterLineChartOptions(names);
|
||||
|
||||
|
||||
let detailed_value_list = [];
|
||||
if (json['reporting_period']['timestamps'].length > 0) {
|
||||
json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
|
||||
|
|
@ -437,7 +448,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
dataField: 'startdatetime',
|
||||
text: t('Datetime'),
|
||||
sort: true
|
||||
})
|
||||
});
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let unit = json['reporting_period']['units'][index];
|
||||
detailed_column_list.push({
|
||||
|
|
@ -451,7 +462,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
setDetailedDataTableColumns(detailed_column_list);
|
||||
|
||||
|
|
@ -463,7 +474,7 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(true);
|
||||
// show export button
|
||||
setExportButtonHidden(false);
|
||||
|
||||
|
||||
} else {
|
||||
toast.error(json.description)
|
||||
}
|
||||
|
|
@ -490,7 +501,6 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
};
|
||||
|
||||
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<div>
|
||||
|
|
@ -565,52 +575,36 @@ const ShopfloorSaving = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodBeginsDatetime">
|
||||
{t('Base Period Begins')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodBeginsDatetime'
|
||||
value={basePeriodBeginsDatetime}
|
||||
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
|
||||
onChange={onBasePeriodBeginsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodBeginsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
<Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
|
||||
<DateRangePicker
|
||||
id='basePeriodDateRangePicker'
|
||||
readOnly={basePeriodDateRangePickerDisabled}
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={basePeriodDateRange}
|
||||
onChange={onBasePeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onBasePeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodEndsDatetime">
|
||||
{t('Base Period Ends')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodEndsDatetime'
|
||||
value={basePeriodEndsDatetime}
|
||||
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
|
||||
onChange={onBasePeriodEndsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodEndsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
|
|||
|
|
@ -13,10 +13,9 @@ import {
|
|||
Input,
|
||||
Label,
|
||||
CustomInput,
|
||||
Spinner,
|
||||
Spinner
|
||||
} from 'reactstrap';
|
||||
import CountUp from 'react-countup';
|
||||
import Datetime from 'react-datetime';
|
||||
import moment from 'moment';
|
||||
import loadable from '@loadable/component';
|
||||
import Cascader from 'rc-cascader';
|
||||
|
|
@ -30,7 +29,8 @@ import ButtonIcon from '../../common/ButtonIcon';
|
|||
import { APIBaseURL } from '../../../config';
|
||||
import { periodTypeOptions } from '../common/PeriodTypeOptions';
|
||||
import { comparisonTypeOptions } from '../common/ComparisonTypeOptions';
|
||||
|
||||
import { DateRangePicker } from 'rsuite';
|
||||
import { endOfDay} from 'date-fns';
|
||||
|
||||
const DetailedDataTable = loadable(() => import('../common/DetailedDataTable'));
|
||||
|
||||
|
|
@ -54,6 +54,8 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
createCookie('token', token, 1000 * 60 * 60 * 8);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// State
|
||||
// Query Parameters
|
||||
const [selectedSpaceName, setSelectedSpaceName] = useState(undefined);
|
||||
|
|
@ -62,14 +64,28 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [selectedShopfloor, setSelectedShopfloor] = useState(undefined);
|
||||
const [comparisonType, setComparisonType] = useState('month-on-month');
|
||||
const [periodType, setPeriodType] = useState('daily');
|
||||
const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month'));
|
||||
const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months'));
|
||||
const [basePeriodBeginsDatetimeDisabled, setBasePeriodBeginsDatetimeDisabled] = useState(true);
|
||||
const [basePeriodEndsDatetimeDisabled, setBasePeriodEndsDatetimeDisabled] = useState(true);
|
||||
const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month'));
|
||||
const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment);
|
||||
const [cascaderOptions, setCascaderOptions] = useState(undefined);
|
||||
|
||||
const [basePeriodDateRange, setBasePeriodDateRange] = useState([current_moment.clone().subtract(1, 'months').startOf('month').toDate(), current_moment.clone().subtract(1, 'months').toDate()]);
|
||||
const [basePeriodDateRangePickerDisabled, setBasePeriodDateRangePickerDisabled] = useState(true);
|
||||
const [reportingPeriodDateRange, setReportingPeriodDateRange] = useState([current_moment.clone().startOf('month').toDate(), current_moment.toDate()]);
|
||||
const dateRangePickerLocale = {
|
||||
sunday: t('sunday'),
|
||||
monday: t('monday'),
|
||||
tuesday: t('tuesday'),
|
||||
wednesday: t('wednesday'),
|
||||
thursday: t('thursday'),
|
||||
friday: t('friday'),
|
||||
saturday: t('saturday'),
|
||||
ok: t('ok'),
|
||||
today: t('today'),
|
||||
yesterday: t('yesterday'),
|
||||
hours: t('hours'),
|
||||
minutes: t('minutes'),
|
||||
seconds: t('seconds'),
|
||||
last7Days: t('last7Days')
|
||||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(true);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -88,7 +104,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
const [detailedDataTableData, setDetailedDataTableData] = useState([]);
|
||||
const [detailedDataTableColumns, setDetailedDataTableColumns] = useState([{dataField: 'startdatetime', text: t('Datetime'), sort: true}]);
|
||||
const [excelBytesBase64, setExcelBytesBase64] = useState(undefined);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let isResponseOK = false;
|
||||
fetch(APIBaseURL + '/spaces/tree', {
|
||||
|
|
@ -208,67 +224,61 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log(target.value);
|
||||
setComparisonType(target.value);
|
||||
if (target.value === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'years'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'years').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'years').toDate()]);
|
||||
} else if (target.value === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodBeginsDatetime(moment(reportingPeriodBeginsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodEndsDatetime(moment(reportingPeriodEndsDatetime).subtract(1, 'months'));
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
setBasePeriodDateRange([moment(reportingPeriodDateRange[0]).subtract(1, 'months').toDate(),
|
||||
moment(reportingPeriodDateRange[1]).subtract(1, 'months').toDate()]);
|
||||
} else if (target.value === 'free-comparison') {
|
||||
setBasePeriodBeginsDatetimeDisabled(false);
|
||||
setBasePeriodEndsDatetimeDisabled(false);
|
||||
setBasePeriodDateRangePickerDisabled(false);
|
||||
} else if (target.value === 'none-comparison') {
|
||||
setBasePeriodBeginsDatetime(undefined);
|
||||
setBasePeriodEndsDatetime(undefined);
|
||||
setBasePeriodBeginsDatetimeDisabled(true);
|
||||
setBasePeriodEndsDatetimeDisabled(true);
|
||||
setBasePeriodDateRange([null, null]);
|
||||
setBasePeriodDateRangePickerDisabled(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onBasePeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodBeginsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onBasePeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setBasePeriodEndsDatetime(newDateTime);
|
||||
}
|
||||
|
||||
let onReportingPeriodBeginsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodBeginsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodBeginsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
let onBasePeriodChange = (DateRange) => {
|
||||
if(DateRange == null) {
|
||||
setBasePeriodDateRange([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]);
|
||||
}
|
||||
setBasePeriodDateRange([DateRange[0], DateRange[1]]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let onReportingPeriodEndsDatetimeChange = (newDateTime) => {
|
||||
setReportingPeriodEndsDatetime(newDateTime);
|
||||
if (comparisonType === 'year-over-year') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'years'));
|
||||
} else if (comparisonType === 'month-on-month') {
|
||||
setBasePeriodEndsDatetime(newDateTime.clone().subtract(1, 'months'));
|
||||
// Callback fired when value changed
|
||||
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]]);
|
||||
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) {
|
||||
return currentDate.isBefore(moment(basePeriodEndsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onBasePeriodClean = event => {
|
||||
setBasePeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
var getValidBasePeriodEndsDatetimes = function (currentDate) {
|
||||
return currentDate.isAfter(moment(basePeriodBeginsDatetime, 'MM/DD/YYYY, hh:mm:ss a'));
|
||||
}
|
||||
|
||||
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'));
|
||||
}
|
||||
// Callback fired when value clean
|
||||
let onReportingPeriodClean = event => {
|
||||
setReportingPeriodDateRange([null, null]);
|
||||
};
|
||||
|
||||
// Handler
|
||||
const handleSubmit = e => {
|
||||
|
|
@ -276,11 +286,12 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
console.log('handleSubmit');
|
||||
console.log(selectedSpaceID);
|
||||
console.log(selectedShopfloor);
|
||||
console.log(comparisonType);
|
||||
console.log(periodType);
|
||||
console.log(basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : undefined);
|
||||
console.log(reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'));
|
||||
console.log(basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : null)
|
||||
console.log(moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss'))
|
||||
console.log(moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'));
|
||||
|
||||
// disable submit button
|
||||
setSubmitButtonDisabled(true);
|
||||
|
|
@ -288,7 +299,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setDetailedDataTableData([]);
|
||||
|
||||
|
|
@ -296,10 +307,10 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
fetch(APIBaseURL + '/reports/shopfloorstatistics?' +
|
||||
'shopfloorid=' + selectedShopfloor +
|
||||
'&periodtype=' + periodType +
|
||||
'&baseperiodstartdatetime=' + (basePeriodBeginsDatetime != null ? basePeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodEndsDatetime != null ? basePeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + reportingPeriodBeginsDatetime.format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + reportingPeriodEndsDatetime.format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
'&baseperiodstartdatetime=' + (basePeriodDateRange[0] != null ? moment(basePeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&baseperiodenddatetime=' + (basePeriodDateRange[1] != null ? moment(basePeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss') : '') +
|
||||
'&reportingperiodstartdatetime=' + moment(reportingPeriodDateRange[0]).format('YYYY-MM-DDTHH:mm:ss') +
|
||||
'&reportingperiodenddatetime=' + moment(reportingPeriodDateRange[1]).format('YYYY-MM-DDTHH:mm:ss'), {
|
||||
method: 'GET',
|
||||
headers: {
|
||||
"Content-type": "application/json",
|
||||
|
|
@ -312,11 +323,10 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
if (response.ok) {
|
||||
isResponseOK = true;
|
||||
};
|
||||
|
||||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json)
|
||||
console.log(json);
|
||||
|
||||
let cardSummaryArray = []
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
|
|
@ -350,7 +360,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
timestamps['a' + index] = currentValue;
|
||||
});
|
||||
setShopfloorLineChartLabels(timestamps);
|
||||
|
||||
|
||||
let values = {}
|
||||
json['reporting_period']['values'].forEach((currentValue, index) => {
|
||||
values['a' + index] = currentValue;
|
||||
|
|
@ -363,7 +373,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue + ' (' + unit + ')'});
|
||||
});
|
||||
setShopfloorLineChartOptions(names);
|
||||
|
||||
|
||||
timestamps = {}
|
||||
json['parameters']['timestamps'].forEach((currentValue, index) => {
|
||||
timestamps['a' + index] = currentValue;
|
||||
|
|
@ -385,7 +395,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
names.push({ 'value': 'a' + index, 'label': currentValue });
|
||||
});
|
||||
setParameterLineChartOptions(names);
|
||||
|
||||
|
||||
let detailed_value_list = [];
|
||||
if (json['reporting_period']['timestamps'].length > 0) {
|
||||
json['reporting_period']['timestamps'][0].forEach((currentTimestamp, timestampIndex) => {
|
||||
|
|
@ -413,7 +423,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
dataField: 'startdatetime',
|
||||
text: t('Datetime'),
|
||||
sort: true
|
||||
})
|
||||
});
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
let unit = json['reporting_period']['units'][index];
|
||||
detailed_column_list.push({
|
||||
|
|
@ -427,7 +437,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
return null;
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
setDetailedDataTableColumns(detailed_column_list);
|
||||
|
||||
|
|
@ -439,7 +449,7 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(true);
|
||||
// show export button
|
||||
setExportButtonHidden(false);
|
||||
|
||||
|
||||
} else {
|
||||
toast.error(json.description)
|
||||
}
|
||||
|
|
@ -466,7 +476,6 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
};
|
||||
|
||||
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<div>
|
||||
|
|
@ -541,52 +550,36 @@ const ShopfloorStatistics = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodBeginsDatetime">
|
||||
{t('Base Period Begins')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodBeginsDatetime'
|
||||
value={basePeriodBeginsDatetime}
|
||||
inputProps={{ disabled: basePeriodBeginsDatetimeDisabled }}
|
||||
onChange={onBasePeriodBeginsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodBeginsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
<Label className={labelClasses} for="basePeriodDateRangePicker">{t('Base Period')}{t('(Optional)')}</Label>
|
||||
<DateRangePicker
|
||||
id='basePeriodDateRangePicker'
|
||||
readOnly={basePeriodDateRangePickerDisabled}
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={basePeriodDateRange}
|
||||
onChange={onBasePeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onBasePeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<FormGroup className="form-group">
|
||||
<Label className={labelClasses} for="basePeriodEndsDatetime">
|
||||
{t('Base Period Ends')}{t('(Optional)')}
|
||||
</Label>
|
||||
<Datetime id='basePeriodEndsDatetime'
|
||||
value={basePeriodEndsDatetime}
|
||||
inputProps={{ disabled: basePeriodEndsDatetimeDisabled }}
|
||||
onChange={onBasePeriodEndsDatetimeChange}
|
||||
isValidDate={getValidBasePeriodEndsDatetimes}
|
||||
closeOnSelect={true} />
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs={6} sm={3}>
|
||||
<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} />
|
||||
<Label className={labelClasses} for="reportingPeriodDateRangePicker">{t('Reporting Period')}</Label>
|
||||
<br/>
|
||||
<DateRangePicker
|
||||
id='reportingPeriodDateRangePicker'
|
||||
format="yyyy-MM-dd HH:mm:ss"
|
||||
value={reportingPeriodDateRange}
|
||||
onChange={onReportingPeriodChange}
|
||||
size="md"
|
||||
style={dateRangePickerStyle}
|
||||
onClean={onReportingPeriodClean}
|
||||
locale={dateRangePickerLocale}
|
||||
placeholder={t("Select Date Range")}
|
||||
/>
|
||||
</FormGroup>
|
||||
</Col>
|
||||
<Col xs="auto">
|
||||
|
|
|
|||
|
|
@ -77,7 +77,6 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
};
|
||||
const dateRangePickerStyle = { display: 'block', zIndex: 10};
|
||||
|
||||
|
||||
// buttons
|
||||
const [submitButtonDisabled, setSubmitButtonDisabled] = useState(false);
|
||||
const [spinnerHidden, setSpinnerHidden] = useState(true);
|
||||
|
|
@ -168,7 +167,7 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
setSpinnerHidden(false);
|
||||
// hide export button
|
||||
setExportButtonHidden(true)
|
||||
|
||||
|
||||
// Reinitialize tables
|
||||
setStoreList([]);
|
||||
|
||||
|
|
@ -235,7 +234,6 @@ const StoreBatch = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
}
|
||||
})
|
||||
});
|
||||
console.log(detailed_column_list);
|
||||
setDetailedDataTableColumns(detailed_column_list);
|
||||
|
||||
setExcelBytesBase64(json['excel_bytes_base64']);
|
||||
|
|
|
|||
|
|
@ -329,11 +329,11 @@ const StoreEnergyCategory = ({ setRedirect, setRedirectUrl, t }) => {
|
|||
}).then(response => {
|
||||
if (response.ok) {
|
||||
isResponseOK = true;
|
||||
}
|
||||
};
|
||||
return response.json();
|
||||
}).then(json => {
|
||||
if (isResponseOK) {
|
||||
console.log(json)
|
||||
console.log(json);
|
||||
|
||||
let cardSummaryArray = []
|
||||
json['reporting_period']['names'].forEach((currentValue, index) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue