taxtank-core 0.29.10 → 0.29.12-1
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.
- package/bundles/taxtank-core.umd.js +30 -27
- package/bundles/taxtank-core.umd.js.map +1 -1
- package/esm2015/lib/collections/report/property/property-report-item-depreciation.collection.js +2 -2
- package/esm2015/lib/forms/phone/phone.form.js +9 -7
- package/esm2015/lib/forms/sole/sole-contact.form.js +2 -4
- package/esm2015/lib/models/property/property-document.js +2 -2
- package/esm2015/lib/services/report/property/property-transaction-report.service.js +3 -1
- package/fesm2015/taxtank-core.js +28 -24
- package/fesm2015/taxtank-core.js.map +1 -1
- package/package.json +1 -1
package/esm2015/lib/collections/report/property/property-report-item-depreciation.collection.js
CHANGED
|
@@ -12,11 +12,11 @@ export class PropertyReportItemDepreciationCollection extends PropertyReportItem
|
|
|
12
12
|
setItems(depreciations, properties, chartAccounts) {
|
|
13
13
|
this.items = [];
|
|
14
14
|
properties.items.forEach((property) => {
|
|
15
|
-
const depreciationsByType = new CollectionDictionary(depreciations, 'type');
|
|
15
|
+
const depreciationsByType = new CollectionDictionary(depreciations.filterBy('property.id', property.id), 'type');
|
|
16
16
|
depreciationsByType.keys.map((type) => {
|
|
17
17
|
this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
|
|
18
18
|
});
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktcmVwb3J0LWl0ZW0tZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvcmVwb3J0L3Byb3BlcnR5L3Byb3BlcnR5LXJlcG9ydC1pdGVtLWRlcHJlY2lhdGlvbi5jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ25FLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLG1FQUFtRSxDQUFDO0FBQ25ILE9BQU8sRUFBRSw0QkFBNEIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBR2pGOztHQUVHO0FBQ0gsTUFBTSxPQUFPLHdDQUF5QyxTQUFRLDRCQUE0QjtJQUN4RixZQUNFLGFBQXFDLEVBQ3JDLFVBQThCLEVBQzlCLGFBQXdDO1FBRXhDLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQ3pELENBQUM7SUFFTyxRQUFRLENBQUMsYUFBcUMsRUFBRSxVQUE4QixFQUFFLGFBQXdDO1FBQzlILElBQUksQ0FBQyxLQUFLLEdBQUcsRUFBRSxDQUFDO1FBRWhCLFVBQVUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsUUFBa0IsRUFBRSxFQUFFO1lBQzlDLE1BQU0sbUJBQW1CLEdBQWlELElBQUksb0JBQW9CLENBQ2hHLGFBQWEsQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUMsRUFDbEQsTUFBTSxDQUNQLENBQUM7WUFFRixtQkFBbUIsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBWSxFQUFFLEVBQUU7Z0JBQzVDLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksOEJBQThCLENBQ2hELG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFDN0IsUUFBUSxFQUNSLGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLEVBQUUsQ0FBQyxDQUNqRixDQUFDLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgUHJvcGVydHkgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMvcHJvcGVydHkvcHJvcGVydHknO1xuaW1wb3J0IHsgQ2hhcnRBY2NvdW50cyB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9jaGFydC1hY2NvdW50cy9jaGFydC1hY2NvdW50cyc7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vZGVwcmVjaWF0aW9uLmNvbGxlY3Rpb24nO1xuaW1wb3J0IHsgQ29sbGVjdGlvbkRpY3Rpb25hcnkgfSBmcm9tICcuLi8uLi9jb2xsZWN0aW9uLWRpY3Rpb25hcnknO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzL3JlcG9ydC9wcm9wZXJ0eS9wcm9wZXJ0eS1yZXBvcnQtaXRlbS1kZXByZWNpYXRpb24nO1xuaW1wb3J0IHsgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbiB9IGZyb20gJy4vcHJvcGVydHktcmVwb3J0LWl0ZW0uY29sbGVjdGlvbic7XG5pbXBvcnQge1Byb3BlcnR5Q29sbGVjdGlvbn0gZnJvbSAnLi4vLi4vcHJvcGVydHkvcHJvcGVydHkuY29sbGVjdGlvbic7XG5cbi8qKlxuICogQ29sbGVjdGlvbiB0byB3b3JrIHdpdGggZGVwcmVjaWF0aW9uLWJhc2VkIHByb3BlcnR5IHJlcG9ydCBpdGVtc1xuICovXG5leHBvcnQgY2xhc3MgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uQ29sbGVjdGlvbiBleHRlbmRzIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24ge1xuICBjb25zdHJ1Y3RvcihcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHByb3BlcnRpZXM6IFByb3BlcnR5Q29sbGVjdGlvbixcbiAgICBjaGFydEFjY291bnRzOiBDb2xsZWN0aW9uPENoYXJ0QWNjb3VudHM+XG4gICkge1xuICAgIHN1cGVyKCk7XG4gICAgdGhpcy5zZXRJdGVtcyhkZXByZWNpYXRpb25zLCBwcm9wZXJ0aWVzLCBjaGFydEFjY291bnRzKVxuICB9XG5cbiAgcHJpdmF0ZSBzZXRJdGVtcyhkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLCBwcm9wZXJ0aWVzOiBQcm9wZXJ0eUNvbGxlY3Rpb24sIGNoYXJ0QWNjb3VudHM6IENvbGxlY3Rpb248Q2hhcnRBY2NvdW50cz4pOiB2b2lkIHtcbiAgICB0aGlzLml0ZW1zID0gW107XG5cbiAgICBwcm9wZXJ0aWVzLml0ZW1zLmZvckVhY2goKHByb3BlcnR5OiBQcm9wZXJ0eSkgPT4ge1xuICAgICAgY29uc3QgZGVwcmVjaWF0aW9uc0J5VHlwZTogQ29sbGVjdGlvbkRpY3Rpb25hcnk8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4gPSBuZXcgQ29sbGVjdGlvbkRpY3Rpb25hcnk8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4oXG4gICAgICAgIGRlcHJlY2lhdGlvbnMuZmlsdGVyQnkoJ3Byb3BlcnR5LmlkJywgcHJvcGVydHkuaWQpLFxuICAgICAgICAndHlwZSdcbiAgICAgICk7XG5cbiAgICAgIGRlcHJlY2lhdGlvbnNCeVR5cGUua2V5cy5tYXAoKHR5cGU6IHN0cmluZykgPT4ge1xuICAgICAgICB0aGlzLml0ZW1zLnB1c2gobmV3IFByb3BlcnR5UmVwb3J0SXRlbURlcHJlY2lhdGlvbihcbiAgICAgICAgICBkZXByZWNpYXRpb25zQnlUeXBlLmdldCh0eXBlKSxcbiAgICAgICAgICBwcm9wZXJ0eSxcbiAgICAgICAgICBjaGFydEFjY291bnRzLmZpbmRCeSgnaWQnLCBkZXByZWNpYXRpb25zQnlUeXBlLmdldCh0eXBlKS5maXJzdC5jaGFydEFjY291bnRzLmlkKVxuICAgICAgICApKTtcbiAgICAgIH0pO1xuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { AbstractForm } from '../abstract.form';
|
|
2
|
-
import { Phone } from '../../models/phone/phone';
|
|
3
|
-
import { plainToClass } from 'class-transformer';
|
|
4
2
|
import { FormControl, Validators } from '@angular/forms';
|
|
5
3
|
import { phoneNumberValidator } from '../../validators/phone-number.validator';
|
|
4
|
+
import { PhoneTypeEnum } from '../../db/Enums/phone-type.enum';
|
|
5
|
+
import { Country } from '../../models';
|
|
6
6
|
export class PhoneForm extends AbstractForm {
|
|
7
|
-
constructor(
|
|
7
|
+
constructor(
|
|
8
|
+
// no default value because this form is always built-in, so phone passed from parent form
|
|
9
|
+
phone) {
|
|
8
10
|
super({
|
|
9
|
-
type: new FormControl(phone.type, Validators.required),
|
|
10
|
-
country: new FormControl(phone.country, Validators.required),
|
|
11
|
-
number: new FormControl(phone.number, [Validators.required, phoneNumberValidator()])
|
|
11
|
+
type: new FormControl((phone === null || phone === void 0 ? void 0 : phone.type) || PhoneTypeEnum.MOBILE, Validators.required),
|
|
12
|
+
country: new FormControl((phone === null || phone === void 0 ? void 0 : phone.country) || Country.australia, Validators.required),
|
|
13
|
+
number: new FormControl((phone === null || phone === void 0 ? void 0 : phone.number) || null, [Validators.required, phoneNumberValidator()])
|
|
12
14
|
}, phone);
|
|
13
15
|
}
|
|
14
16
|
}
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGhvbmUuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9waG9uZS9waG9uZS5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVoRCxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUMvRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXZDLE1BQU0sT0FBTyxTQUFVLFNBQVEsWUFBbUI7SUFDaEQ7SUFDRSwwRkFBMEY7SUFDMUYsS0FBYTtRQUViLEtBQUssQ0FBQztZQUNKLElBQUksRUFBRSxJQUFJLFdBQVcsQ0FBQyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxJQUFJLEtBQUksYUFBYSxDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQy9FLE9BQU8sRUFBRSxJQUFJLFdBQVcsQ0FBQyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxPQUFPLEtBQUksT0FBTyxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ2xGLE1BQU0sRUFBRSxJQUFJLFdBQVcsQ0FBQyxDQUFBLEtBQUssYUFBTCxLQUFLLHVCQUFMLEtBQUssQ0FBRSxNQUFNLEtBQUksSUFBSSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxvQkFBb0IsRUFBRSxDQUFDLENBQUM7U0FDOUYsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNaLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFic3RyYWN0Rm9ybSB9IGZyb20gJy4uL2Fic3RyYWN0LmZvcm0nO1xuaW1wb3J0IHsgUGhvbmUgfSBmcm9tICcuLi8uLi9tb2RlbHMvcGhvbmUvcGhvbmUnO1xuaW1wb3J0IHsgRm9ybUNvbnRyb2wsIFZhbGlkYXRvcnMgfSBmcm9tICdAYW5ndWxhci9mb3Jtcyc7XG5pbXBvcnQgeyBwaG9uZU51bWJlclZhbGlkYXRvciB9IGZyb20gJy4uLy4uL3ZhbGlkYXRvcnMvcGhvbmUtbnVtYmVyLnZhbGlkYXRvcic7XG5pbXBvcnQgeyBQaG9uZVR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vZGIvRW51bXMvcGhvbmUtdHlwZS5lbnVtJztcbmltcG9ydCB7IENvdW50cnkgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuXG5leHBvcnQgY2xhc3MgUGhvbmVGb3JtIGV4dGVuZHMgQWJzdHJhY3RGb3JtPFBob25lPiB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIC8vIG5vIGRlZmF1bHQgdmFsdWUgYmVjYXVzZSB0aGlzIGZvcm0gaXMgYWx3YXlzIGJ1aWx0LWluLCBzbyBwaG9uZSBwYXNzZWQgZnJvbSBwYXJlbnQgZm9ybVxuICAgIHBob25lPzogUGhvbmVcbiAgKSB7XG4gICAgc3VwZXIoe1xuICAgICAgdHlwZTogbmV3IEZvcm1Db250cm9sKHBob25lPy50eXBlIHx8IFBob25lVHlwZUVudW0uTU9CSUxFLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgIGNvdW50cnk6IG5ldyBGb3JtQ29udHJvbChwaG9uZT8uY291bnRyeSB8fCBDb3VudHJ5LmF1c3RyYWxpYSwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBudW1iZXI6IG5ldyBGb3JtQ29udHJvbChwaG9uZT8ubnVtYmVyIHx8IG51bGwsIFtWYWxpZGF0b3JzLnJlcXVpcmVkLCBwaG9uZU51bWJlclZhbGlkYXRvcigpXSlcbiAgICB9LCBwaG9uZSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,8 +3,6 @@ import { SoleContact } from '../../models';
|
|
|
3
3
|
import { plainToClass } from 'class-transformer';
|
|
4
4
|
import { FormControl, Validators } from '@angular/forms';
|
|
5
5
|
import { AddressForm } from '../address';
|
|
6
|
-
import { PhoneForm } from '../phone';
|
|
7
|
-
import { Phone } from '../../models/phone/phone';
|
|
8
6
|
import { Address } from '../../models/address/address';
|
|
9
7
|
export class SoleContactForm extends AbstractForm {
|
|
10
8
|
constructor(contact = plainToClass(SoleContact, {})) {
|
|
@@ -14,9 +12,9 @@ export class SoleContactForm extends AbstractForm {
|
|
|
14
12
|
firstName: new FormControl(contact.firstName, Validators.required),
|
|
15
13
|
lastName: new FormControl(contact.lastName, Validators.required),
|
|
16
14
|
email: new FormControl(contact.email, [Validators.required, Validators.email]),
|
|
17
|
-
phone: new
|
|
15
|
+
phone: new FormControl(contact.phone),
|
|
18
16
|
address: new AddressForm(contact.address || plainToClass(Address, {}))
|
|
19
17
|
}, contact);
|
|
20
18
|
}
|
|
21
19
|
}
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic29sZS1jb250YWN0LmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvc29sZS9zb2xlLWNvbnRhY3QuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDaEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN6RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUV2RCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxZQUF5QjtJQUM1RCxZQUNFLFVBQXVCLFlBQVksQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDO1FBRXBELEtBQUssQ0FBQztZQUNKLElBQUksRUFBRSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDeEQsR0FBRyxFQUFFLElBQUksV0FBVyxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUN2RixTQUFTLEVBQUUsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQ2xFLFFBQVEsRUFBRSxJQUFJLFdBQVcsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7WUFDaEUsS0FBSyxFQUFFLElBQUksV0FBVyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM5RSxLQUFLLEVBQUUsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztZQUNyQyxPQUFPLEVBQUUsSUFBSSxXQUFXLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSSxZQUFZLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZFLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDZCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFNvbGVDb250YWN0IH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IEZvcm1Db250cm9sLCBWYWxpZGF0b3JzIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgQWRkcmVzc0Zvcm0gfSBmcm9tICcuLi9hZGRyZXNzJztcbmltcG9ydCB7IEFkZHJlc3MgfSBmcm9tICcuLi8uLi9tb2RlbHMvYWRkcmVzcy9hZGRyZXNzJztcblxuZXhwb3J0IGNsYXNzIFNvbGVDb250YWN0Rm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybTxTb2xlQ29udGFjdD4ge1xuICBjb25zdHJ1Y3RvcihcbiAgICBjb250YWN0OiBTb2xlQ29udGFjdCA9IHBsYWluVG9DbGFzcyhTb2xlQ29udGFjdCwge30pXG4gICkge1xuICAgIHN1cGVyKHtcbiAgICAgIG5hbWU6IG5ldyBGb3JtQ29udHJvbChjb250YWN0Lm5hbWUsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgYWJuOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5hYm4sIFtWYWxpZGF0b3JzLm1pbkxlbmd0aCgxMSksIFZhbGlkYXRvcnMubWF4TGVuZ3RoKDExKV0pLFxuICAgICAgZmlyc3ROYW1lOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5maXJzdE5hbWUsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgbGFzdE5hbWU6IG5ldyBGb3JtQ29udHJvbChjb250YWN0Lmxhc3ROYW1lLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgIGVtYWlsOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5lbWFpbCwgW1ZhbGlkYXRvcnMucmVxdWlyZWQsIFZhbGlkYXRvcnMuZW1haWxdKSxcbiAgICAgIHBob25lOiBuZXcgRm9ybUNvbnRyb2woY29udGFjdC5waG9uZSksXG4gICAgICBhZGRyZXNzOiBuZXcgQWRkcmVzc0Zvcm0oY29udGFjdC5hZGRyZXNzIHx8IHBsYWluVG9DbGFzcyhBZGRyZXNzLCB7fSkpXG4gICAgfSwgY29udGFjdCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -4,7 +4,7 @@ import { AssetEntityTypeEnum } from '../../interfaces/asset-entity-type.enum';
|
|
|
4
4
|
export class PropertyDocument extends PropertyDocumentBase {
|
|
5
5
|
constructor() {
|
|
6
6
|
super(...arguments);
|
|
7
|
-
this.type = AssetTypeEnum.
|
|
7
|
+
this.type = AssetTypeEnum.PROPERTY;
|
|
8
8
|
this.entityType = AssetEntityTypeEnum.PROPERTIES;
|
|
9
9
|
}
|
|
10
10
|
getApiUrlPrefix() {
|
|
@@ -14,4 +14,4 @@ export class PropertyDocument extends PropertyDocumentBase {
|
|
|
14
14
|
return this.property;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktZG9jdW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3Byb3BlcnR5L3Byb3BlcnR5LWRvY3VtZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsSUFBSSxvQkFBb0IsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBR3RHLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNqRSxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUk5RSxNQUFNLE9BQU8sZ0JBQWlCLFNBQVEsb0JBQW9CO0lBQTFEOztRQUNFLFNBQUksR0FBa0IsYUFBYSxDQUFDLFFBQVEsQ0FBQztRQUM3QyxlQUFVLEdBQXdCLG1CQUFtQixDQUFDLFVBQVUsQ0FBQztJQVVuRSxDQUFDO0lBUEMsZUFBZTtRQUNiLE9BQU8sRUFBRSxDQUFDO0lBQ1osQ0FBQztJQUVELFNBQVM7UUFDUCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUM7SUFDdkIsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUHJvcGVydHlEb2N1bWVudCBhcyBQcm9wZXJ0eURvY3VtZW50QmFzZSB9IGZyb20gJy4uLy4uL2RiL01vZGVscy9kb2N1bWVudC9wcm9wZXJ0eS1kb2N1bWVudCc7XG5pbXBvcnQgeyBJQXNzZXQgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2Fzc2V0LmludGVyZmFjZSc7XG5pbXBvcnQgeyBJRG9jdW1lbnQgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2RvY3VtZW50LmludGVyZmFjZSc7XG5pbXBvcnQgeyBBc3NldFR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vaW50ZXJmYWNlcy9hc3NldC10eXBlLmVudW0nO1xuaW1wb3J0IHsgQXNzZXRFbnRpdHlUeXBlRW51bSB9IGZyb20gJy4uLy4uL2ludGVyZmFjZXMvYXNzZXQtZW50aXR5LXR5cGUuZW51bSc7XG5pbXBvcnQgeyBEb2N1bWVudGFibGUgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzL2RvY3VtZW50YWJsZS5pbnRlcmZhY2UnO1xuaW1wb3J0IHsgUHJvcGVydHkgfSBmcm9tICcuL3Byb3BlcnR5JztcblxuZXhwb3J0IGNsYXNzIFByb3BlcnR5RG9jdW1lbnQgZXh0ZW5kcyBQcm9wZXJ0eURvY3VtZW50QmFzZSBpbXBsZW1lbnRzIElBc3NldCwgSURvY3VtZW50IHtcbiAgdHlwZTogQXNzZXRUeXBlRW51bSA9IEFzc2V0VHlwZUVudW0uUFJPUEVSVFk7XG4gIGVudGl0eVR5cGU6IEFzc2V0RW50aXR5VHlwZUVudW0gPSBBc3NldEVudGl0eVR5cGVFbnVtLlBST1BFUlRJRVM7XG4gIHByb3BlcnR5OiBQcm9wZXJ0eTtcblxuICBnZXRBcGlVcmxQcmVmaXgoKTogc3RyaW5nIHtcbiAgICByZXR1cm4gJyc7XG4gIH1cblxuICBnZXRFbnRpdHkoKTogRG9jdW1lbnRhYmxlIHtcbiAgICByZXR1cm4gdGhpcy5wcm9wZXJ0eTtcbiAgfVxufVxuIl19
|
|
@@ -29,6 +29,8 @@ export class PropertyTransactionReportService {
|
|
|
29
29
|
this.getDepreciations(),
|
|
30
30
|
this.chartAccountsService.get()
|
|
31
31
|
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
32
|
+
const r = this.create(transactions, depreciations, properties, chartAccounts);
|
|
33
|
+
debugger;
|
|
32
34
|
return new CollectionDictionary(this.create(transactions, depreciations, properties, chartAccounts), 'propertyId');
|
|
33
35
|
}));
|
|
34
36
|
}
|
|
@@ -67,4 +69,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
|
|
|
67
69
|
providedIn: 'root'
|
|
68
70
|
}]
|
|
69
71
|
}], ctorParameters: function () { return [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }]; } });
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"property-transaction-report.service.js","sourceRoot":"","sources":["../../../../../../../projects/tt-core/src/lib/services/report/property/property-transaction-report.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAc,MAAM,MAAM,CAAC;AAEjD,OAAO,EAAe,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAErC,OAAO,EACL,uCAAuC,EACxC,MAAM,kFAAkF,CAAC;AAC1F,OAAO,EACL,wCAAwC,EACzC,MAAM,mFAAmF,CAAC;AAC3F,OAAO,EAAE,4BAA4B,EAAE,MAAM,sEAAsE,CAAC;;;AAGpH;;GAEG;AAIH,MAAM,OAAO,gCAAgC;IAM3C,YACU,eAAgC,EAChC,kBAAsC,EACtC,mBAAwC,EACxC,oBAA0C;QAH1C,oBAAe,GAAf,eAAe,CAAiB;QAChC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;IAEpD,CAAC;IAED;;OAEG;IACH,GAAG;QACD,OAAO,aAAa,CAAC;YACnB,IAAI,CAAC,eAAe,CAAC,GAAG,EAAoC;YAC5D,IAAI,CAAC,eAAe,EAAuC;YAC3D,IAAI,CAAC,gBAAgB,EAAwC;YAC7D,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAyC;SACvE,CAAC,CAAC,IAAI,CACL,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE,EAAE;YAE/D,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CACnB,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,CACd,CAAC;YAEF,QAAQ,CAAC;YACT,OAAO,IAAI,oBAAoB,CAC7B,IAAI,CAAC,MAAM,CACT,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,CACd,EACD,YAAY,CACb,CAAC;QACJ,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEO,MAAM,CACZ,YAAmC,EACnC,aAAqC,EACrC,UAA8B,EAC9B,aAAsC;QAEtC,OAAO,IAAI,4BAA4B,CAAC;YACtC,GAAG,IAAI,uCAAuC,CAAC,YAAY,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,KAAK;YAC7F,GAAG,IAAI,wCAAwC,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,KAAK;SAChG,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,eAAe;QACrB,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CACvC,GAAG,CAAC,CAAC,YAA2B,EAAE,EAAE;YAClC,OAAO,IAAI,qBAAqB,CAAC,YAAY,CAAC;iBAC3C,4BAA4B,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACtE,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,aAAqC,EAAE,EAAE;YAC5C,OAAO,aAAa;iBACjB,4BAA4B,CAAC,yBAAyB,CAAC,QAAQ,CAAC;gBACjE,mDAAmD;iBAClD,2BAA2B,EAAE,CAAC;QACnC,CAAC,CAAC,CACH,CAAA;IACH,CAAC;;8HAnFU,gCAAgC;kIAAhC,gCAAgC,cAF/B,MAAM;4FAEP,gCAAgC;kBAH5C,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { Injectable } from '@angular/core';\nimport { PropertyService, TransactionService, DepreciationService, ChartAccountsService,  } from '../../http';\nimport { combineLatest, Observable } from 'rxjs';\nimport { Property } from '../../../models/property/property';\nimport { Transaction, CHART_ACCOUNTS_CATEGORIES } from '../../../models';\nimport { DepreciationCollection } from '../../../collections/depreciation.collection';\nimport { CollectionDictionary } from '../../../collections/collection-dictionary';\nimport { TransactionCollection } from '../../../collections';\nimport { map } from 'rxjs/operators';\nimport { PropertyCollection } from '../../../collections';\nimport {\n  PropertyReportItemTransactionCollection\n} from '../../../collections/report/property/property-report-item-transaction.collection';\nimport {\n  PropertyReportItemDepreciationCollection\n} from '../../../collections/report/property/property-report-item-depreciation.collection';\nimport { PropertyReportItemCollection } from '../../../collections/report/property/property-report-item.collection';\nimport { ChartAccountsCollection } from '../../../collections/chart-accounts.collection';\n\n/**\n * Service to handle Property transactions report items data (get income / expense report items, e.t.c.)\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class PropertyTransactionReportService {\n  properties: Property[];\n  transactions: TransactionCollection;\n  depreciations: DepreciationCollection;\n  chartAccounts: ChartAccountsCollection;\n\n  constructor(\n    private propertyService: PropertyService,\n    private transactionService: TransactionService,\n    private depreciationService: DepreciationService,\n    private chartAccountsService: ChartAccountsService\n  ) {\n  }\n\n  /**\n   * Get collection of report items based on transactions & depreciations\n   */\n  get(): Observable<CollectionDictionary<PropertyReportItemCollection>> {\n    return combineLatest([\n      this.propertyService.get() as Observable<PropertyCollection>,\n      this.getTransactions() as Observable<TransactionCollection>,\n      this.getDepreciations() as Observable<DepreciationCollection>,\n      this.chartAccountsService.get() as Observable<ChartAccountsCollection>\n    ]).pipe(\n      map(([properties, transactions, depreciations, chartAccounts]) => {\n\n        const r = this.create(\n          transactions,\n          depreciations,\n          properties,\n          chartAccounts\n        );\n\n        debugger;\n        return new CollectionDictionary(\n          this.create(\n            transactions,\n            depreciations,\n            properties,\n            chartAccounts\n          ),\n          'propertyId'\n        );\n      })\n    )\n  }\n\n  private create(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    properties: PropertyCollection,\n    chartAccounts: ChartAccountsCollection\n  ): PropertyReportItemCollection {\n    return new PropertyReportItemCollection([\n      ...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,\n      ...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,\n    ]);\n  }\n\n  /**\n   * Get collection of property transactions\n   */\n  private getTransactions(): Observable<TransactionCollection> {\n    return this.transactionService.get().pipe(\n      map((transactions: Transaction[]) => {\n        return new TransactionCollection(transactions)\n          .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property);\n      })\n    )\n  }\n\n  /**\n   * Get list of asset & capital property depreciations\n   */\n  private getDepreciations(): Observable<DepreciationCollection> {\n    return this.depreciationService.get().pipe(\n      map((depreciations: DepreciationCollection) => {\n        return depreciations\n          .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)\n          // we don't need borrowing expenses for this report\n          .getWithoutBorrowingExpenses();\n      })\n    )\n  }\n}\n"]}
|
package/fesm2015/taxtank-core.js
CHANGED
|
@@ -4613,7 +4613,7 @@ class PropertyCategory extends PropertyCategory$1 {
|
|
|
4613
4613
|
class PropertyDocument extends PropertyDocument$1 {
|
|
4614
4614
|
constructor() {
|
|
4615
4615
|
super(...arguments);
|
|
4616
|
-
this.type = AssetTypeEnum.
|
|
4616
|
+
this.type = AssetTypeEnum.PROPERTY;
|
|
4617
4617
|
this.entityType = AssetEntityTypeEnum.PROPERTIES;
|
|
4618
4618
|
}
|
|
4619
4619
|
getApiUrlPrefix() {
|
|
@@ -6960,7 +6960,7 @@ class PropertyReportItemDepreciationCollection extends PropertyReportItemCollect
|
|
|
6960
6960
|
setItems(depreciations, properties, chartAccounts) {
|
|
6961
6961
|
this.items = [];
|
|
6962
6962
|
properties.items.forEach((property) => {
|
|
6963
|
-
const depreciationsByType = new CollectionDictionary(depreciations, 'type');
|
|
6963
|
+
const depreciationsByType = new CollectionDictionary(depreciations.filterBy('property.id', property.id), 'type');
|
|
6964
6964
|
depreciationsByType.keys.map((type) => {
|
|
6965
6965
|
this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
|
|
6966
6966
|
});
|
|
@@ -15180,6 +15180,8 @@ class PropertyTransactionReportService {
|
|
|
15180
15180
|
this.getDepreciations(),
|
|
15181
15181
|
this.chartAccountsService.get()
|
|
15182
15182
|
]).pipe(map(([properties, transactions, depreciations, chartAccounts]) => {
|
|
15183
|
+
const r = this.create(transactions, depreciations, properties, chartAccounts);
|
|
15184
|
+
debugger;
|
|
15183
15185
|
return new CollectionDictionary(this.create(transactions, depreciations, properties, chartAccounts), 'propertyId');
|
|
15184
15186
|
}));
|
|
15185
15187
|
}
|
|
@@ -16170,27 +16172,6 @@ class SoleBusinessLossForm extends AbstractForm {
|
|
|
16170
16172
|
}
|
|
16171
16173
|
}
|
|
16172
16174
|
|
|
16173
|
-
const phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
|
|
16174
|
-
/**
|
|
16175
|
-
* Validator for phone number
|
|
16176
|
-
* Allowed special symbols"-", "(", ")"
|
|
16177
|
-
*/
|
|
16178
|
-
function phoneNumberValidator() {
|
|
16179
|
-
return (control) => {
|
|
16180
|
-
return phonePattern.test(control.value) ? null : { phoneInvalid: true };
|
|
16181
|
-
};
|
|
16182
|
-
}
|
|
16183
|
-
|
|
16184
|
-
class PhoneForm extends AbstractForm {
|
|
16185
|
-
constructor(phone = plainToClass(Phone, {})) {
|
|
16186
|
-
super({
|
|
16187
|
-
type: new FormControl(phone.type, Validators.required),
|
|
16188
|
-
country: new FormControl(phone.country, Validators.required),
|
|
16189
|
-
number: new FormControl(phone.number, [Validators.required, phoneNumberValidator()])
|
|
16190
|
-
}, phone);
|
|
16191
|
-
}
|
|
16192
|
-
}
|
|
16193
|
-
|
|
16194
16175
|
class SoleContactForm extends AbstractForm {
|
|
16195
16176
|
constructor(contact = plainToClass(SoleContact, {})) {
|
|
16196
16177
|
super({
|
|
@@ -16199,7 +16180,7 @@ class SoleContactForm extends AbstractForm {
|
|
|
16199
16180
|
firstName: new FormControl(contact.firstName, Validators.required),
|
|
16200
16181
|
lastName: new FormControl(contact.lastName, Validators.required),
|
|
16201
16182
|
email: new FormControl(contact.email, [Validators.required, Validators.email]),
|
|
16202
|
-
phone: new
|
|
16183
|
+
phone: new FormControl(contact.phone),
|
|
16203
16184
|
address: new AddressForm(contact.address || plainToClass(Address, {}))
|
|
16204
16185
|
}, contact);
|
|
16205
16186
|
}
|
|
@@ -16680,6 +16661,29 @@ class LoginForm extends AbstractForm {
|
|
|
16680
16661
|
}
|
|
16681
16662
|
}
|
|
16682
16663
|
|
|
16664
|
+
const phonePattern = /^(((\s*)?([- ()]?\d[- ()]?){0,30}(\s*)?)|)$/;
|
|
16665
|
+
/**
|
|
16666
|
+
* Validator for phone number
|
|
16667
|
+
* Allowed special symbols"-", "(", ")"
|
|
16668
|
+
*/
|
|
16669
|
+
function phoneNumberValidator() {
|
|
16670
|
+
return (control) => {
|
|
16671
|
+
return phonePattern.test(control.value) ? null : { phoneInvalid: true };
|
|
16672
|
+
};
|
|
16673
|
+
}
|
|
16674
|
+
|
|
16675
|
+
class PhoneForm extends AbstractForm {
|
|
16676
|
+
constructor(
|
|
16677
|
+
// no default value because this form is always built-in, so phone passed from parent form
|
|
16678
|
+
phone) {
|
|
16679
|
+
super({
|
|
16680
|
+
type: new FormControl((phone === null || phone === void 0 ? void 0 : phone.type) || PhoneTypeEnum.MOBILE, Validators.required),
|
|
16681
|
+
country: new FormControl((phone === null || phone === void 0 ? void 0 : phone.country) || Country.australia, Validators.required),
|
|
16682
|
+
number: new FormControl((phone === null || phone === void 0 ? void 0 : phone.number) || null, [Validators.required, phoneNumberValidator()])
|
|
16683
|
+
}, phone);
|
|
16684
|
+
}
|
|
16685
|
+
}
|
|
16686
|
+
|
|
16683
16687
|
// @TODO Alex: Create a model and handle request fields via class-transformer
|
|
16684
16688
|
class PasswordForm extends AbstractForm {
|
|
16685
16689
|
constructor() {
|