taxtank-core 0.30.46 → 0.30.48
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/esm2020/lib/collections/exportable.collection.mjs +1 -1
- package/esm2020/lib/collections/holding/holding-sale.collection.mjs +35 -3
- package/esm2020/lib/collections/holding/holding.collection.mjs +6 -2
- package/esm2020/lib/collections/loan/loan-payment.collection.mjs +2 -2
- package/esm2020/lib/db/Enums/chart-accounts/chart-accounts-category.enum.mjs +3 -3
- package/esm2020/lib/forms/holding/holding-sale.form.mjs +3 -2
- package/esm2020/lib/services/account-setup/account-setup.service.mjs +13 -10
- package/esm2020/lib/services/xlsx/xlsx.service.mjs +5 -1
- package/fesm2015/taxtank-core.mjs +54 -13
- package/fesm2015/taxtank-core.mjs.map +1 -1
- package/fesm2020/taxtank-core.mjs +53 -13
- package/fesm2020/taxtank-core.mjs.map +1 -1
- package/lib/collections/exportable.collection.d.ts +1 -1
- package/lib/collections/holding/holding-sale.collection.d.ts +9 -3
- package/lib/collections/loan/loan-payment.collection.d.ts +1 -2
- package/lib/db/Enums/chart-accounts/chart-accounts-category.enum.d.ts +2 -2
- package/lib/services/account-setup/account-setup.service.d.ts +3 -2
- package/lib/services/xlsx/xlsx.service.d.ts +4 -0
- package/package.json +1 -1
|
@@ -20,4 +20,4 @@ export class ExportableCollection extends Collection {
|
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwb3J0YWJsZS5jb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL2NvbGxlY3Rpb25zL2V4cG9ydGFibGUuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNqRCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFJckUsTUFBTSxPQUFnQixvQkFBa0QsU0FBUSxVQUFpQjtJQUsvRixlQUFlLENBQUMsSUFBYTtRQUMzQixPQUFPLEVBQUUsQ0FBQztJQUNaLENBQUM7SUFFRCxVQUFVLENBQUMsVUFBVTtRQUNuQixPQUFPLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQy9CLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDcEIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDO1lBQ3BCLENBQUMsQ0FBQyxDQUFBO1FBQ0osQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLElBQWE7UUFDbEIsT0FBTyxZQUFZLENBQUMsZUFBZSxFQUFFO1lBQ25DLE1BQU0sRUFBRSxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQztZQUNsQyxJQUFJLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUM7WUFDOUIsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUNyQyxDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb2xsZWN0aW9uIH0gZnJvbSAnLi9jb2xsZWN0aW9uJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IEV4cG9ydERhdGFUYWJsZSB9IGZyb20gJy4uL21vZGVscy9leHBvcnQvZXhwb3J0LWRhdGEtdGFibGUnO1xuaW1wb3J0IHsgRXhwb3J0Q2VsbCB9IGZyb20gJy4uL21vZGVscy9leHBvcnQvZXhwb3J0LWNlbGwnO1xuaW1wb3J0IHtBYnN0cmFjdE1vZGVsfSBmcm9tICcuLi9kYi9Nb2RlbHMnO1xuXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgRXhwb3J0YWJsZUNvbGxlY3Rpb248TW9kZWwgZXh0ZW5kcyBBYnN0cmFjdE1vZGVsPiBleHRlbmRzIENvbGxlY3Rpb248TW9kZWw+IHtcbiAgYWJzdHJhY3QgZ2V0RXhwb3J0SGVhZGVyKHR5cGU/OiBzdHJpbmcpOiBzdHJpbmdbXTtcblxuICBhYnN0cmFjdCBnZXRFeHBvcnRCb2R5KHR5cGU/OiBzdHJpbmcpOiBFeHBvcnRDZWxsW11bXTtcblxuICBnZXRFeHBvcnRGb290ZXIodHlwZT86IHN0cmluZyk6IEV4cG9ydENlbGxbXSB7XG4gICAgcmV0dXJuIFtdO1xuICB9XG5cbiAgZ2V0Qm9keUFvYShleHBvcnREYXRhKTogYW55IHtcbiAgICByZXR1cm4gZXhwb3J0RGF0YS5ib2R5Lm1hcChyb3cgPT4ge1xuICAgICAgcmV0dXJuIHJvdy5tYXAoY2VsbCA9PiB7XG4gICAgICAgIHJldHVybiBjZWxsLnZhbHVlO1xuICAgICAgfSlcbiAgICB9KVxuICB9XG5cbiAgZXhwb3J0KHR5cGU/OiBzdHJpbmcpOiBFeHBvcnREYXRhVGFibGUge1xuICAgIHJldHVybiBwbGFpblRvQ2xhc3MoRXhwb3J0RGF0YVRhYmxlLCB7XG4gICAgICBoZWFkZXI6IHRoaXMuZ2V0RXhwb3J0SGVhZGVyKHR5cGUpLFxuICAgICAgYm9keTogdGhpcy5nZXRFeHBvcnRCb2R5KHR5cGUpLFxuICAgICAgZm9vdGVyOiBbdGhpcy5nZXRFeHBvcnRGb290ZXIodHlwZSldXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { ExportableCollection } from "../exportable.collection";
|
|
2
|
+
import { ExportCell } from "../../models/export/export-cell";
|
|
3
|
+
import { ExportCellTypeEnum } from "../../models/export/export-cell-type.enum";
|
|
4
|
+
import { plainToClass } from 'class-transformer';
|
|
5
|
+
export class HoldingSaleCollection extends ExportableCollection {
|
|
3
6
|
/**
|
|
4
7
|
* @TODO vik remove?
|
|
5
8
|
*/
|
|
@@ -16,5 +19,34 @@ export class HoldingSaleCollection extends Collection {
|
|
|
16
19
|
get noExemptionGrossCapitalGain() {
|
|
17
20
|
return this.filter((sale) => sale.netCapitalGain > 0 && sale.netCapitalGain === sale.grossCapitalGain).grossCapitalGain;
|
|
18
21
|
}
|
|
22
|
+
getExportHeader() {
|
|
23
|
+
return ['Ticker', 'Asset type', 'Date of buy', 'Date of sale', 'My Capital Gain/(Loss)', 'Exempt or Concession'];
|
|
24
|
+
}
|
|
25
|
+
getExportFooter() {
|
|
26
|
+
return [
|
|
27
|
+
plainToClass(ExportCell, { value: '', type: ExportCellTypeEnum.STRING }),
|
|
28
|
+
];
|
|
29
|
+
}
|
|
30
|
+
getExportBody() {
|
|
31
|
+
return this.items.map((sale) => {
|
|
32
|
+
return [
|
|
33
|
+
plainToClass(ExportCell, {
|
|
34
|
+
value: this.holdingTypesById.get(this.holdingsById.get(sale.holding.id).type.id).ticker,
|
|
35
|
+
type: ExportCellTypeEnum.STRING
|
|
36
|
+
}),
|
|
37
|
+
plainToClass(ExportCell, {
|
|
38
|
+
value: this.holdingsById.get(sale.holding.id).type.categoryLabel,
|
|
39
|
+
type: ExportCellTypeEnum.STRING
|
|
40
|
+
}),
|
|
41
|
+
plainToClass(ExportCell, { value: this.holdingsById.get(sale.holding.id)?.date, type: ExportCellTypeEnum.DATE }),
|
|
42
|
+
plainToClass(ExportCell, { value: sale.date, type: ExportCellTypeEnum.DATE }),
|
|
43
|
+
plainToClass(ExportCell, { value: sale.grossCapitalGain, type: ExportCellTypeEnum.CURRENCY }),
|
|
44
|
+
plainToClass(ExportCell, {
|
|
45
|
+
value: sale.isOneYearExemptionApplicable() ? '50% (1 year rule)' : 'None',
|
|
46
|
+
type: ExportCellTypeEnum.STRING
|
|
47
|
+
}),
|
|
48
|
+
];
|
|
49
|
+
});
|
|
50
|
+
}
|
|
19
51
|
}
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9sZGluZy1zYWxlLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvaG9sZGluZy9ob2xkaW5nLXNhbGUuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDL0UsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRWpELE1BQU0sT0FBTyxxQkFBdUIsU0FBUSxvQkFBaUM7SUFHM0U7O09BRUc7SUFDSCxJQUFJLGdCQUFnQjtRQUNsQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxDQUFDLENBQUM7YUFDcEQsS0FBSyxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFDL0IsQ0FBQztJQUVELElBQUksc0JBQXNCO1FBQ3hCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsY0FBYyxHQUFHLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7SUFDMUgsQ0FBQztJQUVELElBQUksNkJBQTZCO1FBQy9CLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLGNBQWMsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLGNBQWMsS0FBSyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQztJQUMxSCxDQUFDO0lBRUQsSUFBSSwyQkFBMkI7UUFDN0IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsY0FBYyxHQUFHLENBQUMsSUFBSSxJQUFJLENBQUMsY0FBYyxLQUFLLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLGdCQUFnQixDQUFDO0lBQzFILENBQUM7SUFFRCxlQUFlO1FBQ2IsT0FBTyxDQUFDLFFBQVEsRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLGNBQWMsRUFBRSx3QkFBd0IsRUFBRSxzQkFBc0IsQ0FBQyxDQUFDO0lBQ25ILENBQUM7SUFFRCxlQUFlO1FBQ2IsT0FBTztZQUNMLFlBQVksQ0FBQyxVQUFVLEVBQUUsRUFBQyxLQUFLLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEVBQUMsQ0FBQztTQUN2RSxDQUFDO0lBQ0osQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBaUIsRUFBRSxFQUFFO1lBQzFDLE9BQU87Z0JBQ0wsWUFBWSxDQUFDLFVBQVUsRUFBRTtvQkFDdkIsS0FBSyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTTtvQkFDdkYsSUFBSSxFQUFFLGtCQUFrQixDQUFDLE1BQU07aUJBQ2hDLENBQUM7Z0JBQ0YsWUFBWSxDQUFDLFVBQVUsRUFBRTtvQkFDdkIsS0FBSyxFQUFFLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLGFBQWE7b0JBQ2hFLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxNQUFNO2lCQUNoQyxDQUFDO2dCQUNGLFlBQVksQ0FBQyxVQUFVLEVBQUUsRUFBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLGtCQUFrQixDQUFDLElBQUksRUFBQyxDQUFDO2dCQUM5RyxZQUFZLENBQUMsVUFBVSxFQUFFLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLGtCQUFrQixDQUFDLElBQUksRUFBQyxDQUFDO2dCQUMzRSxZQUFZLENBQUMsVUFBVSxFQUFFLEVBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLENBQUMsUUFBUSxFQUFDLENBQUM7Z0JBQzNGLFlBQVksQ0FBQyxVQUFVLEVBQUU7b0JBQ3ZCLEtBQUssRUFBRSxJQUFJLENBQUMsNEJBQTRCLEVBQUUsQ0FBQSxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLE1BQU07b0JBQ3hFLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxNQUFNO2lCQUNoQyxDQUFDO2FBQ0gsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgRGljdGlvbmFyeSwgSG9sZGluZywgSG9sZGluZ1NhbGUsIEhvbGRpbmdUeXBlIH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IEV4cG9ydGFibGVDb2xsZWN0aW9uIH0gZnJvbSBcIi4uL2V4cG9ydGFibGUuY29sbGVjdGlvblwiO1xuaW1wb3J0IHsgRXhwb3J0Q2VsbCB9IGZyb20gXCIuLi8uLi9tb2RlbHMvZXhwb3J0L2V4cG9ydC1jZWxsXCI7XG5pbXBvcnQgeyBFeHBvcnRDZWxsVHlwZUVudW0gfSBmcm9tIFwiLi4vLi4vbW9kZWxzL2V4cG9ydC9leHBvcnQtY2VsbC10eXBlLmVudW1cIjtcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcblxuZXhwb3J0IGNsYXNzIEhvbGRpbmdTYWxlQ29sbGVjdGlvbiAgZXh0ZW5kcyBFeHBvcnRhYmxlQ29sbGVjdGlvbjxIb2xkaW5nU2FsZT4ge1xuICBob2xkaW5nVHlwZXNCeUlkOiBEaWN0aW9uYXJ5PEhvbGRpbmdUeXBlPlxuICBob2xkaW5nc0J5SWQ6IERpY3Rpb25hcnk8SG9sZGluZz47XG4gIC8qKlxuICAgKiBAVE9ETyB2aWsgcmVtb3ZlP1xuICAgKi9cbiAgZ2V0IGdyb3NzQ2FwaXRhbEdhaW4oKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5maWx0ZXIoKHNhbGUpID0+IHNhbGUuZ3Jvc3NDYXBpdGFsR2FpbiA+IDApXG4gICAgICAuc3VtQnkoJ2dyb3NzQ2FwaXRhbEdhaW4nKTtcbiAgfVxuXG4gIGdldCBjdXJyZW50WWVhckNhcGl0YWxMb3NzKCk6IG51bWJlciB7XG4gICAgcmV0dXJuIE1hdGguYWJzKHRoaXMuZmlsdGVyQnlGaW5hbmNpYWxZZWFyKCdkYXRlJykuZmlsdGVyKChzYWxlKSA9PiBzYWxlLm5ldENhcGl0YWxHYWluIDwgMCkuc3VtQnkoJ2dyb3NzQ2FwaXRhbEdhaW4nKSk7XG4gIH1cblxuICBnZXQgaGFsZkV4ZW1wdGlvbkdyb3NzQ2FwaXRhbEdhaW4oKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5maWx0ZXIoKHNhbGUpID0+IHNhbGUubmV0Q2FwaXRhbEdhaW4gPiAwICYmIHNhbGUubmV0Q2FwaXRhbEdhaW4gIT09IHNhbGUuZ3Jvc3NDYXBpdGFsR2FpbikuZ3Jvc3NDYXBpdGFsR2FpbjtcbiAgfVxuXG4gIGdldCBub0V4ZW1wdGlvbkdyb3NzQ2FwaXRhbEdhaW4oKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5maWx0ZXIoKHNhbGUpID0+IHNhbGUubmV0Q2FwaXRhbEdhaW4gPiAwICYmIHNhbGUubmV0Q2FwaXRhbEdhaW4gPT09IHNhbGUuZ3Jvc3NDYXBpdGFsR2FpbikuZ3Jvc3NDYXBpdGFsR2FpbjtcbiAgfVxuXG4gIGdldEV4cG9ydEhlYWRlcigpOiBzdHJpbmdbXSB7XG4gICAgcmV0dXJuIFsnVGlja2VyJywgJ0Fzc2V0IHR5cGUnLCAnRGF0ZSBvZiBidXknLCAnRGF0ZSBvZiBzYWxlJywgJ015IENhcGl0YWwgR2Fpbi8oTG9zcyknLCAnRXhlbXB0IG9yIENvbmNlc3Npb24nXTtcbiAgfVxuXG4gIGdldEV4cG9ydEZvb3RlcigpOiBFeHBvcnRDZWxsW10ge1xuICAgIHJldHVybiBbXG4gICAgICBwbGFpblRvQ2xhc3MoRXhwb3J0Q2VsbCwge3ZhbHVlOiAnJywgdHlwZTogRXhwb3J0Q2VsbFR5cGVFbnVtLlNUUklOR30pLFxuICAgIF07XG4gIH1cblxuICBnZXRFeHBvcnRCb2R5KCk6IEV4cG9ydENlbGxbXVtdIHtcbiAgICByZXR1cm4gdGhpcy5pdGVtcy5tYXAoKHNhbGU6IEhvbGRpbmdTYWxlKSA9PiB7XG4gICAgICByZXR1cm4gW1xuICAgICAgICBwbGFpblRvQ2xhc3MoRXhwb3J0Q2VsbCwge1xuICAgICAgICAgIHZhbHVlOiB0aGlzLmhvbGRpbmdUeXBlc0J5SWQuZ2V0KHRoaXMuaG9sZGluZ3NCeUlkLmdldChzYWxlLmhvbGRpbmcuaWQpLnR5cGUuaWQpLnRpY2tlcixcbiAgICAgICAgICB0eXBlOiBFeHBvcnRDZWxsVHlwZUVudW0uU1RSSU5HXG4gICAgICAgIH0pLFxuICAgICAgICBwbGFpblRvQ2xhc3MoRXhwb3J0Q2VsbCwge1xuICAgICAgICAgIHZhbHVlOiB0aGlzLmhvbGRpbmdzQnlJZC5nZXQoc2FsZS5ob2xkaW5nLmlkKS50eXBlLmNhdGVnb3J5TGFiZWwsXG4gICAgICAgICAgdHlwZTogRXhwb3J0Q2VsbFR5cGVFbnVtLlNUUklOR1xuICAgICAgICB9KSxcbiAgICAgICAgcGxhaW5Ub0NsYXNzKEV4cG9ydENlbGwsIHt2YWx1ZTogdGhpcy5ob2xkaW5nc0J5SWQuZ2V0KHNhbGUuaG9sZGluZy5pZCk/LmRhdGUsIHR5cGU6IEV4cG9ydENlbGxUeXBlRW51bS5EQVRFfSksXG4gICAgICAgIHBsYWluVG9DbGFzcyhFeHBvcnRDZWxsLCB7dmFsdWU6IHNhbGUuZGF0ZSwgdHlwZTogRXhwb3J0Q2VsbFR5cGVFbnVtLkRBVEV9KSxcbiAgICAgICAgcGxhaW5Ub0NsYXNzKEV4cG9ydENlbGwsIHt2YWx1ZTogc2FsZS5ncm9zc0NhcGl0YWxHYWluLCB0eXBlOiBFeHBvcnRDZWxsVHlwZUVudW0uQ1VSUkVOQ1l9KSxcbiAgICAgICAgcGxhaW5Ub0NsYXNzKEV4cG9ydENlbGwsIHtcbiAgICAgICAgICB2YWx1ZTogc2FsZS5pc09uZVllYXJFeGVtcHRpb25BcHBsaWNhYmxlKCk/ICc1MCUgKDEgeWVhciBydWxlKScgOiAnTm9uZScsXG4gICAgICAgICAgdHlwZTogRXhwb3J0Q2VsbFR5cGVFbnVtLlNUUklOR1xuICAgICAgICB9KSxcbiAgICAgIF07XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -5,7 +5,7 @@ import { ExportCellTypeEnum } from "../../models/export/export-cell-type.enum";
|
|
|
5
5
|
import { HoldingTypeCategoryEnum } from '../../db/Enums';
|
|
6
6
|
export class HoldingCollection extends ExportableCollection {
|
|
7
7
|
getExportHeader() {
|
|
8
|
-
return ['Date', 'Ticker', 'Asset type', 'Qty bought', 'Qty current', 'Buy price/Unit', 'Current price/Unit', 'Total MV', 'Profit/Loss'];
|
|
8
|
+
return ['Date', 'Ticker', 'Name', 'Asset type', 'Qty bought', 'Qty current', 'Buy price/Unit', 'Current price/Unit', 'Total MV', 'Profit/Loss'];
|
|
9
9
|
}
|
|
10
10
|
getExportFooter() {
|
|
11
11
|
return [
|
|
@@ -16,6 +16,10 @@ export class HoldingCollection extends ExportableCollection {
|
|
|
16
16
|
return this.items.map((holding) => {
|
|
17
17
|
return [
|
|
18
18
|
plainToClass(ExportCell, { value: holding.date, type: ExportCellTypeEnum.DATE }),
|
|
19
|
+
plainToClass(ExportCell, {
|
|
20
|
+
value: this.holdingTypesById.get(holding.type.id).ticker,
|
|
21
|
+
type: ExportCellTypeEnum.STRING
|
|
22
|
+
}),
|
|
19
23
|
plainToClass(ExportCell, {
|
|
20
24
|
value: this.holdingTypesById.get(holding.type.id).name,
|
|
21
25
|
type: ExportCellTypeEnum.STRING
|
|
@@ -66,4 +70,4 @@ export class HoldingCollection extends ExportableCollection {
|
|
|
66
70
|
return this.removeBy('currentQuantity', 0);
|
|
67
71
|
}
|
|
68
72
|
}
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"holding.collection.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/collections/holding/holding.collection.ts"],"names":[],"mappings":"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","sourcesContent":["import { plainToClass } from 'class-transformer';\nimport { ExportableCollection } from \"../exportable.collection\";\nimport { Dictionary, Holding, HoldingType } from \"../../models\";\nimport { ExportCell } from \"../../models/export/export-cell\";\nimport { ExportCellTypeEnum } from \"../../models/export/export-cell-type.enum\";\nimport { HoldingTypeCategoryEnum } from '../../db/Enums';\n\nexport class HoldingCollection extends ExportableCollection<Holding> {\n  // dictionary holding type\n  holdingTypesById: Dictionary<HoldingType>\n\n  getExportHeader(): string[] {\n    return ['Date', 'Ticker', 'Name', 'Asset type', 'Qty bought', 'Qty current', 'Buy price/Unit', 'Current price/Unit', 'Total MV', 'Profit/Loss'];\n  }\n\n  getExportFooter(): ExportCell[] {\n    return [\n      plainToClass(ExportCell, {value: '', type: ExportCellTypeEnum.STRING}),\n    ];\n  }\n\n  getExportBody(): ExportCell[][] {\n    return this.items.map((holding: Holding) => {\n      return [\n        plainToClass(ExportCell, {value: holding.date, type: ExportCellTypeEnum.DATE}),\n        plainToClass(ExportCell, {\n          value: this.holdingTypesById.get(holding.type.id).ticker,\n          type: ExportCellTypeEnum.STRING\n        }),\n        plainToClass(ExportCell, {\n          value: this.holdingTypesById.get(holding.type.id).name,\n          type: ExportCellTypeEnum.STRING\n        }),\n        plainToClass(ExportCell, {value: holding.type.categoryLabel, type: ExportCellTypeEnum.STRING}),\n        plainToClass(ExportCell, {value: holding.quantity, type: ExportCellTypeEnum.STRING}),\n        plainToClass(ExportCell, {value: holding.currentQuantity, type: ExportCellTypeEnum.STRING}),\n        plainToClass(ExportCell, {value: holding.price, type: ExportCellTypeEnum.CURRENCY}),\n        plainToClass(ExportCell, {\n          value: this.holdingTypesById.get(holding.type.id).price,\n          type: ExportCellTypeEnum.CURRENCY\n        }),\n        plainToClass(ExportCell, {\n          value: holding.getMarketValue(this.holdingTypesById.get(holding.type.id)),\n          type: ExportCellTypeEnum.CURRENCY\n        }),\n        plainToClass(ExportCell, {\n          value: holding.getGrowthCoefficient(this.holdingTypesById.get(holding.type.id)),\n          type: ExportCellTypeEnum.PERCENT\n        }),\n      ];\n    });\n  }\n\n  getShares(): this {\n    return this.filterBy('type.category', HoldingTypeCategoryEnum.STOCK);\n  }\n\n  getCryptos(): this {\n    return this.filterBy('type.category', HoldingTypeCategoryEnum.CRYPTO);\n  }\n\n  getOthers(): this {\n    return this.filterBy('type.category', [\n      HoldingTypeCategoryEnum.COLLECTIBLE,\n      HoldingTypeCategoryEnum.UNLISTED_STOCK,\n      HoldingTypeCategoryEnum.UNLISTED_UNIT,\n      HoldingTypeCategoryEnum.OTHER\n    ]);\n  }\n\n  getPurchaseValue(): number {\n    return this.sumBy('purchaseValue');\n  }\n\n  getMarketValue(holdingTypesById: Dictionary<HoldingType>): number {\n    return this.items.reduce((sum: number, holding: Holding) => sum + holding.getMarketValue(holdingTypesById.get(holding.type.id)), 0);\n  }\n\n  getGrowthCoefficient(holdingTypesById: Dictionary<HoldingType>): number {\n    return this.getMarketValue(holdingTypesById) / this.getPurchaseValue() - 1;\n  }\n\n  getUnsold(): this {\n    return this.removeBy('currentQuantity', 0);\n  }\n}\n"]}
|
|
@@ -2,7 +2,7 @@ import { ExportableCollection } from '../exportable.collection';
|
|
|
2
2
|
import { ExportCell } from '../../models/export/export-cell';
|
|
3
3
|
import { plainToClass } from 'class-transformer';
|
|
4
4
|
import { ExportCellTypeEnum } from '../../models/export/export-cell-type.enum';
|
|
5
|
-
import { FinancialYear } from '../../models
|
|
5
|
+
import { FinancialYear } from '../../models';
|
|
6
6
|
export class LoanPaymentCollection extends ExportableCollection {
|
|
7
7
|
getExportHeader() {
|
|
8
8
|
return [
|
|
@@ -37,4 +37,4 @@ export class LoanPaymentCollection extends ExportableCollection {
|
|
|
37
37
|
return this.getByFinYear(new FinancialYear());
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hbi1wYXltZW50LmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvbG9hbi9sb2FuLXBheW1lbnQuY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNoRSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQy9FLE9BQU8sRUFBZSxhQUFhLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFMUQsTUFBTSxPQUFPLHFCQUFzQixTQUFRLG9CQUFpQztJQUMxRSxlQUFlO1FBQ2IsT0FBTztZQUNMLFNBQVM7WUFDVCxNQUFNO1lBQ04sYUFBYTtZQUNiLGtCQUFrQjtZQUNsQixnQkFBZ0I7WUFDaEIsbUJBQW1CO1lBQ25CLFFBQVE7U0FDVCxDQUFDO0lBQ0osQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsT0FBb0IsRUFBRSxFQUFFLENBQUM7WUFDOUMsWUFBWSxDQUFDLFVBQVUsRUFBRSxFQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxNQUFNLEVBQUMsQ0FBQztZQUNsRixZQUFZLENBQUMsVUFBVSxFQUFFLEVBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLGtCQUFrQixDQUFDLElBQUksRUFBQyxDQUFDO1lBQzlFLFlBQVksQ0FBQyxVQUFVLEVBQUUsRUFBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLFVBQVUsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLENBQUMsUUFBUSxFQUFDLENBQUM7WUFDeEYsWUFBWSxDQUFDLFVBQVUsRUFBRSxFQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsZUFBZSxFQUFFLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxRQUFRLEVBQUMsQ0FBQztZQUM3RixZQUFZLENBQUMsVUFBVSxFQUFFLEVBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxhQUFhLEVBQUUsSUFBSSxFQUFFLGtCQUFrQixDQUFDLFFBQVEsRUFBQyxDQUFDO1lBQzNGLFlBQVksQ0FBQyxVQUFVLEVBQUUsRUFBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixFQUFFLElBQUksRUFBRSxrQkFBa0IsQ0FBQyxRQUFRLEVBQUMsQ0FBQztZQUM5RixZQUFZLENBQUMsVUFBVSxFQUFFLEVBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLGtCQUFrQixDQUFDLFFBQVEsRUFBQyxDQUFDO1NBQ3JGLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxJQUFJLFVBQVU7UUFDWixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUVELFlBQVksQ0FBQyxVQUF5QixJQUFJLGFBQWEsRUFBRTtRQUN2RCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFvQixFQUFFLEVBQUUsQ0FBQyxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksT0FBTyxDQUFDLFNBQVM7WUFDcEYsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUNoRCxDQUFDO0lBRUQsaUJBQWlCO1FBQ2YsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksYUFBYSxFQUFFLENBQUMsQ0FBQztJQUNoRCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFeHBvcnRhYmxlQ29sbGVjdGlvbiB9IGZyb20gJy4uL2V4cG9ydGFibGUuY29sbGVjdGlvbic7XG5pbXBvcnQgeyBFeHBvcnRDZWxsIH0gZnJvbSAnLi4vLi4vbW9kZWxzL2V4cG9ydC9leHBvcnQtY2VsbCc7XG5pbXBvcnQgeyBwbGFpblRvQ2xhc3MgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBFeHBvcnRDZWxsVHlwZUVudW0gfSBmcm9tICcuLi8uLi9tb2RlbHMvZXhwb3J0L2V4cG9ydC1jZWxsLXR5cGUuZW51bSc7XG5pbXBvcnQgeyBMb2FuUGF5bWVudCwgRmluYW5jaWFsWWVhciB9IGZyb20gJy4uLy4uL21vZGVscyc7XG5cbmV4cG9ydCBjbGFzcyBMb2FuUGF5bWVudENvbGxlY3Rpb24gZXh0ZW5kcyBFeHBvcnRhYmxlQ29sbGVjdGlvbjxMb2FuUGF5bWVudD4ge1xuICBnZXRFeHBvcnRIZWFkZXIoKTogc3RyaW5nW10ge1xuICAgIHJldHVybiBbXG4gICAgICAnUG10IE5vLicsXG4gICAgICAnRGF0ZScsXG4gICAgICAnUGF5bWVudCBEdWUnLFxuICAgICAgJ0ludGVyZXN0IEFjY3J1ZWQnLFxuICAgICAgJ1ByaW5jaXBhbCBQYWlkJyxcbiAgICAgICdQcmluY2lwYWwgQmFsYW5jZScsXG4gICAgICAnUGF5b3V0J1xuICAgIF07XG4gIH1cblxuICBnZXRFeHBvcnRCb2R5KCk6IEV4cG9ydENlbGxbXVtdIHtcbiAgICByZXR1cm4gdGhpcy5pdGVtcy5tYXAoKHBheW1lbnQ6IExvYW5QYXltZW50KSA9PiBbXG4gICAgICBwbGFpblRvQ2xhc3MoRXhwb3J0Q2VsbCwge3ZhbHVlOiBwYXltZW50Lm51bWJlciwgdHlwZTogRXhwb3J0Q2VsbFR5cGVFbnVtLlNUUklOR30pLFxuICAgICAgcGxhaW5Ub0NsYXNzKEV4cG9ydENlbGwsIHt2YWx1ZTogcGF5bWVudC5kYXRlLCB0eXBlOiBFeHBvcnRDZWxsVHlwZUVudW0uREFURX0pLFxuICAgICAgcGxhaW5Ub0NsYXNzKEV4cG9ydENlbGwsIHt2YWx1ZTogcGF5bWVudC5wYXltZW50RHVlLCB0eXBlOiBFeHBvcnRDZWxsVHlwZUVudW0uQ1VSUkVOQ1l9KSxcbiAgICAgIHBsYWluVG9DbGFzcyhFeHBvcnRDZWxsLCB7dmFsdWU6IHBheW1lbnQuaW50ZXJlc3RBY2NydWVkLCB0eXBlOiBFeHBvcnRDZWxsVHlwZUVudW0uQ1VSUkVOQ1l9KSxcbiAgICAgIHBsYWluVG9DbGFzcyhFeHBvcnRDZWxsLCB7dmFsdWU6IHBheW1lbnQucHJpbmNpcGFsUGFpZCwgdHlwZTogRXhwb3J0Q2VsbFR5cGVFbnVtLkNVUlJFTkNZfSksXG4gICAgICBwbGFpblRvQ2xhc3MoRXhwb3J0Q2VsbCwge3ZhbHVlOiBwYXltZW50LnByaW5jaXBhbEJhbGFuY2UsIHR5cGU6IEV4cG9ydENlbGxUeXBlRW51bS5DVVJSRU5DWX0pLFxuICAgICAgcGxhaW5Ub0NsYXNzKEV4cG9ydENlbGwsIHt2YWx1ZTogcGF5bWVudC5wYXlvdXQsIHR5cGU6IEV4cG9ydENlbGxUeXBlRW51bS5DVVJSRU5DWX0pLFxuICAgIF0pO1xuICB9XG5cbiAgZ2V0IHBheW1lbnREdWUoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5zdW1CeSgncGF5bWVudER1ZScpO1xuICB9XG5cbiAgZ2V0QnlGaW5ZZWFyKGZpblllYXI6IEZpbmFuY2lhbFllYXIgPSBuZXcgRmluYW5jaWFsWWVhcigpKTogdGhpcyB7XG4gICAgcmV0dXJuIHRoaXMuZmlsdGVyKChwYXltZW50OiBMb2FuUGF5bWVudCkgPT4gbmV3IERhdGUocGF5bWVudC5kYXRlKSA+PSBmaW5ZZWFyLnN0YXJ0RGF0ZSAmJlxuICAgICAgICBuZXcgRGF0ZShwYXltZW50LmRhdGUpIDw9IGZpblllYXIuZW5kRGF0ZSlcbiAgfVxuXG4gIGdldEZvckN1cnJlbnRZZWFyKCk6IHRoaXMge1xuICAgIHJldHVybiB0aGlzLmdldEJ5RmluWWVhcihuZXcgRmluYW5jaWFsWWVhcigpKTtcbiAgfVxufVxuIl19
|
|
@@ -14,7 +14,7 @@ export var ChartAccountsCategoryEnum;
|
|
|
14
14
|
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_INCOME"] = 12] = "SOLE_INCOME";
|
|
15
15
|
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_EXPENSE"] = 13] = "SOLE_EXPENSE";
|
|
16
16
|
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["SOLE_DEPRECIATION"] = 14] = "SOLE_DEPRECIATION";
|
|
17
|
-
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["
|
|
18
|
-
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["
|
|
17
|
+
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["HOLDING_INCOME"] = 15] = "HOLDING_INCOME";
|
|
18
|
+
ChartAccountsCategoryEnum[ChartAccountsCategoryEnum["HOLDING_EXPENSE"] = 16] = "HOLDING_EXPENSE";
|
|
19
19
|
})(ChartAccountsCategoryEnum || (ChartAccountsCategoryEnum = {}));
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtYWNjb3VudHMtY2F0ZWdvcnkuZW51bS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9FbnVtcy9jaGFydC1hY2NvdW50cy9jaGFydC1hY2NvdW50cy1jYXRlZ29yeS5lbnVtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBTixJQUFZLHlCQWlCWDtBQWpCRCxXQUFZLHlCQUF5QjtJQUNuQywrRkFBbUIsQ0FBQTtJQUNuQixpR0FBb0IsQ0FBQTtJQUNwQiwyR0FBeUIsQ0FBQTtJQUN6Qiw2R0FBMEIsQ0FBQTtJQUMxQixtR0FBcUIsQ0FBQTtJQUNyQix1RkFBZSxDQUFBO0lBQ2YseUZBQWdCLENBQUE7SUFDaEIseUZBQWdCLENBQUE7SUFDaEIsMkZBQWlCLENBQUE7SUFDakIsZ0dBQW9CLENBQUE7SUFDcEIsa0dBQXFCLENBQUE7SUFDckIsd0ZBQWdCLENBQUE7SUFDaEIsMEZBQWlCLENBQUE7SUFDakIsb0dBQXNCLENBQUE7SUFDdEIsOEZBQW1CLENBQUE7SUFDbkIsZ0dBQW9CLENBQUE7QUFDdEIsQ0FBQyxFQWpCVyx5QkFBeUIsS0FBekIseUJBQXlCLFFBaUJwQyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIENoYXJ0QWNjb3VudHNDYXRlZ29yeUVudW0ge1xuICBQUk9QRVJUWV9JTkNPTUUgPSAxLFxuICBQUk9QRVJUWV9FWFBFTlNFID0gMixcbiAgUFJPUEVSVFlfREVQUkVDSUFUSU9OID0gMyxcbiAgUFJPUEVSVFlfQ0FQSVRBTF9XT1JLUyA9IDQsXG4gIFdPUktfREVQUkVDSUFUSU9OID0gNSxcbiAgV09SS19JTkNPTUUgPSA2LFxuICBXT1JLX0VYUEVOU0UgPSA3LFxuICBPVEhFUl9JTkNPTUUgPSA4LFxuICBPVEhFUl9FWFBFTlNFID0gOSxcbiAgUEVSU09OQUxfSU5DT01FID0gMTAsXG4gIFBFUlNPTkFMX0VYUEVOU0UgPSAxMSxcbiAgU09MRV9JTkNPTUUgPSAxMixcbiAgU09MRV9FWFBFTlNFID0gMTMsXG4gIFNPTEVfREVQUkVDSUFUSU9OID0gMTQsXG4gIEhPTERJTkdfSU5DT01FID0gMTUsXG4gIEhPTERJTkdfRVhQRU5TRSA9IDE2LFxufVxuIl19
|
|
@@ -34,7 +34,8 @@ export class HoldingSaleForm extends AbstractForm {
|
|
|
34
34
|
this.get('netCapitalGain').setValue(this.calculateNetCapitalGain(totalCapitalGain, date));
|
|
35
35
|
}
|
|
36
36
|
calculateTotalCapitalGain(price, quantity, fee) {
|
|
37
|
-
|
|
37
|
+
const fees = quantity * this.holding.fee / this.holding.quantity + fee;
|
|
38
|
+
return round((price - this.holding.price) * quantity - fees, 2);
|
|
38
39
|
}
|
|
39
40
|
calculateNetCapitalGain(totalCapitalGain, date) {
|
|
40
41
|
let netCapitalGain = (totalCapitalGain * this.holding.ownershipPercent) / 100;
|
|
@@ -47,4 +48,4 @@ export class HoldingSaleForm extends AbstractForm {
|
|
|
47
48
|
return netCapitalGain > 0 && moment(date).diff(moment(this.holding.date), 'year') > 0;
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9sZGluZy1zYWxlLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvaG9sZGluZy9ob2xkaW5nLXNhbGUuZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFHaEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDckMsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQzVCLE9BQU8sS0FBSyxNQUFNLGNBQWMsQ0FBQztBQUNqQyxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUV4RCxNQUFNLE9BQU8sZUFBZ0IsU0FBUSxZQUF5QjtJQUM1RCxZQUFZLElBQWlCLEVBQVUsT0FBZ0IsRUFBRSxJQUFpQjtRQUN4RSxLQUFLLENBQUM7WUFDSixRQUFRLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsRUFBRSxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hJLEtBQUssRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDLEtBQUssRUFBRSxVQUFVLENBQUMsUUFBUSxDQUFDO1lBQzVFLEdBQUcsRUFBRSxJQUFJLGtCQUFrQixDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztZQUMxRCxJQUFJLEVBQUUsSUFBSSxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxRQUFRLENBQUM7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Q0FBQyxDQUFDO0lBQ3hGLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVudHlwZWRGb3JtQ29udHJvbCwgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IElFdmVudExpc3RlbmVyIH0gZnJvbSAnLi4vLi4vaW50ZXJmYWNlcyc7XG5pbXBvcnQgeyBIb2xkaW5nLCBIb2xkaW5nU2FsZSwgSG9sZGluZ1R5cGUgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgQWJzdHJhY3RGb3JtIH0gZnJvbSAnLi4vYWJzdHJhY3QuZm9ybSc7XG5pbXBvcnQgeyBjb21iaW5lTGF0ZXN0IH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgbW9tZW50IGZyb20gJ21vbWVudCc7XG5pbXBvcnQgcm91bmQgZnJvbSAnbG9kYXNoL3JvdW5kJztcbmltcG9ydCB7IGdyZWF0ZXJUaGFuVmFsaWRhdG9yIH0gZnJvbSAnLi4vLi4vdmFsaWRhdG9ycyc7XG5cbmV4cG9ydCBjbGFzcyBIb2xkaW5nU2FsZUZvcm0gZXh0ZW5kcyBBYnN0cmFjdEZvcm08SG9sZGluZ1NhbGU+IGltcGxlbWVudHMgSUV2ZW50TGlzdGVuZXIge1xuICBjb25zdHJ1Y3RvcihzYWxlOiBIb2xkaW5nU2FsZSwgcHJpdmF0ZSBob2xkaW5nOiBIb2xkaW5nLCB0eXBlOiBIb2xkaW5nVHlwZSkge1xuICAgIHN1cGVyKHtcbiAgICAgIHF1YW50aXR5OiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHNhbGUucXVhbnRpdHksIFtWYWxpZGF0b3JzLnJlcXVpcmVkLCBWYWxpZGF0b3JzLm1heChob2xkaW5nLmN1cnJlbnRRdWFudGl0eSksIGdyZWF0ZXJUaGFuVmFsaWRhdG9yKDApXSksXG4gICAgICBwcmljZTogbmV3IFVudHlwZWRGb3JtQ29udHJvbChzYWxlLnByaWNlIHx8IHR5cGUucHJpY2UsIFZhbGlkYXRvcnMucmVxdWlyZWQpLFxuICAgICAgZmVlOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHNhbGUuZmVlLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgIGRhdGU6IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woc2FsZS5kYXRlLCBWYWxpZGF0b3JzLnJlcXVpcmVkKSxcbiAgICAgIHRvdGFsQ2FwaXRhbEdhaW46IG5ldyBVbnR5cGVkRm9ybUNvbnRyb2woe3ZhbHVlOiBzYWxlLnRvdGFsQ2FwaXRhbEdhaW4sIGRpc2FibGVkOiB0cnVlfSksXG4gICAgICBuZXRDYXBpdGFsR2FpbjogbmV3IFVudHlwZWRGb3JtQ29udHJvbCh7dmFsdWU6IHNhbGUubmV0Q2FwaXRhbEdhaW4sIGRpc2FibGVkOiB0cnVlfSksXG4gICAgICBmaWxlOiBuZXcgVW50eXBlZEZvcm1Db250cm9sKHNhbGUuZmlsZSlcbiAgICB9LCBzYWxlKTtcblxuICAgIHRoaXMubGlzdGVuRXZlbnRzKCk7XG4gICAgdGhpcy5lbWl0VmFsdWVzKCk7XG4gIH1cblxuICBsaXN0ZW5FdmVudHMoKTogdm9pZCB7XG4gICAgY29tYmluZUxhdGVzdChbJ2RhdGUnLCAncHJpY2UnLCAncXVhbnRpdHknLCAnZmVlJ10ubWFwKChmaWVsZCkgPT4gdGhpcy5nZXQoZmllbGQpLnZhbHVlQ2hhbmdlcykpXG4gICAgICAuc3Vic2NyaWJlKChbZGF0ZSwgcHJpY2UsIHF1YW50aXR5LCBmZWVdKSA9PiB7XG4gICAgICAgIHRoaXMudXBkYXRlR2FpbkZpZWxkcyhkYXRlLCBwcmljZSwgcXVhbnRpdHksIGZlZSk7XG4gICAgICB9KTtcbiAgfVxuXG4gIHN1Ym1pdCgpOiBIb2xkaW5nU2FsZSB7XG4gICAgcmV0dXJuIHN1cGVyLnN1Ym1pdCh7fSwgdHJ1ZSk7XG4gIH1cblxuICBwcml2YXRlIHVwZGF0ZUdhaW5GaWVsZHMoZGF0ZTogRGF0ZSwgcHJpY2U6IG51bWJlciwgcXVhbnRpdHk6IG51bWJlciwgZmVlOiBudW1iZXIpOiB2b2lkIHtcbiAgICBjb25zdCB0b3RhbENhcGl0YWxHYWluID0gdGhpcy5jYWxjdWxhdGVUb3RhbENhcGl0YWxHYWluKHByaWNlLCBxdWFudGl0eSwgZmVlKTtcblxuICAgIHRoaXMuZ2V0KCd0b3RhbENhcGl0YWxHYWluJykuc2V0VmFsdWUodG90YWxDYXBpdGFsR2Fpbik7XG4gICAgdGhpcy5nZXQoJ25ldENhcGl0YWxHYWluJykuc2V0VmFsdWUodGhpcy5jYWxjdWxhdGVOZXRDYXBpdGFsR2Fpbih0b3RhbENhcGl0YWxHYWluLCBkYXRlKSk7XG4gIH1cblxuICBwcml2YXRlIGNhbGN1bGF0ZVRvdGFsQ2FwaXRhbEdhaW4ocHJpY2U6IG51bWJlciwgcXVhbnRpdHk6IG51bWJlciwgZmVlOiBudW1iZXIpOiBudW1iZXIge1xuICAgIGNvbnN0IGZlZXMgPSBxdWFudGl0eSAqIHRoaXMuaG9sZGluZy5mZWUgLyB0aGlzLmhvbGRpbmcucXVhbnRpdHkgKyBmZWU7XG4gICAgcmV0dXJuIHJvdW5kKChwcmljZSAtIHRoaXMuaG9sZGluZy5wcmljZSkgKiBxdWFudGl0eSAtIGZlZXMsIDIpO1xuICB9XG5cbiAgcHJpdmF0ZSBjYWxjdWxhdGVOZXRDYXBpdGFsR2Fpbih0b3RhbENhcGl0YWxHYWluOiBudW1iZXIsIGRhdGU6IERhdGUpOiBudW1iZXIge1xuICAgIGxldCBuZXRDYXBpdGFsR2FpbiA9ICh0b3RhbENhcGl0YWxHYWluICogdGhpcy5ob2xkaW5nLm93bmVyc2hpcFBlcmNlbnQpIC8gMTAwO1xuXG4gICAgaWYgKHRoaXMuaXNPbmVZZWFyRXhlbXB0aW9uQXBwbGljYWJsZShuZXRDYXBpdGFsR2FpbiwgZGF0ZSkpIHtcbiAgICAgIG5ldENhcGl0YWxHYWluID0gbmV0Q2FwaXRhbEdhaW4gLyAyO1xuICAgIH1cblxuICAgIHJldHVybiByb3VuZChuZXRDYXBpdGFsR2FpbiwgMik7XG4gIH1cblxuICBwcml2YXRlIGlzT25lWWVhckV4ZW1wdGlvbkFwcGxpY2FibGUobmV0Q2FwaXRhbEdhaW46IG51bWJlciwgZGF0ZTogRGF0ZSk6IGJvb2xlYW4ge1xuICAgIHJldHVybiBuZXRDYXBpdGFsR2FpbiA+IDAgJiYgbW9tZW50KGRhdGUpLmRpZmYobW9tZW50KHRoaXMuaG9sZGluZy5kYXRlKSwgJ3llYXInKSA+IDA7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,13 +3,14 @@ import { ACCOUNT_SETUP_ITEMS } from '../../models/account-setup/account-setup-it
|
|
|
3
3
|
import { AccountSetupItemsEnum } from '../../models/account-setup/account-setup-items.enum';
|
|
4
4
|
import { ClientIncomeTypes } from '../../models/client/client-income-types';
|
|
5
5
|
import { IncomeSourceCollection } from '../../collections/income-source.collection';
|
|
6
|
-
import {
|
|
6
|
+
import { combineLatest, of, ReplaySubject } from 'rxjs';
|
|
7
7
|
import { map, mergeMap } from 'rxjs/operators';
|
|
8
8
|
import { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';
|
|
9
9
|
import fromPairs from 'lodash/fromPairs';
|
|
10
10
|
import cloneDeep from 'lodash/cloneDeep';
|
|
11
11
|
import { plainToClass } from 'class-transformer';
|
|
12
12
|
import { TransactionCollection } from '../../collections/transaction/transaction.collection';
|
|
13
|
+
import { UserRolesEnum } from '../../db/Enums/user-roles.enum';
|
|
13
14
|
import * as i0 from "@angular/core";
|
|
14
15
|
import * as i1 from "../http/firm/client-income/client-income-types.service";
|
|
15
16
|
import * as i2 from "../http/property/property.service";
|
|
@@ -24,7 +25,7 @@ import * as i8 from "../http";
|
|
|
24
25
|
* Checks required steps and their completion
|
|
25
26
|
*/
|
|
26
27
|
export class AccountSetupService {
|
|
27
|
-
constructor(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService, holdingService) {
|
|
28
|
+
constructor(clientIncomeTypesService, propertyService, incomeSourceService, bankAccountsService, transactionAllocationService, vehicleClaimService, transactionService, soleBusinessService, holdingService, userService) {
|
|
28
29
|
this.clientIncomeTypesService = clientIncomeTypesService;
|
|
29
30
|
this.propertyService = propertyService;
|
|
30
31
|
this.incomeSourceService = incomeSourceService;
|
|
@@ -34,6 +35,7 @@ export class AccountSetupService {
|
|
|
34
35
|
this.transactionService = transactionService;
|
|
35
36
|
this.soleBusinessService = soleBusinessService;
|
|
36
37
|
this.holdingService = holdingService;
|
|
38
|
+
this.userService = userService;
|
|
37
39
|
this.cacheSubject = new ReplaySubject(1);
|
|
38
40
|
}
|
|
39
41
|
/**
|
|
@@ -86,25 +88,26 @@ export class AccountSetupService {
|
|
|
86
88
|
*/
|
|
87
89
|
createBatch(incomeTypes) {
|
|
88
90
|
const batch = [];
|
|
91
|
+
const user = this.userService.getCache();
|
|
89
92
|
// Salary item is completed when user added salary income source
|
|
90
|
-
if (incomeTypes.work) {
|
|
93
|
+
if (incomeTypes.work && user.hasRoles(UserRolesEnum.WORK_TANK)) {
|
|
91
94
|
batch.push(this.create(AccountSetupItemsEnum.SALARY, this.getIncomeSources(true)),
|
|
92
95
|
// Other income is a part of work tank, completed when user added at least one other income source
|
|
93
96
|
this.create(AccountSetupItemsEnum.OTHER_INCOME, this.getIncomeSources()));
|
|
94
97
|
}
|
|
95
98
|
// Rental income item is completed when user added at least one property
|
|
96
|
-
if (incomeTypes.property) {
|
|
99
|
+
if (incomeTypes.property && user.hasRoles(UserRolesEnum.PROPERTY_TANK)) {
|
|
97
100
|
batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.getArray()));
|
|
98
101
|
}
|
|
99
102
|
// Sole business item is completed when user added at least one business
|
|
100
|
-
if (incomeTypes.sole) {
|
|
103
|
+
if (incomeTypes.sole && user.hasRoles(UserRolesEnum.SOLE_TANK)) {
|
|
101
104
|
batch.push(this.create(AccountSetupItemsEnum.SOLE_BUSINESS, this.soleBusinessService.get()));
|
|
102
105
|
}
|
|
103
106
|
// holdings item is completed when user added at least one holding
|
|
104
|
-
if (incomeTypes.holdings) {
|
|
107
|
+
if (incomeTypes.holdings && user.hasRoles(UserRolesEnum.HOLDING_TANK)) {
|
|
105
108
|
batch.push(this.create(AccountSetupItemsEnum.HOLDINGS, this.holdingService.getArray()));
|
|
106
109
|
}
|
|
107
|
-
if (incomeTypes.sole || incomeTypes.property || incomeTypes.work) {
|
|
110
|
+
if (incomeTypes.sole || incomeTypes.property || incomeTypes.work || incomeTypes.holdings) {
|
|
108
111
|
// Bank feeds item is completed when user added at least one bank account (basiq or manual)
|
|
109
112
|
batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.getArray()));
|
|
110
113
|
// Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)
|
|
@@ -142,12 +145,12 @@ export class AccountSetupService {
|
|
|
142
145
|
}));
|
|
143
146
|
}
|
|
144
147
|
}
|
|
145
|
-
AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, deps: [{ token: i1.ClientIncomeTypesService }, { token: i2.PropertyService }, { token: i3.IncomeSourceService }, { token: i4.BankAccountService }, { token: i5.TransactionAllocationService }, { token: i6.VehicleClaimService }, { token: i7.TransactionService }, { token: i8.SoleBusinessService }, { token: i8.HoldingService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
148
|
+
AccountSetupService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, deps: [{ token: i1.ClientIncomeTypesService }, { token: i2.PropertyService }, { token: i3.IncomeSourceService }, { token: i4.BankAccountService }, { token: i5.TransactionAllocationService }, { token: i6.VehicleClaimService }, { token: i7.TransactionService }, { token: i8.SoleBusinessService }, { token: i8.HoldingService }, { token: i8.UserService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
146
149
|
AccountSetupService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, providedIn: 'root' });
|
|
147
150
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImport: i0, type: AccountSetupService, decorators: [{
|
|
148
151
|
type: Injectable,
|
|
149
152
|
args: [{
|
|
150
153
|
providedIn: 'root'
|
|
151
154
|
}]
|
|
152
|
-
}], ctorParameters: function () { return [{ type: i1.ClientIncomeTypesService }, { type: i2.PropertyService }, { type: i3.IncomeSourceService }, { type: i4.BankAccountService }, { type: i5.TransactionAllocationService }, { type: i6.VehicleClaimService }, { type: i7.TransactionService }, { type: i8.SoleBusinessService }, { type: i8.HoldingService }]; } });
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account-setup.service.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/services/account-setup/account-setup.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { ACCOUNT_SETUP_ITEMS } from '../../models/account-setup/account-setup-items.const';\nimport { AccountSetupItem } from '../../models/account-setup/account-setup-item';\nimport { AccountSetupItemsEnum } from '../../models/account-setup/account-setup-items.enum';\nimport { BankAccountService } from '../http/bank/bank-account/bank-account.service';\nimport { ClientIncomeTypes } from '../../models/client/client-income-types';\nimport { ClientIncomeTypesService } from '../http/firm/client-income/client-income-types.service';\nimport { IncomeSource } from '../../models/income-source/income-source';\nimport { IncomeSourceCollection } from '../../collections/income-source.collection';\nimport { IncomeSourceService } from '../http/income-source/income-source.service';\nimport { PropertyService } from '../http/property/property.service';\nimport { TransactionAllocationService } from '../http/transaction/transaction-allocation/transaction-allocation.service';\nimport { Observable, ReplaySubject, combineLatest, of } from 'rxjs';\nimport { filter, map, mergeMap } from 'rxjs/operators';\nimport { AccountSetupItemCollection } from '../../collections/account-setup-item.collection';\nimport { VehicleClaimService } from '../http/vehicle/vehicle-claim.service';\nimport fromPairs from 'lodash/fromPairs';\nimport cloneDeep from 'lodash/cloneDeep';\nimport { plainToClass } from 'class-transformer';\nimport { TransactionService } from '../http/transaction/transaction.service';\nimport { Transaction } from '../../models/transaction/transaction';\nimport { TransactionCollection } from '../../collections/transaction/transaction.collection';\nimport {HoldingService, SoleBusinessService} from '../http';\n\n/**\n * Service handling user's account setup process.\n * Checks required steps and their completion\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class AccountSetupService {\n  cache: AccountSetupItemCollection;\n  cacheSubject: ReplaySubject<AccountSetupItemCollection> = new ReplaySubject<AccountSetupItemCollection>(1);\n  clientIncomeTypesId: number;\n\n  constructor(\n    private clientIncomeTypesService: ClientIncomeTypesService,\n    private propertyService: PropertyService,\n    private incomeSourceService: IncomeSourceService,\n    private bankAccountsService: BankAccountService,\n    private transactionAllocationService: TransactionAllocationService,\n    private vehicleClaimService: VehicleClaimService,\n    private transactionService: TransactionService,\n    private soleBusinessService: SoleBusinessService,\n    private holdingService: HoldingService,\n  ) {\n  }\n\n  /**\n   * Get list of account setup items for current user\n   */\n  get(): Observable<AccountSetupItemCollection> {\n    if (!this.cache) {\n      this.cache = new AccountSetupItemCollection([]);\n\n      this.clientIncomeTypesService.getSingle()\n        .pipe(\n          mergeMap((incomeTypes: ClientIncomeTypes) => {\n            this.clientIncomeTypesId = incomeTypes.id;\n\n            return this.createBatch(incomeTypes);\n          })\n        )\n        .subscribe((items: AccountSetupItemCollection) => {\n          switch (true) {\n            case !this.cache:\n            case this.cache.filterBy('isCompleted', true).length !== items.filterBy('isCompleted', true).length:\n            case this.cache.length !== items.length:\n              this.cache = cloneDeep(items);\n              this.cacheSubject.next(this.cache);\n          }\n        });\n    }\n\n    return this.cacheSubject.asObservable();\n  }\n\n  /**\n   * Prepare client income types to update to hide depended account setup items\n   */\n  prepareIncomeTypes(item: AccountSetupItem): ClientIncomeTypes {\n    return plainToClass(\n      ClientIncomeTypes,\n      Object.assign({id: this.clientIncomeTypesId}, fromPairs(item.clientIncomeTypes.map((type: string) => [type, false])))\n    )\n  }\n\n  /**\n   * Get a single AccountSetupItem and check it's completion\n   */\n  private create(itemType: AccountSetupItemsEnum, request: Observable<object[]>): Observable<AccountSetupItem> {\n    return request.pipe(\n      map((result: object[]): AccountSetupItem => {\n        const item: AccountSetupItem = ACCOUNT_SETUP_ITEMS[itemType];\n\n        if (result.length) {\n          item.isCompleted = true;\n        } else {\n          item.isCompleted = false;\n        }\n\n        return item;\n      })\n    );\n  }\n\n  /**\n   * Get batch of requests to get list of required AccountSetupItem's.\n   * Some items are optional and depends of user's client income types\n   */\n  private createBatch(incomeTypes: ClientIncomeTypes): Observable<AccountSetupItemCollection> {\n    const batch: Observable<AccountSetupItem>[] = [];\n\n    // Salary item is completed when user added salary income source\n    if (incomeTypes.work) {\n      batch.push(\n        this.create(\n          AccountSetupItemsEnum.SALARY,\n          this.getIncomeSources(true)\n        ),\n        // Other income is a part of work tank, completed when user added at least one other income source\n        this.create(\n          AccountSetupItemsEnum.OTHER_INCOME,\n          this.getIncomeSources()\n        )\n      );\n    }\n\n    // Rental income item is completed when user added at least one property\n    if (incomeTypes.property) {\n      batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.getArray()));\n    }\n\n    // Sole business item is completed when user added at least one business\n    if (incomeTypes.sole) {\n      batch.push(this.create(AccountSetupItemsEnum.SOLE_BUSINESS, this.soleBusinessService.get()));\n    }\n\n    // holdings item is completed when user added at least one holding\n    if (incomeTypes.holdings) {\n      batch.push(this.create(AccountSetupItemsEnum.HOLDINGS, this.holdingService.getArray()));\n    }\n\n    if (incomeTypes.sole || incomeTypes.property || incomeTypes.work) {\n      // Bank feeds item is completed when user added at least one bank account (basiq or manual)\n      batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.getArray()));\n\n      // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)\n      batch.push(this.getLogbookItem());\n\n      // Allocation item is completed when user added at least one transaction allocation\n      batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));\n    }\n\n    return combineLatest(batch).pipe(map((items: AccountSetupItem[]) => new AccountSetupItemCollection(items)));\n  }\n\n  /**\n   * @TODO Alex: work with collection when services refactored\n   * @TODO Vik: waiting for income sources refactoring\n   */\n  private getIncomeSources(isSalary = false): Observable<IncomeSource[]> {\n    return this.incomeSourceService.get().pipe(\n      map((incomeSources: IncomeSource[]): IncomeSource[] => {\n        const collection: IncomeSourceCollection = new IncomeSourceCollection(incomeSources);\n        if (isSalary) {\n          return collection.getSalary();\n        }\n\n        return collection.items.filter((incomeSource: IncomeSource) => !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome());\n      })\n    )\n  }\n\n  /**\n   * Show logbook item when user has at least 1 vehicle transaction\n   */\n  private getLogbookItem(): Observable<AccountSetupItem> {\n    return this.transactionService.get()\n      .pipe(\n        // @TODO Alex: remove map when services start work with collections\n        map((transactions: Transaction[]) => new TransactionCollection(transactions)),\n        mergeMap((transactions: TransactionCollection) => {\n          if (transactions.getVehicleTransactions().length) {\n            return this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get());\n          }\n\n          return of(null);\n        })\n      );\n  }\n}\n"]}
|
|
155
|
+
}], ctorParameters: function () { return [{ type: i1.ClientIncomeTypesService }, { type: i2.PropertyService }, { type: i3.IncomeSourceService }, { type: i4.BankAccountService }, { type: i5.TransactionAllocationService }, { type: i6.VehicleClaimService }, { type: i7.TransactionService }, { type: i8.SoleBusinessService }, { type: i8.HoldingService }, { type: i8.UserService }]; } });
|
|
156
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"account-setup.service.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/services/account-setup/account-setup.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,sDAAsD,CAAC;AAEzF,OAAO,EAAC,qBAAqB,EAAC,MAAM,qDAAqD,CAAC;AAE1F,OAAO,EAAC,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAAC,sBAAsB,EAAC,MAAM,4CAA4C,CAAC;AAIlF,OAAO,EAAC,aAAa,EAAc,EAAE,EAAE,aAAa,EAAC,MAAM,MAAM,CAAC;AAClE,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAC,0BAA0B,EAAC,MAAM,iDAAiD,CAAC;AAE3F,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAG/C,OAAO,EAAC,qBAAqB,EAAC,MAAM,sDAAsD,CAAC;AAE3F,OAAO,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;;;;;;;;;;AAE7D;;;GAGG;AAIH,MAAM,OAAO,mBAAmB;IAK9B,YACU,wBAAkD,EAClD,eAAgC,EAChC,mBAAwC,EACxC,mBAAuC,EACvC,4BAA0D,EAC1D,mBAAwC,EACxC,kBAAsC,EACtC,mBAAwC,EACxC,cAA8B,EAC9B,WAAwB;QATxB,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,oBAAe,GAAf,eAAe,CAAiB;QAChC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAoB;QACvC,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QAblC,iBAAY,GAA8C,IAAI,aAAa,CAA6B,CAAC,CAAC,CAAC;IAe3G,CAAC;IAED;;OAEG;IACH,GAAG;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,KAAK,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAC;YAEhD,IAAI,CAAC,wBAAwB,CAAC,SAAS,EAAE;iBACtC,IAAI,CACH,QAAQ,CAAC,CAAC,WAA8B,EAAE,EAAE;gBAC1C,IAAI,CAAC,mBAAmB,GAAG,WAAW,CAAC,EAAE,CAAC;gBAE1C,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACvC,CAAC,CAAC,CACH;iBACA,SAAS,CAAC,CAAC,KAAiC,EAAE,EAAE;gBAC/C,QAAQ,IAAI,EAAE;oBACZ,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;oBACjB,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC;oBACpG,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;wBACrC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;wBAC9B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACtC;YACH,CAAC,CAAC,CAAC;SACN;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,IAAsB;QACvC,OAAO,YAAY,CACjB,iBAAiB,EACjB,MAAM,CAAC,MAAM,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAC,EAAE,SAAS,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CACtH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,QAA+B,EAAE,OAA6B;QAC3E,OAAO,OAAO,CAAC,IAAI,CACjB,GAAG,CAAC,CAAC,MAAgB,EAAoB,EAAE;YACzC,MAAM,IAAI,GAAqB,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAE7D,IAAI,MAAM,CAAC,MAAM,EAAE;gBACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;aACzB;iBAAM;gBACL,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;aAC1B;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,WAA8B;QAChD,MAAM,KAAK,GAAmC,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QAEzC,gEAAgE;QAChE,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;YAC9D,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,MAAM,CACT,qBAAqB,CAAC,MAAM,EAC5B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAC5B;YACD,kGAAkG;YAClG,IAAI,CAAC,MAAM,CACT,qBAAqB,CAAC,YAAY,EAClC,IAAI,CAAC,gBAAgB,EAAE,CACxB,CACF,CAAC;SACH;QAED,wEAAwE;QACxE,IAAI,WAAW,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,CAAC,EAAE;YACtE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SAC1F;QAED,wEAAwE;QACxE,IAAI,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;YAC9D,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC9F;QAED,kEAAkE;QAClE,IAAI,WAAW,CAAC,QAAQ,IAAK,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE;YACtE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;SACzF;QAED,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxF,2FAA2F;YAC3F,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAE/F,sGAAsG;YACtG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YAElC,mFAAmF;YACnF,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SACrG;QAED,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAyB,EAAE,EAAE,CAAC,IAAI,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9G,CAAC;IAED;;;OAGG;IACK,gBAAgB,CAAC,QAAQ,GAAG,KAAK;QACvC,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,IAAI,CACxC,GAAG,CAAC,CAAC,aAA6B,EAAkB,EAAE;YACpD,MAAM,UAAU,GAA2B,IAAI,sBAAsB,CAAC,aAAa,CAAC,CAAC;YACrF,IAAI,QAAQ,EAAE;gBACZ,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC;aAC/B;YAED,OAAO,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,YAA0B,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC;QACjI,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;OAEG;IACK,cAAc;QACpB,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE;aACjC,IAAI;QACH,mEAAmE;QACnE,GAAG,CAAC,CAAC,YAA2B,EAAE,EAAE,CAAC,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAAC,EAC7E,QAAQ,CAAC,CAAC,YAAmC,EAAE,EAAE;YAC/C,IAAI,YAAY,CAAC,sBAAsB,EAAE,CAAC,MAAM,EAAE;gBAChD,OAAO,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAC,CAAC;aACxF;YAED,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CACH,CAAC;IACN,CAAC;;gHAlKU,mBAAmB;oHAAnB,mBAAmB,cAFlB,MAAM;2FAEP,mBAAmB;kBAH/B,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import {Injectable} from '@angular/core';\nimport {ACCOUNT_SETUP_ITEMS} from '../../models/account-setup/account-setup-items.const';\nimport {AccountSetupItem} from '../../models/account-setup/account-setup-item';\nimport {AccountSetupItemsEnum} from '../../models/account-setup/account-setup-items.enum';\nimport {BankAccountService} from '../http/bank/bank-account/bank-account.service';\nimport {ClientIncomeTypes} from '../../models/client/client-income-types';\nimport {ClientIncomeTypesService} from '../http/firm/client-income/client-income-types.service';\nimport {IncomeSource} from '../../models/income-source/income-source';\nimport {IncomeSourceCollection} from '../../collections/income-source.collection';\nimport {IncomeSourceService} from '../http/income-source/income-source.service';\nimport {PropertyService} from '../http/property/property.service';\nimport {TransactionAllocationService} from '../http/transaction/transaction-allocation/transaction-allocation.service';\nimport {combineLatest, Observable, of, ReplaySubject} from 'rxjs';\nimport {map, mergeMap} from 'rxjs/operators';\nimport {AccountSetupItemCollection} from '../../collections/account-setup-item.collection';\nimport {VehicleClaimService} from '../http/vehicle/vehicle-claim.service';\nimport fromPairs from 'lodash/fromPairs';\nimport cloneDeep from 'lodash/cloneDeep';\nimport {plainToClass} from 'class-transformer';\nimport {TransactionService} from '../http/transaction/transaction.service';\nimport {Transaction} from '../../models/transaction/transaction';\nimport {TransactionCollection} from '../../collections/transaction/transaction.collection';\nimport {HoldingService, SoleBusinessService, UserService} from '../http';\nimport {UserRolesEnum} from '../../db/Enums/user-roles.enum';\n\n/**\n * Service handling user's account setup process.\n * Checks required steps and their completion\n */\n@Injectable({\n  providedIn: 'root'\n})\nexport class AccountSetupService {\n  cache: AccountSetupItemCollection;\n  cacheSubject: ReplaySubject<AccountSetupItemCollection> = new ReplaySubject<AccountSetupItemCollection>(1);\n  clientIncomeTypesId: number;\n\n  constructor(\n    private clientIncomeTypesService: ClientIncomeTypesService,\n    private propertyService: PropertyService,\n    private incomeSourceService: IncomeSourceService,\n    private bankAccountsService: BankAccountService,\n    private transactionAllocationService: TransactionAllocationService,\n    private vehicleClaimService: VehicleClaimService,\n    private transactionService: TransactionService,\n    private soleBusinessService: SoleBusinessService,\n    private holdingService: HoldingService,\n    private userService: UserService,\n  ) {\n  }\n\n  /**\n   * Get list of account setup items for current user\n   */\n  get(): Observable<AccountSetupItemCollection> {\n    if (!this.cache) {\n      this.cache = new AccountSetupItemCollection([]);\n\n      this.clientIncomeTypesService.getSingle()\n        .pipe(\n          mergeMap((incomeTypes: ClientIncomeTypes) => {\n            this.clientIncomeTypesId = incomeTypes.id;\n\n            return this.createBatch(incomeTypes);\n          })\n        )\n        .subscribe((items: AccountSetupItemCollection) => {\n          switch (true) {\n            case !this.cache:\n            case this.cache.filterBy('isCompleted', true).length !== items.filterBy('isCompleted', true).length:\n            case this.cache.length !== items.length:\n              this.cache = cloneDeep(items);\n              this.cacheSubject.next(this.cache);\n          }\n        });\n    }\n\n    return this.cacheSubject.asObservable();\n  }\n\n  /**\n   * Prepare client income types to update to hide depended account setup items\n   */\n  prepareIncomeTypes(item: AccountSetupItem): ClientIncomeTypes {\n    return plainToClass(\n      ClientIncomeTypes,\n      Object.assign({id: this.clientIncomeTypesId}, fromPairs(item.clientIncomeTypes.map((type: string) => [type, false])))\n    )\n  }\n\n  /**\n   * Get a single AccountSetupItem and check it's completion\n   */\n  private create(itemType: AccountSetupItemsEnum, request: Observable<object[]>): Observable<AccountSetupItem> {\n    return request.pipe(\n      map((result: object[]): AccountSetupItem => {\n        const item: AccountSetupItem = ACCOUNT_SETUP_ITEMS[itemType];\n\n        if (result.length) {\n          item.isCompleted = true;\n        } else {\n          item.isCompleted = false;\n        }\n\n        return item;\n      })\n    );\n  }\n\n  /**\n   * Get batch of requests to get list of required AccountSetupItem's.\n   * Some items are optional and depends of user's client income types\n   */\n  private createBatch(incomeTypes: ClientIncomeTypes): Observable<AccountSetupItemCollection> {\n    const batch: Observable<AccountSetupItem>[] = [];\n    const user = this.userService.getCache();\n\n    // Salary item is completed when user added salary income source\n    if (incomeTypes.work && user.hasRoles(UserRolesEnum.WORK_TANK)) {\n      batch.push(\n        this.create(\n          AccountSetupItemsEnum.SALARY,\n          this.getIncomeSources(true)\n        ),\n        // Other income is a part of work tank, completed when user added at least one other income source\n        this.create(\n          AccountSetupItemsEnum.OTHER_INCOME,\n          this.getIncomeSources()\n        )\n      );\n    }\n\n    // Rental income item is completed when user added at least one property\n    if (incomeTypes.property && user.hasRoles(UserRolesEnum.PROPERTY_TANK)) {\n      batch.push(this.create(AccountSetupItemsEnum.PROPERTY, this.propertyService.getArray()));\n    }\n\n    // Sole business item is completed when user added at least one business\n    if (incomeTypes.sole && user.hasRoles(UserRolesEnum.SOLE_TANK)) {\n      batch.push(this.create(AccountSetupItemsEnum.SOLE_BUSINESS, this.soleBusinessService.get()));\n    }\n\n    // holdings item is completed when user added at least one holding\n    if (incomeTypes.holdings  && user.hasRoles(UserRolesEnum.HOLDING_TANK)) {\n      batch.push(this.create(AccountSetupItemsEnum.HOLDINGS, this.holdingService.getArray()));\n    }\n\n    if (incomeTypes.sole || incomeTypes.property || incomeTypes.work || incomeTypes.holdings) {\n      // Bank feeds item is completed when user added at least one bank account (basiq or manual)\n      batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.getArray()));\n\n      // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)\n      batch.push(this.getLogbookItem());\n\n      // Allocation item is completed when user added at least one transaction allocation\n      batch.push(this.create(AccountSetupItemsEnum.TRANSACTION, this.transactionAllocationService.get()));\n    }\n\n    return combineLatest(batch).pipe(map((items: AccountSetupItem[]) => new AccountSetupItemCollection(items)));\n  }\n\n  /**\n   * @TODO Alex: work with collection when services refactored\n   * @TODO Vik: waiting for income sources refactoring\n   */\n  private getIncomeSources(isSalary = false): Observable<IncomeSource[]> {\n    return this.incomeSourceService.get().pipe(\n      map((incomeSources: IncomeSource[]): IncomeSource[] => {\n        const collection: IncomeSourceCollection = new IncomeSourceCollection(incomeSources);\n        if (isSalary) {\n          return collection.getSalary();\n        }\n\n        return collection.items.filter((incomeSource: IncomeSource) => !incomeSource.isSalaryIncome() && !incomeSource.isSoleIncome());\n      })\n    )\n  }\n\n  /**\n   * Show logbook item when user has at least 1 vehicle transaction\n   */\n  private getLogbookItem(): Observable<AccountSetupItem> {\n    return this.transactionService.get()\n      .pipe(\n        // @TODO Alex: remove map when services start work with collections\n        map((transactions: Transaction[]) => new TransactionCollection(transactions)),\n        mergeMap((transactions: TransactionCollection) => {\n          if (transactions.getVehicleTransactions().length) {\n            return this.create(AccountSetupItemsEnum.WORK_LOGBOOK, this.vehicleClaimService.get());\n          }\n\n          return of(null);\n        })\n      );\n  }\n}\n"]}
|
|
@@ -46,6 +46,10 @@ export class XlsxService {
|
|
|
46
46
|
xlsx.utils.book_append_sheet(workbook, worksheet);
|
|
47
47
|
return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });
|
|
48
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* @TODO vik/artem work with ExportDataTable instead of ExportableCollection
|
|
51
|
+
* @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8
|
|
52
|
+
*/
|
|
49
53
|
exportArrayToExcel(exportableCollection, name) {
|
|
50
54
|
const workbook = xlsx.utils.book_new();
|
|
51
55
|
// create empty worksheet
|
|
@@ -77,4 +81,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.8", ngImpor
|
|
|
77
81
|
providedIn: 'root'
|
|
78
82
|
}]
|
|
79
83
|
}] });
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"xlsx.service.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/services/xlsx/xlsx.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport * as xlsx from 'xlsx';\nimport * as FileSaver from 'file-saver';\nimport { ExportableCollection } from \"../../collections\";\nimport { ExportDataTable } from \"../../models/export/export-data-table\";\n\nconst EXCEL_TYPE: string = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8'\n\n@Injectable({\n  providedIn: 'root'\n})\n\n/**\n * Service to work with XLSX (generate, download, e.t.c.)\n */\nexport class XlsxService {\n  /**\n   * Export file form provided HTML tables\n   */\n  exportTables(tables: NodeListOf<HTMLTableElement>, title: string, fileName: string): void {\n    const excelFile: BlobPart = this.generateFromTables(tables, title);\n    const data: Blob = new Blob([excelFile], {\n      type: EXCEL_TYPE\n    });\n\n    FileSaver.saveAs(data, `${fileName}.xlsx`);\n  }\n\n  private generateFromTables(tables: NodeListOf<HTMLTableElement>, title?: string): BlobPart {\n    // create new workbook\n    const workbook: xlsx.WorkBook = xlsx.utils.book_new();\n    // create empty worksheet\n    const worksheet: xlsx.WorkSheet = {\n      SheetNames: [],\n      Sheets: {}\n    };\n\n    tables.forEach((data: HTMLTableElement) => {\n      // add caption for the current table\n      xlsx.utils.sheet_add_aoa(worksheet, [[data.caption?.innerText]], {origin: -1});\n      // add table table data to the worksheet\n      xlsx.utils.sheet_add_dom(worksheet, data, {origin: -1, raw: true});\n      // set empty row after current table\n      xlsx.utils.sheet_add_aoa(worksheet, [], {origin: -1});\n    });\n\n    xlsx.utils.book_append_sheet(workbook, worksheet);\n    return xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });\n  }\n\n  getFileName = (name: string) => {\n    let sheetName = name || \"ExportResult\";\n    let fileName = `${sheetName}`;\n    return {\n      sheetName,\n      fileName\n    };\n  };\n\n  /**\n   * @TODO vik/artem work with ExportDataTable instead of ExportableCollection\n   * @TODO vik/artem why so much code? here is 6 rows solution https://stackoverflow.com/questions/64939994/how-to-export-array-of-objects-to-an-excel-in-angular-8\n   */\n  exportArrayToExcel(exportableCollection: ExportableCollection<any>, name?: string) {\n    const workbook: xlsx.WorkBook = xlsx.utils.book_new();\n    // create empty worksheet\n    const worksheet: xlsx.WorkSheet = {\n      SheetNames: [],\n      Sheets: {}\n    };\n\n    const exportData: ExportDataTable = exportableCollection.export()\n    const exportAoa = exportableCollection.getBodyAoa(exportData);\n    let { sheetName, fileName } = this.getFileName(name);\n\n    xlsx.utils.sheet_add_aoa(worksheet, [exportData.header], {origin: -1});\n    // add table table data to the worksheet\n    xlsx.utils.sheet_add_aoa(worksheet, exportAoa, {origin: -1});\n    // set empty row after current table\n    xlsx.utils.sheet_add_aoa(worksheet, [], {origin: -1});\n\n    xlsx.utils.book_append_sheet(workbook, worksheet);\n    const excelFile: BlobPart = xlsx.write(workbook, { bookType: 'xlsx', type: 'array' });\n\n    const data: Blob = new Blob([excelFile], {\n      type: EXCEL_TYPE\n    });\n    FileSaver.saveAs(data, `${fileName}.xlsx`);\n  }\n}\n"]}
|