Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nengyuanzhang
nengyuanzhang committed Feb 29, 2024
2 parents e8e2987 + fd2ce40 commit 5e7502a
Show file tree
Hide file tree
Showing 55 changed files with 2,387 additions and 1,698 deletions.
2 changes: 1 addition & 1 deletion myems-web/src/components/MyEMS/AuxiliarySystem/EnergyFlowDiagram.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ const EnergyFlowDiagram = ({ setRedirect, setRedirectUrl, t }) => {
setReportingPeriodDateRange([null, null]);
setSubmitButtonDisabled(true);
} else {
if (moment(DateRange[1]).format('HH:mm:ss') == '00:00:00') {
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]);
}
Expand Down
917 changes: 517 additions & 400 deletions myems-web/src/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationDetails.js
View file

Large diffs are not rendered by default.

185 changes: 94 additions & 91 deletions myems-web/src/components/MyEMS/EnergyStoragePowerStation/EnergyStoragePowerStationList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
FormGroup,
Input,
Label,
Spinner,
Spinner
} from 'reactstrap';
import Loader from '../../common/Loader';
import { isIterableArray } from '../../../helpers/utils';
Expand All @@ -29,15 +29,14 @@ import { toast } from 'react-toastify';
import { APIBaseURL, settings } from '../../../config';
import CustomizeMapBox from '../common/CustomizeMapBox';


