taxtank-core 0.33.98 → 0.33.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/src/lib/collections/depreciation.collection.mjs +6 -4
- package/esm2022/src/lib/forms/depreciation/depreciation.form.mjs +2 -2
- package/fesm2022/taxtank-core.mjs +23 -21
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/package.json +1 -1
- package/src/lib/collections/depreciation.collection.d.ts +2 -0
@@ -2,8 +2,8 @@ import { TankTypeEnum } from '../db/Enums/tank-type.enum';
|
|
2
2
|
import uniqBy from 'lodash/uniqBy';
|
3
3
|
import compact from 'lodash/compact';
|
4
4
|
import { TransactionCollection } from './transaction';
|
5
|
-
import round from 'lodash/round';
|
6
5
|
import { TransactionBaseCollection } from './transaction';
|
6
|
+
import { DepreciationForecastCollection } from './depreciation-forecast.collection';
|
7
7
|
export class DepreciationCollection extends TransactionBaseCollection {
|
8
8
|
getSoleDepreciations() {
|
9
9
|
return this.filter((depreciation) => depreciation.isSoleTank());
|
@@ -21,8 +21,7 @@ export class DepreciationCollection extends TransactionBaseCollection {
|
|
21
21
|
return this.sumBy('currentYearForecast.claimAmount');
|
22
22
|
}
|
23
23
|
getClaimedAmountByYear(year = +localStorage.getItem('financialYear')) {
|
24
|
-
|
25
|
-
return round(this.amount - closeBalance, 2);
|
24
|
+
return this.getForecasts().filter(forecast => forecast.financialYear <= year).reduce((sum, forecast) => sum + forecast.claimAmount, 0);
|
26
25
|
}
|
27
26
|
getClaimAmountByYear(year = +localStorage.getItem('financialYear')) {
|
28
27
|
return this.items.reduce((sum, depreciation) => sum + depreciation.getClaimAmountByYear(year), 0);
|
@@ -30,6 +29,9 @@ export class DepreciationCollection extends TransactionBaseCollection {
|
|
30
29
|
getCloseBalanceByYear(year = +localStorage.getItem('financialYear')) {
|
31
30
|
return this.items.reduce((sum, depreciation) => sum + depreciation.getCloseBalanceByYear(year), 0);
|
32
31
|
}
|
32
|
+
getForecasts() {
|
33
|
+
return new DepreciationForecastCollection(this.map(depreciation => depreciation.forecasts).flat());
|
34
|
+
}
|
33
35
|
getCurrentYearForecastAmount() {
|
34
36
|
return this.sumBy('currentYearForecast.amount');
|
35
37
|
}
|
@@ -107,4 +109,4 @@ export class DepreciationCollection extends TransactionBaseCollection {
|
|
107
109
|
return [];
|
108
110
|
}
|
109
111
|
}
|
110
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"depreciation.collection.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/collections/depreciation.collection.ts"],"names":[],"mappings":"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","sourcesContent":["import { TankTypeEnum } from '../db/Enums/tank-type.enum';\nimport { Depreciation } from '../models';\nimport uniqBy from 'lodash/uniqBy';\nimport compact from 'lodash/compact';\nimport { DepreciationCapitalProject } from '../models';\nimport { TransactionCollection } from './transaction';\nimport { ChartAccountsCategoryEnum } from '../db/Enums';\nimport { VehicleClaim } from '../models';\nimport round from 'lodash/round';\nimport { TransactionBaseCollection } from './transaction';\nimport { ExportCell } from '../models/export/export-cell';\n\nexport class DepreciationCollection extends TransactionBaseCollection<Depreciation> {\n  getSoleDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isSoleTank());\n  }\n\n  getCurrentYearBuy(): this {\n    return this.filter(depreciation => depreciation.isCurrentYearBuy());\n  }\n\n  /**\n   * Get total amount of all depreciations in the collection\n   */\n  get amount(): number {\n    return this.items.reduce((sum: number, depreciation: Depreciation): number => sum + depreciation.amount, 0);\n  }\n\n  get claimAmount(): number {\n    return this.sumBy('currentYearForecast.claimAmount');\n  }\n\n  getClaimedAmountByYear(year: number = +localStorage.getItem('financialYear')): number {\n    const closeBalance = this.items.reduce(\n      (sum: number, depreciation: Depreciation): number => sum + depreciation.getCloseBalanceByYear(year), 0\n    );\n\n    return round(this.amount - closeBalance, 2);\n  }\n\n  getClaimAmountByYear(year: number = +localStorage.getItem('financialYear')): number {\n    return this.items.reduce((sum: number, depreciation: Depreciation): number => sum + depreciation.getClaimAmountByYear(year), 0);\n  }\n\n  getCloseBalanceByYear(year: number = +localStorage.getItem('financialYear')): number {\n    return this.items.reduce((sum: number, depreciation: Depreciation): number => sum + depreciation.getCloseBalanceByYear(year), 0);\n  }\n\n  getCurrentYearForecastAmount(): number {\n    return this.sumBy('currentYearForecast.amount');\n  }\n\n  get closeBalance(): number {\n    return this.sumBy('currentYearForecast.closeBalance');\n  }\n\n  getByPropertiesIds(ids: number[]): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => ids.includes(depreciation.property?.id))\n    );\n  }\n\n  getWithCapitalProject(): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => !!depreciation.depreciationCapitalProject)\n    );\n  }\n\n  getWithoutCapitalProject(): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => !depreciation.depreciationCapitalProject)\n    );\n  }\n\n  getWithoutBorrowingExpenses(): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => !depreciation.isBorrowingExpense())\n    );\n  }\n\n  getByChartAccountsCategories(categories: ChartAccountsCategoryEnum[]): this {\n    return this.filterBy('chartAccounts.category', categories);\n  }\n\n  getAssets(): this {\n    return this.filter((depreciation) => depreciation.isAsset());\n  }\n\n  getPlantEquipment(): this {\n    return this.filter((depreciation) => depreciation.isPlantEquipmentPool());\n  }\n\n  getCapitalDepreciations(): this {\n    return this.filter((depreciation) => depreciation.isCapital());\n  }\n\n  getBorrowingExpenseDepreciations(): DepreciationCollection {\n    return this.filter((depreciation: Depreciation) => depreciation.isBorrowingExpense());\n  }\n\n  getWrittenOffDepreciations(): DepreciationCollection {\n    return this.filter((depreciation: Depreciation) => depreciation.isWrittenOff());\n  }\n\n  getLVPDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isLVP());\n  }\n\n  getSBPDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isSBP());\n  }\n\n  getCapitalProjects(): DepreciationCapitalProject[] {\n    return uniqBy(\n      compact(\n        this.items.map((depreciation: Depreciation): DepreciationCapitalProject => depreciation.depreciationCapitalProject)\n      ),\n      'id'\n    );\n  }\n\n  /**\n   * Get a new collection of depreciations related to vehicles\n   */\n  getVehicleDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isVehicleDepreciation());\n  }\n\n  getByTankType(tankType: TankTypeEnum): this {\n    return this.filterBy('tankType', tankType);\n  }\n\n  /**\n   * Create TransactionCollection from depreciation items\n   */\n  toTransactions(): TransactionCollection {\n    return new TransactionCollection(\n      this.items.map((item: Depreciation) => item.toTransaction())\n    );\n  }\n\n  /**\n   * Get depreciations by vehicle claim. Only vehicle depreciations may be related to vehicle claim\n   */\n  getByVehicleClaim(vehicleClaim: VehicleClaim): this {\n    return vehicleClaim.isSoleTank()\n      // sole tank may have multiple vehicle claims, so we need to filter by business.id\n      ? this.getVehicleDepreciations().filterBy('business.id', vehicleClaim.business.id)\n      // work tank may have only one vehicle claim, so we need to filter by tank type\n      : this.getVehicleDepreciations().filterBy('tankType', TankTypeEnum.WORK);\n  }\n\n  getExportBody(params: object): ExportCell[][] {\n    return [];\n  }\n\n  getExportHeader(): string[] {\n    return [];\n  }\n}\n"]}
|
112
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"depreciation.collection.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/collections/depreciation.collection.ts"],"names":[],"mappings":"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","sourcesContent":["import { TankTypeEnum } from '../db/Enums/tank-type.enum';\nimport { Depreciation, DepreciationForecast } from '../models';\nimport uniqBy from 'lodash/uniqBy';\nimport compact from 'lodash/compact';\nimport { DepreciationCapitalProject } from '../models';\nimport { TransactionCollection } from './transaction';\nimport { ChartAccountsCategoryEnum } from '../db/Enums';\nimport { VehicleClaim } from '../models';\nimport round from 'lodash/round';\nimport { TransactionBaseCollection } from './transaction';\nimport { ExportCell } from '../models/export/export-cell';\nimport { DepreciationForecastCollection } from './depreciation-forecast.collection';\n\nexport class DepreciationCollection extends TransactionBaseCollection<Depreciation> {\n  getSoleDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isSoleTank());\n  }\n\n  getCurrentYearBuy(): this {\n    return this.filter(depreciation => depreciation.isCurrentYearBuy());\n  }\n\n  /**\n   * Get total amount of all depreciations in the collection\n   */\n  get amount(): number {\n    return this.items.reduce((sum: number, depreciation: Depreciation): number => sum + depreciation.amount, 0);\n  }\n\n  get claimAmount(): number {\n    return this.sumBy('currentYearForecast.claimAmount');\n  }\n\n  getClaimedAmountByYear(year: number = +localStorage.getItem('financialYear')): number {\n    return this.getForecasts().filter(forecast => forecast.financialYear <= year).reduce(\n      (sum: number, forecast: DepreciationForecast): number => sum + forecast.claimAmount, 0\n    );\n  }\n\n  getClaimAmountByYear(year: number = +localStorage.getItem('financialYear')): number {\n    return this.items.reduce((sum: number, depreciation: Depreciation): number => sum + depreciation.getClaimAmountByYear(year), 0);\n  }\n\n  getCloseBalanceByYear(year: number = +localStorage.getItem('financialYear')): number {\n    return this.items.reduce((sum: number, depreciation: Depreciation): number => sum + depreciation.getCloseBalanceByYear(year), 0);\n  }\n\n  getForecasts() {\n    return new DepreciationForecastCollection(this.map(depreciation => depreciation.forecasts).flat());\n  }\n\n  getCurrentYearForecastAmount(): number {\n    return this.sumBy('currentYearForecast.amount');\n  }\n\n  get closeBalance(): number {\n    return this.sumBy('currentYearForecast.closeBalance');\n  }\n\n  getByPropertiesIds(ids: number[]): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => ids.includes(depreciation.property?.id))\n    );\n  }\n\n  getWithCapitalProject(): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => !!depreciation.depreciationCapitalProject)\n    );\n  }\n\n  getWithoutCapitalProject(): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => !depreciation.depreciationCapitalProject)\n    );\n  }\n\n  getWithoutBorrowingExpenses(): DepreciationCollection {\n    return new DepreciationCollection(\n      this.items.filter((depreciation: Depreciation): boolean => !depreciation.isBorrowingExpense())\n    );\n  }\n\n  getByChartAccountsCategories(categories: ChartAccountsCategoryEnum[]): this {\n    return this.filterBy('chartAccounts.category', categories);\n  }\n\n  getAssets(): this {\n    return this.filter((depreciation) => depreciation.isAsset());\n  }\n\n  getPlantEquipment(): this {\n    return this.filter((depreciation) => depreciation.isPlantEquipmentPool());\n  }\n\n  getCapitalDepreciations(): this {\n    return this.filter((depreciation) => depreciation.isCapital());\n  }\n\n  getBorrowingExpenseDepreciations(): DepreciationCollection {\n    return this.filter((depreciation: Depreciation) => depreciation.isBorrowingExpense());\n  }\n\n  getWrittenOffDepreciations(): DepreciationCollection {\n    return this.filter((depreciation: Depreciation) => depreciation.isWrittenOff());\n  }\n\n  getLVPDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isLVP());\n  }\n\n  getSBPDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isSBP());\n  }\n\n  getCapitalProjects(): DepreciationCapitalProject[] {\n    return uniqBy(\n      compact(\n        this.items.map((depreciation: Depreciation): DepreciationCapitalProject => depreciation.depreciationCapitalProject)\n      ),\n      'id'\n    );\n  }\n\n  /**\n   * Get a new collection of depreciations related to vehicles\n   */\n  getVehicleDepreciations(): this {\n    return this.filter((depreciation: Depreciation) => depreciation.isVehicleDepreciation());\n  }\n\n  getByTankType(tankType: TankTypeEnum): this {\n    return this.filterBy('tankType', tankType);\n  }\n\n  /**\n   * Create TransactionCollection from depreciation items\n   */\n  toTransactions(): TransactionCollection {\n    return new TransactionCollection(\n      this.items.map((item: Depreciation) => item.toTransaction())\n    );\n  }\n\n  /**\n   * Get depreciations by vehicle claim. Only vehicle depreciations may be related to vehicle claim\n   */\n  getByVehicleClaim(vehicleClaim: VehicleClaim): this {\n    return vehicleClaim.isSoleTank()\n      // sole tank may have multiple vehicle claims, so we need to filter by business.id\n      ? this.getVehicleDepreciations().filterBy('business.id', vehicleClaim.business.id)\n      // work tank may have only one vehicle claim, so we need to filter by tank type\n      : this.getVehicleDepreciations().filterBy('tankType', TankTypeEnum.WORK);\n  }\n\n  getExportBody(params: object): ExportCell[][] {\n    return [];\n  }\n\n  getExportHeader(): string[] {\n    return [];\n  }\n}\n"]}
|
@@ -10,7 +10,7 @@ export class DepreciationForm extends TransactionBaseForm {
|
|
10
10
|
claimStartDate: new FormControl({ value: depreciation.claimStartDate, disabled: !depreciation.chartAccounts?.isBuildingAtCost() }),
|
11
11
|
});
|
12
12
|
if (depreciation.id) {
|
13
|
-
this.get('claimPercent').setValue(depreciation.currentYearForecast.claimPercent);
|
13
|
+
// this.get('claimPercent').setValue(depreciation.currentYearForecast.claimPercent);
|
14
14
|
}
|
15
15
|
// forbid to change chartAccounts/claimPercent for existing depreciations
|
16
16
|
if (depreciation.id) {
|
@@ -45,4 +45,4 @@ export class DepreciationForm extends TransactionBaseForm {
|
|
45
45
|
return super.submit(data, true);
|
46
46
|
}
|
47
47
|
}
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcmVjaWF0aW9uLmZvcm0uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvZm9ybXMvZGVwcmVjaWF0aW9uL2RlcHJlY2lhdGlvbi5mb3JtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDekQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDckQsT0FBTyxFQUErQixhQUFhLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFMUUsTUFBTSxPQUFPLGdCQUFpQixTQUFRLG1CQUFpQztJQUNyRSxZQUFZLFlBQTBCLEVBQUUsZ0JBQXlCO1FBQy9ELEtBQUssQ0FBQyxZQUFZLEVBQUUsZ0JBQWdCLEVBQUU7WUFDcEMscUJBQXFCLEVBQUUsSUFBSSxXQUFXLENBQUMsSUFBSSxDQUFDO1lBQzVDLFlBQVksRUFBRSxJQUFJLFdBQVcsQ0FBQyxFQUFFLEtBQUssRUFBRSxZQUFZLENBQUMsWUFBWSxJQUFJLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLEVBQUUsVUFBVSxDQUFDLFFBQVEsQ0FBQztZQUM3RyxhQUFhLEVBQUUsSUFBSSxXQUFXLENBQUMsWUFBWSxDQUFDLGFBQWEsSUFBSSxJQUFJLGFBQWEsRUFBRSxDQUFDLElBQUksQ0FBQztZQUN0RixjQUFjLEVBQUUsSUFBSSxXQUFXLENBQUMsRUFBRSxLQUFLLEVBQUUsWUFBWSxDQUFDLGNBQWMsRUFBRSxRQUFRLEVBQUUsQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLGdCQUFnQixFQUFFLEVBQUUsQ0FBQztTQUNuSSxDQUFDLENBQUM7UUFFSCxJQUFJLFlBQVksQ0FBQyxFQUFFLEVBQUU7WUFDbkIsb0ZBQW9GO1NBQ3JGO1FBRUQseUVBQXlFO1FBQ3pFLElBQUksWUFBWSxDQUFDLEVBQUUsRUFBRTtZQUNuQixJQUFJLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1lBQ3hELElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7U0FDeEQ7UUFFRCwyQkFBMkI7UUFDM0IscUdBQXFHO1FBQ3JHLElBQUksWUFBWSxDQUFDLDBCQUEwQixFQUFFO1lBQzNDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQywwQkFBMEIsQ0FBQyxhQUFhLENBQUMsQ0FBQztZQUNqRixJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1NBQzVCO2FBQU07WUFDTCxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDOUM7UUFFRCxJQUFJLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDLFVBQW1CLEVBQUUsRUFBRTtZQUMvRSxJQUFJLFVBQVUsRUFBRTtnQkFDZCxJQUFJLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO2FBQ3BDO2lCQUFNO2dCQUNMLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7YUFDbkM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxrQkFBa0I7UUFDaEIsS0FBSyxDQUFDLGtCQUFrQixFQUFFLENBQUM7UUFDM0IsSUFBSSxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUMsYUFBNEIsRUFBRSxFQUFFO1lBQ2hGLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLGFBQWEsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUM7UUFDckYsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsTUFBTSxDQUFDLE9BQWUsRUFBRSxFQUFFLHFCQUFxQixHQUFHLEtBQUs7UUFDckQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNsQyxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBGb3JtQ29udHJvbCwgVmFsaWRhdG9ycyB9IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IFRyYW5zYWN0aW9uQmFzZUZvcm0gfSBmcm9tICcuLi90cmFuc2FjdGlvbic7XG5pbXBvcnQgeyBDaGFydEFjY291bnRzLCBEZXByZWNpYXRpb24sIEZpbmFuY2lhbFllYXIgfSBmcm9tICcuLi8uLi9tb2RlbHMnO1xuXG5leHBvcnQgY2xhc3MgRGVwcmVjaWF0aW9uRm9ybSBleHRlbmRzIFRyYW5zYWN0aW9uQmFzZUZvcm08RGVwcmVjaWF0aW9uPiB7XG4gIGNvbnN0cnVjdG9yKGRlcHJlY2lhdGlvbjogRGVwcmVjaWF0aW9uLCByZWdpc3RlcmVkRm9yR3N0OiBib29sZWFuKSB7XG4gICAgc3VwZXIoZGVwcmVjaWF0aW9uLCByZWdpc3RlcmVkRm9yR3N0LCB7XG4gICAgICBpc0Nsb3NlQmFsYW5jZUNvcnJlY3Q6IG5ldyBGb3JtQ29udHJvbCh0cnVlKSxcbiAgICAgIGNsb3NlQmFsYW5jZTogbmV3IEZvcm1Db250cm9sKHsgdmFsdWU6IGRlcHJlY2lhdGlvbi5jbG9zZUJhbGFuY2UgfHwgMCwgZGlzYWJsZWQ6IHRydWUgfSwgVmFsaWRhdG9ycy5yZXF1aXJlZCksXG4gICAgICBmaW5hbmNpYWxZZWFyOiBuZXcgRm9ybUNvbnRyb2woZGVwcmVjaWF0aW9uLmZpbmFuY2lhbFllYXIgfHwgbmV3IEZpbmFuY2lhbFllYXIoKS55ZWFyKSxcbiAgICAgIGNsYWltU3RhcnREYXRlOiBuZXcgRm9ybUNvbnRyb2woeyB2YWx1ZTogZGVwcmVjaWF0aW9uLmNsYWltU3RhcnREYXRlLCBkaXNhYmxlZDogIWRlcHJlY2lhdGlvbi5jaGFydEFjY291bnRzPy5pc0J1aWxkaW5nQXRDb3N0KCkgfSksXG4gICAgfSk7XG5cbiAgICBpZiAoZGVwcmVjaWF0aW9uLmlkKSB7XG4gICAgICAvLyB0aGlzLmdldCgnY2xhaW1QZXJjZW50Jykuc2V0VmFsdWUoZGVwcmVjaWF0aW9uLmN1cnJlbnRZZWFyRm9yZWNhc3QuY2xhaW1QZXJjZW50KTtcbiAgICB9XG5cbiAgICAvLyBmb3JiaWQgdG8gY2hhbmdlIGNoYXJ0QWNjb3VudHMvY2xhaW1QZXJjZW50IGZvciBleGlzdGluZyBkZXByZWNpYXRpb25zXG4gICAgaWYgKGRlcHJlY2lhdGlvbi5pZCkge1xuICAgICAgdGhpcy5nZXQoJ2NoYXJ0QWNjb3VudHMnKS5kaXNhYmxlKHsgZW1pdEV2ZW50OiBmYWxzZSB9KTtcbiAgICAgIHRoaXMuZ2V0KCdjbGFpbVBlcmNlbnQnKS5kaXNhYmxlKHsgZW1pdEV2ZW50OiBmYWxzZSB9KTtcbiAgICB9XG5cbiAgICAvLyBAVE9ETyBzaG91bGQgYmUgd2F0Y2hlZD9cbiAgICAvLyBpZiBkZXByZWNpYXRpb24gaGFzICdkZXByZWNpYXRpb25DYXBpdGFsUHJvamVjdCcgdmFsdWUgLSBzZXQgdmFsdWUgYW5kIGRpc2FibGUgJ2RhdGUnIGZvcm0gY29udHJvbFxuICAgIGlmIChkZXByZWNpYXRpb24uZGVwcmVjaWF0aW9uQ2FwaXRhbFByb2plY3QpIHtcbiAgICAgIHRoaXMuZ2V0KCdkYXRlJykuc2V0VmFsdWUoZGVwcmVjaWF0aW9uLmRlcHJlY2lhdGlvbkNhcGl0YWxQcm9qZWN0LmVmZmVjdGl2ZURhdGUpO1xuICAgICAgdGhpcy5nZXQoJ2RhdGUnKS5kaXNhYmxlKCk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuZ2V0KCdkYXRlJykuc2V0VmFsdWUoZGVwcmVjaWF0aW9uLmRhdGUpO1xuICAgIH1cblxuICAgIHRoaXMuZ2V0KCdpc0Nsb3NlQmFsYW5jZUNvcnJlY3QnKS52YWx1ZUNoYW5nZXMuc3Vic2NyaWJlKChpc1NlbGVjdGVkOiBib29sZWFuKSA9PiB7XG4gICAgICBpZiAoaXNTZWxlY3RlZCkge1xuICAgICAgICB0aGlzLmdldCgnY2xvc2VCYWxhbmNlJykuZGlzYWJsZSgpO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdGhpcy5nZXQoJ2Nsb3NlQmFsYW5jZScpLmVuYWJsZSgpO1xuICAgICAgfVxuICAgIH0pO1xuICB9XG5cbiAgd2F0Y2hDaGFydEFjY291bnRzKCk6IHZvaWQge1xuICAgIHN1cGVyLndhdGNoQ2hhcnRBY2NvdW50cygpO1xuICAgIHRoaXMuZ2V0KCdjaGFydEFjY291bnRzJykudmFsdWVDaGFuZ2VzLnN1YnNjcmliZSgoY2hhcnRBY2NvdW50czogQ2hhcnRBY2NvdW50cykgPT4ge1xuICAgICAgdGhpcy5zZXRFbmFibGVkU3RhdGUodGhpcy5nZXQoJ2NsYWltU3RhcnREYXRlJyksIGNoYXJ0QWNjb3VudHMuaXNCdWlsZGluZ0F0Q29zdCgpKTtcbiAgICB9KTtcbiAgfVxuXG4gIHN1Ym1pdChkYXRhOiBvYmplY3QgPSB7fSwgaW5jbHVkZURpc2FibGVkRmllbGRzID0gZmFsc2UpOiBEZXByZWNpYXRpb24ge1xuICAgIHJldHVybiBzdXBlci5zdWJtaXQoZGF0YSwgdHJ1ZSk7XG4gIH1cbn1cbiJdfQ==
|
@@ -7153,6 +7153,24 @@ class TransactionAllocationCollection extends Collection {
|
|
7153
7153
|
}
|
7154
7154
|
}
|
7155
7155
|
|
7156
|
+
/**
|
7157
|
+
* Collection of depreciations
|
7158
|
+
*/
|
7159
|
+
class DepreciationForecastCollection extends Collection {
|
7160
|
+
filterByYear(financialYear) {
|
7161
|
+
return new DepreciationForecastCollection(this.items.filter((forecast) => forecast.financialYear === financialYear));
|
7162
|
+
}
|
7163
|
+
getClaimAmountByMonth(month) {
|
7164
|
+
return this.items.reduce((sum, item) => sum + item.getClaimAmountByMonth(month), 0);
|
7165
|
+
}
|
7166
|
+
get amount() {
|
7167
|
+
return this.sumBy('amount');
|
7168
|
+
}
|
7169
|
+
get claimAmount() {
|
7170
|
+
return this.sumBy('claimAmount');
|
7171
|
+
}
|
7172
|
+
}
|
7173
|
+
|
7156
7174
|
class DepreciationCollection extends TransactionBaseCollection {
|
7157
7175
|
getSoleDepreciations() {
|
7158
7176
|
return this.filter((depreciation) => depreciation.isSoleTank());
|
@@ -7170,8 +7188,7 @@ class DepreciationCollection extends TransactionBaseCollection {
|
|
7170
7188
|
return this.sumBy('currentYearForecast.claimAmount');
|
7171
7189
|
}
|
7172
7190
|
getClaimedAmountByYear(year = +localStorage.getItem('financialYear')) {
|
7173
|
-
|
7174
|
-
return round(this.amount - closeBalance, 2);
|
7191
|
+
return this.getForecasts().filter(forecast => forecast.financialYear <= year).reduce((sum, forecast) => sum + forecast.claimAmount, 0);
|
7175
7192
|
}
|
7176
7193
|
getClaimAmountByYear(year = +localStorage.getItem('financialYear')) {
|
7177
7194
|
return this.items.reduce((sum, depreciation) => sum + depreciation.getClaimAmountByYear(year), 0);
|
@@ -7179,6 +7196,9 @@ class DepreciationCollection extends TransactionBaseCollection {
|
|
7179
7196
|
getCloseBalanceByYear(year = +localStorage.getItem('financialYear')) {
|
7180
7197
|
return this.items.reduce((sum, depreciation) => sum + depreciation.getCloseBalanceByYear(year), 0);
|
7181
7198
|
}
|
7199
|
+
getForecasts() {
|
7200
|
+
return new DepreciationForecastCollection(this.map(depreciation => depreciation.forecasts).flat());
|
7201
|
+
}
|
7182
7202
|
getCurrentYearForecastAmount() {
|
7183
7203
|
return this.sumBy('currentYearForecast.amount');
|
7184
7204
|
}
|
@@ -9313,24 +9333,6 @@ class ClientPortfolioReportCollection extends Collection {
|
|
9313
9333
|
}
|
9314
9334
|
}
|
9315
9335
|
|
9316
|
-
/**
|
9317
|
-
* Collection of depreciations
|
9318
|
-
*/
|
9319
|
-
class DepreciationForecastCollection extends Collection {
|
9320
|
-
filterByYear(financialYear) {
|
9321
|
-
return new DepreciationForecastCollection(this.items.filter((forecast) => forecast.financialYear === financialYear));
|
9322
|
-
}
|
9323
|
-
getClaimAmountByMonth(month) {
|
9324
|
-
return this.items.reduce((sum, item) => sum + item.getClaimAmountByMonth(month), 0);
|
9325
|
-
}
|
9326
|
-
get amount() {
|
9327
|
-
return this.sumBy('amount');
|
9328
|
-
}
|
9329
|
-
get claimAmount() {
|
9330
|
-
return this.sumBy('claimAmount');
|
9331
|
-
}
|
9332
|
-
}
|
9333
|
-
|
9334
9336
|
/**
|
9335
9337
|
* Collection of income sources
|
9336
9338
|
*/
|
@@ -24825,7 +24827,7 @@ class DepreciationForm extends TransactionBaseForm {
|
|
24825
24827
|
claimStartDate: new FormControl({ value: depreciation.claimStartDate, disabled: !depreciation.chartAccounts?.isBuildingAtCost() }),
|
24826
24828
|
});
|
24827
24829
|
if (depreciation.id) {
|
24828
|
-
this.get('claimPercent').setValue(depreciation.currentYearForecast.claimPercent);
|
24830
|
+
// this.get('claimPercent').setValue(depreciation.currentYearForecast.claimPercent);
|
24829
24831
|
}
|
24830
24832
|
// forbid to change chartAccounts/claimPercent for existing depreciations
|
24831
24833
|
if (depreciation.id) {
|