taxtank-core 0.27.4 → 0.27.5

package/fesm2015/taxtank-core.js

@@ -14,8 +14,8 @@ import last from 'lodash/last';
 import flatten from 'lodash/flatten';
 import hasIn from 'lodash/hasIn';
 import first from 'lodash/first';
-import * as moment from 'moment';
-import { DateRange } from 'moment-range';
+import * as moment$1 from 'moment';
+import { extendMoment, DateRange } from 'moment-range';
 import uniqBy from 'lodash/uniqBy';
 import concat from 'lodash/concat';
 import { throwError as throwError$1 } from 'rxjs/internal/observable/throwError';
@@ -1241,6 +1241,7 @@ class FinancialYear {
         return months;
     }
 }
+FinancialYear.weeksInYear = 52;
 FinancialYear.startMonthIndex = 6;
 
 /**
@@ -2241,26 +2242,26 @@ class ChartAccounts extends ChartAccounts$1 {
         return this.name;
     }
     /**
-     * Check if chart accounts id is related for 'Klms travelled for work' category
+     * Check if chart accounts id is related for 'Kms travelled for work' category
      */
-    isKlmsForWork() {
+    isKmsForWork() {
         return this.id === ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
     }
     /**
-     * Check if chart accounts id is related for 'Klms travelled for sole' category
+     * Check if chart accounts id is related for 'Kms travelled for sole' category
      */
-    isKlmsForSole() {
+    isKmsForSole() {
         return this.id === ChartAccountsListEnum.KLMS_TRAVELLED;
     }
     /**
-     * Check if accounts id is related for KLMs category related to passed tank type
+     * Check if accounts id is related for KMs category related to passed tank type
      */
-    isKLMsByTankType(tankType) {
+    isKMsByTankType(tankType) {
         switch (tankType) {
             case TankTypeEnum.WORK:
-                return this.isKlmsForWork();
+                return this.isKmsForWork();
             case TankTypeEnum.SOLE:
-                return this.isKlmsForSole();
+                return this.isKmsForSole();
             default:
                 return false;
         }
@@ -2421,8 +2422,9 @@ class SoleInvoiceTemplate$1 extends AbstractModel {
 }
 
 class SoleInvoiceTemplate extends SoleInvoiceTemplate$1 {
-    static create(businessId) {
-        return plainToClass(SoleInvoiceTemplate, { business: { id: businessId }, isTaxIncluded: false });
+    constructor() {
+        super(...arguments);
+        this.isTaxIncluded = false;
     }
 }
 __decorate([
@@ -2459,6 +2461,7 @@ __decorate([
 /**
  * Class contains traveled kilometers and work usage percent in 12 weeks date range
  * @TODO Vik: Best period: move this and related logic to backend
+ * @TODO Alex: check if we need this class when calculation refactored with backend
  */
 class LogbookPeriod {
     isEndOfYear() {
@@ -2482,6 +2485,7 @@ class Vehicle$1 extends AbstractModel {
 class VehicleLogbook$1 extends AbstractModel {
 }
 
+const moment = extendMoment(moment$1);
 class VehicleLogbook extends VehicleLogbook$1 {
     get kilometers() {
         return this.odometerEnd - this.odometerStart;
@@ -2495,13 +2499,18 @@ class VehicleLogbook extends VehicleLogbook$1 {
     isSoleTank() {
         return !!this.business;
     }
+    /**
+     * Get logbook period date range from logbook date and weeksInPeriod duration
+     */
+    getPeriod() {
+        return moment.rangeFromInterval('weeks', VehicleLogbook.bestPeriodWeeks, this.date);
+    }
 }
 /**
- * 12 weeks in milliseconds
- * "To work out your business-use percentage, you need to keep a logbook and the odometer readings for the logbook period.
- * The logbook period is a minimum continuous period of 12 weeks." © Nicole Kelly
+ * Logbook period duration in weeks.
+ * https://taxtank.atlassian.net/wiki/spaces/TAXTANK/pages/211517441/Logbook+Vehicle
  */
-VehicleLogbook.periodDuration = 7257600000;
+VehicleLogbook.bestPeriodWeeks = 12;
 __decorate([
     Type(() => Date)
 ], VehicleLogbook.prototype, "date", void 0);
@@ -2528,26 +2537,32 @@ var VehicleClaimDetailsMethodEnum;
 })(VehicleClaimDetailsMethodEnum || (VehicleClaimDetailsMethodEnum = {}));
 
 class VehicleClaimDetails extends VehicleClaimDetails$1 {
+    constructor() {
+        super(...arguments);
+        /**
+         * Init default values for the new instances
+         */
+        this.isManual = true;
+        this.method = VehicleClaimDetailsMethodEnum.KMS;
+        this.financialYear = new FinancialYear().year;
+    }
     isLogbookMethod() {
         return this.method === VehicleClaimDetailsMethodEnum.LOGBOOK;
     }
-    isKlmsMethod() {
+    isKmsMethod() {
         return this.method === VehicleClaimDetailsMethodEnum.KMS;
     }
-    // @TODO Alex: discuss with Vik and think about abstract method in AbstractModel
-    static create() {
-        return plainToClass(VehicleClaimDetails, {
-            isManual: true,
-            method: VehicleClaimDetailsMethodEnum.KMS,
-            financialYear: new FinancialYear().year
-        });
-    }
 }
 __decorate([
     Type(() => User)
 ], VehicleClaimDetails.prototype, "user", void 0);
 
 class VehicleClaim extends VehicleClaim$1 {
+    constructor() {
+        super(...arguments);
+        this.kilometers = 0;
+        this.workUsage = 0;
+    }
     isWorkTank() {
         return !this.business;
     }
@@ -2558,9 +2573,9 @@ class VehicleClaim extends VehicleClaim$1 {
         return this.isSoleTank() ? TankTypeEnum.SOLE : TankTypeEnum.WORK;
     }
     /**
-     * Claim amount for KLMs method. Exists only for KLMs method.
+     * Claim amount for KMs method. Exists only for KMs method.
      */
-    getKLMsClaimAmount(vehicleClaimRate) {
+    getKMSClaimAmount(vehicleClaimRate) {
         return +(this.kilometers * vehicleClaimRate).toFixed(2);
     }
     /**
@@ -2575,19 +2590,14 @@ class VehicleClaim extends VehicleClaim$1 {
         // Math.abs because amount will be negative (because we sum expenses), but we don't want negative percent value
         return Math.abs(transactionsAmount) * this.workUsage / 100;
     }
-    getKlmsChartAccountsIdByTankType(tankType = this.tankType) {
+    getAverageWeeklyKMS() {
+        return this.kilometers / FinancialYear.weeksInYear;
+    }
+    static getKMSChartAccountsIdByTankType(tankType) {
         return tankType === TankTypeEnum.WORK
             ? ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK
             : ChartAccountsListEnum.KLMS_TRAVELLED;
     }
-    static create(details, business) {
-        return plainToClass(VehicleClaim, {
-            kilometers: 0,
-            workUsage: 0,
-            details,
-            business
-        });
-    }
 }
 /**
  * limit for kms claim method
@@ -2673,6 +2683,7 @@ var DepreciationCalculationEnum;
 (function (DepreciationCalculationEnum) {
     DepreciationCalculationEnum[DepreciationCalculationEnum["PRIME_COST"] = 1] = "PRIME_COST";
     DepreciationCalculationEnum[DepreciationCalculationEnum["DIMINISHING"] = 2] = "DIMINISHING";
+    DepreciationCalculationEnum[DepreciationCalculationEnum["CAPITAL"] = 3] = "CAPITAL";
     DepreciationCalculationEnum[DepreciationCalculationEnum["LVP"] = 4] = "LVP";
     DepreciationCalculationEnum[DepreciationCalculationEnum["AMORTISATION"] = 5] = "AMORTISATION";
     DepreciationCalculationEnum[DepreciationCalculationEnum["SBP"] = 6] = "SBP";
@@ -2695,7 +2706,7 @@ class DepreciationForecast extends DepreciationForecast$1 {
         return this.claimAmount / this.daysApplied;
     }
     get daysApplied() {
-        return moment(this.toDate).diff(moment(this.fromDate), 'days');
+        return moment$1(this.toDate).diff(moment$1(this.fromDate), 'days');
     }
     getDaysByMonth(month) {
         // @TODO find a better place
@@ -3047,9 +3058,9 @@ class Transaction extends Transaction$1 {
         }
     }
     /**
-     * Check if transaction has 'Klms travelled for work' chart accounts category
+     * Check if transaction has 'Kms travelled for work' chart accounts category
      */
-    get isKlmsChartAccountsCategory() {
+    get isKmsChartAccountsCategory() {
         return this.chartAccounts.id === ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK;
     }
     /**
@@ -3992,7 +4003,7 @@ class Property extends Property$1 {
      * ownership duration from purchase till sale
      */
     getOwnershipDuration(sale, unitOfTime = 'days') {
-        return moment(sale.contractDate).diff(moment(this.contractDate), unitOfTime);
+        return moment$1(sale.contractDate).diff(moment$1(this.contractDate), unitOfTime);
     }
     /**
      * Tax Position = Income - Expense - Interest - Depreciation
@@ -4132,6 +4143,9 @@ __decorate([
 ], BankConnection.prototype, "bank", void 0);
 
 class BankAccount extends BankAccount$1 {
+    get bank() {
+        return this.bankConnection.bank;
+    }
     /**
      * Get current opening balance amount
      */
@@ -4758,9 +4772,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImpo
 class VehicleClaimCollection extends Collection {
     /**
      * Get remaining kilometers limit. Total limit ({@link VehicleClaim.totalKmsLimit}) - claimed kilometers from other vehicle claims
-     * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
      */
-    getKlmsLimitForClaim(claim) {
+    getKmsLimitForClaim(claim) {
         let collection = this;
         if (claim) {
             collection = collection.removeBy('id', claim.id);
@@ -4769,7 +4782,6 @@ class VehicleClaimCollection extends Collection {
     }
     /**
      * Get remaining work usage limit. Total limit ({@link VehicleClaim.totalWorkUsagePercent}) - claimed percent from other vehicle claims
-     * @param claim may not exist when user come to vehicle claim page 1st time and not created claim yet
      */
     getWorkUsageLimitForClaim(claim) {
         let collection = this;
@@ -4782,14 +4794,14 @@ class VehicleClaimCollection extends Collection {
 
 class VehicleLogbookCollection extends Collection {
     /**
-     * Best period may be calculated only when user has logbooks minimum for {@link VehicleLogbook.periodDuration}
+     * Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks
      * @TODO Vik: Best period: move this and related logic to backend
      */
     isBestPeriodExist() {
         if (this.items.length < 2) {
             return false;
         }
-        return VehicleLogbook.periodDuration < (this.last.date.getTime() - this.first.date.getTime());
+        return VehicleLogbook.bestPeriodWeeks < (this.last.date.getTime() - this.first.date.getTime());
     }
     /**
      * Get collection of non-personal logbooks (work-related, sole-related).
@@ -4799,15 +4811,14 @@ class VehicleLogbookCollection extends Collection {
         return this.filterBy('isPersonal', false);
     }
     /**
-     * Logbook Period is the best when it has the biggest work usage percent
-     * Best period duration is defined as {@link VehicleLogbook.periodDuration} by the ATO
+     * Get Logbook Period with the biggest work usage percent
+     * Best period duration is defined as VehicleLogbook.bestPeriodWeeks by the ATO
      * @TODO Vik: Best period: move this and related logic to backend
      */
     getBestPeriod() {
         if (!this.isBestPeriodExist()) {
             return null;
         }
-        // declare best period variable
         let bestPeriod;
         // get list of all logbooks available for best period calculation
         const claimableLogbooks = this.getClaimableLogbooks().toArray();
@@ -4817,12 +4828,12 @@ class VehicleLogbookCollection extends Collection {
                 break;
             }
             // get date range started from current handling logbook date
-            const dateRange = this.getPeriodRange(claimableLogbooks[i].date);
+            const dateRange = claimableLogbooks[i].getPeriod();
             // get all logbooks included in current logbook period
-            const logbooksInRange = this.filterByRange('date', dateRange.from, dateRange.to);
+            const logbooksInRange = this.filterByRange('date', dateRange.start, dateRange.end);
             const currentPeriod = plainToClass(LogbookPeriod, {
-                from: dateRange.from,
-                to: dateRange.to,
+                from: dateRange.start,
+                to: dateRange.end,
                 kilometers: logbooksInRange.getClaimableLogbooks().kilometers,
                 workUsage: logbooksInRange.getWorkUsage(),
                 logbooks: logbooksInRange
@@ -4856,28 +4867,15 @@ class VehicleLogbookCollection extends Collection {
         const workKilometers = this.getClaimableLogbooks().kilometers;
         return Math.round(workKilometers / this.kilometers * 100);
     }
-    /**
-     * Get LOGBOOK_PERIOD_DURATION date range from passed start date
-     * @TODO Vik: Best period: move this and related logic to backend
-     */
-    getPeriodRange(from) {
-        // set end date as VehicleLogbook.periodDuration after start date
-        let to = new Date(from.getTime() + VehicleLogbook.periodDuration);
-        const financialYear = new FinancialYear();
-        // set as period last VehicleLogbook.periodDuration of current year if period end date after end of current year
-        if (to > financialYear.endDate) {
-            to = financialYear.endDate;
-            from = new Date(to.getTime() - VehicleLogbook.periodDuration);
-        }
-        return { from, to };
-    }
     /**
      * Get list of logbooks related to passed vehicle claim
      */
-    getByVehicleClaim(claim) {
-        return claim.isWorkTank()
-            ? this.filterBy('tankType', TankTypeEnum.WORK)
-            : this.filterBy('business.id', claim.business.id);
+    getByVehicleClaim(vehicleClaim) {
+        return vehicleClaim.isSoleTank()
+            // sole tank may have multiple vehicle claims, so we need to filter by business.id
+            ? this.filterBy('business.id', vehicleClaim.business.id)
+            // work tank may have only one vehicle claim, so we need to filter by tank type
+            : this.filterBy('tankType', TankTypeEnum.WORK);
     }
 }
 
@@ -5011,9 +5009,9 @@ class BankTransactionCollection extends Collection {
 
 class ChartAccountsCollection extends Collection {
     /**
-     * Get 'Klms travelled for work' related chart account value
+     * Get 'Kms travelled for work' related chart account value
      */
-    getVehicleKlmsRate(year = new FinancialYear().year) {
+    getVehicleKmsRate(year = new FinancialYear().year) {
         return this.findBy('id', ChartAccountsListEnum.KLMS_TRAVELLED_FOR_WORK).getValueByYear(year).value;
     }
 }
@@ -5271,6 +5269,9 @@ class TransactionCollection extends ExportableCollection {
      * Get list of vehicle transactions filtered by vehicle claim
      */
     getByVehicleClaim(vehicleClaim) {
+        if (!vehicleClaim) {
+            return this.create([]);
+        }
         return vehicleClaim.isSoleTank()
             // sole tank may have multiple vehicle claims, so we need to filter by business.id
             ? this.getVehicleTransactions().filterBy('business.id', vehicleClaim.business.id)
@@ -5278,7 +5279,7 @@ class TransactionCollection extends ExportableCollection {
             : this.getVehicleTransactions().filterBy('tankType', TankTypeEnum.WORK);
     }
     /**
-     * Get list of vehicle transactions except KLMS transactions
+     * Get list of vehicle transactions except KMS transactions
      */
     getLogbookTransactions() {
         return this
@@ -8101,7 +8102,7 @@ class MyTaxDeductions {
         return 0;
     }
     setVehicleClaimData() {
-        this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
+        this.klmsMethodClaimAmount = this.vehicleClaim.getKMSClaimAmount(this.vehicleClaimRate);
         this.totalExpensesAmount = this.vehicleClaim.getLogbookClaimAmount(new TransactionCollection([
             ...this.transactions.getByTankType(this.vehicleClaim.tankType),
             ...this.depreciations.getByTankType(this.vehicleClaim.tankType).toTransactions().toArray()
@@ -9008,10 +9009,7 @@ class VehicleClaimService extends RestService {
      * when details method changed, all claims current values become 0
      */
     listenVehicleClaimDetailsChanges() {
-        this.eventDispatcherService.on([
-            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
-            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
-        ])
+        this.eventDispatcherService.on(AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED)
             .subscribe(() => {
             this.resetCache();
         });
@@ -9036,14 +9034,17 @@ class VehicleClaimService extends RestService {
      * @TODO Vik: Best period move this and related logic to backend
      */
     updateWorkUsage(bestPeriod) {
-        // We are sure this.cache exist here because logbook best period calculation is based on vehicle claims,
-        // so before we can get logbook best period changes, we must get vehicle claims
+        // no need to update if cache not exist
+        if (!this.cache) {
+            return;
+        }
+        // @TODO Vik (TT-2210): need batch endpoint for this update
+        // @TODO Alex (TT-2210): fix frontend when endpoint ready
         const batch$ = this.cache.map((claim) => {
             const claimToUpdate = plainToClass(VehicleClaim, Object.assign({}, claim, { workUsage: bestPeriod === null || bestPeriod === void 0 ? void 0 : bestPeriod.getWorkUsageByClaim(claim) }));
             return this.update(claimToUpdate);
         });
-        // take(1) is using to avoid unnecessary callback calling whe user updated details directly
-        combineLatest(batch$).pipe(take(1)).subscribe();
+        combineLatest(batch$).subscribe();
     }
 }
 VehicleClaimService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
@@ -9117,11 +9118,12 @@ class VehicleClaimDetailsService {
      * @TODO Vik: Best period move this and related logic to backend
      */
     updateToManual() {
-        // We are sure this.cache exist here because logbook best period calculation is based on vehicle claim details,
-        // so before we can get logbook best period changes, we must get vehicle claim details
+        // no need to update if cache not exist
+        if (!this.cache) {
+            return;
+        }
         const vehicleClaimDetails = plainToClass(VehicleClaimDetails, Object.assign({}, this.cache, { isManual: true }));
-        // take(1) is using to avoid unnecessary callback calling whe user updated details directly
-        this.update(vehicleClaimDetails).pipe(take(1)).subscribe();
+        this.update(vehicleClaimDetails).subscribe();
     }
 }
 VehicleClaimDetailsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0, type: VehicleClaimDetailsService, deps: [{ token: 'environment' }, { token: i1.HttpClient }, { token: EventDispatcherService }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -9412,7 +9414,7 @@ const ACCOUNT_SETUP_ITEMS = {
     }),
     [AccountSetupItemsEnum.WORK_LOGBOOK]: plainToClass(AccountSetupItem, {
         title: 'Set up your logbook method',
-        description: 'Do you use your vehicle for work? Select your method and the klms or logbook % to automate accurately all vehicle expenses throughout the year.',
+        description: 'Do you use your vehicle for work? Select your method and the kms or logbook % to automate accurately all vehicle expenses throughout the year.',
         url: '/client/work-tank/logbook',
         urlFragment: 'productTour'
     }),
@@ -10288,7 +10290,6 @@ class TransactionService extends RestService {
         this.eventDispatcherService.on([
             AppEventTypeEnum.VEHICLE_CLAIM_CREATED,
             AppEventTypeEnum.VEHICLE_CLAIM_UPDATED,
-            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
             AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
         ]).subscribe(() => {
             this.resetCache();
@@ -10392,7 +10393,7 @@ class AccountSetupService {
         }
         // Bank feeds item is completed when user added at least one bank account (basiq or manual)
         batch.push(this.create(AccountSetupItemsEnum.BANK_FEEDS, this.bankAccountsService.get()));
-        // Logbook item is completed when user has at least one vehicle claim with any method (klms or logbook)
+        // Logbook item is completed when user has at least one vehicle claim with any method (kms or logbook)
         batch.push(this.getLogbookItem());
         // @TODO waiting for sole tank forecast page
         // Sole item is completed when user added at least one sole income source
@@ -11532,7 +11533,6 @@ class DepreciationService extends RestService {
         this.eventDispatcherService.on([
             AppEventTypeEnum.VEHICLE_CLAIM_CREATED,
             AppEventTypeEnum.VEHICLE_CLAIM_UPDATED,
-            AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_CREATED,
             AppEventTypeEnum.VEHICLE_CLAIM_DETAILS_UPDATED
         ]).subscribe(() => {
             this.resetCache();
@@ -13822,7 +13822,7 @@ function taxReviewFilterPredicate(data, filter) {
 /**
  * Abstract form class
  * @TODO rename to AbstractFormGroup
- * @TODO Alex: refactor: check and improve logic
+ * @TODO Alex TT-2190: refactor: check and improve logic
  */
 class AbstractForm extends FormGroup {
     constructor(controls, model, validatorOrOpts, asyncValidator) {
@@ -13838,13 +13838,14 @@ class AbstractForm extends FormGroup {
         if (model && !model['id']) {
             this.markAsUnsaved();
         }
-        this.valueChanges.subscribe(() => {
-            !!model && !!model['id'] && isEqual(this.value, this.initialValue) ? this.markAsSaved() : this.markAsUnsaved();
-        });
+        this.listenValueChanges();
     }
     get saved() {
         return !this.unsaved;
     }
+    get currentValue() {
+        return this.createModelInstance(Object.assign({}, this.model, this.getRawValue()));
+    }
     /**
      * Check validation and return a new instance of generic model.
      * Merge form value to initial object
@@ -13873,6 +13874,11 @@ class AbstractForm extends FormGroup {
     createModelInstance(data = {}) {
         return plainToClass(this.modelClass, data);
     }
+    listenValueChanges() {
+        this.valueChanges.subscribe(() => {
+            !!this.model && !!this.model['id'] && isEqual(this.value, this.initialValue) ? this.markAsSaved() : this.markAsUnsaved();
+        });
+    }
 }
 
 /**
@@ -14152,6 +14158,7 @@ class SoleBusinessForm extends AbstractForm {
 /**
  * Form array with bank account business allocations
  * @TODO create AbstractFormArray
+ * @TODO Alex/Vik (TT-2184): copypasted from bank-account-properties.form, improve logic and create common parent class maybe
  */
 class SoleBusinessAllocationsForm extends FormArray {
     constructor(businessAllocations) {
@@ -14248,7 +14255,7 @@ class SoleInvoiceTemplateForm extends AbstractForm {
             name: new FormControl(invoiceTemplate.name, Validators.required),
             isTaxIncluded: new FormControl(invoiceTemplate.isTaxIncluded),
             term: new FormControl(invoiceTemplate.term, [Validators.required, Validators.min(0)]),
-            bankAccount: new FormControl(invoiceTemplate.bankAccount)
+            bankAccount: new FormControl(invoiceTemplate.bankAccount, [Validators.required])
         }, invoiceTemplate);
     }
 }
@@ -14265,9 +14272,12 @@ class BankAccountAllocationForm extends AbstractForm {
         if (bankAccount === null || bankAccount === void 0 ? void 0 : bankAccount.isSoleTank()) {
             this.addControl('businessAllocations', new SoleBusinessAllocationsForm(bankAccount.businessAllocations));
         }
-        this.watchTankType();
+        this.listenEvents();
+    }
+    listenEvents() {
+        this.listenTankTypeChanges();
     }
-    watchTankType() {
+    listenTankTypeChanges() {
         this.get('tankType').valueChanges.subscribe((tankType) => {
             var _a, _b;
             this.removeControl('bankAccountProperties');
@@ -14928,9 +14938,14 @@ class VehicleClaimForm extends AbstractForm {
             }),
             workUsage: new FormControl({
                 value: vehicleClaim.workUsage,
-                disabled: !details.isManual || details.isKlmsMethod()
+                disabled: !details.isManual || details.isKmsMethod()
             })
         }, vehicleClaim);
+        this.vehicleClaim = vehicleClaim;
+        this.details = details;
+    }
+    getAverageWeeklyKMS() {
+        return this.get('kilometers').value / FinancialYear.weeksInYear;
     }
 }
 
@@ -14938,16 +14953,12 @@ class VehicleClaimForm extends AbstractForm {
  * Add/Edit vehicle claim details form
  */
 class VehicleClaimDetailsForm extends AbstractForm {
-    /**
-     * @param vehicleClaimDetails required because we create a new details with prefilled data (like Financial year)
-     * @param logbooks required for isManual field disabled state management
-     */
-    constructor(vehicleClaimDetails, logbooks) {
+    constructor(vehicleClaimDetails, isBestPeriodExist) {
         super({
             method: new FormControl(vehicleClaimDetails.method, Validators.required),
             isManual: new FormControl({
                 value: vehicleClaimDetails.isManual,
-                disabled: !logbooks.isBestPeriodExist()
+                disabled: !isBestPeriodExist
             }),
         }, vehicleClaimDetails);
     }
@@ -14972,30 +14983,38 @@ class VehicleLogbookForm extends AbstractForm {
             date: new FormControl(logbook.date, Validators.required),
             odometerStart: new FormControl(logbook.odometerStart, Validators.required),
             odometerEnd: new FormControl(logbook.odometerEnd, Validators.required),
-            business: new FormControl(logbook.business),
-            // @TODO Alex: remove when backend fixed
-            purpose: new FormControl(VehicleLogbookPurposeEnum.BUSINESS)
+            business: new FormControl(logbook.business)
         }, logbook);
         this.logbook = logbook;
         this.logbooks = logbooks;
+        this.updateStateAndValidators();
+    }
+    /**
+     * Set logbook validators and disable state depends of initial logbook and its place in the whole list
+     */
+    updateStateAndValidators() {
         switch (true) {
             // Create the first or edit the single logbook
-            case !logbook.id && !logbooks.length:
-            case !!logbook.id && logbooks.length === 1:
+            case !this.logbook.id && !this.logbooks.length:
+            case !!this.logbook.id && this.logbooks.length === 1:
                 this.get('odometerStart').setValidators(Validators.min(0));
                 this.get('date').setValidators(dateRangeValidator(new FinancialYear().startDate, new FinancialYear().endDate));
                 break;
-            // Create the non-first or edit the last logbook
-            case !logbook.id && !!logbooks.length:
-            case !!logbook.id && logbook.id === logbooks.last.id && logbooks.length > 1:
+            // Create the non-first
+            case !this.logbook.id && !!this.logbooks.length:
                 this.get('odometerStart').disable();
-                this.get('odometerEnd').setValidators(Validators.min(logbooks.last.odometerEnd));
-                if (!!logbook.id) {
-                }
-                this.get('date').setValidators(dateRangeValidator(logbooks.last.date, new FinancialYear().endDate));
+                this.get('odometerEnd').setValidators(Validators.min(this.logbooks.last.odometerEnd));
+                this.get('date').setValidators(dateRangeValidator(this.logbooks.last.date, new FinancialYear().endDate));
+                break;
+            // Edit the last logbook
+            case !!this.logbook.id && this.logbook.id === this.logbooks.last.id && this.logbooks.length > 1:
+                this.get('odometerStart').disable();
+                this.get('odometerEnd').setValidators(Validators.min(this.logbooks.last.odometerEnd));
+                const preLastDate = this.logbooks.toArray()[this.logbooks.length - 1].date;
+                this.get('date').setValidators(dateRangeValidator(preLastDate, new FinancialYear().endDate));
                 break;
             // Edit the non-last logbook
-            case !!logbook.id && logbook.id !== logbooks.last.id && logbooks.length > 1:
+            case !!this.logbook.id && this.logbook.id !== this.logbooks.last.id && this.logbooks.length > 1:
                 this.get('odometerStart').disable();
                 this.get('odometerEnd').disable();
                 this.get('date').disable();