taxtank-core 2.0.66 → 2.0.67

package/fesm2022/taxtank-core.mjs

@@ -9754,7 +9754,7 @@ class ClientPortfolioReportCollection extends Collection {
 
 class FinancialGoalCollection extends Collection {
     getActive() {
-        return this.filterBy('status', FinancialGoalStatusEnum.ACTIVE);
+        return this.filterBy('status', [FinancialGoalStatusEnum.ACTIVE, FinancialGoalStatusEnum.PAUSE]);
     }
 }
 
@@ -11504,12 +11504,15 @@ class FinancialGoal extends AbstractModel {
     constructor() {
         super(...arguments);
         this.startDate = moment().startOf('day').toDate();
-        this.paymentFrequency = DailyFrequencyEnum.MONTHLY;
-        this.inCalendar = true;
+        this.inCalendar = false;
+        this.properties = [];
     }
     isCompleted() {
         return this.status === FinancialGoalStatusEnum.COMPLETE;
     }
+    isPropertyType() {
+        return [FinancialGoalTypeEnum.PROPERTY_EQUITY, FinancialGoalTypeEnum.PROPERTY_LVR].includes(this.type);
+    }
     /**
      * today's forecasted progress
      */
@@ -11523,6 +11526,9 @@ class FinancialGoal extends AbstractModel {
      *  How much user saved so far.
      */
     get progress() {
+        if (this.isPropertyType()) {
+            return 0;
+        }
         return this.isCompleted()
             ? Math.abs(this.finalValue - this.initialValue)
             : Math.abs(this.bankAccount.currentBalance - this.initialValue);
@@ -23265,7 +23271,7 @@ function greaterThanControlValidator(controlName) {
         const group = control.parent;
         const fieldToCompare = group.get(controlName);
         const isLessThan = Number(fieldToCompare.value) > Number(control.value);
-        return isLessThan ? { min: { min: fieldToCompare.value, actual: control.value } } : null;
+        return isLessThan ? { greaterThanControl: { min: fieldToCompare.value, actual: control.value } } : null;
     };
 }
 
@@ -23455,34 +23461,34 @@ const END_DATE_VALIDATION_ERROR = 'Target date must be more than start date';
 class FinancialGoalForm extends AbstractForm {
     constructor(goal = plainToClass(FinancialGoal, {})) {
         super({
-            type: new FormControl({
-                value: goal.type ?? FinancialGoalTypeEnum.DEBIT,
-                disabled: !!goal.id
-            }, Validators.required),
+            type: new FormControl({ value: goal.type ?? FinancialGoalTypeEnum.DEBIT, disabled: !!goal.id }, Validators.required),
             name: new FormControl(goal.name, Validators.required),
             bankAccount: new FormControl({ value: goal.bankAccount, disabled: !!goal.id }, [
-                conditionalValidator(() => [FinancialGoalTypeEnum.CREDIT, FinancialGoalTypeEnum.DEBIT].includes(this.value.type), Validators.required),
+                conditionalValidator(() => !this.isPropertyType(), Validators.required),
             ]),
             targetValue: new FormControl(goal.targetValue, [
-                conditionalValidator(() => this.value.type === FinancialGoalTypeEnum.DEBIT, Validators.min(0)),
-                conditionalValidator(() => this.value.type === FinancialGoalTypeEnum.CREDIT, Validators.max(0)),
                 greaterThanControlValidator('initialValue'),
                 Validators.required
             ]),
-            initialValue: new FormControl({ value: goal.initialValue, disabled: true }, Validators.required),
+            initialValue: new FormControl({ value: goal.initialValue, disabled: false }, Validators.required),
             startDate: new FormControl({ value: goal.startDate, disabled: true }),
             endDate: new FormControl(goal.endDate, [Validators.required, minDateValidator(goal.startDate, END_DATE_VALIDATION_ERROR)]),
-            paymentFrequency: new FormControl(goal.paymentFrequency, Validators.required),
-            paymentAmount: new FormControl(goal.paymentAmount, Validators.required),
+            paymentFrequency: new FormControl(goal.paymentFrequency, [
+                conditionalValidator(() => !this.isPropertyType(), Validators.required),
+            ]),
+            paymentAmount: new FormControl(goal.paymentAmount, [
+                conditionalValidator(() => !this.isPropertyType(), Validators.required),
+            ]),
             inCalendar: new FormControl(goal.inCalendar),
             file: new FormControl(goal.file),
             description: new FormControl(goal.description),
+            properties: new FormControl(goal.properties, [
+                conditionalValidator(() => this.isPropertyType(), Validators.required),
+            ]),
         }, goal);
         this.includeDisabledFields = true;
         this.bankAccountTypes = [];
-        this.isDebit = true;
         this.bankAccountTypes = this.getBankAccountTypes(goal.type);
-        this.isDebit = this.getIsDebit(goal.type);
         this.listenEvents();
     }
     listenEvents() {
@@ -23490,11 +23496,19 @@ class FinancialGoalForm extends AbstractForm {
         this.listenBankAccountChanges();
         this.listenPaymentChanges();
     }
+    isPropertyType() {
+        return [FinancialGoalTypeEnum.PROPERTY_EQUITY, FinancialGoalTypeEnum.PROPERTY_LVR].includes(this.value.type);
+    }
     listenTypeChanges() {
         this.get('type').valueChanges.subscribe((type) => {
             this.get('bankAccount').setValue(null, { onlySelf: true });
+            this.get('properties').setValue([], { onlySelf: true });
+            if (this.isPropertyType()) {
+                this.get('inCalendar').setValue(false, { onlySelf: true });
+                this.get('paymentFrequency').setValue(false, { onlySelf: true });
+                this.get('paymentAmount').setValue(false, { onlySelf: true });
+            }
             this.bankAccountTypes = this.getBankAccountTypes(type);
-            this.isDebit = this.getIsDebit(type);
         });
     }
     /**
@@ -23563,13 +23577,12 @@ class FinancialGoalForm extends AbstractForm {
         switch (type) {
             case FinancialGoalTypeEnum.CREDIT:
                 return [BankAccountTypeEnum.MORTGAGE, BankAccountTypeEnum.LOAN, BankAccountTypeEnum.CREDIT_CARD];
-            default:
+            case FinancialGoalTypeEnum.DEBIT:
                 return [BankAccountTypeEnum.TRANSACTION, BankAccountTypeEnum.SAVINGS, BankAccountTypeEnum.OFFSET];
+            default:
+                return [];
         }
     }
-    getIsDebit(type) {
-        return type !== FinancialGoalTypeEnum.CREDIT;
-    }
 }
 
 class FirmForm extends AbstractForm {