Merge pull request #25 from Geesa-Vihara/hashini

Commas added to dashboard
Project-BSafe · May 26, 2020 · 02fdc5d · 02fdc5d
2 parents 2e26194 + a8b769c
commit 02fdc5d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/screens/Global.js b/screens/Global.js
@@ -101,16 +101,16 @@ class Global extends React.Component {
 
 
     console.log("global total cases = "+data.data.global_total_cases);
+
 
 
       this.setState({
-        local_total_cases: data.data.local_total_cases,
-        global_total_cases: data.data.global_total_cases,
-        global_deaths : data.data.global_deaths,
-        global_new_cases : data.data.global_new_cases,
-        global_recovered : data.data.global_recovered,
-        global_new_deaths : data.data.global_new_deaths,
-        total_pcr_testing_count: data.data.total_pcr_testing_count,
+        global_total_cases: this.thousands_separators(data.data.global_total_cases),
+        global_deaths : this.thousands_separators(data.data.global_deaths),
+        global_new_cases : this.thousands_separators(data.data.global_new_cases),
+        global_recovered : this.thousands_separators(data.data.global_recovered),
+        global_new_deaths : this.thousands_separators(data.data.global_new_deaths),
+        total_pcr_testing_count: this.thousands_separators(data.data.total_pcr_testing_count),
         isLoading: false,
 
         });
@@ -126,6 +126,13 @@ class Global extends React.Component {
     this.newsFetch();
   }
 
+   thousands_separators(num)
+  {
+    var num_parts = num.toString().split(".");
+    num_parts[0] = num_parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    return num_parts.join(".");
+  }
+
 
 
   render() {

diff --git a/screens/Home.js b/screens/Home.js
@@ -96,13 +96,13 @@ class Home extends React.Component {
     console.log("local recovered cases = "+data.data.local_recovered);
 
       this.setState({
-        local_total_cases: data.data.local_total_cases,
-        global_total_cases: data.data.global_total_cases,
-        local_deaths : data.data.local_deaths,
-        local_new_cases : data.data.local_new_cases,
-        local_recovered : data.data.local_recovered,
-        local_active_cases : data.data.local_active_cases,
-        local_total_number_of_individuals_in_hospitals : data.data.local_total_number_of_individuals_in_hospitals,
+        local_total_cases: this.thousands_separators(data.data.local_total_cases),
+        global_total_cases: this.thousands_separators(data.data.global_total_cases),
+        local_deaths : this.thousands_separators(data.data.local_deaths),
+        local_new_cases : this.thousands_separators(data.data.local_new_cases),
+        local_recovered : this.thousands_separators(data.data.local_recovered),
+        local_active_cases : this.thousands_separators(data.data.local_active_cases),
+        local_total_number_of_individuals_in_hospitals : this.thousands_separators(data.data.local_total_number_of_individuals_in_hospitals),
         isLoading: false,
 
         });
@@ -118,6 +118,13 @@ class Home extends React.Component {
     this.newsFetch();
   }
 
+  thousands_separators(num)
+  {
+    var num_parts = num.toString().split(".");
+    num_parts[0] = num_parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    return num_parts.join(".");
+  }
+
 
 
   render() {