taxtank-core 2.0.71 → 2.0.73

package/fesm2022/taxtank-core.mjs

@@ -11556,6 +11556,9 @@ class FinancialGoal extends AbstractModel {
     isCompleted() {
         return this.status === FinancialGoalStatusEnum.COMPLETE;
     }
+    isAchieved() {
+        return this.progress >= this.target;
+    }
     isPropertyType() {
         return [FinancialGoalTypeEnum.PROPERTY_EQUITY, FinancialGoalTypeEnum.PROPERTY_LVR].includes(this.type);
     }
@@ -11575,41 +11578,50 @@ class FinancialGoal extends AbstractModel {
      *  How much user saved so far.
      */
     get progress() {
-        if (this.isPropertyType()) {
-            return 0;
+        let progress = this.currentValue - this.initialValue;
+        if (this.isLvr()) {
+            progress = this.initialValue - this.currentValue;
         }
-        return this.isCompleted()
-            ? Math.abs(this.finalValue - this.initialValue)
-            : Math.abs(this.bankAccount.currentBalance - this.initialValue);
+        return round(progress, 2);
     }
     /**
      * How much is left to reach the goal from the current balance.
      */
     get remaining() {
-        return this.isCompleted() ? 0 : this.target - this.progress;
+        if (this.isCompleted() || this.isAchieved()) {
+            return 0;
+        }
+        return round(this.target - this.progress, 2);
     }
     /**
      * How much needs to deposit to achieve the goal from the start
      */
     get target() {
-        return Math.abs(this.targetValue - this.initialValue);
+        let target = this.targetValue - this.initialValue;
+        if (this.isLvr()) {
+            target = this.initialValue - this.targetValue;
+        }
+        return round(target, 2);
     }
     /**
      *  How much of the goal is reached in percents.
      */
     get progressPercent() {
-        return this.progress / this.target;
+        return round(this.progress / this.target, 2);
     }
     getBadge() {
+        if (this.isPropertyType() && this.status === FinancialGoalStatusEnum.ACTIVE && this.progress > 0 && !this.isAchieved()) {
+            return new Badge('Active', BadgeColorEnum.GREEN);
+        }
         switch (true) {
             case this.status === FinancialGoalStatusEnum.PAUSE:
                 return new Badge('Paused', BadgeColorEnum.GOLD);
             case this.status === FinancialGoalStatusEnum.COMPLETE:
                 return new Badge('Completed', BadgeColorEnum.GREEN);
+            case this.isAchieved():
+                return new Badge('Achieved', BadgeColorEnum.GREEN);
             case this.forecast === 0:
                 return this.progress ? new Badge(`Ahead`, BadgeColorEnum.GREEN) : new Badge(`On track`, BadgeColorEnum.PRIMARY);
-            case this.progress >= this.target:
-                return new Badge('Achieved', BadgeColorEnum.GREEN);
             case this.forecastPercent >= 1.05:
                 return new Badge(`Ahead by ${this.forecastPercent} %`, BadgeColorEnum.GREEN);
             case this.forecastPercent >= 0.95 && this.forecastPercent <= 1.05: