taxtank-core 0.32.4 → 0.32.6
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/collections/vehicle/best-vehicle-logbook.collection.mjs +12 -13
- package/esm2022/lib/collections/vehicle/vehicle-logbook.collection.mjs +2 -2
- package/esm2022/lib/services/http/vehicle/vehicle-claim.service.mjs +10 -10
- package/fesm2022/taxtank-core.mjs +18 -22
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/services/http/vehicle/vehicle-claim.service.d.ts +5 -6
- package/package.json +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FinancialYear } from '../../models';
|
|
1
2
|
import { VehicleLogbookCollection } from './vehicle-logbook.collection';
|
|
2
3
|
import { DateRange } from 'moment-range';
|
|
3
4
|
/**
|
|
@@ -27,7 +28,7 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
27
28
|
if (!(logbooks instanceof VehicleLogbookCollection)) {
|
|
28
29
|
logbooks = new VehicleLogbookCollection(logbooks);
|
|
29
30
|
}
|
|
30
|
-
return
|
|
31
|
+
return this.periodDuration <= (logbooks.last.date.getTime() - logbooks.first.date.getTime());
|
|
31
32
|
}
|
|
32
33
|
// get list of date ranges for each of passed logbook
|
|
33
34
|
static getPeriods(logbooks) {
|
|
@@ -35,14 +36,12 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
35
36
|
// get a list of date ranges that could potentially be the best
|
|
36
37
|
const periods = claimable
|
|
37
38
|
// skip logbooks whose range ends after the last logbook
|
|
38
|
-
.filter((logbook) =>
|
|
39
|
-
.map((logbook) =>
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
periods.push(BestVehicleLogbookCollection.getPeriodByLogbook(claimable.last, true));
|
|
45
|
-
// }
|
|
39
|
+
.filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
|
|
40
|
+
.map((logbook) => this.getPeriodByLogbook(logbook));
|
|
41
|
+
const last = this.getPeriodByLogbook(claimable.last, true);
|
|
42
|
+
if (FinancialYear.toFinYear(last.start.toDate()) === FinancialYear.year) {
|
|
43
|
+
periods.push(last);
|
|
44
|
+
}
|
|
46
45
|
return periods;
|
|
47
46
|
}
|
|
48
47
|
/**
|
|
@@ -52,9 +51,9 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
52
51
|
*/
|
|
53
52
|
static getPeriodByLogbook(logbook, isBackward = false) {
|
|
54
53
|
if (isBackward) {
|
|
55
|
-
return new DateRange([new Date(logbook.date.getTime() -
|
|
54
|
+
return new DateRange([new Date(logbook.date.getTime() - this.periodDuration), logbook.date]);
|
|
56
55
|
}
|
|
57
|
-
return new DateRange([logbook.date, new Date(logbook.date.getTime() +
|
|
56
|
+
return new DateRange([logbook.date, new Date(logbook.date.getTime() + this.periodDuration)]);
|
|
58
57
|
}
|
|
59
58
|
/**
|
|
60
59
|
* Set Date Range with the biggest work usage percent
|
|
@@ -80,7 +79,7 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
80
79
|
});
|
|
81
80
|
}
|
|
82
81
|
static fromLogbooks(logbooks) {
|
|
83
|
-
if (!
|
|
82
|
+
if (!this.isBestPeriodExist(logbooks)) {
|
|
84
83
|
return null;
|
|
85
84
|
}
|
|
86
85
|
const collection = new BestVehicleLogbookCollection(logbooks.toArray());
|
|
@@ -88,4 +87,4 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
88
87
|
return collection;
|
|
89
88
|
}
|
|
90
89
|
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"best-vehicle-logbook.collection.js","sourceRoot":"","sources":["../../../../../../projects/tt-core/src/lib/collections/vehicle/best-vehicle-logbook.collection.ts"],"names":[],"mappings":"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","sourcesContent":["import { FinancialYear, VehicleLogbook } from '../../models';\nimport { VehicleLogbookCollection } from './vehicle-logbook.collection';\nimport { DateRange } from 'moment-range';\n\n/**\n * Special logbook collection that contains logbooks from date period with the highest work usage percent\n * Docs: https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle\n */\nexport class BestVehicleLogbookCollection extends VehicleLogbookCollection {\n  /**\n   * Logbook claimable period duration in milliseconds.\n   * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle\n   */\n  static periodDuration = 12 * 7 * 24 * 3600 * 1000;\n\n  /**\n   * Date range with the biggest work usage percent\n   */\n  period: DateRange;\n\n  /**\n   * constructor is private because we want to prevent collection initialization via 'new' operator.\n   * We should create instances only with fromLogbooks method\n   */\n  private constructor(logbooks: VehicleLogbook[]) {\n    super(logbooks);\n  }\n\n  /**\n   * Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks\n   */\n  static isBestPeriodExist(logbooks: VehicleLogbookCollection): boolean {\n    if (logbooks.length < 2) {\n      return false;\n    }\n\n    if (!(logbooks instanceof VehicleLogbookCollection)) {\n      logbooks = new VehicleLogbookCollection(logbooks);\n    }\n\n    return this.periodDuration <= (logbooks.last.date.getTime() - logbooks.first.date.getTime());\n  }\n\n  // get list of date ranges for each of passed logbook\n  static getPeriods(logbooks: VehicleLogbookCollection): DateRange[] {\n    const claimable = logbooks.getClaimable();\n    // get a list of date ranges that could potentially be the best\n    const periods: DateRange[] = claimable\n      // skip logbooks whose range ends after the last logbook\n      .filter((logbook: VehicleLogbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)\n      .map((logbook: VehicleLogbook) => this.getPeriodByLogbook(logbook));\n\n    const last = this.getPeriodByLogbook(claimable.last, true);\n    if (FinancialYear.toFinYear(last.start.toDate()) === FinancialYear.year) {\n      periods.push(last);\n    }\n\n    return periods;\n  }\n\n  /**\n   * Get claimable date range for passed logbook\n   * @param logbook logbook instance for range calculation\n   * @param isBackward Flag false - range for logbook + duration; flag true - range for logbook - duration. Used for extra case, when we should add an extra date range for the last logbook\n   */\n  static getPeriodByLogbook(logbook: VehicleLogbook, isBackward = false): DateRange {\n    if (isBackward) {\n      return new DateRange([new Date(logbook.date.getTime() - this.periodDuration), logbook.date]);\n    }\n\n    return new DateRange([logbook.date, new Date(logbook.date.getTime() + this.periodDuration)]);\n  }\n\n  /**\n   * Set Date Range with the biggest work usage percent\n   * Range duration is defined as BestVehicleLogbookCollection.periodDuration by the ATO\n   *\n   * Algorithm:\n   * Claimable logbooks or claimable trips - work/business logbook items.\n   * We should work with dates from the first to the last trip (include personal trips).\n   * Get date ranges starts on each claimable trip, all other ranges are definetily worst.\n   * Also get extra date range which ends with the last claimable trip.\n   * Get all trips included to each date range.\n   * Find and return range with the biggest workUsage percent.\n   */\n  private calculateBestPeriod(logbooks: VehicleLogbookCollection): void {\n    // get a list of date ranges that could potentially be the best\n    const periods: DateRange[] = BestVehicleLogbookCollection.getPeriods(logbooks);\n\n    periods.forEach((period: DateRange) => {\n      const logbooksInPeriod: VehicleLogbookCollection = logbooks.filterByRange('date', period.start.toDate(), period.end.toDate());\n\n      if (!this.period || (this.getWorkUsage() < logbooksInPeriod.getWorkUsage())) {\n        this.period = period;\n        this.items = logbooksInPeriod.toArray();\n      }\n    });\n  }\n\n  static fromLogbooks(logbooks: VehicleLogbookCollection): BestVehicleLogbookCollection | null {\n    if (!this.isBestPeriodExist(logbooks)) {\n      return null;\n    }\n\n    const collection = new BestVehicleLogbookCollection(logbooks.toArray());\n    collection.calculateBestPeriod(logbooks);\n\n    return collection;\n  }\n}\n"]}
|
|
@@ -9,7 +9,7 @@ export class VehicleLogbookCollection extends Collection {
|
|
|
9
9
|
return this.sumBy('kilometers');
|
|
10
10
|
}
|
|
11
11
|
getWorkUsage(vehicleClaim) {
|
|
12
|
-
return this.getClaimable(vehicleClaim).kilometers / this.kilometers * 100;
|
|
12
|
+
return +(this.getClaimable(vehicleClaim).kilometers / this.kilometers * 100).toFixed(10);
|
|
13
13
|
}
|
|
14
14
|
getClaimable(vehicleClaim) {
|
|
15
15
|
if (!vehicleClaim) {
|
|
@@ -28,4 +28,4 @@ export class VehicleLogbookCollection extends Collection {
|
|
|
28
28
|
return BestVehicleLogbookCollection.fromLogbooks(this);
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1sb2dib29rLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvdmVoaWNsZS92ZWhpY2xlLWxvZ2Jvb2suY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM3RCxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVqRixNQUFNLE9BQU8sd0JBQXlCLFNBQVEsVUFBMEI7SUFDdEU7O09BRUc7SUFDSCxJQUFJLFVBQVU7UUFDWixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUVELFlBQVksQ0FBQyxZQUEyQjtRQUN0QyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxHQUFHLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUMzRixDQUFDO0lBRUQsWUFBWSxDQUFDLFlBQTJCO1FBQ3RDLElBQUksQ0FBQyxZQUFZLEVBQUU7WUFDakIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBdUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7U0FDdEU7UUFFRCxPQUFPLFlBQVksQ0FBQyxVQUFVLEVBQUU7WUFDOUIsa0ZBQWtGO1lBQ2xGLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxZQUFZLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUN4RCwrRUFBK0U7WUFDL0UsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxPQUFPO1FBQ0wsT0FBTyw0QkFBNEIsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDekQsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29sbGVjdGlvbiB9IGZyb20gJy4uL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgVmVoaWNsZUNsYWltLCBWZWhpY2xlTG9nYm9vayB9IGZyb20gJy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBUYW5rVHlwZUVudW0gfSBmcm9tICcuLi8uLi9kYi9FbnVtcy90YW5rLXR5cGUuZW51bSc7XG5pbXBvcnQgeyBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uIH0gZnJvbSAnLi9iZXN0LXZlaGljbGUtbG9nYm9vay5jb2xsZWN0aW9uJztcblxuZXhwb3J0IGNsYXNzIFZlaGljbGVMb2dib29rQ29sbGVjdGlvbiBleHRlbmRzIENvbGxlY3Rpb248VmVoaWNsZUxvZ2Jvb2s+IHtcbiAgLyoqXG4gICAqIENhbGN1bGF0ZSB0b3RhbCBraWxvbWV0ZXJzIHRyYXZlbGVkXG4gICAqL1xuICBnZXQga2lsb21ldGVycygpOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLnN1bUJ5KCdraWxvbWV0ZXJzJyk7XG4gIH1cblxuICBnZXRXb3JrVXNhZ2UodmVoaWNsZUNsYWltPzogVmVoaWNsZUNsYWltKTogbnVtYmVyIHtcbiAgICByZXR1cm4gKyh0aGlzLmdldENsYWltYWJsZSh2ZWhpY2xlQ2xhaW0pLmtpbG9tZXRlcnMgLyB0aGlzLmtpbG9tZXRlcnMgKiAxMDApLnRvRml4ZWQoMTApO1xuICB9XG5cbiAgZ2V0Q2xhaW1hYmxlKHZlaGljbGVDbGFpbT86IFZlaGljbGVDbGFpbSk6IHRoaXMge1xuICAgIGlmICghdmVoaWNsZUNsYWltKSB7XG4gICAgICByZXR1cm4gdGhpcy5maWx0ZXIoKGxvZ2Jvb2s6IFZlaGljbGVMb2dib29rKSA9PiAhbG9nYm9vay5pc1BlcnNvbmFsKTtcbiAgICB9XG5cbiAgICByZXR1cm4gdmVoaWNsZUNsYWltLmlzU29sZVRhbmsoKVxuICAgICAgLy8gc29sZSB0YW5rIG1heSBoYXZlIG11bHRpcGxlIHZlaGljbGUgY2xhaW1zLCBzbyB3ZSBuZWVkIHRvIGZpbHRlciBieSBidXNpbmVzcy5pZFxuICAgICAgPyB0aGlzLmZpbHRlckJ5KCdidXNpbmVzcy5pZCcsIHZlaGljbGVDbGFpbS5idXNpbmVzcy5pZClcbiAgICAgIC8vIHdvcmsgdGFuayBtYXkgaGF2ZSBvbmx5IG9uZSB2ZWhpY2xlIGNsYWltLCBzbyB3ZSBuZWVkIHRvIGZpbHRlciBieSB0YW5rIHR5cGVcbiAgICAgIDogdGhpcy5maWx0ZXJCeSgndGFua1R5cGUnLCBUYW5rVHlwZUVudW0uV09SSyk7XG4gIH1cblxuICAvKipcbiAgICogZ2V0IGNvbGxlY3Rpb24gb2YgbG9nYm9va3Mgd2l0aCB0aGUgYmlnZ2VzdCB3b3JrIHVzYWdlIGZvciB7QGxpbmsgQmVzdFZlaGljbGVMb2dib29rQ29sbGVjdGlvbi5wZXJpb2REdXJhdGlvbn1cbiAgICovXG4gIGdldEJlc3QoKTogQmVzdFZlaGljbGVMb2dib29rQ29sbGVjdGlvbiB8IG51bGwge1xuICAgIHJldHVybiBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uLmZyb21Mb2dib29rcyh0aGlzKTtcbiAgfVxufVxuIl19
|
|
@@ -2,8 +2,10 @@ import { 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';
|
|
5
|
+
import { combineLatest } from 'rxjs';
|
|
5
6
|
import { map } from 'rxjs/operators';
|
|
6
7
|
import { AppEvent } from '../../../models';
|
|
8
|
+
import { plainToClass } from 'class-transformer';
|
|
7
9
|
import { UserRolesEnum } from '../../../db/Enums/user-roles.enum';
|
|
8
10
|
import * as i0 from "@angular/core";
|
|
9
11
|
export class VehicleClaimService extends RestService {
|
|
@@ -13,9 +15,6 @@ export class VehicleClaimService extends RestService {
|
|
|
13
15
|
this.url = 'vehicle-claims';
|
|
14
16
|
this.roles = [UserRolesEnum.WORK_TANK, UserRolesEnum.SOLE_TANK];
|
|
15
17
|
}
|
|
16
|
-
listenEvents() {
|
|
17
|
-
this.listenVehicleClaimDetailsChanges();
|
|
18
|
-
}
|
|
19
18
|
add(model) {
|
|
20
19
|
return super.add(model).pipe(map((vehicleClaim) => {
|
|
21
20
|
this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_CREATED, vehicleClaim));
|
|
@@ -29,14 +28,15 @@ export class VehicleClaimService extends RestService {
|
|
|
29
28
|
}));
|
|
30
29
|
}
|
|
31
30
|
/**
|
|
32
|
-
*
|
|
33
|
-
*
|
|
31
|
+
* Update workUsage for all vehicle claims if logbook best period changed
|
|
32
|
+
* @TODO Vik: Best period move this and related logic to backend
|
|
34
33
|
*/
|
|
35
|
-
|
|
36
|
-
this.
|
|
37
|
-
.
|
|
38
|
-
this.
|
|
34
|
+
updateWorkUsage(bestLogbooks) {
|
|
35
|
+
const batch$ = (this.cache ?? []).map((claim) => {
|
|
36
|
+
const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestLogbooks.getWorkUsage(claim) }));
|
|
37
|
+
return this.update(claimToUpdate);
|
|
39
38
|
});
|
|
39
|
+
return combineLatest(batch$);
|
|
40
40
|
}
|
|
41
41
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
42
42
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
|
|
@@ -47,4 +47,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
47
47
|
providedIn: 'root'
|
|
48
48
|
}]
|
|
49
49
|
}] });
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1jbGFpbS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvdmVoaWNsZS92ZWhpY2xlLWNsYWltLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRW5ELE9BQU8sRUFBYyxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDakQsT0FBTyxFQUFFLEdBQUcsRUFBUSxNQUFNLGdCQUFnQixDQUFDO0FBQzNDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDakQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDOztBQU1sRSxNQUFNLE9BQU8sbUJBQW9CLFNBQVEsV0FBMkM7SUFIcEY7O1FBSUUsZUFBVSxHQUF3QixZQUFZLENBQUM7UUFDL0MsUUFBRyxHQUFHLGdCQUFnQixDQUFDO1FBQ3ZCLFVBQUssR0FBRyxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0tBc0M1RDtJQXBDQyxHQUFHLENBQUMsS0FBbUI7UUFDckIsT0FBTyxLQUFLLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FDMUIsR0FBRyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsZ0JBQWdCLENBQUMscUJBQXFCLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUV6RyxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxLQUFtQixFQUFFLGNBQXNCLEVBQUU7UUFDbEQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQzFDLEdBQUcsQ0FBQyxDQUFDLFlBQTBCLEVBQUUsRUFBRTtZQUNqQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLElBQUksUUFBUSxDQUFDLGdCQUFnQixDQUFDLHFCQUFxQixFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7WUFFekcsT0FBTyxZQUFZLENBQUM7UUFDdEIsQ0FBQyxDQUFDLENBQ0gsQ0FBQztJQUNKLENBQUM7SUFFRDs7O09BR0c7SUFDSCxlQUFlLENBQUMsWUFBMEM7UUFDeEQsTUFBTSxNQUFNLEdBQStCLENBQUMsSUFBSSxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFtQixFQUFFLEVBQUU7WUFDeEYsTUFBTSxhQUFhLEdBQWlCLFlBQVksQ0FDOUMsWUFBWSxFQUNaLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLEtBQUssRUFBRSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FDMUUsQ0FBQztZQUVGLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQyxDQUFDLENBQUMsQ0FBQTtRQUVGLE9BQU8sYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQy9CLENBQUM7K0dBeENVLG1CQUFtQjttSEFBbkIsbUJBQW1CLGNBRmxCLE1BQU07OzRGQUVQLG1CQUFtQjtrQkFIL0IsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBWZWhpY2xlQ2xhaW0gYXMgVmVoaWNsZUNsYWltQmFzZSB9IGZyb20gJy4uLy4uLy4uL2RiL01vZGVscy92ZWhpY2xlL3ZlaGljbGUtY2xhaW0nO1xuaW1wb3J0IHsgVmVoaWNsZUNsYWltIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFJlc3RTZXJ2aWNlIH0gZnJvbSAnLi4vcmVzdC9yZXN0LW9sZC5zZXJ2aWNlJztcbmltcG9ydCB7IEFwcEV2ZW50VHlwZUVudW0gfSBmcm9tICcuLi8uLi8uLi9tb2RlbHMnO1xuaW1wb3J0IHsgSUV2ZW50TGlzdGVuZXIgfSBmcm9tICcuLi8uLi8uLi9pbnRlcmZhY2VzJztcbmltcG9ydCB7IE9ic2VydmFibGUsIGNvbWJpbmVMYXRlc3QgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IG1hcCwgdGFrZSB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEFwcEV2ZW50IH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IFVzZXJSb2xlc0VudW0gfSBmcm9tICcuLi8uLi8uLi9kYi9FbnVtcy91c2VyLXJvbGVzLmVudW0nO1xuaW1wb3J0IHsgQmVzdFZlaGljbGVMb2dib29rQ29sbGVjdGlvbiB9IGZyb20gJy4uLy4uLy4uL2NvbGxlY3Rpb25zJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgVmVoaWNsZUNsYWltU2VydmljZSBleHRlbmRzIFJlc3RTZXJ2aWNlPFZlaGljbGVDbGFpbUJhc2UsIFZlaGljbGVDbGFpbT4ge1xuICBtb2RlbENsYXNzOiB0eXBlb2YgVmVoaWNsZUNsYWltID0gVmVoaWNsZUNsYWltO1xuICB1cmwgPSAndmVoaWNsZS1jbGFpbXMnO1xuICByb2xlcyA9IFtVc2VyUm9sZXNFbnVtLldPUktfVEFOSywgVXNlclJvbGVzRW51bS5TT0xFX1RBTktdO1xuXG4gIGFkZChtb2RlbDogVmVoaWNsZUNsYWltKTogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW0+IHtcbiAgICByZXR1cm4gc3VwZXIuYWRkKG1vZGVsKS5waXBlKFxuICAgICAgbWFwKCh2ZWhpY2xlQ2xhaW06IFZlaGljbGVDbGFpbSkgPT4ge1xuICAgICAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2UuZGlzcGF0Y2gobmV3IEFwcEV2ZW50KEFwcEV2ZW50VHlwZUVudW0uVkVISUNMRV9DTEFJTV9DUkVBVEVELCB2ZWhpY2xlQ2xhaW0pKTtcblxuICAgICAgICByZXR1cm4gdmVoaWNsZUNsYWltO1xuICAgICAgfSlcbiAgICApO1xuICB9XG5cbiAgdXBkYXRlKG1vZGVsOiBWZWhpY2xlQ2xhaW0sIHF1ZXJ5UGFyYW1zOiBvYmplY3QgPSB7fSk6IE9ic2VydmFibGU8VmVoaWNsZUNsYWltPiB7XG4gICAgcmV0dXJuIHN1cGVyLnVwZGF0ZShtb2RlbCwgcXVlcnlQYXJhbXMpLnBpcGUoXG4gICAgICBtYXAoKHZlaGljbGVDbGFpbTogVmVoaWNsZUNsYWltKSA9PiB7XG4gICAgICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5kaXNwYXRjaChuZXcgQXBwRXZlbnQoQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX1VQREFURUQsIHZlaGljbGVDbGFpbSkpO1xuXG4gICAgICAgIHJldHVybiB2ZWhpY2xlQ2xhaW07XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICAvKipcbiAgICogVXBkYXRlIHdvcmtVc2FnZSBmb3IgYWxsIHZlaGljbGUgY2xhaW1zIGlmIGxvZ2Jvb2sgYmVzdCBwZXJpb2QgY2hhbmdlZFxuICAgKiBAVE9ETyBWaWs6IEJlc3QgcGVyaW9kIG1vdmUgdGhpcyBhbmQgcmVsYXRlZCBsb2dpYyB0byBiYWNrZW5kXG4gICAqL1xuICB1cGRhdGVXb3JrVXNhZ2UoYmVzdExvZ2Jvb2tzOiBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uKTogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW1bXT4ge1xuICAgIGNvbnN0IGJhdGNoJDogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW0+W10gPSAodGhpcy5jYWNoZSA/PyBbXSkubWFwKChjbGFpbTogVmVoaWNsZUNsYWltKSA9PiB7XG4gICAgICBjb25zdCBjbGFpbVRvVXBkYXRlOiBWZWhpY2xlQ2xhaW0gPSBwbGFpblRvQ2xhc3MoXG4gICAgICAgIFZlaGljbGVDbGFpbSxcbiAgICAgICAgT2JqZWN0LmFzc2lnbih7fSwgY2xhaW0sIHsgd29ya1VzYWdlOiBiZXN0TG9nYm9va3MuZ2V0V29ya1VzYWdlKGNsYWltKSB9KVxuICAgICAgKTtcblxuICAgICAgcmV0dXJuIHRoaXMudXBkYXRlKGNsYWltVG9VcGRhdGUpO1xuICAgIH0pXG5cbiAgICByZXR1cm4gY29tYmluZUxhdGVzdChiYXRjaCQpO1xuICB9XG59XG4iXX0=
|
|
@@ -8502,7 +8502,7 @@ class VehicleLogbookCollection extends Collection {
|
|
|
8502
8502
|
return this.sumBy('kilometers');
|
|
8503
8503
|
}
|
|
8504
8504
|
getWorkUsage(vehicleClaim) {
|
|
8505
|
-
return this.getClaimable(vehicleClaim).kilometers / this.kilometers * 100;
|
|
8505
|
+
return +(this.getClaimable(vehicleClaim).kilometers / this.kilometers * 100).toFixed(10);
|
|
8506
8506
|
}
|
|
8507
8507
|
getClaimable(vehicleClaim) {
|
|
8508
8508
|
if (!vehicleClaim) {
|
|
@@ -8549,7 +8549,7 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8549
8549
|
if (!(logbooks instanceof VehicleLogbookCollection)) {
|
|
8550
8550
|
logbooks = new VehicleLogbookCollection(logbooks);
|
|
8551
8551
|
}
|
|
8552
|
-
return
|
|
8552
|
+
return this.periodDuration <= (logbooks.last.date.getTime() - logbooks.first.date.getTime());
|
|
8553
8553
|
}
|
|
8554
8554
|
// get list of date ranges for each of passed logbook
|
|
8555
8555
|
static getPeriods(logbooks) {
|
|
@@ -8557,14 +8557,12 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8557
8557
|
// get a list of date ranges that could potentially be the best
|
|
8558
8558
|
const periods = claimable
|
|
8559
8559
|
// skip logbooks whose range ends after the last logbook
|
|
8560
|
-
.filter((logbook) =>
|
|
8561
|
-
.map((logbook) =>
|
|
8562
|
-
|
|
8563
|
-
|
|
8564
|
-
|
|
8565
|
-
|
|
8566
|
-
periods.push(BestVehicleLogbookCollection.getPeriodByLogbook(claimable.last, true));
|
|
8567
|
-
// }
|
|
8560
|
+
.filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
|
|
8561
|
+
.map((logbook) => this.getPeriodByLogbook(logbook));
|
|
8562
|
+
const last = this.getPeriodByLogbook(claimable.last, true);
|
|
8563
|
+
if (FinancialYear.toFinYear(last.start.toDate()) === FinancialYear.year) {
|
|
8564
|
+
periods.push(last);
|
|
8565
|
+
}
|
|
8568
8566
|
return periods;
|
|
8569
8567
|
}
|
|
8570
8568
|
/**
|
|
@@ -8574,9 +8572,9 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8574
8572
|
*/
|
|
8575
8573
|
static getPeriodByLogbook(logbook, isBackward = false) {
|
|
8576
8574
|
if (isBackward) {
|
|
8577
|
-
return new DateRange([new Date(logbook.date.getTime() -
|
|
8575
|
+
return new DateRange([new Date(logbook.date.getTime() - this.periodDuration), logbook.date]);
|
|
8578
8576
|
}
|
|
8579
|
-
return new DateRange([logbook.date, new Date(logbook.date.getTime() +
|
|
8577
|
+
return new DateRange([logbook.date, new Date(logbook.date.getTime() + this.periodDuration)]);
|
|
8580
8578
|
}
|
|
8581
8579
|
/**
|
|
8582
8580
|
* Set Date Range with the biggest work usage percent
|
|
@@ -8602,7 +8600,7 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8602
8600
|
});
|
|
8603
8601
|
}
|
|
8604
8602
|
static fromLogbooks(logbooks) {
|
|
8605
|
-
if (!
|
|
8603
|
+
if (!this.isBestPeriodExist(logbooks)) {
|
|
8606
8604
|
return null;
|
|
8607
8605
|
}
|
|
8608
8606
|
const collection = new BestVehicleLogbookCollection(logbooks.toArray());
|
|
@@ -15236,9 +15234,6 @@ class VehicleClaimService extends RestService {
|
|
|
15236
15234
|
this.url = 'vehicle-claims';
|
|
15237
15235
|
this.roles = [UserRolesEnum.WORK_TANK, UserRolesEnum.SOLE_TANK];
|
|
15238
15236
|
}
|
|
15239
|
-
listenEvents() {
|
|
15240
|
-
this.listenVehicleClaimDetailsChanges();
|
|
15241
|
-
}
|
|
15242
15237
|
add(model) {
|
|
15243
15238
|
return super.add(model).pipe(map((vehicleClaim) => {
|
|
15244
15239
|
this.eventDispatcherService.dispatch(new AppEvent(AppEventTypeEnum.VEHICLE_CLAIM_CREATED, vehicleClaim));
|
|
@@ -15252,14 +15247,15 @@ class VehicleClaimService extends RestService {
|
|
|
15252
15247
|
}));
|
|
15253
15248
|
}
|
|
15254
15249
|
/**
|
|
15255
|
-
*
|
|
15256
|
-
*
|
|
15250
|
+
* Update workUsage for all vehicle claims if logbook best period changed
|
|
15251
|
+
* @TODO Vik: Best period move this and related logic to backend
|
|
15257
15252
|
*/
|
|
15258
|
-
|
|
15259
|
-
this.
|
|
15260
|
-
.
|
|
15261
|
-
this.
|
|
15253
|
+
updateWorkUsage(bestLogbooks) {
|
|
15254
|
+
const batch$ = (this.cache ?? []).map((claim) => {
|
|
15255
|
+
const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestLogbooks.getWorkUsage(claim) }));
|
|
15256
|
+
return this.update(claimToUpdate);
|
|
15262
15257
|
});
|
|
15258
|
+
return combineLatest(batch$);
|
|
15263
15259
|
}
|
|
15264
15260
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
15265
15261
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
|