taxtank-core 0.33.108 → 0.33.109
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/esm2022/src/lib/collections/property/property-category-movement.collection.mjs +1 -2
- package/esm2022/src/lib/forms/holding/holding-trade/holding-trade-filter.form.mjs +2 -2
- package/esm2022/src/lib/services/report/property/property-transaction-report.service.mjs +1 -2
- package/fesm2022/taxtank-core.mjs +1 -3
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -5,7 +5,6 @@ export class PropertyCategoryMovementCollection extends Collection {
|
|
|
5
5
|
* @TODO TT-2355 Alex refactor propertyForecast, use separated api (then I can remove property from param)
|
|
6
6
|
*/
|
|
7
7
|
filterByForecast(property, forecast) {
|
|
8
|
-
console.log(property, forecast);
|
|
9
8
|
return this.filterBy('property.id', property.id)
|
|
10
9
|
.filterByFinancialYear('fromDate', 'toDate', new FinancialYear(forecast.financialYear));
|
|
11
10
|
}
|
|
@@ -21,4 +20,4 @@ export class PropertyCategoryMovementCollection extends Collection {
|
|
|
21
20
|
.toArray());
|
|
22
21
|
}
|
|
23
22
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktY2F0ZWdvcnktbW92ZW1lbnQuY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9jb2xsZWN0aW9ucy9wcm9wZXJ0eS9wcm9wZXJ0eS1jYXRlZ29yeS1tb3ZlbWVudC5jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLGFBQWEsRUFBd0QsTUFBTSxjQUFjLENBQUM7QUFFbkcsTUFBTSxPQUFPLGtDQUFtQyxTQUFRLFVBQW9DO0lBQzFGOztPQUVHO0lBQ0gsZ0JBQWdCLENBQUMsUUFBa0IsRUFBRSxRQUEwQjtRQUM3RCxPQUFPLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFFBQVEsQ0FBQyxFQUFFLENBQUM7YUFDN0MscUJBQXFCLENBQUMsVUFBVSxFQUFFLFFBQVEsRUFBRSxJQUFJLGFBQWEsQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztJQUM1RixDQUFDO0lBRUQsV0FBVyxDQUFDLFVBQWtCO1FBQzVCLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMscUJBQXFCLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDMUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FDaEIsSUFBSSxDQUFDLHFCQUFxQixDQUFDLFVBQVUsRUFBRSxRQUFRLENBQUM7YUFDN0MsT0FBTyxDQUFDLGFBQWEsQ0FBQzthQUN0QixPQUFPLEVBQUUsQ0FDYixDQUFDO0lBQ0osQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgRmluYW5jaWFsWWVhciwgUHJvcGVydHksIFByb3BlcnR5Q2F0ZWdvcnlNb3ZlbWVudCwgUHJvcGVydHlGb3JlY2FzdCB9IGZyb20gJy4uLy4uL21vZGVscyc7XG5cbmV4cG9ydCBjbGFzcyBQcm9wZXJ0eUNhdGVnb3J5TW92ZW1lbnRDb2xsZWN0aW9uIGV4dGVuZHMgQ29sbGVjdGlvbjxQcm9wZXJ0eUNhdGVnb3J5TW92ZW1lbnQ+IHtcbiAgLyoqXG4gICAqIEBUT0RPIFRULTIzNTUgQWxleCByZWZhY3RvciBwcm9wZXJ0eUZvcmVjYXN0LCB1c2Ugc2VwYXJhdGVkIGFwaSAodGhlbiBJIGNhbiByZW1vdmUgcHJvcGVydHkgZnJvbSBwYXJhbSlcbiAgICovXG4gIGZpbHRlckJ5Rm9yZWNhc3QocHJvcGVydHk6IFByb3BlcnR5LCBmb3JlY2FzdDogUHJvcGVydHlGb3JlY2FzdCk6IHRoaXMge1xuICAgIHJldHVybiB0aGlzLmZpbHRlckJ5KCdwcm9wZXJ0eS5pZCcsIHByb3BlcnR5LmlkKVxuICAgICAgLmZpbHRlckJ5RmluYW5jaWFsWWVhcignZnJvbURhdGUnLCAndG9EYXRlJywgbmV3IEZpbmFuY2lhbFllYXIoZm9yZWNhc3QuZmluYW5jaWFsWWVhcikpO1xuICB9XG5cbiAgaGFzQ2F0ZWdvcnkoY2F0ZWdvcnlJZDogbnVtYmVyKTogYm9vbGVhbiB7XG4gICAgcmV0dXJuICEhdGhpcy5maW5kQnkoJ3Byb3BlcnR5Q2F0ZWdvcnkuaWQnLCBjYXRlZ29yeUlkKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBhY3RpdmUgbW92ZW1lbnQgYnkgcHJvcGVydHkgYmFzZWQgb24gc2VsZWN0ZWQgeWVhclxuICAgKi9cbiAgZ2V0Q3VycmVudCgpOiB0aGlzIHtcbiAgICByZXR1cm4gdGhpcy5jcmVhdGUoXG4gICAgICB0aGlzLmZpbHRlckJ5RmluYW5jaWFsWWVhcignZnJvbURhdGUnLCAndG9EYXRlJylcbiAgICAgICAgLmluZGV4QnkoJ3Byb3BlcnR5LmlkJylcbiAgICAgICAgLnRvQXJyYXkoKVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -14,7 +14,7 @@ export class HoldingTradeFilterForm extends AbstractForm {
|
|
|
14
14
|
this.get('category').valueChanges.subscribe(category => {
|
|
15
15
|
this.categories = category === HoldingTypeCategoryEnum.OTHER
|
|
16
16
|
? [HoldingTypeCategoryEnum.OTHER, HoldingTypeCategoryEnum.COLLECTIBLE, HoldingTypeCategoryEnum.UNLISTED_STOCK, HoldingTypeCategoryEnum.UNLISTED_UNIT]
|
|
17
|
-
: [category];
|
|
17
|
+
: [category].filter(Boolean);
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
filter(trades) {
|
|
@@ -41,4 +41,4 @@ export class HoldingTradeFilterForm extends AbstractForm {
|
|
|
41
41
|
return filteredTrades;
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9sZGluZy10cmFkZS1maWx0ZXIuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9ob2xkaW5nL2hvbGRpbmctdHJhZGUvaG9sZGluZy10cmFkZS1maWx0ZXIuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFakUsT0FBTyxFQUFFLFlBQVksRUFBcUIsTUFBTSxxQkFBcUIsQ0FBQztBQUV0RSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVU1RCxNQUFNLE9BQU8sc0JBQXVCLFNBQVEsWUFBK0Q7SUFFekc7UUFDRSxLQUFLLENBQUM7WUFDSixRQUFRLEVBQUUsSUFBSSxrQkFBa0IsRUFBRTtZQUNsQyxTQUFTLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxFQUFFLENBQUM7WUFDckMsWUFBWSxFQUFFLElBQUksV0FBVyxDQUFDLElBQUksQ0FBQztZQUNuQyxRQUFRLEVBQUUsSUFBSSxXQUFXLENBQUMsSUFBSSxDQUFDO1lBQy9CLE1BQU0sRUFBRSxJQUFJLFdBQVcsQ0FBQyxJQUFJLENBQUM7U0FDOUIsQ0FBQyxDQUFDO1FBUkwsZUFBVSxHQUE4QixFQUFFLENBQUM7UUFVekMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ3JELElBQUksQ0FBQyxVQUFVLEdBQUcsUUFBUSxLQUFLLHVCQUF1QixDQUFDLEtBQUs7Z0JBQzFELENBQUMsQ0FBQyxDQUFDLHVCQUF1QixDQUFDLEtBQUssRUFBRSx1QkFBdUIsQ0FBQyxXQUFXLEVBQUUsdUJBQXVCLENBQUMsY0FBYyxFQUFFLHVCQUF1QixDQUFDLGFBQWEsQ0FBQztnQkFDckosQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2pDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUE4QjtRQUNuQyxJQUFJLGNBQWMsR0FBRyxNQUFNLENBQUM7UUFFNUIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLEVBQUU7WUFDMUIsT0FBTyxjQUFjLENBQUM7U0FDdkI7UUFFRCxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBRXpCLElBQUksS0FBSyxDQUFDLFFBQVEsRUFBRTtZQUNsQixjQUFjLEdBQUcsY0FBYyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQzNGO1FBRUQsSUFBSSxLQUFLLENBQUMsWUFBWSxFQUFFO1lBQ3RCLGNBQWMsR0FBRyxjQUFjLENBQUMsUUFBUSxDQUFDLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBaUIsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDcEg7UUFFRCxJQUFJLEtBQUssQ0FBQyxNQUFNLEVBQUU7WUFDaEIsY0FBYyxHQUFHLGNBQWMsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUN6RjtRQUVELElBQUksT0FBTyxLQUFLLENBQUMsU0FBUyxJQUFJLFNBQVMsRUFBRTtZQUN2QyxjQUFjLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1NBQ2hFO1FBRUQsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRTtZQUMxQixjQUFjLEdBQUcsY0FBYyxDQUFDLFFBQVEsQ0FBQyxzQkFBc0IsRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7U0FDbkY7UUFFRCxPQUFPLGNBQWMsQ0FBQztJQUN4QixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBGb3JtQ29udHJvbCwgVW50eXBlZEZvcm1Db250cm9sIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuaW1wb3J0IHsgSG9sZGluZ1RyYWRlLCBIb2xkaW5nVHlwZSB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBBYnN0cmFjdEZvcm0sIENvbnRyb2xzSW50ZXJmYWNlIH0gZnJvbSAnLi4vLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBIb2xkaW5nVHJhZGVDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgSG9sZGluZ1R5cGVDYXRlZ29yeUVudW0gfSBmcm9tICcuLi8uLi8uLi9kYi9FbnVtcyc7XG5cbmludGVyZmFjZSBIb2xkaW5nVHJhZGVGaWx0ZXJDb250cm9sc0ludGVyZmFjZSBleHRlbmRzIENvbnRyb2xzSW50ZXJmYWNlIHtcbiAgY2F0ZWdvcnk6IFVudHlwZWRGb3JtQ29udHJvbCxcbiAgaXNUYXhGcmVlOiBVbnR5cGVkRm9ybUNvbnRyb2wsXG4gIGhvbGRpbmdUeXBlczogRm9ybUNvbnRyb2w8SG9sZGluZ1R5cGVbXT5cbiAgZGF0ZUZyb206IEZvcm1Db250cm9sPERhdGU+XG4gIGRhdGVUbzogRm9ybUNvbnRyb2w8RGF0ZT5cbn1cblxuZXhwb3J0IGNsYXNzIEhvbGRpbmdUcmFkZUZpbHRlckZvcm0gZXh0ZW5kcyBBYnN0cmFjdEZvcm08SG9sZGluZ1RyYWRlLCBIb2xkaW5nVHJhZGVGaWx0ZXJDb250cm9sc0ludGVyZmFjZT4ge1xuICBjYXRlZ29yaWVzOiBIb2xkaW5nVHlwZUNhdGVnb3J5RW51bVtdID0gW107XG4gIGNvbnN0cnVjdG9yKCkge1xuICAgIHN1cGVyKHtcbiAgICAgIGNhdGVnb3J5OiBuZXcgVW50eXBlZEZvcm1Db250cm9sKCksXG4gICAgICBpc1RheEZyZWU6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woJycpLFxuICAgICAgaG9sZGluZ1R5cGVzOiBuZXcgRm9ybUNvbnRyb2wobnVsbCksXG4gICAgICBkYXRlRnJvbTogbmV3IEZvcm1Db250cm9sKG51bGwpLFxuICAgICAgZGF0ZVRvOiBuZXcgRm9ybUNvbnRyb2wobnVsbCksXG4gICAgfSk7XG5cbiAgICB0aGlzLmdldCgnY2F0ZWdvcnknKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKGNhdGVnb3J5ID0+IHtcbiAgICAgIHRoaXMuY2F0ZWdvcmllcyA9IGNhdGVnb3J5ID09PSBIb2xkaW5nVHlwZUNhdGVnb3J5RW51bS5PVEhFUlxuICAgICAgICA/IFtIb2xkaW5nVHlwZUNhdGVnb3J5RW51bS5PVEhFUiwgSG9sZGluZ1R5cGVDYXRlZ29yeUVudW0uQ09MTEVDVElCTEUsIEhvbGRpbmdUeXBlQ2F0ZWdvcnlFbnVtLlVOTElTVEVEX1NUT0NLLCBIb2xkaW5nVHlwZUNhdGVnb3J5RW51bS5VTkxJU1RFRF9VTklUXVxuICAgICAgICA6IFtjYXRlZ29yeV0uZmlsdGVyKEJvb2xlYW4pO1xuICAgIH0pO1xuICB9XG5cbiAgZmlsdGVyKHRyYWRlczogSG9sZGluZ1RyYWRlQ29sbGVjdGlvbik6IEhvbGRpbmdUcmFkZUNvbGxlY3Rpb24ge1xuICAgIGxldCBmaWx0ZXJlZFRyYWRlcyA9IHRyYWRlcztcblxuICAgIGlmICghZmlsdGVyZWRUcmFkZXMubGVuZ3RoKSB7XG4gICAgICByZXR1cm4gZmlsdGVyZWRUcmFkZXM7XG4gICAgfVxuXG4gICAgY29uc3QgdmFsdWUgPSB0aGlzLnZhbHVlO1xuXG4gICAgaWYgKHZhbHVlLmRhdGVGcm9tKSB7XG4gICAgICBmaWx0ZXJlZFRyYWRlcyA9IGZpbHRlcmVkVHJhZGVzLmZpbHRlcih0cmFuc2FjdGlvbiA9PiB0cmFuc2FjdGlvbi5kYXRlID49IHZhbHVlLmRhdGVGcm9tKTtcbiAgICB9XG5cbiAgICBpZiAodmFsdWUuaG9sZGluZ1R5cGVzKSB7XG4gICAgICBmaWx0ZXJlZFRyYWRlcyA9IGZpbHRlcmVkVHJhZGVzLmZpbHRlckJ5KCdob2xkaW5nVHlwZS5pZCcsIHZhbHVlLmhvbGRpbmdUeXBlcy5tYXAoKHR5cGU6IEhvbGRpbmdUeXBlKSA9PiB0eXBlLmlkKSk7XG4gICAgfVxuXG4gICAgaWYgKHZhbHVlLmRhdGVUbykge1xuICAgICAgZmlsdGVyZWRUcmFkZXMgPSBmaWx0ZXJlZFRyYWRlcy5maWx0ZXIodHJhbnNhY3Rpb24gPT4gdHJhbnNhY3Rpb24uZGF0ZSA8PSB2YWx1ZS5kYXRlVG8pO1xuICAgIH1cblxuICAgIGlmICh0eXBlb2YgdmFsdWUuaXNUYXhGcmVlID09ICdib29sZWFuJykge1xuICAgICAgZmlsdGVyZWRUcmFkZXMgPSB0cmFkZXMuZmlsdGVyQnkoJ2lzVGF4RnJlZScsIHZhbHVlLmlzVGF4RnJlZSk7XG4gICAgfVxuXG4gICAgaWYgKHRoaXMuY2F0ZWdvcmllcy5sZW5ndGgpIHtcbiAgICAgIGZpbHRlcmVkVHJhZGVzID0gZmlsdGVyZWRUcmFkZXMuZmlsdGVyQnkoJ2hvbGRpbmdUeXBlLmNhdGVnb3J5JywgdGhpcy5jYXRlZ29yaWVzKTtcbiAgICB9XG5cbiAgICByZXR1cm4gZmlsdGVyZWRUcmFkZXM7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -28,7 +28,6 @@ export class PropertyTransactionReportService {
|
|
|
28
28
|
this.properties = properties;
|
|
29
29
|
this.transactions = transactions.filter(transaction => !transaction.chartAccounts.isDepreciation());
|
|
30
30
|
this.depreciations = depreciations;
|
|
31
|
-
console.log(this.depreciations.filterBy('property.id', 341));
|
|
32
31
|
this.chartAccounts = chartAccounts;
|
|
33
32
|
return this.create(this.transactions, depreciations, properties, chartAccounts);
|
|
34
33
|
}));
|
|
@@ -65,4 +64,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
65
64
|
providedIn: 'root'
|
|
66
65
|
}]
|
|
67
66
|
}], ctorParameters: () => [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }] });
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# 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":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ChartAccountsService, DepreciationService, PropertyService, TransactionService, } from '../../http';\nimport { Observable, combineLatest } from 'rxjs';\nimport { CHART_ACCOUNTS_CATEGORIES, Transaction } from '../../../models';\nimport {\n  ChartAccountsCollection,\n  CollectionDictionary,\n  DepreciationCollection,\n  PropertyCollection,\n  PropertyReportItemCollection,\n  PropertyReportItemDepreciationCollection,\n  PropertyReportItemTransactionCollection,\n  TransactionCollection,\n} from '../../../collections';\nimport { map } from 'rxjs/operators';\nimport { TransactionBaseFilterForm } from '../../../forms';\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: PropertyCollection;\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        this.properties = properties;\n        this.transactions = transactions.filter(transaction => !transaction.chartAccounts.isDepreciation());\n        this.depreciations = depreciations;\n        this.chartAccounts = chartAccounts;\n        return this.create(this.transactions, depreciations, properties, chartAccounts);\n      })\n    );\n  }\n\n  filter(filterForm: TransactionBaseFilterForm): CollectionDictionary<PropertyReportItemCollection> {\n    return this.create(\n      filterForm.filter(this.transactions),\n      filterForm.filter(this.depreciations),\n      this.properties,\n      this.chartAccounts\n    );\n  }\n\n  private create(\n    transactions: TransactionCollection,\n    depreciations: DepreciationCollection,\n    properties: PropertyCollection,\n    chartAccounts: ChartAccountsCollection\n  ): CollectionDictionary<PropertyReportItemCollection> {\n    return new PropertyReportItemCollection([\n      ...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,\n      ...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,\n    ]).sortBy('subCode', 'asc').groupBy('propertyId');\n  }\n\n  /**\n   * Get collection of property transactions\n   */\n  private getTransactions(): Observable<TransactionCollection> {\n    return this.transactionService.getWithoutTaxFreeProperty().pipe(\n      map((transactions: Transaction[]) => new TransactionCollection(transactions)\n        .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)\n        .filter(transaction => transaction.claimPercent > 0)\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) => depreciations.getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property))\n    );\n  }\n}\n"]}
|
|
@@ -2311,7 +2311,6 @@ class PropertyCategoryMovementCollection extends Collection {
|
|
|
2311
2311
|
* @TODO TT-2355 Alex refactor propertyForecast, use separated api (then I can remove property from param)
|
|
2312
2312
|
*/
|
|
2313
2313
|
filterByForecast(property, forecast) {
|
|
2314
|
-
console.log(property, forecast);
|
|
2315
2314
|
return this.filterBy('property.id', property.id)
|
|
2316
2315
|
.filterByFinancialYear('fromDate', 'toDate', new FinancialYear(forecast.financialYear));
|
|
2317
2316
|
}
|
|
@@ -20045,7 +20044,6 @@ class PropertyTransactionReportService {
|
|
|
20045
20044
|
this.properties = properties;
|
|
20046
20045
|
this.transactions = transactions.filter(transaction => !transaction.chartAccounts.isDepreciation());
|
|
20047
20046
|
this.depreciations = depreciations;
|
|
20048
|
-
console.log(this.depreciations.filterBy('property.id', 341));
|
|
20049
20047
|
this.chartAccounts = chartAccounts;
|
|
20050
20048
|
return this.create(this.transactions, depreciations, properties, chartAccounts);
|
|
20051
20049
|
}));
|
|
@@ -24941,7 +24939,7 @@ class HoldingTradeFilterForm extends AbstractForm {
|
|
|
24941
24939
|
this.get('category').valueChanges.subscribe(category => {
|
|
24942
24940
|
this.categories = category === HoldingTypeCategoryEnum.OTHER
|
|
24943
24941
|
? [HoldingTypeCategoryEnum.OTHER, HoldingTypeCategoryEnum.COLLECTIBLE, HoldingTypeCategoryEnum.UNLISTED_STOCK, HoldingTypeCategoryEnum.UNLISTED_UNIT]
|
|
24944
|
-
: [category];
|
|
24942
|
+
: [category].filter(Boolean);
|
|
24945
24943
|
});
|
|
24946
24944
|
}
|
|
24947
24945
|
filter(trades) {
|