taxtank-core 0.33.95 → 0.33.96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -29,11 +29,9 @@ export class PropertyAddForm extends AbstractForm {
|
|
29
29
|
new PropertyCategoryMovementForm()
|
30
30
|
])
|
31
31
|
}, plainToClass(Property, {}));
|
32
|
-
//
|
33
|
-
|
34
|
-
this.
|
35
|
-
this.forecastForm.get('marketValue').setValue(marketValue);
|
36
|
-
});
|
32
|
+
// we should put the same market value to both, forecast and valuation. also we moved marketValue to another form - leave it as 0
|
33
|
+
this.valuationForm.get('marketValue').setValue(0);
|
34
|
+
this.forecastForm.get('marketValue').setValue(0);
|
37
35
|
this.get('contractDate').valueChanges.subscribe((contractDate) => {
|
38
36
|
this.categoryMovementForm.get('fromDate').setValue(contractDate);
|
39
37
|
});
|
@@ -70,4 +68,4 @@ export class PropertyAddForm extends AbstractForm {
|
|
70
68
|
return this.get('categoryMovements').controls[0];
|
71
69
|
}
|
72
70
|
}
|
73
|
-
//# sourceMappingURL=data:application/json;base64,
|
71
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property-add.form.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/forms/property/property-add.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { UntypedFormArray, UntypedFormControl, Validators } from '@angular/forms';\r\nimport { FinancialYear, Property, PropertyCategory } from '../../models';\r\nimport { AbstractForm } from '../abstract.form';\r\nimport { plainToClass } from 'class-transformer';\r\nimport { PropertyValuationForm } from './property-valuation.form';\r\nimport { PropertyShareForm } from './property-share.form';\r\nimport { PropertyForecastForm } from './property-forecast.form';\r\nimport { PropertyCategoryMovementForm } from './property-category-movement-form';\r\nimport { maxDateValidator } from '../../validators';\r\n\r\n/**\r\n * Form class for the single new property\r\n */\r\nexport class PropertyAddForm extends AbstractForm<Property> {\r\n  constructor() {\r\n    super({\r\n      address: new UntypedFormControl(null, Validators.required),\r\n      purchasePrice: new UntypedFormControl(null, Validators.required),\r\n      contractDate: new UntypedFormControl(null, [\r\n        Validators.required,\r\n        maxDateValidator(new FinancialYear().endDate, 'You cannot add a property with a contract date in future financial years.')\r\n      ]),\r\n      settlementDate: new UntypedFormControl(null, Validators.required),\r\n      forecasts: new UntypedFormArray([\r\n        new PropertyForecastForm()\r\n      ]),\r\n      shares: new UntypedFormArray([\r\n        new PropertyShareForm()\r\n      ]),\r\n      categoryMovements: new UntypedFormArray([\r\n        new PropertyCategoryMovementForm()\r\n      ])\r\n    }, plainToClass(Property, {}));\r\n\r\n    // we should put the same market value to both, forecast and valuation. also we moved marketValue to another form - leave it as 0\r\n    this.valuationForm.get('marketValue').setValue(0);\r\n    this.forecastForm.get('marketValue').setValue(0);\r\n\r\n    this.get('contractDate').valueChanges.subscribe((contractDate: Date) => {\r\n      this.categoryMovementForm.get('fromDate').setValue(contractDate);\r\n    });\r\n\r\n    this.categoryMovementForm.get('propertyCategory').valueChanges.subscribe((category: PropertyCategory) => {\r\n      if (category.isShared()) {\r\n        this.forecastForm.get('claimPercent').enable();\r\n      } else {\r\n        this.forecastForm.get('claimPercent').disable();\r\n      }\r\n\r\n      if (category.isOwnerOccupied() || category.isVacantLand()) {\r\n        this.forecastForm.get('income').disable();\r\n        this.forecastForm.get('depreciation').disable();\r\n      } else {\r\n        this.forecastForm.get('income').enable();\r\n        this.forecastForm.get('depreciation').enable();\r\n      }\r\n    });\r\n  }\r\n\r\n  get valuationForm(): PropertyValuationForm {\r\n    return this.categoryMovementForm.get('valuation') as PropertyValuationForm;\r\n  }\r\n\r\n  get forecastForm(): PropertyForecastForm {\r\n    // [0] because for property add form we have always 1 forecast form inside\r\n    return (this.get('forecasts') as UntypedFormArray).controls[0] as PropertyForecastForm;\r\n  }\r\n\r\n  get shareForm(): PropertyShareForm {\r\n    // [0] because for property add form we have always 1 forecast form inside\r\n    return (this.get('shares') as UntypedFormArray).controls[0] as PropertyShareForm;\r\n  }\r\n\r\n  get categoryMovementForm(): PropertyCategoryMovementForm {\r\n    // [0] because for property add form we always have 1 category movement form inside\r\n    return (this.get('categoryMovements') as UntypedFormArray).controls[0] as PropertyCategoryMovementForm;\r\n  }\r\n}\r\n"]}
|
@@ -23284,11 +23284,9 @@ class PropertyAddForm extends AbstractForm {
|
|
23284
23284
|
new PropertyCategoryMovementForm()
|
23285
23285
|
])
|
23286
23286
|
}, plainToClass(Property, {}));
|
23287
|
-
//
|
23288
|
-
|
23289
|
-
this.
|
23290
|
-
this.forecastForm.get('marketValue').setValue(marketValue);
|
23291
|
-
});
|
23287
|
+
// we should put the same market value to both, forecast and valuation. also we moved marketValue to another form - leave it as 0
|
23288
|
+
this.valuationForm.get('marketValue').setValue(0);
|
23289
|
+
this.forecastForm.get('marketValue').setValue(0);
|
23292
23290
|
this.get('contractDate').valueChanges.subscribe((contractDate) => {
|
23293
23291
|
this.categoryMovementForm.get('fromDate').setValue(contractDate);
|
23294
23292
|
});
|