Fixed different month amount display bug

xJonathanLEI · Sep 23, 2018 · 12502bd · 12502bd
1 parent 35b3031
commit 12502bd
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/webapp/src/pages/CFODashBoard/index.js b/webapp/src/pages/CFODashBoard/index.js
@@ -93,13 +93,23 @@ class CFODashboard extends Component {
             departments: displayedDepartments,
             applications: displayedApplications,
             sysLmt: this.scaleAmount(configs.system_monthly_limit, token.precision),
-            sysUsed: this.scaleAmount(configs.system_limit_used, token.precision),
+            sysUsed: this.scaleAmount(this.actualUsed(configs.system_limit_used, configs.last_spend_time), token.precision),
             tokenName: token.name,
             tokenPrecision: token.precision,
             tokenContract: configs.token.contract
         });
     }
 
+    actualUsed = (used, usedTime) => {
+        let spendDate = new Date(usedTime * 1000);
+        let nowDate = new Date();
+
+        if (spendDate.getUTCFullYear() == nowDate.getFullYear() && spendDate.getUTCMonth() == nowDate.getUTCMonth())
+            return used;
+
+        return 0;
+    }
+
     formatAmount = (amount, token) => {
         return this.scaleAmount(amount, token.precision) + " " + token.name;
     }
@@ -214,7 +224,7 @@ class CFODashboard extends Component {
         this.setState({
             newDepartmentModalVisibility: false,
         });
-        
+
         this.pageInit();
     }
 

diff --git a/webapp/src/pages/Dashboard/index.js b/webapp/src/pages/Dashboard/index.js
@@ -83,9 +83,9 @@ class Dashborad extends Component {
             displayedExpenditures.push({
                 id: currentExpenditure.id,
                 name: currentExpenditure.name,
-                used: this.formatAmount(currentExpenditure.allowance_used, token),
+                used: this.formatAmount(this.actualUsed(currentExpenditure.allowance_used, currentExpenditure.last_spend_time), token),
                 total: this.formatAmount(currentExpenditure.monthly_allowance, token),
-                percent: Math.round(currentExpenditure.allowance_used / currentExpenditure.monthly_allowance * 100)
+                percent: Math.round(this.actualUsed(currentExpenditure.allowance_used, currentExpenditure.last_spend_time) / currentExpenditure.monthly_allowance * 100)
             });
         }
 
@@ -105,7 +105,7 @@ class Dashborad extends Component {
         this.setState({
             departmentName: department.name,
             monthlyAllowance: this.scaleAmount(department.monthly_allowance, token.precision),
-            allowanceUsed: this.scaleAmount(department.allowance_used, token.precision),
+            allowanceUsed: this.scaleAmount(this.actualUsed(department.allowance_used, department.last_spend_time), token.precision),
             allowanceAllocated: this.scaleAmount(department.allowance_allocated, token.precision),
             expenditures: displayedExpenditures,
             expenses: displayedExpenses,
@@ -116,6 +116,16 @@ class Dashborad extends Component {
         });
     }
 
+    actualUsed = (used, usedTime) => {
+        let spendDate = new Date(usedTime * 1000);
+        let nowDate = new Date();
+
+        if (spendDate.getUTCFullYear() == nowDate.getFullYear() && spendDate.getUTCMonth() == nowDate.getUTCMonth())
+            return used;
+
+        return 0;
+    }
+
     formatAmount = (amount, token) => {
         return this.scaleAmount(amount, token.precision) + " " + token.name;
     }

diff --git a/webapp/src/pages/ExpenditureDetailPage/index.js b/webapp/src/pages/ExpenditureDetailPage/index.js
@@ -77,14 +77,24 @@ class ExpenditureDetailPage extends Component {
             expenditureName: expenditure.name,
             expenditureRecipient: expenditure.recipient,
             expenditureAllowance: this.scaleAmount(expenditure.monthly_allowance, token.precision),
-            expenditureUsed: this.scaleAmount(expenditure.allowance_used, token.precision),
-            expenditureAllowanceLeft: this.scaleAmount(expenditure.monthly_allowance - expenditure.allowance_used, token.precision),
+            expenditureUsed: this.scaleAmount(this.actualUsed(expenditure.allowance_used, expenditure.last_spend_time), token.precision),
+            expenditureAllowanceLeft: this.scaleAmount(expenditure.monthly_allowance - this.actualUsed(expenditure.allowance_used, expenditure.last_spend_time), token.precision),
             tokenName: token.name,
             tokenPrecision: token.precision,
             expenses: displayedExpenses
         });
     }
 
+    actualUsed = (used, usedTime) => {
+        let spendDate = new Date(usedTime * 1000);
+        let nowDate = new Date();
+
+        if (spendDate.getUTCFullYear() == nowDate.getFullYear() && spendDate.getUTCMonth() == nowDate.getUTCMonth())
+            return used;
+
+        return 0;
+    }
+
     formatAmount = (amount, token) => {
         return this.scaleAmount(amount, token.precision) + " " + token.name;
     }