taxtank-core 1.0.8 → 1.0.9

package/fesm2022/taxtank-core.mjs

@@ -2320,8 +2320,8 @@ class PropertyCategoryMovementCollection extends Collection {
         return this.filterBy('property.id', property.id)
             .filterByFinancialYear('fromDate', 'toDate', new FinancialYear(forecast.financialYear));
     }
-    hasCategory(categoryId) {
-        return !!this.findBy('propertyCategory.id', categoryId);
+    isShared() {
+        return !!this.findBy('propertyCategory.isPropertyShare', true);
     }
     /**
      * active movement by property based on selected year
@@ -23352,7 +23352,9 @@ class PropertyForecastForm extends AbstractForm {
      * @param forecast
      * @param movements property could have multiple categories within forecast year, based on categories we hide/show some fields
      */
-    constructor(forecast = plainToClass(PropertyForecast, {}), movements = new PropertyCategoryMovementCollection()) {
+    constructor(forecast = plainToClass(PropertyForecast, {}), 
+    // @TODO why collection? forecast can be related with just one movement
+    movements = new PropertyCategoryMovementCollection()) {
         const noIncomeCategories = [PropertyCategoryListEnum.VACANT_LAND, PropertyCategoryListEnum.OWNER_OCCUPIED];
         const noIncome = movements.filterBy('propertyCategory.id', noIncomeCategories).length === movements.length;
         super({
@@ -23361,7 +23363,7 @@ class PropertyForecastForm extends AbstractForm {
             expense: new UntypedFormControl(forecast.expense, Validators.required),
             interest: new UntypedFormControl(forecast.interest, Validators.required),
             depreciation: new UntypedFormControl({ value: forecast.depreciation, disabled: noIncome }, Validators.required),
-            claimPercent: new UntypedFormControl({ value: forecast.claimPercent, disabled: !movements.hasCategory(PropertyCategoryListEnum.SHARED) }, [Validators.min(0), Validators.max(100), Validators.required])
+            claimPercent: new UntypedFormControl({ value: forecast.claimPercent, disabled: !movements.isShared() }, [Validators.min(0), Validators.max(100), Validators.required])
         }, forecast);
     }
 }