Merge pull request #257 from capcodigital/feature/CGC-115-update-offi…

…ce-tab updated distance fields
capcodigital · Jun 25, 2024 · 759a47b · 759a47b
2 parents f270adb + f38b8e1
commit 759a47b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/components/global/common/CountryLeaderboardTable.component.js b/app/components/global/common/CountryLeaderboardTable.component.js
@@ -116,7 +116,7 @@ const CountryLeaderboardTable = ({
             <Table.Body className="main-table">
               {data.map((item, idx) => {
                 let dateCompletion = item.completionDate ? "finish" : "pending";
-                const {name, members, position, totalDistanceCovered} = item;
+                const {name, members, position, averageDistanceConverted, totalDistanceConverted} = item;
                 const location = name;
                 return (
                   <Table.Row
@@ -140,10 +140,10 @@ const CountryLeaderboardTable = ({
                       />
                     </Table.Cell>
                     <Table.Cell>
-                      {totalDistanceCovered ? totalDistanceCovered : 0}km
+                      {totalDistanceConverted ? totalDistanceConverted : 0}km
                     </Table.Cell>
                     <Table.Cell>
-                      {averageDistance(totalDistanceCovered, usersByLocation, location)}km
+                    {averageDistanceConverted ? averageDistanceConverted : 0}km
                     </Table.Cell>
                   </Table.Row>
                 );
@@ -183,10 +183,10 @@ const CountryLeaderboardTable = ({
               </span>
               <span>
                 <div className={"date"}>
-                  {totalDistanceCovered}
+                {totalDistanceConverted ? totalDistanceConverted : 0}km
                 </div>
                   <div className="distance">
-                    {averageDistance(totalDistanceCovered, usersByLocation, location)}
+                  {averageDistanceConverted ? averageDistanceConverted : 0}km
                     km
                   </div>
               </span>

diff --git a/app/components/global/dashboard/dashboardGlobal.component.js b/app/components/global/dashboard/dashboardGlobal.component.js
@@ -257,6 +257,7 @@ class DashboardGlobal extends React.Component {
         return this.forceUpdate();
       case "office":
         this.setState({
+          userData: personal,
           currentData: locations,
           filteredData: locations,
           activeTab: "office",