taxtank-core 0.32.5 → 0.32.6

package/esm2022/lib/collections/vehicle/best-vehicle-logbook.collection.mjs

@@ -1,3 +1,4 @@
+import { FinancialYear } from '../../models';
 import { VehicleLogbookCollection } from './vehicle-logbook.collection';
 import { DateRange } from 'moment-range';
 /**
@@ -27,7 +28,7 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
         if (!(logbooks instanceof VehicleLogbookCollection)) {
             logbooks = new VehicleLogbookCollection(logbooks);
         }
-        return this.periodDuration < (logbooks.last.date.getTime() - logbooks.first.date.getTime());
+        return this.periodDuration <= (logbooks.last.date.getTime() - logbooks.first.date.getTime());
     }
     // get list of date ranges for each of passed logbook
     static getPeriods(logbooks) {
@@ -37,12 +38,10 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
             // skip logbooks whose range ends after the last logbook
             .filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
             .map((logbook) => this.getPeriodByLogbook(logbook));
-        // skip if the last logbook already included to the last existing date range
-        // if (last(periods).end.toDate() < logbooks.last.date) {
-        // add extra date range for the last claimable logbook
-        // @TODO vik
-        periods.push(this.getPeriodByLogbook(claimable.last, true));
-        // }
+        const last = this.getPeriodByLogbook(claimable.last, true);
+        if (FinancialYear.toFinYear(last.start.toDate()) === FinancialYear.year) {
+            periods.push(last);
+        }
         return periods;
     }
     /**
@@ -88,4 +87,4 @@ export class BestVehicleLogbookCollection extends VehicleLogbookCollection {
         return collection;
     }
 }
-//# 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 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\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(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  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"]}
+//# 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"]}

package/fesm2022/taxtank-core.mjs

@@ -8549,7 +8549,7 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
         if (!(logbooks instanceof VehicleLogbookCollection)) {
             logbooks = new VehicleLogbookCollection(logbooks);
         }
-        return this.periodDuration < (logbooks.last.date.getTime() - logbooks.first.date.getTime());
+        return this.periodDuration <= (logbooks.last.date.getTime() - logbooks.first.date.getTime());
     }
     // get list of date ranges for each of passed logbook
     static getPeriods(logbooks) {
@@ -8559,12 +8559,10 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
             // skip logbooks whose range ends after the last logbook
             .filter((logbook) => this.getPeriodByLogbook(logbook).end.toDate() < logbooks.last.date)
             .map((logbook) => this.getPeriodByLogbook(logbook));
-        // skip if the last logbook already included to the last existing date range
-        // if (last(periods).end.toDate() < logbooks.last.date) {
-        // add extra date range for the last claimable logbook
-        // @TODO vik
-        periods.push(this.getPeriodByLogbook(claimable.last, true));
-        // }
+        const last = this.getPeriodByLogbook(claimable.last, true);
+        if (FinancialYear.toFinYear(last.start.toDate()) === FinancialYear.year) {
+            periods.push(last);
+        }
         return periods;
     }
     /**