Преглед изворни кода

Fix bug with allowances not updating.
Fix bug with allowances only allowing integers.

Lee Morgan пре 6 месеци
родитељ
комит
40488232e1

+ 5 - 0
src/views/js/data/Allowance.js

@@ -47,6 +47,11 @@ export default class Allowance{
         this._active = v;
     }
 
+    updateAmount(amount, isPercent){
+        this._amount = amount;
+        this._isPercent = isPercent;
+    }
+
     currencyAmount(income){
         if(this._isPercent) return income * (this._amount / 100);
         return this._amount;

+ 1 - 1
src/views/js/pages/CreateAllowance.js

@@ -24,7 +24,7 @@ export default class CreateAllowance extends Page{
         if(event.target.checked){
             text = "Amount (%)";
             titleText = "(Percent of Income)";
-            step = "1";
+            step = "0.01";
         }else{
             text = "Amount ($)";
             titleText = "(Fixed Amount)";

+ 5 - 7
src/views/js/pages/EditAllowance.js

@@ -16,8 +16,9 @@ export default class EditAllowance extends Page{
 
         const select = this.container.querySelector.bind(this.container);
         allowance.name = select(".name").value;
-        allowance.isPercent = select(".isPercent").checked;
-        allowance.amount = select(".amount").value;
+        const isPercent = select(".isPercent").checked;
+        const amount = select(".amount").value;
+        allowance.updateAmount(amount, isPercent);
 
         user.account.save();
         changePage("viewAllowances");
@@ -40,15 +41,13 @@ export default class EditAllowance extends Page{
 
     updateAmount(allowance){
         let value = this.amountDisplay(event.target.checked, allowance);
-        let text, titleText, step;
+        let text, titleText;
         if(event.target.checked){
             text = "Amount (%)";
             titleText = "(Percent of Income)";
-            step = "1";
         }else{
             text = "Amount ($)";
             titleText = "(Fixed Amount)";
-            step = "0.01";
         }
 
         new Elem(this.container.querySelector("h2"))
@@ -64,7 +63,6 @@ export default class EditAllowance extends Page{
                 .addClass("amount")
                 .value(value)
                 .min("0")
-                .step(step)
                 .required()
             );
     }
@@ -119,7 +117,7 @@ export default class EditAllowance extends Page{
                     .addClass("amount")
                     .value(value)
                     .min("0")
-                    .step(allowance.isPercent ? "1" : "0.01")
+                    .step("0.01")
                     .required()
                 )
             )