diff --git a/src/components/Blocks/PlantLogs/View.jsx b/src/components/Blocks/PlantLogs/View.jsx index 84e5d62..e05b62b 100644 --- a/src/components/Blocks/PlantLogs/View.jsx +++ b/src/components/Blocks/PlantLogs/View.jsx @@ -50,6 +50,10 @@ const View = (props) => { {item[2]} {item[3]} {item[4]} + {item[5]} + {item[6]} + {item[7]} + {item[8]} ); }) diff --git a/src/components/Blocks/PlantLogs/data.js b/src/components/Blocks/PlantLogs/data.js index d4ecfae..f7fa010 100644 --- a/src/components/Blocks/PlantLogs/data.js +++ b/src/components/Blocks/PlantLogs/data.js @@ -45,11 +45,10 @@ const WholeDataResponse = (props) => { const include = ['asset', 'location']; return farm.log.fetch({ filter, include, limit: 1 }); }); - Promise.all(requests).then((responses) => { responses.forEach(async (respP) => { var { - data: [remoteLog, remoteAsset, remoteLocation], + data: [remoteLog, remoteAsset, remoteLocation, remoteLocation2, remoteLocation3, remoteLocation4, remoteLocation5], } = respP; if (typeof remoteLocation == 'undefined') { remoteLocation = { attributes: { name: null } }; @@ -60,7 +59,7 @@ const WholeDataResponse = (props) => { relationships: { plant_type: [{ id: null }] }, }; } - const objectPName = [remoteLog?.attributes.name, remoteLog?.attributes.timestamp, remoteLog?.attributes.status, remoteAsset?.attributes.name, remoteLocation?.attributes.name, remoteLog?.attributes.timestamp]; + const objectPName = [remoteLog?.attributes.name, remoteLog?.attributes.timestamp, remoteLog?.attributes.status, remoteAsset?.attributes.name, remoteLocation?.attributes.name, remoteLocation2?.attributes.name, remoteLocation3?.attributes.name, remoteLocation4?.attributes.name, remoteLocation5?.attributes.name]; newlyarray.push(objectPName); }); var okthen = { newlyarray };