taxtank-core 0.32.2 → 0.32.5

package/lib/collections/vehicle/best-vehicle-logbook.collection.d.ts

@@ -1,4 +1,4 @@
-import { VehicleClaim } from '../../models';
+import { VehicleLogbook } from '../../models';
 import { VehicleLogbookCollection } from './vehicle-logbook.collection';
 import { DateRange } from 'moment-range';
 /**
@@ -6,7 +6,6 @@ import { DateRange } from 'moment-range';
  * Docs: https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
  */
 export declare class BestVehicleLogbookCollection extends VehicleLogbookCollection {
-    private isSole;
     /**
      * Logbook claimable period duration in milliseconds.
      * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
@@ -24,8 +23,14 @@ export declare class BestVehicleLogbookCollection extends VehicleLogbookCollecti
     /**
      * Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks
      */
-    isBestPeriodExist(logbooks?: VehicleLogbookCollection): boolean;
-    getWorkUsageByClaim(claim: VehicleClaim): number;
+    static isBestPeriodExist(logbooks: VehicleLogbookCollection): boolean;
+    static getPeriods(logbooks: VehicleLogbookCollection): DateRange[];
+    /**
+     * Get claimable date range for passed logbook
+     * @param logbook logbook instance for range calculation
+     * @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
+     */
+    static getPeriodByLogbook(logbook: VehicleLogbook, isBackward?: boolean): DateRange;
     /**
      * Set Date Range with the biggest work usage percent
      * Range duration is defined as BestVehicleLogbookCollection.periodDuration by the ATO
@@ -39,12 +44,5 @@ export declare class BestVehicleLogbookCollection extends VehicleLogbookCollecti
      * Find and return range with the biggest workUsage percent.
      */
     private calculateBestPeriod;
-    private getPeriods;
-    /**
-     * Get claimable date range for passed logbook
-     * @param logbook logbook instance for range calculation
-     * @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
-     */
-    private getPeriodByLogbook;
-    static fromLogbooks(logbooks: VehicleLogbookCollection, isSole?: boolean): BestVehicleLogbookCollection | null;
+    static fromLogbooks(logbooks: VehicleLogbookCollection): BestVehicleLogbookCollection | null;
 }

package/lib/collections/vehicle/vehicle-logbook.collection.d.ts

@@ -2,27 +2,14 @@ import { Collection } from '../collection';
 import { VehicleClaim, VehicleLogbook } from '../../models';
 import { BestVehicleLogbookCollection } from './best-vehicle-logbook.collection';
 export declare class VehicleLogbookCollection extends Collection<VehicleLogbook> {
-    /**
-     * Get collection of non-personal logbooks (work-related, sole-related).
-     * @TODO Vik: Best period: move this and related logic to backend
-     */
-    getClaimableLogbooks(isSole?: boolean): this;
     /**
      * Calculate total kilometers traveled
      */
     get kilometers(): number;
-    /**
-     * Calculate work usage (percent of business-related kilometers from total kilometers)
-     * @TODO Alex: TT-2089 replace with getter
-     */
-    get workUsage(): number;
-    getWorkUsageByTank(isSole: boolean): number;
-    /**
-     * Get list of logbooks related to passed vehicle claim
-     */
-    getByVehicleClaim(vehicleClaim: VehicleClaim): this;
+    getWorkUsage(vehicleClaim?: VehicleClaim): number;
+    getClaimable(vehicleClaim?: VehicleClaim): this;
     /**
      * get collection of logbooks with the biggest work usage for {@link BestVehicleLogbookCollection.periodDuration}
      */
-    getBest(isSole?: boolean): BestVehicleLogbookCollection | null;
+    getBest(): BestVehicleLogbookCollection | null;
 }

package/lib/models/financial-year/financial-year.d.ts

@@ -2,7 +2,7 @@ export declare class FinancialYear {
     static weeksInYear: number;
     static monthsInYear: number;
     static startMonthIndex: number;
-    static year: number;
+    static get year(): number;
     year: number;
     startDate: Date;
     endDate: Date;

package/lib/models/vehicle/vehicle-logbook.d.ts

@@ -6,6 +6,4 @@ export declare class VehicleLogbook extends VehicleLogbookBase {
     business: SoleBusiness;
     get kilometers(): number;
     get tankType(): TankTypeEnum;
-    isWorkTank(): boolean;
-    isSoleTank(): boolean;
 }

package/lib/services/http/vehicle/vehicle-claim.service.d.ts

@@ -1,27 +1,21 @@
 import { VehicleClaim as VehicleClaimBase } from '../../../db/Models/vehicle/vehicle-claim';
 import { VehicleClaim } from '../../../models';
 import { RestService } from '../rest/rest-old.service';
-import { IEventListener } from '../../../interfaces';
 import { Observable } from 'rxjs';
 import { UserRolesEnum } from '../../../db/Enums/user-roles.enum';
+import { BestVehicleLogbookCollection } from '../../../collections';
 import * as i0 from "@angular/core";
-export declare class VehicleClaimService extends RestService<VehicleClaimBase, VehicleClaim> implements IEventListener {
+export declare class VehicleClaimService extends RestService<VehicleClaimBase, VehicleClaim> {
     modelClass: typeof VehicleClaim;
     url: string;
     roles: UserRolesEnum[];
-    listenEvents(): void;
     add(model: VehicleClaim): Observable<VehicleClaim>;
     update(model: VehicleClaim, queryParams?: object): Observable<VehicleClaim>;
-    /**
-     * Details changes may affect vehicle claims:
-     * when details method changed, all claims current values become 0
-     */
-    private listenVehicleClaimDetailsChanges;
     /**
      * Update workUsage for all vehicle claims if logbook best period changed
      * @TODO Vik: Best period move this and related logic to backend
      */
-    private updateWorkUsage;
+    updateWorkUsage(bestLogbooks: BestVehicleLogbookCollection): Observable<VehicleClaim[]>;
     static ɵfac: i0.ɵɵFactoryDeclaration<VehicleClaimService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<VehicleClaimService>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.32.2",
+  "version": "0.32.5",
   "private": false,
   "peerDependencies": {
     "@angular/compiler": "^16.2.12",