taxtank-core 0.32.96 → 0.32.97
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/lib/forms/report/my-tax/my-tax-rent.form.mjs +1 -1
- package/esm2022/lib/models/report/my-tax/my-tax-rent/my-tax-rent.mjs +4 -9
- package/esm2022/lib/services/http/vehicle/vehicle-claim.service.mjs +16 -6
- package/esm2022/lib/services/report/property/property-transaction-report.service.mjs +3 -2
- package/fesm2022/taxtank-core.mjs +18 -12
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/forms/report/my-tax/my-tax-rent.form.d.ts +1 -1
- package/lib/services/http/vehicle/vehicle-claim.service.d.ts +5 -1
- package/package.json +1 -1
|
@@ -10,4 +10,4 @@ export class MyTaxRentForm extends AbstractForm {
|
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9mb3Jtcy9yZXBvcnQvbXktdGF4L215LXRheC1yZW50LmZvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBR3BELE1BQU0sT0FBTyxhQUFjLFNBQVEsWUFBdUI7SUFDeEQsWUFDRSxJQUFlO1FBRWYsS0FBSyxDQUFDO1lBQ0osZUFBZSxFQUFFLElBQUksa0JBQWtCLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQztZQUM3RCxrQkFBa0IsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyx3QkFBd0IsQ0FBQztZQUN6RSxzQkFBc0IsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyw0QkFBNEIsQ0FBQztZQUNqRiwyQkFBMkIsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQztTQUN0RixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBYnN0cmFjdEZvcm0gfSBmcm9tICcuLi8uLi9hYnN0cmFjdC5mb3JtJztcbmltcG9ydCB7IFVudHlwZWRGb3JtQ29udHJvbCB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IE15VGF4UmVudCB9IGZyb20gJy4uLy4uLy4uL21vZGVscy9yZXBvcnQnO1xuXG5leHBvcnQgY2xhc3MgTXlUYXhSZW50Rm9ybSBleHRlbmRzIEFic3RyYWN0Rm9ybTxNeVRheFJlbnQ+IHtcbiAgY29uc3RydWN0b3IoXG4gICAgcmVudDogTXlUYXhSZW50LFxuICApIHtcbiAgICBzdXBlcih7XG4gICAgICBncm9zc1JlbnRBbW91bnQ6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wocmVudC5ncm9zc1JlbnRBbW91bnQpLFxuICAgICAgaW50ZXJlc3REZWR1Y3Rpb25zOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHJlbnQuaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50KSxcbiAgICAgIGNhcGl0YWxXb3Jrc0RlZHVjdGlvbnM6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2wocmVudC5jYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50KSxcbiAgICAgIG90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudDogbmV3IFVudHlwZWRGb3JtQ29udHJvbChyZW50Lm90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudClcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChartAccountsListEnum } from '../../../../db/Enums';
|
|
2
|
-
import { TaxReturnCategoryListEnum } from '../../../../db/Enums
|
|
2
|
+
import { TaxReturnCategoryListEnum } from '../../../../db/Enums';
|
|
3
3
|
import round from 'lodash/round';
|
|
4
4
|
export class MyTaxRent {
|
|
5
5
|
constructor(transactions, depreciations, taxSummary) {
|
|
@@ -8,13 +8,8 @@ export class MyTaxRent {
|
|
|
8
8
|
this.grossRentAmount = transactions
|
|
9
9
|
.getPropertyTransactions()
|
|
10
10
|
.getIncomeTransactions()
|
|
11
|
-
.filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)
|
|
12
|
-
.sumBy('
|
|
13
|
-
transactions
|
|
14
|
-
.getPropertyTransactions()
|
|
15
|
-
.getIncomeTransactions()
|
|
16
|
-
.filterBy('chartAccounts.id', ChartAccountsListEnum.OTHER_RENTAL_INCOME)
|
|
17
|
-
.sumBy('claimAmount');
|
|
11
|
+
.filterBy('chartAccounts.id', [ChartAccountsListEnum.RENTAL_INCOME, ChartAccountsListEnum.OTHER_RENTAL_INCOME])
|
|
12
|
+
.sumBy('grossAmount');
|
|
18
13
|
this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('claimAmount'));
|
|
19
14
|
this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
|
|
20
15
|
this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
|
|
@@ -45,4 +40,4 @@ export class MyTaxRent {
|
|
|
45
40
|
return round(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount, 2);
|
|
46
41
|
}
|
|
47
42
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXktdGF4LXJlbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL3JlcG9ydC9teS10YXgvbXktdGF4LXJlbnQvbXktdGF4LXJlbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJN0QsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDakUsT0FBTyxLQUFLLE1BQU0sY0FBYyxDQUFDO0FBRWpDLE1BQU0sT0FBTyxTQUFTO0lBU3BCLFlBQ0UsWUFBbUMsRUFDbkMsYUFBcUMsRUFDckMsVUFBc0I7UUFFdEIsSUFBSSxDQUFDLGdCQUFnQixHQUFHLFlBQVksQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLHNCQUFzQixFQUFFLENBQUM7UUFDeEYsSUFBSSxDQUFDLHlCQUF5QixHQUFHLFVBQVUsQ0FBQyxRQUFRLENBQUM7UUFDckQsSUFBSSxDQUFDLGVBQWUsR0FBRyxZQUFZO2FBQ2hDLHVCQUF1QixFQUFFO2FBQ3pCLHFCQUFxQixFQUFFO2FBQ3ZCLFFBQVEsQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLHFCQUFxQixDQUFDLGFBQWEsRUFBRSxxQkFBcUIsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO2FBQzlHLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUV4QixJQUFJLENBQUMsd0JBQXdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUN0RyxJQUFJLENBQUMsNEJBQTRCLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUUzRyxJQUFJLENBQUMsMkJBQTJCLEdBQUcsSUFBSSxDQUFDLG9DQUFvQyxFQUFFLENBQUM7UUFFL0U7O1dBRUc7UUFDSCxrSEFBa0g7UUFDbEgsd0dBQXdHO1FBQ3hHLDBEQUEwRDtRQUUxRCxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxlQUFlO1lBQ2pDLElBQUksQ0FBQyx3QkFBd0I7WUFDN0IsSUFBSSxDQUFDLDRCQUE0QjtZQUNqQyxJQUFJLENBQUMsMkJBQTJCLENBQUM7SUFDckMsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ssb0NBQW9DO1FBQzFDLE1BQU0sdUJBQXVCLEdBQVcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUNsRixNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsbUJBQW1CLENBQUMsRUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUM7UUFFL0YsTUFBTSx1QkFBdUIsR0FBVyxJQUFJLENBQUMsR0FBRyxDQUM5QyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSzthQUNqQyxNQUFNLENBQUMsc0JBQXNCLEVBQUUseUJBQXlCLENBQUMsa0JBQWtCLENBQUMsRUFBRSxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUM7UUFFaEcsTUFBTSwyQkFBMkIsR0FBVyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxLQUFLO2FBQ3RGLE1BQU0sQ0FBQyxzQkFBc0IsRUFBRSx5QkFBeUIsQ0FBQyx1QkFBdUIsQ0FBQyxFQUFFLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQztRQUVuRyxPQUFPLEtBQUssQ0FBQyx1QkFBdUIsR0FBRyx1QkFBdUIsR0FBRywyQkFBMkIsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNuRyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmFuc2FjdGlvbkNvbGxlY3Rpb24gfSBmcm9tICcuLi8uLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzTGlzdEVudW0gfSBmcm9tICcuLi8uLi8uLi8uLi9kYi9FbnVtcyc7XG5pbXBvcnQgeyBEZXByZWNpYXRpb25Db2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgVGF4U3VtbWFyeSB9IGZyb20gJy4uLy4uLy4uL3RheC1zdW1tYXJ5L3RheC1zdW1tYXJ5JztcbmltcG9ydCB7IFRheFN1bW1hcnlTZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vdGF4LXN1bW1hcnkvdGF4LXN1bW1hcnktc2VjdGlvbic7XG5pbXBvcnQgeyBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtIH0gZnJvbSAnLi4vLi4vLi4vLi4vZGIvRW51bXMnO1xuaW1wb3J0IHJvdW5kIGZyb20gJ2xvZGFzaC9yb3VuZCc7XG5cbmV4cG9ydCBjbGFzcyBNeVRheFJlbnQge1xuICBwcm9wZXJ0eUV4cGVuc2VzOiBUcmFuc2FjdGlvbkNvbGxlY3Rpb247XG4gIHRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb246IFRheFN1bW1hcnlTZWN0aW9uO1xuICBncm9zc1JlbnRBbW91bnQ6IG51bWJlcjtcbiAgaW50ZXJlc3REZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIGNhcGl0YWxXb3Jrc0RlZHVjdGlvbnNBbW91bnQ6IG51bWJlcjtcbiAgb3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50OiBudW1iZXI7XG4gIG5ldFJlbnQ6IG51bWJlcjtcblxuICBjb25zdHJ1Y3RvcihcbiAgICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgICBkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICAgIHRheFN1bW1hcnk6IFRheFN1bW1hcnlcbiAgKSB7XG4gICAgdGhpcy5wcm9wZXJ0eUV4cGVuc2VzID0gdHJhbnNhY3Rpb25zLmdldFByb3BlcnR5VHJhbnNhY3Rpb25zKCkuZ2V0RXhwZW5zZVRyYW5zYWN0aW9ucygpO1xuICAgIHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbiA9IHRheFN1bW1hcnkucHJvcGVydHk7XG4gICAgdGhpcy5ncm9zc1JlbnRBbW91bnQgPSB0cmFuc2FjdGlvbnNcbiAgICAgIC5nZXRQcm9wZXJ0eVRyYW5zYWN0aW9ucygpXG4gICAgICAuZ2V0SW5jb21lVHJhbnNhY3Rpb25zKClcbiAgICAgIC5maWx0ZXJCeSgnY2hhcnRBY2NvdW50cy5pZCcsIFtDaGFydEFjY291bnRzTGlzdEVudW0uUkVOVEFMX0lOQ09NRSwgQ2hhcnRBY2NvdW50c0xpc3RFbnVtLk9USEVSX1JFTlRBTF9JTkNPTUVdKVxuICAgICAgLnN1bUJ5KCdncm9zc0Ftb3VudCcpO1xuXG4gICAgdGhpcy5pbnRlcmVzdERlZHVjdGlvbnNBbW91bnQgPSBNYXRoLmFicyh0cmFuc2FjdGlvbnMuZ2V0SW50ZXJlc3RUcmFuc2FjdGlvbnMoKS5zdW1CeSgnY2xhaW1BbW91bnQnKSk7XG4gICAgdGhpcy5jYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50ID0gTWF0aC5hYnMoZGVwcmVjaWF0aW9ucy5nZXRDYXBpdGFsRGVwcmVjaWF0aW9ucygpLnN1bUJ5KCdjbGFpbUFtb3VudCcpKTtcblxuICAgIHRoaXMub3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50ID0gdGhpcy5jYWxjdWxhdGVPdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQoKTtcblxuICAgIC8qKlxuICAgICAqIEBUb2RvIFZpayB1bmNvbW1lbnQgd2hlbiB0YXNrIFRULTIwMDkgd2lsbCBiZSBpbXBsZW1lbnRlZFxuICAgICAqL1xuICAgIC8vIHRoaXMub3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50ID0gZGVwcmVjaWF0aW9ucy5nZXRCeVRhbmtUeXBlKFRhbmtUeXBlRW51bS5QUk9QRVJUWSkuZ2V0QXNzZXRzKCkuY2xhaW1BbW91bnQgK1xuICAgIC8vICAgZGVwcmVjaWF0aW9ucy5nZXRCeVRhbmtUeXBlKFRhbmtUeXBlRW51bS5QUk9QRVJUWSkuZ2V0Qm9ycm93aW5nRXhwZW5zZURlcHJlY2lhdGlvbnMoKS5jbGFpbUFtb3VudCArXG4gICAgLy8gICBNYXRoLmFicyh0aGlzLnByb3BlcnR5RXhwZW5zZXMuc3VtQnkoJ2NsYWltQW1vdW50JykpO1xuXG4gICAgdGhpcy5uZXRSZW50ID0gdGhpcy5ncm9zc1JlbnRBbW91bnQgLVxuICAgICAgdGhpcy5pbnRlcmVzdERlZHVjdGlvbnNBbW91bnQgLVxuICAgICAgdGhpcy5jYXBpdGFsV29ya3NEZWR1Y3Rpb25zQW1vdW50IC1cbiAgICAgIHRoaXMub3RoZXJSZW50YWxEZWR1Y3Rpb25zQW1vdW50O1xuICB9XG5cbiAgLyoqXG4gICAqIEBUb2RvIFZpayByZW1vdmUgd2hlbiBUVC0yMDA5IHdpbGwgYmUgaW1wbGVtZW50ZWQuXG4gICAqIFdlIHVzZSB0YXggc3VtbWFyeSBkYXRhIGhlcmUgYmVjYXVzZSBjbGFpbSBhbW91bnQgZnJvbSBkZXByZWNpYXRpb24gaXMgZGlmZmVyZW50XG4gICAqIGZyb20gdGhlIGNsYWltIGFtb3VudCB0aGF0IHdlIGdldCBmcm9tIHRheCBzdW1tYXJ5IChkZXByZWNpYXRpb24gY2xhaW0gYW1vdW50IGlzIG5vdCBhZmZlY3RlZCBieSBwcm9wZXJ0eSBzaGFyZSxcbiAgICogcHJvcGVydHkgY29udHJhY3QgZGF0ZSwgZS50LmMuKS4gRGV0YWlscyBpbiB0aGUgVFQtMjAwOSB0YXNrXG4gICAqL1xuICBwcml2YXRlIGNhbGN1bGF0ZU90aGVyUmVudGFsRGVkdWN0aW9uc0Ftb3VudCgpOiBudW1iZXIge1xuICAgIGNvbnN0IHBsYW50QW5kRXF1aXBtZW50QW1vdW50OiBudW1iZXIgPSBNYXRoLmFicyh0aGlzLnRheFN1bW1hcnlQcm9wZXJ0eVNlY3Rpb24uaXRlbXNcbiAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5QTEFOVF9BTkRfRVFVSVBNRU5UKT8uYW1vdW50IHx8IDApO1xuXG4gICAgY29uc3QgYm9ycm93aW5nRXhwZW5zZXNBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKFxuICAgICAgdGhpcy50YXhTdW1tYXJ5UHJvcGVydHlTZWN0aW9uLml0ZW1zXG4gICAgICAgIC5maW5kQnkoJ3RheFJldHVybkNhdGVnb3J5LmlkJywgVGF4UmV0dXJuQ2F0ZWdvcnlMaXN0RW51bS5CT1JST1dJTkdfRVhQRU5TRVMpPy5hbW91bnQgfHwgMCk7XG5cbiAgICBjb25zdCBvdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQ6IG51bWJlciA9IE1hdGguYWJzKHRoaXMudGF4U3VtbWFyeVByb3BlcnR5U2VjdGlvbi5pdGVtc1xuICAgICAgLmZpbmRCeSgndGF4UmV0dXJuQ2F0ZWdvcnkuaWQnLCBUYXhSZXR1cm5DYXRlZ29yeUxpc3RFbnVtLk9USEVSX1JFTlRBTF9ERURVQ1RJT05TKT8uYW1vdW50IHx8IDApO1xuXG4gICAgcmV0dXJuIHJvdW5kKHBsYW50QW5kRXF1aXBtZW50QW1vdW50ICsgYm9ycm93aW5nRXhwZW5zZXNBbW91bnQgKyBvdGhlclJlbnRhbERlZHVjdGlvbnNBbW91bnQsIDIpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
1
|
+
import { Inject, Injectable } from '@angular/core';
|
|
2
2
|
import { VehicleClaim } from '../../../models';
|
|
3
3
|
import { RestService } from '../rest/rest-old.service';
|
|
4
4
|
import { AppEventTypeEnum } from '../../../models';
|
|
@@ -9,11 +9,18 @@ import { plainToClass } from 'class-transformer';
|
|
|
9
9
|
import { UserRolesEnum } from '../../../db/Enums/user-roles.enum';
|
|
10
10
|
import * as i0 from "@angular/core";
|
|
11
11
|
export class VehicleClaimService extends RestService {
|
|
12
|
-
constructor() {
|
|
13
|
-
super(
|
|
12
|
+
constructor(environment) {
|
|
13
|
+
super(environment);
|
|
14
|
+
this.environment = environment;
|
|
14
15
|
this.modelClass = VehicleClaim;
|
|
15
16
|
this.url = 'vehicle-claims';
|
|
16
17
|
this.roles = [UserRolesEnum.WORK_TANK, UserRolesEnum.SOLE_TANK];
|
|
18
|
+
this.listenEvents();
|
|
19
|
+
}
|
|
20
|
+
listenEvents() {
|
|
21
|
+
this.eventDispatcherService.on([AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED]).subscribe(() => {
|
|
22
|
+
this.refreshCache();
|
|
23
|
+
});
|
|
17
24
|
}
|
|
18
25
|
add(model) {
|
|
19
26
|
return super.add(model).pipe(map((vehicleClaim) => {
|
|
@@ -38,7 +45,7 @@ export class VehicleClaimService extends RestService {
|
|
|
38
45
|
});
|
|
39
46
|
return combineLatest(batch$);
|
|
40
47
|
}
|
|
41
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps:
|
|
48
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
42
49
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
|
|
43
50
|
}
|
|
44
51
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, decorators: [{
|
|
@@ -46,5 +53,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
46
53
|
args: [{
|
|
47
54
|
providedIn: 'root'
|
|
48
55
|
}]
|
|
49
|
-
}]
|
|
50
|
-
|
|
56
|
+
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
57
|
+
type: Inject,
|
|
58
|
+
args: ['environment']
|
|
59
|
+
}] }]; } });
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1jbGFpbS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvdmVoaWNsZS92ZWhpY2xlLWNsYWltLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFbkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQy9DLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNuRCxPQUFPLEVBQWMsYUFBYSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ2pELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQzs7QUFPbEUsTUFBTSxPQUFPLG1CQUFvQixTQUFRLFdBQTJDO0lBS2xGLFlBQTZDLFdBQWdCO1FBQzNELEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUR3QixnQkFBVyxHQUFYLFdBQVcsQ0FBSztRQUo3RCxlQUFVLEdBQXdCLFlBQVksQ0FBQztRQUMvQyxRQUFHLEdBQUcsZ0JBQWdCLENBQUM7UUFDdkIsVUFBSyxHQUFHLENBQUMsYUFBYSxDQUFDLFNBQVMsRUFBRSxhQUFhLENBQUMsU0FBUyxDQUFDLENBQUM7UUFJekQsSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFDO0lBQ3RCLENBQUM7SUFFRCxZQUFZO1FBQ1YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEVBQUUsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLDZCQUE2QixDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFO1lBQzlGLElBQUksQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxHQUFHLENBQUMsS0FBbUI7UUFDckIsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FDMUIsR0FBRyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsZ0JBQWdCLENBQUMscUJBQXFCLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUV6RyxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFtQixFQUFFLGNBQXNCLEVBQUU7UUFDbEQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQzFDLEdBQUcsQ0FBQyxDQUFDLFlBQTBCLEVBQUUsRUFBRTtZQUNqQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLGdCQUFnQixDQUFDLHFCQUFxQixFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFFekcsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFRDs7O09BR0c7SUFDSCxlQUFlLENBQUMsWUFBMEM7UUFDeEQsTUFBTSxNQUFNLEdBQStCLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFtQixFQUFFLEVBQUU7WUFDeEYsTUFBTSxhQUFhLEdBQWlCLFlBQVksQ0FDOUMsWUFBWSxFQUNaLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FDMUUsQ0FBQztZQUVGLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9CLENBQUM7K0dBbkRVLG1CQUFtQixrQkFLVixhQUFhO21IQUx0QixtQkFBbUIsY0FGbEIsTUFBTTs7NEZBRVAsbUJBQW1CO2tCQUgvQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQjs7MEJBTWMsTUFBTTsyQkFBQyxhQUFhIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBWZWhpY2xlQ2xhaW0gYXMgVmVoaWNsZUNsYWltQmFzZSB9IGZyb20gJy4uLy4uLy4uL2RiL01vZGVscy92ZWhpY2xlL3ZlaGljbGUtY2xhaW0nO1xuaW1wb3J0IHsgVmVoaWNsZUNsYWltIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFJlc3RTZXJ2aWNlIH0gZnJvbSAnLi4vcmVzdC9yZXN0LW9sZC5zZXJ2aWNlJztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgY29tYmluZUxhdGVzdCB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgQXBwRXZlbnQgfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgcGxhaW5Ub0NsYXNzIH0gZnJvbSAnY2xhc3MtdHJhbnNmb3JtZXInO1xuaW1wb3J0IHsgVXNlclJvbGVzRW51bSB9IGZyb20gJy4uLy4uLy4uL2RiL0VudW1zL3VzZXItcm9sZXMuZW51bSc7XG5pbXBvcnQgeyBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uIH0gZnJvbSAnLi4vLi4vLi4vY29sbGVjdGlvbnMnO1xuaW1wb3J0IHsgSUV2ZW50TGlzdGVuZXIgfSBmcm9tICcuLi8uLi8uLi9pbnRlcmZhY2VzJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgVmVoaWNsZUNsYWltU2VydmljZSBleHRlbmRzIFJlc3RTZXJ2aWNlPFZlaGljbGVDbGFpbUJhc2UsIFZlaGljbGVDbGFpbT4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBWZWhpY2xlQ2xhaW0gPSBWZWhpY2xlQ2xhaW07XG4gIHVybCA9ICd2ZWhpY2xlLWNsYWltcyc7XG4gIHJvbGVzID0gW1VzZXJSb2xlc0VudW0uV09SS19UQU5LLCBVc2VyUm9sZXNFbnVtLlNPTEVfVEFOS107XG5cbiAgY29uc3RydWN0b3IoQEluamVjdCgnZW52aXJvbm1lbnQnKSBwcm90ZWN0ZWQgZW52aXJvbm1lbnQ6IGFueSkge1xuICAgIHN1cGVyKGVudmlyb25tZW50KTtcbiAgICB0aGlzLmxpc3RlbkV2ZW50cygpO1xuICB9XG5cbiAgbGlzdGVuRXZlbnRzKCkge1xuICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5vbihbQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX0RFVEFJTFNfVVBEQVRFRF0pLnN1YnNjcmliZSgoKSA9PiB7XG4gICAgICB0aGlzLnJlZnJlc2hDYWNoZSgpO1xuICAgIH0pO1xuICB9XG5cbiAgYWRkKG1vZGVsOiBWZWhpY2xlQ2xhaW0pOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbT4ge1xuICAgIHJldHVybiBzdXBlci5hZGQobW9kZWwpLnBpcGUoXG4gICAgICBtYXAoKHZlaGljbGVDbGFpbTogVmVoaWNsZUNsYWltKSA9PiB7XG4gICAgICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5kaXNwYXRjaChuZXcgQXBwRXZlbnQoQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX0NSRUFURUQsIHZlaGljbGVDbGFpbSkpO1xuXG4gICAgICAgIHJldHVybiB2ZWhpY2xlQ2xhaW07XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICB1cGRhdGUobW9kZWw6IFZlaGljbGVDbGFpbSwgcXVlcnlQYXJhbXM6IG9iamVjdCA9IHt9KTogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW0+IHtcbiAgICByZXR1cm4gc3VwZXIudXBkYXRlKG1vZGVsLCBxdWVyeVBhcmFtcykucGlwZShcbiAgICAgIG1hcCgodmVoaWNsZUNsYWltOiBWZWhpY2xlQ2xhaW0pID0+IHtcbiAgICAgICAgdGhpcy5ldmVudERpc3BhdGNoZXJTZXJ2aWNlLmRpc3BhdGNoKG5ldyBBcHBFdmVudChBcHBFdmVudFR5cGVFbnVtLlZFSElDTEVfQ0xBSU1fVVBEQVRFRCwgdmVoaWNsZUNsYWltKSk7XG5cbiAgICAgICAgcmV0dXJuIHZlaGljbGVDbGFpbTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBVcGRhdGUgd29ya1VzYWdlIGZvciBhbGwgdmVoaWNsZSBjbGFpbXMgaWYgbG9nYm9vayBiZXN0IHBlcmlvZCBjaGFuZ2VkXG4gICAqIEBUT0RPIFZpazogQmVzdCBwZXJpb2QgbW92ZSB0aGlzIGFuZCByZWxhdGVkIGxvZ2ljIHRvIGJhY2tlbmRcbiAgICovXG4gIHVwZGF0ZVdvcmtVc2FnZShiZXN0TG9nYm9va3M6IEJlc3RWZWhpY2xlTG9nYm9va0NvbGxlY3Rpb24pOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbVtdPiB7XG4gICAgY29uc3QgYmF0Y2gkOiBPYnNlcnZhYmxlPFZlaGljbGVDbGFpbT5bXSA9ICh0aGlzLmNhY2hlID8/IFtdKS5tYXAoKGNsYWltOiBWZWhpY2xlQ2xhaW0pID0+IHtcbiAgICAgIGNvbnN0IGNsYWltVG9VcGRhdGU6IFZlaGljbGVDbGFpbSA9IHBsYWluVG9DbGFzcyhcbiAgICAgICAgVmVoaWNsZUNsYWltLFxuICAgICAgICBPYmplY3QuYXNzaWduKHt9LCBjbGFpbSwgeyB3b3JrVXNhZ2U6IGJlc3RMb2dib29rcy5nZXRXb3JrVXNhZ2UoY2xhaW0pIH0pXG4gICAgICApO1xuXG4gICAgICByZXR1cm4gdGhpcy51cGRhdGUoY2xhaW1Ub1VwZGF0ZSk7XG4gICAgfSlcblxuICAgIHJldHVybiBjb21iaW5lTGF0ZXN0KGJhdGNoJCk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -37,7 +37,8 @@ export class PropertyTransactionReportService {
|
|
|
37
37
|
*/
|
|
38
38
|
getTransactions() {
|
|
39
39
|
return this.transactionService.get().pipe(map((transactions) => new TransactionCollection(transactions)
|
|
40
|
-
.getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
|
|
40
|
+
.getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
|
|
41
|
+
.filter(transaction => transaction.claimPercent > 0)));
|
|
41
42
|
}
|
|
42
43
|
/**
|
|
43
44
|
* Get list of asset & capital property depreciations
|
|
@@ -57,4 +58,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
57
58
|
providedIn: 'root'
|
|
58
59
|
}]
|
|
59
60
|
}], ctorParameters: function () { return [{ type: i1.PropertyService }, { type: i1.TransactionService }, { type: i1.DepreciationService }, { type: i1.ChartAccountsService }]; } });
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvcGVydHktdHJhbnNhY3Rpb24tcmVwb3J0LnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvc2VydmljZXMvcmVwb3J0L3Byb3BlcnR5L3Byb3BlcnR5LXRyYW5zYWN0aW9uLXJlcG9ydC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFjLGFBQWEsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNqRCxPQUFPLEVBQUUseUJBQXlCLEVBQXlCLE1BQU0saUJBQWlCLENBQUM7QUFDbkYsT0FBTyxFQUtMLDRCQUE0QixFQUM1Qix3Q0FBd0MsRUFDeEMsdUNBQXVDLEVBQ3ZDLHFCQUFxQixHQUN0QixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQzs7O0FBRXJDOztHQUVHO0FBSUgsTUFBTSxPQUFPLGdDQUFnQztJQU0zQyxZQUNVLGVBQWdDLEVBQ2hDLGtCQUFzQyxFQUN0QyxtQkFBd0MsRUFDeEMsb0JBQTBDO1FBSDFDLG9CQUFlLEdBQWYsZUFBZSxDQUFpQjtRQUNoQyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQ3RDLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBcUI7UUFDeEMseUJBQW9CLEdBQXBCLG9CQUFvQixDQUFzQjtJQUVwRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxHQUFHO1FBQ0QsT0FBTyxhQUFhLENBQUM7WUFDbkIsSUFBSSxDQUFDLGVBQWUsQ0FBQyxHQUFHLEVBQW9DO1lBQzVELElBQUksQ0FBQyxlQUFlLEVBQXVDO1lBQzNELElBQUksQ0FBQyxnQkFBZ0IsRUFBd0M7WUFDN0QsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEdBQUcsRUFBeUM7U0FDdkUsQ0FBQyxDQUFDLElBQUksQ0FDTCxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLGFBQWEsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxhQUFhLEVBQUUsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUM3SixDQUFBO0lBQ0gsQ0FBQztJQUVPLE1BQU0sQ0FDWixZQUFtQyxFQUNuQyxhQUFxQyxFQUNyQyxVQUE4QixFQUM5QixhQUFzQztRQUV0QyxPQUFPLElBQUksNEJBQTRCLENBQUM7WUFDdEMsR0FBRyxJQUFJLHVDQUF1QyxDQUFDLFlBQVksRUFBRSxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUMsS0FBSztZQUM3RixHQUFHLElBQUksd0NBQXdDLENBQUMsYUFBYSxFQUFFLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQyxLQUFLO1NBQ2hHLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRDs7T0FFRztJQUNLLGVBQWU7UUFDckIsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUN2QyxHQUFHLENBQUMsQ0FBQyxZQUEyQixFQUFFLEVBQUUsQ0FBQyxJQUFJLHFCQUFxQixDQUFDLFlBQVksQ0FBQzthQUN6RSw0QkFBNEIsQ0FBQyx5QkFBeUIsQ0FBQyxRQUFRLENBQUM7YUFDaEUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLFlBQVksR0FBRyxDQUFDLENBQUMsQ0FDckQsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ssZ0JBQWdCO1FBQ3RCLE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FDeEMsR0FBRyxDQUFDLENBQUMsYUFBcUMsRUFBRSxFQUFFLENBQUMsYUFBYTthQUN6RCw0QkFBNEIsQ0FBQyx5QkFBeUIsQ0FBQyxRQUFRLENBQUM7WUFDakUsbURBQW1EO2FBQ2xELDJCQUEyQixFQUFFLENBQUMsQ0FDbEMsQ0FBQTtJQUNILENBQUM7K0dBOURVLGdDQUFnQzttSEFBaEMsZ0NBQWdDLGNBRi9CLE1BQU07OzRGQUVQLGdDQUFnQztrQkFINUMsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzU2VydmljZSwgRGVwcmVjaWF0aW9uU2VydmljZSwgUHJvcGVydHlTZXJ2aWNlLCBUcmFuc2FjdGlvblNlcnZpY2UsIH0gZnJvbSAnLi4vLi4vaHR0cCc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBjb21iaW5lTGF0ZXN0IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBDSEFSVF9BQ0NPVU5UU19DQVRFR09SSUVTLCBQcm9wZXJ0eSwgVHJhbnNhY3Rpb24gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHtcbiAgQ2hhcnRBY2NvdW50c0NvbGxlY3Rpb24sXG4gIENvbGxlY3Rpb25EaWN0aW9uYXJ5LFxuICBEZXByZWNpYXRpb25Db2xsZWN0aW9uLFxuICBQcm9wZXJ0eUNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbURlcHJlY2lhdGlvbkNvbGxlY3Rpb24sXG4gIFByb3BlcnR5UmVwb3J0SXRlbVRyYW5zYWN0aW9uQ29sbGVjdGlvbixcbiAgVHJhbnNhY3Rpb25Db2xsZWN0aW9uLFxufSBmcm9tICcuLi8uLi8uLi9jb2xsZWN0aW9ucyc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbi8qKlxuICogU2VydmljZSB0byBoYW5kbGUgUHJvcGVydHkgdHJhbnNhY3Rpb25zIHJlcG9ydCBpdGVtcyBkYXRhIChnZXQgaW5jb21lIC8gZXhwZW5zZSByZXBvcnQgaXRlbXMsIGUudC5jLilcbiAqL1xuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgUHJvcGVydHlUcmFuc2FjdGlvblJlcG9ydFNlcnZpY2Uge1xuICBwcm9wZXJ0aWVzOiBQcm9wZXJ0eVtdO1xuICB0cmFuc2FjdGlvbnM6IFRyYW5zYWN0aW9uQ29sbGVjdGlvbjtcbiAgZGVwcmVjaWF0aW9uczogRGVwcmVjaWF0aW9uQ29sbGVjdGlvbjtcbiAgY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50c0NvbGxlY3Rpb247XG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHJpdmF0ZSBwcm9wZXJ0eVNlcnZpY2U6IFByb3BlcnR5U2VydmljZSxcbiAgICBwcml2YXRlIHRyYW5zYWN0aW9uU2VydmljZTogVHJhbnNhY3Rpb25TZXJ2aWNlLFxuICAgIHByaXZhdGUgZGVwcmVjaWF0aW9uU2VydmljZTogRGVwcmVjaWF0aW9uU2VydmljZSxcbiAgICBwcml2YXRlIGNoYXJ0QWNjb3VudHNTZXJ2aWNlOiBDaGFydEFjY291bnRzU2VydmljZVxuICApIHtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgY29sbGVjdGlvbiBvZiByZXBvcnQgaXRlbXMgYmFzZWQgb24gdHJhbnNhY3Rpb25zICYgZGVwcmVjaWF0aW9uc1xuICAgKi9cbiAgZ2V0KCk6IE9ic2VydmFibGU8Q29sbGVjdGlvbkRpY3Rpb25hcnk8UHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbj4+IHtcbiAgICByZXR1cm4gY29tYmluZUxhdGVzdChbXG4gICAgICB0aGlzLnByb3BlcnR5U2VydmljZS5nZXQoKSBhcyBPYnNlcnZhYmxlPFByb3BlcnR5Q29sbGVjdGlvbj4sXG4gICAgICB0aGlzLmdldFRyYW5zYWN0aW9ucygpIGFzIE9ic2VydmFibGU8VHJhbnNhY3Rpb25Db2xsZWN0aW9uPixcbiAgICAgIHRoaXMuZ2V0RGVwcmVjaWF0aW9ucygpIGFzIE9ic2VydmFibGU8RGVwcmVjaWF0aW9uQ29sbGVjdGlvbj4sXG4gICAgICB0aGlzLmNoYXJ0QWNjb3VudHNTZXJ2aWNlLmdldCgpIGFzIE9ic2VydmFibGU8Q2hhcnRBY2NvdW50c0NvbGxlY3Rpb24+XG4gICAgXSkucGlwZShcbiAgICAgIG1hcCgoW3Byb3BlcnRpZXMsIHRyYW5zYWN0aW9ucywgZGVwcmVjaWF0aW9ucywgY2hhcnRBY2NvdW50c10pID0+IHRoaXMuY3JlYXRlKHRyYW5zYWN0aW9ucywgZGVwcmVjaWF0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cykuZ3JvdXBCeSgncHJvcGVydHlJZCcpKVxuICAgIClcbiAgfVxuXG4gIHByaXZhdGUgY3JlYXRlKFxuICAgIHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25Db2xsZWN0aW9uLFxuICAgIGRlcHJlY2lhdGlvbnM6IERlcHJlY2lhdGlvbkNvbGxlY3Rpb24sXG4gICAgcHJvcGVydGllczogUHJvcGVydHlDb2xsZWN0aW9uLFxuICAgIGNoYXJ0QWNjb3VudHM6IENoYXJ0QWNjb3VudHNDb2xsZWN0aW9uXG4gICk6IFByb3BlcnR5UmVwb3J0SXRlbUNvbGxlY3Rpb24ge1xuICAgIHJldHVybiBuZXcgUHJvcGVydHlSZXBvcnRJdGVtQ29sbGVjdGlvbihbXG4gICAgICAuLi5uZXcgUHJvcGVydHlSZXBvcnRJdGVtVHJhbnNhY3Rpb25Db2xsZWN0aW9uKHRyYW5zYWN0aW9ucywgcHJvcGVydGllcywgY2hhcnRBY2NvdW50cykuaXRlbXMsXG4gICAgICAuLi5uZXcgUHJvcGVydHlSZXBvcnRJdGVtRGVwcmVjaWF0aW9uQ29sbGVjdGlvbihkZXByZWNpYXRpb25zLCBwcm9wZXJ0aWVzLCBjaGFydEFjY291bnRzKS5pdGVtcyxcbiAgICBdKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBHZXQgY29sbGVjdGlvbiBvZiBwcm9wZXJ0eSB0cmFuc2FjdGlvbnNcbiAgICovXG4gIHByaXZhdGUgZ2V0VHJhbnNhY3Rpb25zKCk6IE9ic2VydmFibGU8VHJhbnNhY3Rpb25Db2xsZWN0aW9uPiB7XG4gICAgcmV0dXJuIHRoaXMudHJhbnNhY3Rpb25TZXJ2aWNlLmdldCgpLnBpcGUoXG4gICAgICBtYXAoKHRyYW5zYWN0aW9uczogVHJhbnNhY3Rpb25bXSkgPT4gbmV3IFRyYW5zYWN0aW9uQ29sbGVjdGlvbih0cmFuc2FjdGlvbnMpXG4gICAgICAgIC5nZXRCeUNoYXJ0QWNjb3VudHNDYXRlZ29yaWVzKENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMucHJvcGVydHkpXG4gICAgICAgIC5maWx0ZXIodHJhbnNhY3Rpb24gPT4gdHJhbnNhY3Rpb24uY2xhaW1QZXJjZW50ID4gMClcbiAgICAgIClcbiAgICApO1xuICB9XG5cbiAgLyoqXG4gICAqIEdldCBsaXN0IG9mIGFzc2V0ICYgY2FwaXRhbCBwcm9wZXJ0eSBkZXByZWNpYXRpb25zXG4gICAqL1xuICBwcml2YXRlIGdldERlcHJlY2lhdGlvbnMoKTogT2JzZXJ2YWJsZTxEZXByZWNpYXRpb25Db2xsZWN0aW9uPiB7XG4gICAgcmV0dXJuIHRoaXMuZGVwcmVjaWF0aW9uU2VydmljZS5nZXQoKS5waXBlKFxuICAgICAgbWFwKChkZXByZWNpYXRpb25zOiBEZXByZWNpYXRpb25Db2xsZWN0aW9uKSA9PiBkZXByZWNpYXRpb25zXG4gICAgICAgIC5nZXRCeUNoYXJ0QWNjb3VudHNDYXRlZ29yaWVzKENIQVJUX0FDQ09VTlRTX0NBVEVHT1JJRVMucHJvcGVydHkpXG4gICAgICAgIC8vIHdlIGRvbid0IG5lZWQgYm9ycm93aW5nIGV4cGVuc2VzIGZvciB0aGlzIHJlcG9ydFxuICAgICAgICAuZ2V0V2l0aG91dEJvcnJvd2luZ0V4cGVuc2VzKCkpXG4gICAgKVxuICB9XG59XG4iXX0=
|
|
@@ -8074,13 +8074,8 @@ class MyTaxRent {
|
|
|
8074
8074
|
this.grossRentAmount = transactions
|
|
8075
8075
|
.getPropertyTransactions()
|
|
8076
8076
|
.getIncomeTransactions()
|
|
8077
|
-
.filterBy('chartAccounts.id', ChartAccountsListEnum.RENTAL_INCOME)
|
|
8078
|
-
.sumBy('
|
|
8079
|
-
transactions
|
|
8080
|
-
.getPropertyTransactions()
|
|
8081
|
-
.getIncomeTransactions()
|
|
8082
|
-
.filterBy('chartAccounts.id', ChartAccountsListEnum.OTHER_RENTAL_INCOME)
|
|
8083
|
-
.sumBy('claimAmount');
|
|
8077
|
+
.filterBy('chartAccounts.id', [ChartAccountsListEnum.RENTAL_INCOME, ChartAccountsListEnum.OTHER_RENTAL_INCOME])
|
|
8078
|
+
.sumBy('grossAmount');
|
|
8084
8079
|
this.interestDeductionsAmount = Math.abs(transactions.getInterestTransactions().sumBy('claimAmount'));
|
|
8085
8080
|
this.capitalWorksDeductionsAmount = Math.abs(depreciations.getCapitalDepreciations().sumBy('claimAmount'));
|
|
8086
8081
|
this.otherRentalDeductionsAmount = this.calculateOtherRentalDeductionsAmount();
|
|
@@ -15420,11 +15415,18 @@ var VehicleMessagesEnum;
|
|
|
15420
15415
|
})(VehicleMessagesEnum || (VehicleMessagesEnum = {}));
|
|
15421
15416
|
|
|
15422
15417
|
class VehicleClaimService extends RestService {
|
|
15423
|
-
constructor() {
|
|
15424
|
-
super(
|
|
15418
|
+
constructor(environment) {
|
|
15419
|
+
super(environment);
|
|
15420
|
+
this.environment = environment;
|
|
15425
15421
|
this.modelClass = VehicleClaim;
|
|
15426
15422
|
this.url = 'vehicle-claims';
|
|
15427
15423
|
this.roles = [UserRolesEnum.WORK_TANK, UserRolesEnum.SOLE_TANK];
|
|
15424
|
+
this.listenEvents();
|
|
15425
|
+
}
|
|
15426
|
+
listenEvents() {
|
|
15427
|
+
this.eventDispatcherService.on([AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED]).subscribe(() => {
|
|
15428
|
+
this.refreshCache();
|
|
15429
|
+
});
|
|
15428
15430
|
}
|
|
15429
15431
|
add(model) {
|
|
15430
15432
|
return super.add(model).pipe(map((vehicleClaim) => {
|
|
@@ -15449,7 +15451,7 @@ class VehicleClaimService extends RestService {
|
|
|
15449
15451
|
});
|
|
15450
15452
|
return combineLatest(batch$);
|
|
15451
15453
|
}
|
|
15452
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps:
|
|
15454
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
15453
15455
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
|
|
15454
15456
|
}
|
|
15455
15457
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, decorators: [{
|
|
@@ -15457,7 +15459,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
15457
15459
|
args: [{
|
|
15458
15460
|
providedIn: 'root'
|
|
15459
15461
|
}]
|
|
15460
|
-
}]
|
|
15462
|
+
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
15463
|
+
type: Inject,
|
|
15464
|
+
args: ['environment']
|
|
15465
|
+
}] }]; } });
|
|
15461
15466
|
|
|
15462
15467
|
/**
|
|
15463
15468
|
* @TODO TT-1777 Alex: extend from rest service when it refactored
|
|
@@ -19165,7 +19170,8 @@ class PropertyTransactionReportService {
|
|
|
19165
19170
|
*/
|
|
19166
19171
|
getTransactions() {
|
|
19167
19172
|
return this.transactionService.get().pipe(map((transactions) => new TransactionCollection(transactions)
|
|
19168
|
-
.getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
|
|
19173
|
+
.getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
|
|
19174
|
+
.filter(transaction => transaction.claimPercent > 0)));
|
|
19169
19175
|
}
|
|
19170
19176
|
/**
|
|
19171
19177
|
* Get list of asset & capital property depreciations
|