taxtank-core 0.32.2 → 0.32.4
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 +38 -43
- package/esm2022/lib/collections/vehicle/vehicle-logbook.collection.mjs +9 -32
- package/esm2022/lib/models/financial-year/financial-year.mjs +4 -2
- package/esm2022/lib/models/vehicle/vehicle-logbook.mjs +9 -8
- package/esm2022/lib/services/http/vehicle/vehicle-claim.service.mjs +1 -20
- package/fesm2022/taxtank-core.mjs +56 -96
- package/fesm2022/taxtank-core.mjs.map +1 -1
- package/lib/collections/vehicle/best-vehicle-logbook.collection.d.ts +10 -12
- package/lib/collections/vehicle/vehicle-logbook.collection.d.ts +3 -16
- package/lib/models/financial-year/financial-year.d.ts +1 -1
- package/lib/models/vehicle/vehicle-logbook.d.ts +0 -2
- package/lib/services/http/vehicle/vehicle-claim.service.d.ts +0 -5
- package/package.json +1 -1
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { VehicleLogbookCollection } from './vehicle-logbook.collection';
|
|
2
2
|
import { DateRange } from 'moment-range';
|
|
3
|
-
import round from 'lodash/round';
|
|
4
3
|
/**
|
|
5
4
|
* Special logbook collection that contains logbooks from date period with the highest work usage percent
|
|
6
5
|
* Docs: https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
|
|
@@ -15,18 +14,13 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
15
14
|
* constructor is private because we want to prevent collection initialization via 'new' operator.
|
|
16
15
|
* We should create instances only with fromLogbooks method
|
|
17
16
|
*/
|
|
18
|
-
constructor(logbooks
|
|
19
|
-
super(
|
|
20
|
-
this.isSole = isSole;
|
|
21
|
-
if (!this.isBestPeriodExist(logbooks)) {
|
|
22
|
-
return;
|
|
23
|
-
}
|
|
24
|
-
this.calculateBestPeriod(logbooks);
|
|
17
|
+
constructor(logbooks) {
|
|
18
|
+
super(logbooks);
|
|
25
19
|
}
|
|
26
20
|
/**
|
|
27
21
|
* Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks
|
|
28
22
|
*/
|
|
29
|
-
isBestPeriodExist(logbooks
|
|
23
|
+
static isBestPeriodExist(logbooks) {
|
|
30
24
|
if (logbooks.length < 2) {
|
|
31
25
|
return false;
|
|
32
26
|
}
|
|
@@ -35,9 +29,32 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
35
29
|
}
|
|
36
30
|
return BestVehicleLogbookCollection.periodDuration < (logbooks.last.date.getTime() - logbooks.first.date.getTime());
|
|
37
31
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
32
|
+
// get list of date ranges for each of passed logbook
|
|
33
|
+
static getPeriods(logbooks) {
|
|
34
|
+
const claimable = logbooks.getClaimable();
|
|
35
|
+
// get a list of date ranges that could potentially be the best
|
|
36
|
+
const periods = claimable
|
|
37
|
+
// skip logbooks whose range ends after the last logbook
|
|
38
|
+
.filter((logbook) => BestVehicleLogbookCollection.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
|
|
39
|
+
.map((logbook) => BestVehicleLogbookCollection.getPeriodByLogbook(logbook));
|
|
40
|
+
// skip if the last logbook already included to the last existing date range
|
|
41
|
+
// if (last(periods).end.toDate() < logbooks.last.date) {
|
|
42
|
+
// add extra date range for the last claimable logbook
|
|
43
|
+
// @TODO vik
|
|
44
|
+
periods.push(BestVehicleLogbookCollection.getPeriodByLogbook(claimable.last, true));
|
|
45
|
+
// }
|
|
46
|
+
return periods;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Get claimable date range for passed logbook
|
|
50
|
+
* @param logbook logbook instance for range calculation
|
|
51
|
+
* @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
|
|
52
|
+
*/
|
|
53
|
+
static getPeriodByLogbook(logbook, isBackward = false) {
|
|
54
|
+
if (isBackward) {
|
|
55
|
+
return new DateRange([new Date(logbook.date.getTime() - BestVehicleLogbookCollection.periodDuration), logbook.date]);
|
|
56
|
+
}
|
|
57
|
+
return new DateRange([logbook.date, new Date(logbook.date.getTime() + BestVehicleLogbookCollection.periodDuration)]);
|
|
41
58
|
}
|
|
42
59
|
/**
|
|
43
60
|
* Set Date Range with the biggest work usage percent
|
|
@@ -53,44 +70,22 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
53
70
|
*/
|
|
54
71
|
calculateBestPeriod(logbooks) {
|
|
55
72
|
// get a list of date ranges that could potentially be the best
|
|
56
|
-
const periods =
|
|
73
|
+
const periods = BestVehicleLogbookCollection.getPeriods(logbooks);
|
|
57
74
|
periods.forEach((period) => {
|
|
58
75
|
const logbooksInPeriod = logbooks.filterByRange('date', period.start.toDate(), period.end.toDate());
|
|
59
|
-
if (!this.period || (this.
|
|
76
|
+
if (!this.period || (this.getWorkUsage() < logbooksInPeriod.getWorkUsage())) {
|
|
60
77
|
this.period = period;
|
|
61
78
|
this.items = logbooksInPeriod.toArray();
|
|
62
79
|
}
|
|
63
80
|
});
|
|
64
81
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
// get a list of date ranges that could potentially be the best
|
|
69
|
-
const periods = claimable
|
|
70
|
-
// skip logbooks whose range ends after the last logbook
|
|
71
|
-
.filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
|
|
72
|
-
.map((logbook) => this.getPeriodByLogbook(logbook));
|
|
73
|
-
// skip if the last logbook already included to the last existing date range
|
|
74
|
-
// if (last(periods).end.toDate() < logbooks.last.date) {
|
|
75
|
-
// add extra date range for the last claimable logbook
|
|
76
|
-
periods.push(this.getPeriodByLogbook(claimable.last, true));
|
|
77
|
-
// }
|
|
78
|
-
return periods;
|
|
79
|
-
}
|
|
80
|
-
/**
|
|
81
|
-
* Get claimable date range for passed logbook
|
|
82
|
-
* @param logbook logbook instance for range calculation
|
|
83
|
-
* @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
|
|
84
|
-
*/
|
|
85
|
-
getPeriodByLogbook(logbook, isBackward = false) {
|
|
86
|
-
if (isBackward) {
|
|
87
|
-
return new DateRange([new Date(logbook.date.getTime() - BestVehicleLogbookCollection.periodDuration), logbook.date]);
|
|
82
|
+
static fromLogbooks(logbooks) {
|
|
83
|
+
if (!BestVehicleLogbookCollection.isBestPeriodExist(logbooks)) {
|
|
84
|
+
return null;
|
|
88
85
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
const collection = new BestVehicleLogbookCollection(logbooks, isSole);
|
|
93
|
-
return collection.isBestPeriodExist(logbooks) ? collection : null;
|
|
86
|
+
const collection = new BestVehicleLogbookCollection(logbooks.toArray());
|
|
87
|
+
collection.calculateBestPeriod(logbooks);
|
|
88
|
+
return collection;
|
|
94
89
|
}
|
|
95
90
|
}
|
|
96
|
-
//# 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 { VehicleClaim, VehicleLogbook } from '../../models';\nimport { VehicleLogbookCollection } from './vehicle-logbook.collection';\nimport { DateRange } from 'moment-range';\nimport round from 'lodash/round';\nimport last from 'lodash/last';\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: VehicleLogbookCollection, private isSole: boolean = false) {\n    super([]);\n\n    if (!this.isBestPeriodExist(logbooks)) {\n      return;\n    }\n\n    this.calculateBestPeriod(logbooks);\n  }\n\n  /**\n   * Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks\n   */\n  isBestPeriodExist(logbooks: VehicleLogbookCollection = this): 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 BestVehicleLogbookCollection.periodDuration < (logbooks.last.date.getTime() - logbooks.first.date.getTime());\n  }\n\n  getWorkUsageByClaim(claim: VehicleClaim): number {\n    const claimKilometers: number = this.getByVehicleClaim(claim).getClaimableLogbooks(this.isSole).kilometers;\n\n    return round(this.getWorkUsageByTank(this.isSole) * (claimKilometers / this.kilometers), 2);\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[] = this.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.getWorkUsageByTank(this.isSole) < logbooksInPeriod.getWorkUsageByTank(this.isSole))) {\n        this.period = period;\n        this.items = logbooksInPeriod.toArray();\n      }\n    });\n  }\n\n  // get list of date ranges for each of passed logbook\n  private getPeriods(logbooks: VehicleLogbookCollection): DateRange[] {\n    const claimable = logbooks.getClaimableLogbooks(this.isSole);\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\n    // skip if the last logbook already included to the last existing date range\n    // if (last(periods).end.toDate() < logbooks.last.date) {\n      // add extra date range for the last claimable logbook\n      periods.push(this.getPeriodByLogbook(claimable.last, true));\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  private getPeriodByLogbook(logbook: VehicleLogbook, isBackward: boolean = false): DateRange {\n    if (isBackward) {\n      return new DateRange([new Date(logbook.date.getTime() - BestVehicleLogbookCollection.periodDuration), logbook.date]);\n    }\n\n    return new DateRange([logbook.date, new Date(logbook.date.getTime() + BestVehicleLogbookCollection.periodDuration)]);\n  }\n\n  static fromLogbooks(logbooks: VehicleLogbookCollection, isSole: boolean = false): BestVehicleLogbookCollection | null {\n    const collection = new BestVehicleLogbookCollection(logbooks, isSole);\n\n    return collection.isBestPeriodExist(logbooks) ? collection : null;\n  }\n}\n"]}
|
|
91
|
+
//# 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 { 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 BestVehicleLogbookCollection.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) => BestVehicleLogbookCollection.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)\n      .map((logbook: VehicleLogbook) => BestVehicleLogbookCollection.getPeriodByLogbook(logbook));\n\n\n    // skip if the last logbook already included to the last existing date range\n    // if (last(periods).end.toDate() < logbooks.last.date) {\n    // add extra date range for the last claimable logbook\n    // @TODO vik\n    periods.push(BestVehicleLogbookCollection.getPeriodByLogbook(claimable.last, true));\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() - BestVehicleLogbookCollection.periodDuration), logbook.date]);\n    }\n\n    return new DateRange([logbook.date, new Date(logbook.date.getTime() + BestVehicleLogbookCollection.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 (!BestVehicleLogbookCollection.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"]}
|
|
@@ -1,43 +1,20 @@
|
|
|
1
1
|
import { Collection } from '../collection';
|
|
2
2
|
import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
|
|
3
|
-
import round from 'lodash/round';
|
|
4
3
|
import { BestVehicleLogbookCollection } from './best-vehicle-logbook.collection';
|
|
5
4
|
export class VehicleLogbookCollection extends Collection {
|
|
6
|
-
/**
|
|
7
|
-
* Get collection of non-personal logbooks (work-related, sole-related).
|
|
8
|
-
* @TODO Vik: Best period: move this and related logic to backend
|
|
9
|
-
*/
|
|
10
|
-
getClaimableLogbooks(isSole = false) {
|
|
11
|
-
return this.filter((logbook) => !logbook.isPersonal && (isSole ? logbook.isSoleTank() : logbook.isWorkTank()));
|
|
12
|
-
}
|
|
13
5
|
/**
|
|
14
6
|
* Calculate total kilometers traveled
|
|
15
7
|
*/
|
|
16
8
|
get kilometers() {
|
|
17
9
|
return this.sumBy('kilometers');
|
|
18
10
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
* @TODO Alex: TT-2089 replace with getter
|
|
22
|
-
*/
|
|
23
|
-
get workUsage() {
|
|
24
|
-
if (!this.length) {
|
|
25
|
-
return 0;
|
|
26
|
-
}
|
|
27
|
-
const workKilometers = this.items
|
|
28
|
-
.filter((logbook) => !logbook.isPersonal)
|
|
29
|
-
.reduce((sum, logbook) => sum + logbook.kilometers, 0);
|
|
30
|
-
return round(workKilometers / this.kilometers * 100, 2);
|
|
31
|
-
}
|
|
32
|
-
getWorkUsageByTank(isSole) {
|
|
33
|
-
const workKilometers = this.getClaimableLogbooks(isSole).items
|
|
34
|
-
.reduce((sum, logbook) => sum + logbook.kilometers, 0);
|
|
35
|
-
return round(workKilometers / this.kilometers * 100, 2);
|
|
11
|
+
getWorkUsage(vehicleClaim) {
|
|
12
|
+
return this.getClaimable(vehicleClaim).kilometers / this.kilometers * 100;
|
|
36
13
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
14
|
+
getClaimable(vehicleClaim) {
|
|
15
|
+
if (!vehicleClaim) {
|
|
16
|
+
return this.filter((logbook) => !logbook.isPersonal);
|
|
17
|
+
}
|
|
41
18
|
return vehicleClaim.isSoleTank()
|
|
42
19
|
// sole tank may have multiple vehicle claims, so we need to filter by business.id
|
|
43
20
|
? this.filterBy('business.id', vehicleClaim.business.id)
|
|
@@ -47,8 +24,8 @@ export class VehicleLogbookCollection extends Collection {
|
|
|
47
24
|
/**
|
|
48
25
|
* get collection of logbooks with the biggest work usage for {@link BestVehicleLogbookCollection.periodDuration}
|
|
49
26
|
*/
|
|
50
|
-
getBest(
|
|
51
|
-
return BestVehicleLogbookCollection.fromLogbooks(this
|
|
27
|
+
getBest() {
|
|
28
|
+
return BestVehicleLogbookCollection.fromLogbooks(this);
|
|
52
29
|
}
|
|
53
30
|
}
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1sb2dib29rLmNvbGxlY3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvY29sbGVjdGlvbnMvdmVoaWNsZS92ZWhpY2xlLWxvZ2Jvb2suY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM3RCxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUVqRixNQUFNLE9BQU8sd0JBQXlCLFNBQVEsVUFBMEI7SUFDdEU7O09BRUc7SUFDSCxJQUFJLFVBQVU7UUFDWixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUVELFlBQVksQ0FBQyxZQUEyQjtRQUN0QyxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsWUFBWSxDQUFDLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDO0lBQzVFLENBQUM7SUFFRCxZQUFZLENBQUMsWUFBMkI7UUFDdEMsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUNqQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUF1QixFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztTQUN0RTtRQUVELE9BQU8sWUFBWSxDQUFDLFVBQVUsRUFBRTtZQUM5QixrRkFBa0Y7WUFDbEYsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1lBQ3hELCtFQUErRTtZQUMvRSxDQUFDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLEVBQUUsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ25ELENBQUM7SUFFRDs7T0FFRztJQUNILE9BQU87UUFDTCxPQUFPLDRCQUE0QixDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN6RCxDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb2xsZWN0aW9uIH0gZnJvbSAnLi4vY29sbGVjdGlvbic7XG5pbXBvcnQgeyBWZWhpY2xlQ2xhaW0sIFZlaGljbGVMb2dib29rIH0gZnJvbSAnLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IFRhbmtUeXBlRW51bSB9IGZyb20gJy4uLy4uL2RiL0VudW1zL3RhbmstdHlwZS5lbnVtJztcbmltcG9ydCB7IEJlc3RWZWhpY2xlTG9nYm9va0NvbGxlY3Rpb24gfSBmcm9tICcuL2Jlc3QtdmVoaWNsZS1sb2dib29rLmNvbGxlY3Rpb24nO1xuXG5leHBvcnQgY2xhc3MgVmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uIGV4dGVuZHMgQ29sbGVjdGlvbjxWZWhpY2xlTG9nYm9vaz4ge1xuICAvKipcbiAgICogQ2FsY3VsYXRlIHRvdGFsIGtpbG9tZXRlcnMgdHJhdmVsZWRcbiAgICovXG4gIGdldCBraWxvbWV0ZXJzKCk6IG51bWJlciB7XG4gICAgcmV0dXJuIHRoaXMuc3VtQnkoJ2tpbG9tZXRlcnMnKTtcbiAgfVxuXG4gIGdldFdvcmtVc2FnZSh2ZWhpY2xlQ2xhaW0/OiBWZWhpY2xlQ2xhaW0pOiBudW1iZXIge1xuICAgIHJldHVybiB0aGlzLmdldENsYWltYWJsZSh2ZWhpY2xlQ2xhaW0pLmtpbG9tZXRlcnMgLyB0aGlzLmtpbG9tZXRlcnMgKiAxMDA7XG4gIH1cblxuICBnZXRDbGFpbWFibGUodmVoaWNsZUNsYWltPzogVmVoaWNsZUNsYWltKTogdGhpcyB7XG4gICAgaWYgKCF2ZWhpY2xlQ2xhaW0pIHtcbiAgICAgIHJldHVybiB0aGlzLmZpbHRlcigobG9nYm9vazogVmVoaWNsZUxvZ2Jvb2spID0+ICFsb2dib29rLmlzUGVyc29uYWwpO1xuICAgIH1cblxuICAgIHJldHVybiB2ZWhpY2xlQ2xhaW0uaXNTb2xlVGFuaygpXG4gICAgICAvLyBzb2xlIHRhbmsgbWF5IGhhdmUgbXVsdGlwbGUgdmVoaWNsZSBjbGFpbXMsIHNvIHdlIG5lZWQgdG8gZmlsdGVyIGJ5IGJ1c2luZXNzLmlkXG4gICAgICA/IHRoaXMuZmlsdGVyQnkoJ2J1c2luZXNzLmlkJywgdmVoaWNsZUNsYWltLmJ1c2luZXNzLmlkKVxuICAgICAgLy8gd29yayB0YW5rIG1heSBoYXZlIG9ubHkgb25lIHZlaGljbGUgY2xhaW0sIHNvIHdlIG5lZWQgdG8gZmlsdGVyIGJ5IHRhbmsgdHlwZVxuICAgICAgOiB0aGlzLmZpbHRlckJ5KCd0YW5rVHlwZScsIFRhbmtUeXBlRW51bS5XT1JLKTtcbiAgfVxuXG4gIC8qKlxuICAgKiBnZXQgY29sbGVjdGlvbiBvZiBsb2dib29rcyB3aXRoIHRoZSBiaWdnZXN0IHdvcmsgdXNhZ2UgZm9yIHtAbGluayBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uLnBlcmlvZER1cmF0aW9ufVxuICAgKi9cbiAgZ2V0QmVzdCgpOiBCZXN0VmVoaWNsZUxvZ2Jvb2tDb2xsZWN0aW9uIHwgbnVsbCB7XG4gICAgcmV0dXJuIEJlc3RWZWhpY2xlTG9nYm9va0NvbGxlY3Rpb24uZnJvbUxvZ2Jvb2tzKHRoaXMpO1xuICB9XG59XG4iXX0=
|
|
@@ -2,7 +2,9 @@ export class FinancialYear {
|
|
|
2
2
|
static { this.weeksInYear = 52; }
|
|
3
3
|
static { this.monthsInYear = 12; }
|
|
4
4
|
static { this.startMonthIndex = 6; }
|
|
5
|
-
static
|
|
5
|
+
static get year() {
|
|
6
|
+
return +localStorage.getItem('financialYear');
|
|
7
|
+
}
|
|
6
8
|
constructor(date) {
|
|
7
9
|
this.yearStartDate = '-07-01';
|
|
8
10
|
this.yearEndDate = '-06-30';
|
|
@@ -52,4 +54,4 @@ export class FinancialYear {
|
|
|
52
54
|
return months;
|
|
53
55
|
}
|
|
54
56
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluYW5jaWFsLXllYXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90dC1jb3JlL3NyYy9saWIvbW9kZWxzL2ZpbmFuY2lhbC15ZWFyL2ZpbmFuY2lhbC15ZWFyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sT0FBTyxhQUFhO2FBQ2pCLGdCQUFXLEdBQUcsRUFBRSxDQUFDO2FBQ2pCLGlCQUFZLEdBQUcsRUFBRSxDQUFDO2FBQ2xCLG9CQUFlLEdBQUcsQ0FBQyxDQUFDO0lBQzNCLE1BQU0sS0FBSyxJQUFJO1FBQ2IsT0FBTyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQVFELFlBQVksSUFBa0I7UUFIdEIsa0JBQWEsR0FBRyxRQUFRLENBQUM7UUFDekIsZ0JBQVcsR0FBRyxRQUFRLENBQUM7UUFHN0IsSUFBSSxJQUFJLEVBQUU7WUFDUixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksWUFBWSxJQUFJLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztTQUN6RTthQUFNO1lBQ0wsSUFBSSxDQUFDLElBQUksR0FBRyxhQUFhLENBQUMsSUFBSSxJQUFJLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1NBQ3ZFO1FBRUQsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBZSxhQUFhLENBQUMsSUFBSTtRQUNoRCxPQUFPLGFBQWEsQ0FBQyxTQUFTLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxLQUFLLElBQUksQ0FBQztJQUN0RCxDQUFDO0lBRUQsUUFBUSxDQUFDLElBQVU7UUFDakIsT0FBTyxJQUFJLENBQUMsSUFBSSxLQUFLLElBQUksYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQztJQUNwRCxDQUFDO0lBRUQsTUFBTSxDQUFDLFNBQVMsQ0FBQyxJQUFVO1FBQ3pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUVELElBQUksV0FBVztRQUNiLE9BQU8sSUFBSSxhQUFhLENBQUMsSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzdGLENBQUM7SUFFRDs7T0FFRztJQUNILFlBQVksQ0FBQyxVQUFrQjtRQUM3QixJQUFJLFVBQVUsSUFBSSxhQUFhLENBQUMsZUFBZSxFQUFFO1lBQy9DLE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxHQUFHLENBQUMsSUFBSSxVQUFVLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUMxRDtRQUNELE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsSUFBSSxJQUFJLFVBQVUsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFTyxZQUFZLENBQUMsSUFBWTtRQUMvQixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksSUFBSSxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztJQUNoRSxDQUFDO0lBRU8sVUFBVSxDQUFDLElBQVk7UUFDN0IsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLElBQUksQ0FBQyxHQUFHLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsYUFBYTtRQUNYLE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztRQUM1QixNQUFNLEdBQUcsR0FBUyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQzdCLE1BQU0sT0FBTyxHQUFTLElBQUksQ0FBQyxPQUFPLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUM7UUFDOUQsS0FBSyxNQUFNLENBQUMsR0FBUyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsSUFBSSxPQUFPLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDL0UsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztTQUMzQjtRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgRmluYW5jaWFsWWVhciB7XHJcbiAgc3RhdGljIHdlZWtzSW5ZZWFyID0gNTI7XHJcbiAgc3RhdGljIG1vbnRoc0luWWVhciA9IDEyO1xyXG4gIHN0YXRpYyBzdGFydE1vbnRoSW5kZXggPSA2O1xyXG4gIHN0YXRpYyBnZXQgeWVhcigpOiBudW1iZXIge1xyXG4gICAgcmV0dXJuICtsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgnZmluYW5jaWFsWWVhcicpO1xyXG4gIH1cclxuICB5ZWFyOiBudW1iZXI7XHJcbiAgc3RhcnREYXRlOiBEYXRlO1xyXG4gIGVuZERhdGU6IERhdGU7XHJcblxyXG4gIHByaXZhdGUgeWVhclN0YXJ0RGF0ZSA9ICctMDctMDEnO1xyXG4gIHByaXZhdGUgeWVhckVuZERhdGUgPSAnLTA2LTMwJztcclxuXHJcbiAgY29uc3RydWN0b3IoZGF0ZT86IERhdGV8bnVtYmVyKSB7XHJcbiAgICBpZiAoZGF0ZSkge1xyXG4gICAgICB0aGlzLnllYXIgPSBkYXRlIGluc3RhbmNlb2YgRGF0ZSA/IEZpbmFuY2lhbFllYXIudG9GaW5ZZWFyKGRhdGUpIDogZGF0ZTtcclxuICAgIH0gZWxzZSB7XHJcbiAgICAgIHRoaXMueWVhciA9IEZpbmFuY2lhbFllYXIueWVhciB8fCBGaW5hbmNpYWxZZWFyLnRvRmluWWVhcihuZXcgRGF0ZSgpKTtcclxuICAgIH1cclxuXHJcbiAgICB0aGlzLnNldFN0YXJ0RGF0ZSh0aGlzLnllYXIpO1xyXG4gICAgdGhpcy5zZXRFbmREYXRlKHRoaXMueWVhcik7XHJcbiAgfVxyXG5cclxuICBzdGF0aWMgaXNDdXJyZW50KHllYXI6IG51bWJlciA9IEZpbmFuY2lhbFllYXIueWVhcik6IGJvb2xlYW4ge1xyXG4gICAgcmV0dXJuIEZpbmFuY2lhbFllYXIudG9GaW5ZZWFyKG5ldyBEYXRlKCkpID09PSB5ZWFyO1xyXG4gIH1cclxuXHJcbiAgaW5jbHVkZXMoZGF0ZTogRGF0ZSk6IGJvb2xlYW4ge1xyXG4gICAgcmV0dXJuIHRoaXMueWVhciA9PT0gbmV3IEZpbmFuY2lhbFllYXIoZGF0ZSkueWVhcjtcclxuICB9XHJcblxyXG4gIHN0YXRpYyB0b0ZpblllYXIoZGF0ZTogRGF0ZSk6IG51bWJlciB7XHJcbiAgICByZXR1cm4gZGF0ZS5nZXRGdWxsWWVhcigpICsgKGRhdGUuZ2V0TW9udGgoKSA+PSB0aGlzLnN0YXJ0TW9udGhJbmRleCA/IDEgOiAwKTtcclxuICB9XHJcblxyXG4gIGdldCBwcmV2RmluWWVhcigpOiBGaW5hbmNpYWxZZWFyIHtcclxuICAgIHJldHVybiBuZXcgRmluYW5jaWFsWWVhcihuZXcgRGF0ZShgJHtuZXcgRGF0ZSgpLmdldEZ1bGxZZWFyKCkgLSAxfSR7dGhpcy55ZWFyU3RhcnREYXRlfWApKTtcclxuICB9XHJcblxyXG4gIC8qKlxyXG4gICAqIEdldCBkYXRlIGJ5IGRlc2lyZWQgbW9udGhcclxuICAgKi9cclxuICBnZXRNb250aERhdGUobW9udGhJbmRleDogbnVtYmVyKTogRGF0ZSB7XHJcbiAgICBpZiAobW9udGhJbmRleCA+PSBGaW5hbmNpYWxZZWFyLnN0YXJ0TW9udGhJbmRleCkge1xyXG4gICAgICByZXR1cm4gbmV3IERhdGUoYCR7dGhpcy55ZWFyIC0gMX0tJHttb250aEluZGV4ICsgMX0tMDFgKTtcclxuICAgIH1cclxuICAgIHJldHVybiBuZXcgRGF0ZShgJHt0aGlzLnllYXJ9LSR7bW9udGhJbmRleCArIDF9LTAxYCk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHNldFN0YXJ0RGF0ZSh5ZWFyOiBudW1iZXIpOiB2b2lkIHtcclxuICAgIHRoaXMuc3RhcnREYXRlID0gbmV3IERhdGUoYCR7eWVhciAtIDF9JHt0aGlzLnllYXJTdGFydERhdGV9YCk7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHNldEVuZERhdGUoeWVhcjogbnVtYmVyKTogdm9pZCB7XHJcbiAgICB0aGlzLmVuZERhdGUgPSBuZXcgRGF0ZShgJHt5ZWFyfSR7dGhpcy55ZWFyRW5kRGF0ZX1gKTtcclxuICB9XHJcblxyXG4gIGdldFBhc3RNb250aHMoKTogbnVtYmVyW10ge1xyXG4gICAgY29uc3QgbW9udGhzOiBudW1iZXJbXSA9IFtdO1xyXG4gICAgY29uc3Qgbm93OiBEYXRlID0gbmV3IERhdGUoKTtcclxuICAgIGNvbnN0IGVuZERhdGU6IERhdGUgPSB0aGlzLmVuZERhdGUgPCBub3cgPyB0aGlzLmVuZERhdGUgOiBub3c7XHJcbiAgICBmb3IgKGNvbnN0IGQ6IERhdGUgPSB0aGlzLnN0YXJ0RGF0ZTsgZCA8PSBlbmREYXRlOyBkLnNldE1vbnRoKGQuZ2V0TW9udGgoKSArIDEpKSB7XHJcbiAgICAgIG1vbnRocy5wdXNoKGQuZ2V0TW9udGgoKSk7XHJcbiAgICB9XHJcblxyXG4gICAgcmV0dXJuIG1vbnRocztcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -8,13 +8,14 @@ export class VehicleLogbook extends VehicleLogbookBase {
|
|
|
8
8
|
return this.odometerEnd - this.odometerStart;
|
|
9
9
|
}
|
|
10
10
|
get tankType() {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
11
|
+
switch (true) {
|
|
12
|
+
case !!this.business:
|
|
13
|
+
return TankTypeEnum.SOLE;
|
|
14
|
+
case this.isPersonal:
|
|
15
|
+
return TankTypeEnum.PERSONAL;
|
|
16
|
+
default:
|
|
17
|
+
return TankTypeEnum.WORK;
|
|
18
|
+
}
|
|
18
19
|
}
|
|
19
20
|
}
|
|
20
21
|
__decorate([
|
|
@@ -23,4 +24,4 @@ __decorate([
|
|
|
23
24
|
__decorate([
|
|
24
25
|
Type(() => SoleBusiness)
|
|
25
26
|
], VehicleLogbook.prototype, "business", void 0);
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1sb2dib29rLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL21vZGVscy92ZWhpY2xlL3ZlaGljbGUtbG9nYm9vay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLGNBQWMsSUFBSSxrQkFBa0IsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQy9GLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUU3RCxNQUFNLE9BQU8sY0FBZSxTQUFRLGtCQUFrQjtJQU9wRCxJQUFJLFVBQVU7UUFDWixPQUFPLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUMvQyxDQUFDO0lBRUQsSUFBSSxRQUFRO1FBQ1YsUUFBUSxJQUFJLEVBQUU7WUFDWixLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUTtnQkFDbEIsT0FBTyxZQUFZLENBQUMsSUFBSSxDQUFDO1lBQzNCLEtBQUssSUFBSSxDQUFDLFVBQVU7Z0JBQ2xCLE9BQU8sWUFBWSxDQUFDLFFBQVEsQ0FBQztZQUMvQjtnQkFDRSxPQUFPLFlBQVksQ0FBQyxJQUFJLENBQUM7U0FDNUI7SUFDSCxDQUFDO0NBQ0Y7QUFuQkM7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDOzRDQUNOO0FBR1g7SUFEQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUFDO2dEQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVmVoaWNsZUxvZ2Jvb2sgYXMgVmVoaWNsZUxvZ2Jvb2tCYXNlIH0gZnJvbSAnLi4vLi4vZGIvTW9kZWxzL3ZlaGljbGUvdmVoaWNsZS1sb2dib29rJztcbmltcG9ydCB7IFR5cGUgfSBmcm9tICdjbGFzcy10cmFuc2Zvcm1lcic7XG5pbXBvcnQgeyBTb2xlQnVzaW5lc3MgfSBmcm9tICcuLi9zb2xlJztcbmltcG9ydCB7IFRhbmtUeXBlRW51bSB9IGZyb20gJy4uLy4uL2RiL0VudW1zL3RhbmstdHlwZS5lbnVtJztcblxuZXhwb3J0IGNsYXNzIFZlaGljbGVMb2dib29rIGV4dGVuZHMgVmVoaWNsZUxvZ2Jvb2tCYXNlIHtcbiAgQFR5cGUoKCkgPT4gRGF0ZSlcbiAgZGF0ZTogRGF0ZTtcblxuICBAVHlwZSgoKSA9PiBTb2xlQnVzaW5lc3MpXG4gIGJ1c2luZXNzOiBTb2xlQnVzaW5lc3M7XG5cbiAgZ2V0IGtpbG9tZXRlcnMoKTogbnVtYmVyIHtcbiAgICByZXR1cm4gdGhpcy5vZG9tZXRlckVuZCAtIHRoaXMub2RvbWV0ZXJTdGFydDtcbiAgfVxuXG4gIGdldCB0YW5rVHlwZSgpOiBUYW5rVHlwZUVudW0ge1xuICAgIHN3aXRjaCAodHJ1ZSkge1xuICAgICAgY2FzZSAhIXRoaXMuYnVzaW5lc3M6XG4gICAgICAgIHJldHVybiBUYW5rVHlwZUVudW0uU09MRTtcbiAgICAgIGNhc2UgdGhpcy5pc1BlcnNvbmFsOlxuICAgICAgICByZXR1cm4gVGFua1R5cGVFbnVtLlBFUlNPTkFMO1xuICAgICAgZGVmYXVsdDpcbiAgICAgICAgcmV0dXJuIFRhbmtUeXBlRW51bS5XT1JLO1xuICAgIH1cbiAgfVxufVxuIl19
|
|
@@ -2,10 +2,8 @@ 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';
|
|
6
5
|
import { map } from 'rxjs/operators';
|
|
7
6
|
import { AppEvent } from '../../../models';
|
|
8
|
-
import { plainToClass } from 'class-transformer';
|
|
9
7
|
import { UserRolesEnum } from '../../../db/Enums/user-roles.enum';
|
|
10
8
|
import * as i0 from "@angular/core";
|
|
11
9
|
export class VehicleClaimService extends RestService {
|
|
@@ -40,23 +38,6 @@ export class VehicleClaimService extends RestService {
|
|
|
40
38
|
this.refreshCache();
|
|
41
39
|
});
|
|
42
40
|
}
|
|
43
|
-
/**
|
|
44
|
-
* Update workUsage for all vehicle claims if logbook best period changed
|
|
45
|
-
* @TODO Vik: Best period move this and related logic to backend
|
|
46
|
-
*/
|
|
47
|
-
updateWorkUsage(bestLogbooks) {
|
|
48
|
-
// no need to update if cache not exist
|
|
49
|
-
if (!this.cache) {
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
|
-
// @TODO Vik (TT-2210): need batch endpoint for this update
|
|
53
|
-
// @TODO Alex (TT-2210): fix frontend when endpoint ready
|
|
54
|
-
const batch$ = this.cache.map((claim) => {
|
|
55
|
-
const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestLogbooks.getWorkUsageByClaim(claim) }));
|
|
56
|
-
return this.update(claimToUpdate);
|
|
57
|
-
});
|
|
58
|
-
combineLatest(batch$).subscribe();
|
|
59
|
-
}
|
|
60
41
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
61
42
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
|
|
62
43
|
}
|
|
@@ -66,4 +47,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
|
|
|
66
47
|
providedIn: 'root'
|
|
67
48
|
}]
|
|
68
49
|
}] });
|
|
69
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVoaWNsZS1jbGFpbS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHQtY29yZS9zcmMvbGliL3NlcnZpY2VzL2h0dHAvdmVoaWNsZS92ZWhpY2xlLWNsYWltLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUUzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBR25ELE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNyQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDM0MsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1DQUFtQyxDQUFDOztBQUtsRSxNQUFNLE9BQU8sbUJBQW9CLFNBQVEsV0FBMkM7SUFIcEY7O1FBSUUsZUFBVSxHQUF3QixZQUFZLENBQUM7UUFDL0MsUUFBRyxHQUFHLGdCQUFnQixDQUFDO1FBQ3ZCLFVBQUssR0FBRyxDQUFDLGFBQWEsQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0tBb0M1RDtJQWxDQyxZQUFZO1FBQ1YsSUFBSSxDQUFDLGdDQUFnQyxFQUFFLENBQUM7SUFDMUMsQ0FBQztJQUVELEdBQUcsQ0FBQyxLQUFtQjtRQUNyQixPQUFPLEtBQUssQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUMxQixHQUFHLENBQUMsQ0FBQyxZQUEwQixFQUFFLEVBQUU7WUFDakMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFFBQVEsQ0FBQyxJQUFJLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxxQkFBcUIsRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBRXpHLE9BQU8sWUFBWSxDQUFDO1FBQ3RCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLEtBQW1CLEVBQUUsY0FBc0IsRUFBRTtRQUNsRCxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FDMUMsR0FBRyxDQUFDLENBQUMsWUFBMEIsRUFBRSxFQUFFO1lBQ2pDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxRQUFRLENBQUMsZ0JBQWdCLENBQUMscUJBQXFCLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUV6RyxPQUFPLFlBQVksQ0FBQztRQUN0QixDQUFDLENBQUMsQ0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVEOzs7T0FHRztJQUNLLGdDQUFnQztRQUN0QyxJQUFJLENBQUMsc0JBQXNCLENBQUMsRUFBRSxDQUFDLGdCQUFnQixDQUFDLDZCQUE2QixDQUFDO2FBQzNFLFNBQVMsQ0FBQyxHQUFHLEVBQUU7WUFDZCxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDdEIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDOytHQXRDVSxtQkFBbUI7bUhBQW5CLG1CQUFtQixjQUZsQixNQUFNOzs0RkFFUCxtQkFBbUI7a0JBSC9CLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgVmVoaWNsZUNsYWltIGFzIFZlaGljbGVDbGFpbUJhc2UgfSBmcm9tICcuLi8uLi8uLi9kYi9Nb2RlbHMvdmVoaWNsZS92ZWhpY2xlLWNsYWltJztcbmltcG9ydCB7IFZlaGljbGVDbGFpbSB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBSZXN0U2VydmljZSB9IGZyb20gJy4uL3Jlc3QvcmVzdC1vbGQuc2VydmljZSc7XG5pbXBvcnQgeyBBcHBFdmVudFR5cGVFbnVtIH0gZnJvbSAnLi4vLi4vLi4vbW9kZWxzJztcbmltcG9ydCB7IElFdmVudExpc3RlbmVyIH0gZnJvbSAnLi4vLi4vLi4vaW50ZXJmYWNlcyc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBBcHBFdmVudCB9IGZyb20gJy4uLy4uLy4uL21vZGVscyc7XG5pbXBvcnQgeyBVc2VyUm9sZXNFbnVtIH0gZnJvbSAnLi4vLi4vLi4vZGIvRW51bXMvdXNlci1yb2xlcy5lbnVtJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgVmVoaWNsZUNsYWltU2VydmljZSBleHRlbmRzIFJlc3RTZXJ2aWNlPFZlaGljbGVDbGFpbUJhc2UsIFZlaGljbGVDbGFpbT4gaW1wbGVtZW50cyBJRXZlbnRMaXN0ZW5lciB7XG4gIG1vZGVsQ2xhc3M6IHR5cGVvZiBWZWhpY2xlQ2xhaW0gPSBWZWhpY2xlQ2xhaW07XG4gIHVybCA9ICd2ZWhpY2xlLWNsYWltcyc7XG4gIHJvbGVzID0gW1VzZXJSb2xlc0VudW0uV09SS19UQU5LLCBVc2VyUm9sZXNFbnVtLlNPTEVfVEFOS107XG5cbiAgbGlzdGVuRXZlbnRzKCkge1xuICAgIHRoaXMubGlzdGVuVmVoaWNsZUNsYWltRGV0YWlsc0NoYW5nZXMoKTtcbiAgfVxuXG4gIGFkZChtb2RlbDogVmVoaWNsZUNsYWltKTogT2JzZXJ2YWJsZTxWZWhpY2xlQ2xhaW0+IHtcbiAgICByZXR1cm4gc3VwZXIuYWRkKG1vZGVsKS5waXBlKFxuICAgICAgbWFwKCh2ZWhpY2xlQ2xhaW06IFZlaGljbGVDbGFpbSkgPT4ge1xuICAgICAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2UuZGlzcGF0Y2gobmV3IEFwcEV2ZW50KEFwcEV2ZW50VHlwZUVudW0uVkVISUNMRV9DTEFJTV9DUkVBVEVELCB2ZWhpY2xlQ2xhaW0pKTtcblxuICAgICAgICByZXR1cm4gdmVoaWNsZUNsYWltO1xuICAgICAgfSlcbiAgICApO1xuICB9XG5cbiAgdXBkYXRlKG1vZGVsOiBWZWhpY2xlQ2xhaW0sIHF1ZXJ5UGFyYW1zOiBvYmplY3QgPSB7fSk6IE9ic2VydmFibGU8VmVoaWNsZUNsYWltPiB7XG4gICAgcmV0dXJuIHN1cGVyLnVwZGF0ZShtb2RlbCwgcXVlcnlQYXJhbXMpLnBpcGUoXG4gICAgICBtYXAoKHZlaGljbGVDbGFpbTogVmVoaWNsZUNsYWltKSA9PiB7XG4gICAgICAgIHRoaXMuZXZlbnREaXNwYXRjaGVyU2VydmljZS5kaXNwYXRjaChuZXcgQXBwRXZlbnQoQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX1VQREFURUQsIHZlaGljbGVDbGFpbSkpO1xuXG4gICAgICAgIHJldHVybiB2ZWhpY2xlQ2xhaW07XG4gICAgICB9KVxuICAgICk7XG4gIH1cblxuICAvKipcbiAgICogRGV0YWlscyBjaGFuZ2VzIG1heSBhZmZlY3QgdmVoaWNsZSBjbGFpbXM6XG4gICAqIHdoZW4gZGV0YWlscyBtZXRob2QgY2hhbmdlZCwgYWxsIGNsYWltcyBjdXJyZW50IHZhbHVlcyBiZWNvbWUgMFxuICAgKi9cbiAgcHJpdmF0ZSBsaXN0ZW5WZWhpY2xlQ2xhaW1EZXRhaWxzQ2hhbmdlcygpOiB2b2lkIHtcbiAgICB0aGlzLmV2ZW50RGlzcGF0Y2hlclNlcnZpY2Uub24oQXBwRXZlbnRUeXBlRW51bS5WRUhJQ0xFX0NMQUlNX0RFVEFJTFNfVVBEQVRFRClcbiAgICAgIC5zdWJzY3JpYmUoKCkgPT4ge1xuICAgICAgICB0aGlzLnJlZnJlc2hDYWNoZSgpO1xuICAgICAgfSlcbiAgfVxufVxuIl19
|
|
@@ -1554,7 +1554,9 @@ class FinancialYear {
|
|
|
1554
1554
|
static { this.weeksInYear = 52; }
|
|
1555
1555
|
static { this.monthsInYear = 12; }
|
|
1556
1556
|
static { this.startMonthIndex = 6; }
|
|
1557
|
-
static
|
|
1557
|
+
static get year() {
|
|
1558
|
+
return +localStorage.getItem('financialYear');
|
|
1559
|
+
}
|
|
1558
1560
|
constructor(date) {
|
|
1559
1561
|
this.yearStartDate = '-07-01';
|
|
1560
1562
|
this.yearEndDate = '-06-30';
|
|
@@ -4930,13 +4932,14 @@ class VehicleLogbook extends VehicleLogbook$1 {
|
|
|
4930
4932
|
return this.odometerEnd - this.odometerStart;
|
|
4931
4933
|
}
|
|
4932
4934
|
get tankType() {
|
|
4933
|
-
|
|
4934
|
-
|
|
4935
|
-
|
|
4936
|
-
|
|
4937
|
-
|
|
4938
|
-
|
|
4939
|
-
|
|
4935
|
+
switch (true) {
|
|
4936
|
+
case !!this.business:
|
|
4937
|
+
return TankTypeEnum.SOLE;
|
|
4938
|
+
case this.isPersonal:
|
|
4939
|
+
return TankTypeEnum.PERSONAL;
|
|
4940
|
+
default:
|
|
4941
|
+
return TankTypeEnum.WORK;
|
|
4942
|
+
}
|
|
4940
4943
|
}
|
|
4941
4944
|
}
|
|
4942
4945
|
__decorate([
|
|
@@ -8492,41 +8495,19 @@ class ReportItemCollection extends Collection {
|
|
|
8492
8495
|
}
|
|
8493
8496
|
|
|
8494
8497
|
class VehicleLogbookCollection extends Collection {
|
|
8495
|
-
/**
|
|
8496
|
-
* Get collection of non-personal logbooks (work-related, sole-related).
|
|
8497
|
-
* @TODO Vik: Best period: move this and related logic to backend
|
|
8498
|
-
*/
|
|
8499
|
-
getClaimableLogbooks(isSole = false) {
|
|
8500
|
-
return this.filter((logbook) => !logbook.isPersonal && (isSole ? logbook.isSoleTank() : logbook.isWorkTank()));
|
|
8501
|
-
}
|
|
8502
8498
|
/**
|
|
8503
8499
|
* Calculate total kilometers traveled
|
|
8504
8500
|
*/
|
|
8505
8501
|
get kilometers() {
|
|
8506
8502
|
return this.sumBy('kilometers');
|
|
8507
8503
|
}
|
|
8508
|
-
|
|
8509
|
-
|
|
8510
|
-
* @TODO Alex: TT-2089 replace with getter
|
|
8511
|
-
*/
|
|
8512
|
-
get workUsage() {
|
|
8513
|
-
if (!this.length) {
|
|
8514
|
-
return 0;
|
|
8515
|
-
}
|
|
8516
|
-
const workKilometers = this.items
|
|
8517
|
-
.filter((logbook) => !logbook.isPersonal)
|
|
8518
|
-
.reduce((sum, logbook) => sum + logbook.kilometers, 0);
|
|
8519
|
-
return round(workKilometers / this.kilometers * 100, 2);
|
|
8520
|
-
}
|
|
8521
|
-
getWorkUsageByTank(isSole) {
|
|
8522
|
-
const workKilometers = this.getClaimableLogbooks(isSole).items
|
|
8523
|
-
.reduce((sum, logbook) => sum + logbook.kilometers, 0);
|
|
8524
|
-
return round(workKilometers / this.kilometers * 100, 2);
|
|
8504
|
+
getWorkUsage(vehicleClaim) {
|
|
8505
|
+
return this.getClaimable(vehicleClaim).kilometers / this.kilometers * 100;
|
|
8525
8506
|
}
|
|
8526
|
-
|
|
8527
|
-
|
|
8528
|
-
|
|
8529
|
-
|
|
8507
|
+
getClaimable(vehicleClaim) {
|
|
8508
|
+
if (!vehicleClaim) {
|
|
8509
|
+
return this.filter((logbook) => !logbook.isPersonal);
|
|
8510
|
+
}
|
|
8530
8511
|
return vehicleClaim.isSoleTank()
|
|
8531
8512
|
// sole tank may have multiple vehicle claims, so we need to filter by business.id
|
|
8532
8513
|
? this.filterBy('business.id', vehicleClaim.business.id)
|
|
@@ -8536,8 +8517,8 @@ class VehicleLogbookCollection extends Collection {
|
|
|
8536
8517
|
/**
|
|
8537
8518
|
* get collection of logbooks with the biggest work usage for {@link BestVehicleLogbookCollection.periodDuration}
|
|
8538
8519
|
*/
|
|
8539
|
-
getBest(
|
|
8540
|
-
return BestVehicleLogbookCollection.fromLogbooks(this
|
|
8520
|
+
getBest() {
|
|
8521
|
+
return BestVehicleLogbookCollection.fromLogbooks(this);
|
|
8541
8522
|
}
|
|
8542
8523
|
}
|
|
8543
8524
|
|
|
@@ -8555,18 +8536,13 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8555
8536
|
* constructor is private because we want to prevent collection initialization via 'new' operator.
|
|
8556
8537
|
* We should create instances only with fromLogbooks method
|
|
8557
8538
|
*/
|
|
8558
|
-
constructor(logbooks
|
|
8559
|
-
super(
|
|
8560
|
-
this.isSole = isSole;
|
|
8561
|
-
if (!this.isBestPeriodExist(logbooks)) {
|
|
8562
|
-
return;
|
|
8563
|
-
}
|
|
8564
|
-
this.calculateBestPeriod(logbooks);
|
|
8539
|
+
constructor(logbooks) {
|
|
8540
|
+
super(logbooks);
|
|
8565
8541
|
}
|
|
8566
8542
|
/**
|
|
8567
8543
|
* Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks
|
|
8568
8544
|
*/
|
|
8569
|
-
isBestPeriodExist(logbooks
|
|
8545
|
+
static isBestPeriodExist(logbooks) {
|
|
8570
8546
|
if (logbooks.length < 2) {
|
|
8571
8547
|
return false;
|
|
8572
8548
|
}
|
|
@@ -8575,9 +8551,32 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8575
8551
|
}
|
|
8576
8552
|
return BestVehicleLogbookCollection.periodDuration < (logbooks.last.date.getTime() - logbooks.first.date.getTime());
|
|
8577
8553
|
}
|
|
8578
|
-
|
|
8579
|
-
|
|
8580
|
-
|
|
8554
|
+
// get list of date ranges for each of passed logbook
|
|
8555
|
+
static getPeriods(logbooks) {
|
|
8556
|
+
const claimable = logbooks.getClaimable();
|
|
8557
|
+
// get a list of date ranges that could potentially be the best
|
|
8558
|
+
const periods = claimable
|
|
8559
|
+
// skip logbooks whose range ends after the last logbook
|
|
8560
|
+
.filter((logbook) => BestVehicleLogbookCollection.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
|
|
8561
|
+
.map((logbook) => BestVehicleLogbookCollection.getPeriodByLogbook(logbook));
|
|
8562
|
+
// skip if the last logbook already included to the last existing date range
|
|
8563
|
+
// if (last(periods).end.toDate() < logbooks.last.date) {
|
|
8564
|
+
// add extra date range for the last claimable logbook
|
|
8565
|
+
// @TODO vik
|
|
8566
|
+
periods.push(BestVehicleLogbookCollection.getPeriodByLogbook(claimable.last, true));
|
|
8567
|
+
// }
|
|
8568
|
+
return periods;
|
|
8569
|
+
}
|
|
8570
|
+
/**
|
|
8571
|
+
* Get claimable date range for passed logbook
|
|
8572
|
+
* @param logbook logbook instance for range calculation
|
|
8573
|
+
* @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
|
|
8574
|
+
*/
|
|
8575
|
+
static getPeriodByLogbook(logbook, isBackward = false) {
|
|
8576
|
+
if (isBackward) {
|
|
8577
|
+
return new DateRange([new Date(logbook.date.getTime() - BestVehicleLogbookCollection.periodDuration), logbook.date]);
|
|
8578
|
+
}
|
|
8579
|
+
return new DateRange([logbook.date, new Date(logbook.date.getTime() + BestVehicleLogbookCollection.periodDuration)]);
|
|
8581
8580
|
}
|
|
8582
8581
|
/**
|
|
8583
8582
|
* Set Date Range with the biggest work usage percent
|
|
@@ -8593,44 +8592,22 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
|
|
|
8593
8592
|
*/
|
|
8594
8593
|
calculateBestPeriod(logbooks) {
|
|
8595
8594
|
// get a list of date ranges that could potentially be the best
|
|
8596
|
-
const periods =
|
|
8595
|
+
const periods = BestVehicleLogbookCollection.getPeriods(logbooks);
|
|
8597
8596
|
periods.forEach((period) => {
|
|
8598
8597
|
const logbooksInPeriod = logbooks.filterByRange('date', period.start.toDate(), period.end.toDate());
|
|
8599
|
-
if (!this.period || (this.
|
|
8598
|
+
if (!this.period || (this.getWorkUsage() < logbooksInPeriod.getWorkUsage())) {
|
|
8600
8599
|
this.period = period;
|
|
8601
8600
|
this.items = logbooksInPeriod.toArray();
|
|
8602
8601
|
}
|
|
8603
8602
|
});
|
|
8604
8603
|
}
|
|
8605
|
-
|
|
8606
|
-
|
|
8607
|
-
|
|
8608
|
-
// get a list of date ranges that could potentially be the best
|
|
8609
|
-
const periods = claimable
|
|
8610
|
-
// skip logbooks whose range ends after the last logbook
|
|
8611
|
-
.filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
|
|
8612
|
-
.map((logbook) => this.getPeriodByLogbook(logbook));
|
|
8613
|
-
// skip if the last logbook already included to the last existing date range
|
|
8614
|
-
// if (last(periods).end.toDate() < logbooks.last.date) {
|
|
8615
|
-
// add extra date range for the last claimable logbook
|
|
8616
|
-
periods.push(this.getPeriodByLogbook(claimable.last, true));
|
|
8617
|
-
// }
|
|
8618
|
-
return periods;
|
|
8619
|
-
}
|
|
8620
|
-
/**
|
|
8621
|
-
* Get claimable date range for passed logbook
|
|
8622
|
-
* @param logbook logbook instance for range calculation
|
|
8623
|
-
* @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
|
|
8624
|
-
*/
|
|
8625
|
-
getPeriodByLogbook(logbook, isBackward = false) {
|
|
8626
|
-
if (isBackward) {
|
|
8627
|
-
return new DateRange([new Date(logbook.date.getTime() - BestVehicleLogbookCollection.periodDuration), logbook.date]);
|
|
8604
|
+
static fromLogbooks(logbooks) {
|
|
8605
|
+
if (!BestVehicleLogbookCollection.isBestPeriodExist(logbooks)) {
|
|
8606
|
+
return null;
|
|
8628
8607
|
}
|
|
8629
|
-
|
|
8630
|
-
|
|
8631
|
-
|
|
8632
|
-
const collection = new BestVehicleLogbookCollection(logbooks, isSole);
|
|
8633
|
-
return collection.isBestPeriodExist(logbooks) ? collection : null;
|
|
8608
|
+
const collection = new BestVehicleLogbookCollection(logbooks.toArray());
|
|
8609
|
+
collection.calculateBestPeriod(logbooks);
|
|
8610
|
+
return collection;
|
|
8634
8611
|
}
|
|
8635
8612
|
}
|
|
8636
8613
|
|
|
@@ -15284,23 +15261,6 @@ class VehicleClaimService extends RestService {
|
|
|
15284
15261
|
this.refreshCache();
|
|
15285
15262
|
});
|
|
15286
15263
|
}
|
|
15287
|
-
/**
|
|
15288
|
-
* Update workUsage for all vehicle claims if logbook best period changed
|
|
15289
|
-
* @TODO Vik: Best period move this and related logic to backend
|
|
15290
|
-
*/
|
|
15291
|
-
updateWorkUsage(bestLogbooks) {
|
|
15292
|
-
// no need to update if cache not exist
|
|
15293
|
-
if (!this.cache) {
|
|
15294
|
-
return;
|
|
15295
|
-
}
|
|
15296
|
-
// @TODO Vik (TT-2210): need batch endpoint for this update
|
|
15297
|
-
// @TODO Alex (TT-2210): fix frontend when endpoint ready
|
|
15298
|
-
const batch$ = this.cache.map((claim) => {
|
|
15299
|
-
const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestLogbooks.getWorkUsageByClaim(claim) }));
|
|
15300
|
-
return this.update(claimToUpdate);
|
|
15301
|
-
});
|
|
15302
|
-
combineLatest(batch$).subscribe();
|
|
15303
|
-
}
|
|
15304
15264
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
15305
15265
|
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: VehicleClaimService, providedIn: 'root' }); }
|
|
15306
15266
|
}
|