const EnergyStoragePowerStationList = ({ setRedirect, setRedirectUrl, t }) => {
useEffect(() => {
let is_logged_in = getCookieValue('is_logged_in');
let user_name = getCookieValue('user_name');
let user_display_name = getCookieValue('user_display_name');
let user_uuid = getCookieValue('user_uuid');
let token = getCookieValue('token');
if (checkEmpty(is_logged_in) || checkEmpty(token)|| checkEmpty(user_uuid) || !is_logged_in) {
if (checkEmpty(is_logged_in) || checkEmpty(token) || checkEmpty(user_uuid) || !is_logged_in) {
setRedirectUrl(`/authentication/basic/login`);
setRedirect(true);
} else {
Expand Down Expand Up @@ -71,89 +70,90 @@ const EnergyStoragePowerStationList = ({ setRedirect, setRedirectUrl, t }) => {

useEffect(() => {
let isResponseOK = false;
fetch(
APIBaseURL +
'/reports/energystoragepowerstationlist', {
fetch(APIBaseURL + '/reports/energystoragepowerstationlist', {
method: 'GET',
headers: {
'Content-type': 'application/json',
'User-UUID': getCookieValue('user_uuid'),
Token: getCookieValue('token')
},
body: null,

}).then(response => {
console.log(response);
if (response.ok) {
isResponseOK = true;
}
return response.json();
}).then(json => {
console.log(json);
if (isResponseOK) {
body: null
})
.then(response => {
console.log(response);
if (response.ok) {
isResponseOK = true;
}
return response.json();
})
.then(json => {
console.log(json);
setEnergyStoragePowerStationArray([]);
setEnergyStoragePowerStationIds([]);
let energyStoragePowerStationArray = [];
let energyStoragePowerStationIds = [];
let geojsonData = [];
if (json.length > 0) {
setRootLongitude(json[0]['longitude']);
setRootLatitude(json[0]['latitude']);
json.forEach((currentValue, index) => {
let energyStoragePowerStation = {}
energyStoragePowerStation['id'] = json[index]['id'];
energyStoragePowerStation['name'] = json[index]['name'];
energyStoragePowerStation['uuid'] = json[index]['uuid'];
energyStoragePowerStation['address'] = json[index]['address'];
energyStoragePowerStation['postal_code'] = json[index]['postal_code'];
energyStoragePowerStation['latitude'] = json[index]['latitude'];
energyStoragePowerStation['longitude'] = json[index]['longitude'];
energyStoragePowerStation['serial_number'] = json[index]['serial_number'];
energyStoragePowerStation['files'] = [{ id: json[index]['uuid'], src: require('./EnergyStoragePowerStation.jpeg'), }];
energyStoragePowerStation['batteryOperatingState'] = json[index]['battery_operating_state'];
energyStoragePowerStation['batterySocPointValue'] = json[index]['battery_soc_point_value'];
energyStoragePowerStation['batteryPowerPointValue'] = json[index]['battery_power_point_value'];
energyStoragePowerStation['photovoltaicPowerPointValue'] = json[index]['photovoltaic_power_point_value'];
energyStoragePowerStation['loadPowerPointValue'] = json[index]['load_power_point_value'];
energyStoragePowerStation['gridPowerPointValue'] = json[index]['grid_power_point_value'];
energyStoragePowerStation['PCSRunState'] = json[index]['pcs_run_state'];
energyStoragePowerStation['alarms'] = ['supply temperature is high', 'return temperature is low'];
energyStoragePowerStation['isOnline'] = json[index]['is_online'];

energyStoragePowerStationArray.push(energyStoragePowerStation);
energyStoragePowerStationIds.push(energyStoragePowerStation['id']);
geojsonData.push({
'type': 'Feature',
'geometry': {
'type': 'Point',
'coordinates': [json[index]['longitude'], json[index]['latitude']]
if (isResponseOK) {
console.log(json);
setEnergyStoragePowerStationArray([]);
setEnergyStoragePowerStationIds([]);
let energyStoragePowerStationArray = [];
let energyStoragePowerStationIds = [];
let geojsonData = [];
if (json.length > 0) {
setRootLongitude(json[0]['longitude']);
setRootLatitude(json[0]['latitude']);
json.forEach((currentValue, index) => {
let energyStoragePowerStation = {};
energyStoragePowerStation['id'] = json[index]['id'];
energyStoragePowerStation['name'] = json[index]['name'];
energyStoragePowerStation['uuid'] = json[index]['uuid'];
energyStoragePowerStation['address'] = json[index]['address'];
energyStoragePowerStation['postal_code'] = json[index]['postal_code'];
energyStoragePowerStation['latitude'] = json[index]['latitude'];
energyStoragePowerStation['longitude'] = json[index]['longitude'];
energyStoragePowerStation['serial_number'] = json[index]['serial_number'];
energyStoragePowerStation['files'] = [
{ id: json[index]['uuid'], src: require('./EnergyStoragePowerStation.jpeg') }
];
energyStoragePowerStation['batteryOperatingState'] = json[index]['battery_operating_state'];
energyStoragePowerStation['batterySocPointValue'] = json[index]['battery_soc_point_value'];
energyStoragePowerStation['batteryPowerPointValue'] = json[index]['battery_power_point_value'];
energyStoragePowerStation['photovoltaicPowerPointValue'] = json[index]['photovoltaic_power_point_value'];
energyStoragePowerStation['loadPowerPointValue'] = json[index]['load_power_point_value'];
energyStoragePowerStation['gridPowerPointValue'] = json[index]['grid_power_point_value'];
energyStoragePowerStation['PCSRunState'] = json[index]['pcs_run_state'];
energyStoragePowerStation['alarms'] = ['supply temperature is high', 'return temperature is low'];
energyStoragePowerStation['isOnline'] = json[index]['is_online'];

energyStoragePowerStationArray.push(energyStoragePowerStation);
energyStoragePowerStationIds.push(energyStoragePowerStation['id']);
geojsonData.push({
type: 'Feature',
geometry: {
type: 'Point',
coordinates: [json[index]['longitude'], json[index]['latitude']]
},
'properties': {
'title': json[index]['name'],
'description': json[index]['description'],
'uuid': json[index]['uuid'],
'url': '/energystoragepowerstation/details'
properties: {
title: json[index]['name'],
description: json[index]['description'],
uuid: json[index]['uuid'],
url: '/energystoragepowerstation/details'
}
})
});
});
});
}
setEnergyStoragePowerStationArray(energyStoragePowerStationArray);
setEnergyStoragePowerStationIds(energyStoragePowerStationIds);
console.log('energyStoragePowerStationArray:');
console.log(energyStoragePowerStationArray);
console.log('energyStoragePowerStationIds:');
console.log(energyStoragePowerStationIds);
setIsLoading(false);
setGeojson(geojsonData);
} else {
toast.error(t(json.description));
}
setEnergyStoragePowerStationArray(energyStoragePowerStationArray);
setEnergyStoragePowerStationIds(energyStoragePowerStationIds);
console.log('energyStoragePowerStationArray:');
console.log(energyStoragePowerStationArray);
console.log('energyStoragePowerStationIds:');
console.log(energyStoragePowerStationIds);
setIsLoading(false);
setGeojson(geojsonData);
} else {
toast.error(t(json.description));
}
}).catch(err => {
console.log(err);
});

}, [t, ]);
})
.catch(err => {
console.log(err);
});
}, [t]);

const labelClasses = 'ls text-uppercase text-600 font-weight-semi-bold mb-0';

Expand All @@ -165,45 +165,51 @@ const EnergyStoragePowerStationList = ({ setRedirect, setRedirectUrl, t }) => {
};

// Hook
const { data: paginationData, meta: paginationMeta, handler: paginationHandler } = usePagination(energyStoragePowerStationIds);
const { data: paginationData, meta: paginationMeta, handler: paginationHandler } = usePagination(
energyStoragePowerStationIds
);
const { total, itemsPerPage, from, to } = paginationMeta;
const { perPage } = paginationHandler;

const isList = true;
const isGrid = false;


return (
<Fragment>
<Card>
<CardBody className={classNames({ 'p-0 overflow-hidden': isList, 'pb-0': isGrid })}>
<Row>
<Col xs={8}>
{isLoading ? (
<Loader />
) : (
{isLoading ? (
<Loader />
) : (
<Row noGutters={isList}>
{isIterableArray(energyStoragePowerStationArray) &&
energyStoragePowerStationArray
.filter(energyStoragePowerStation => paginationData.includes(energyStoragePowerStation.id))
.map((energyStoragePowerStation, index) => <EnergyStoragePowerStationListItem {...energyStoragePowerStation} sliderSettings={sliderSettings} key={energyStoragePowerStation.id} index={index} />)}
.map((energyStoragePowerStation, index) => (
<EnergyStoragePowerStationListItem
{...energyStoragePowerStation}
sliderSettings={sliderSettings}
key={energyStoragePowerStation.id}
index={index}
/>
))}
</Row>
)}
</Col>
<Col>
<CustomizeMapBox Latitude={rootLatitude} Longitude={rootLongitude} Zoom={10} Geojson={geojson}></CustomizeMapBox>
<CustomizeMapBox Latitude={rootLatitude} Longitude={rootLongitude} Zoom={10} Geojson={geojson} />
</Col>
</Row>
</Row>
</CardBody>
<EnergyStoragePowerStationFooter meta={paginationMeta} handler={paginationHandler} />
</Card>
<Card className="mb-3">
<CardBody>
<Row className="justify-content-between align-items-center">
<Col sm="auto" className="mb-2 mb-sm-0" tag={Flex} align="center">
<h6 className="mb-0 text-nowrap ml-2">
{t('Show Up to')}
</h6>
<h6 className="mb-0 text-nowrap ml-2">{t('Show Up to')}</h6>
<CustomInput
id="itemsPerPage"
type="select"
Expand All @@ -216,11 +222,8 @@ const EnergyStoragePowerStationList = ({ setRedirect, setRedirectUrl, t }) => {
<option value={20}>20</option>
<option value={total}>{t('All')}</option>
</CustomInput>
<h6 className="mb-0 text-nowrap ml-2">
{t('FROM - TO of TOTAL', { 'FROM': from, 'TO': to, 'TOTAL': total })}
</h6>
<h6 className="mb-0 text-nowrap ml-2">{t('FROM - TO of TOTAL', { FROM: from, TO: to, TOTAL: total })}</h6>
</Col>

</Row>
</CardBody>
</Card>
Expand Down
Loading

0 comments on commit 5e7502a

Please sign in to comment.