taxtank-core 0.33.48 → 0.33.50

package/fesm2022/taxtank-core.mjs

@@ -8731,9 +8731,10 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
     }
     /**
      * Best period may be calculated only when user has logbooks minimum for VehicleLogbook.bestPeriodWeeks
+     * and has at least one work/business trip
      */
     static isBestPeriodExist(logbooks) {
-        if (logbooks.length < 2) {
+        if (logbooks.length < 2 || !logbooks.getClaimable().length) {
             return false;
         }
         if (!(logbooks instanceof VehicleLogbookCollection)) {
@@ -8744,6 +8745,9 @@ class BestVehicleLogbookCollection extends VehicleLogbookCollection {
     // get list of date ranges for each of passed logbook
     static getPeriods(logbooks) {
         const claimable = logbooks.getClaimable();
+        if (!claimable.length) {
+            return [];
+        }
         // get a list of date ranges that could potentially be the best
         const periods = claimable
             // skip logbooks whose range ends after the last logbook
@@ -10727,13 +10731,13 @@ __decorate([
 class HomeOfficeClaim extends ObservableModel {
     constructor() {
         super(...arguments);
-        this.hours = 0;
         this.electricityAndGas = 0;
         this.cleaning = 0;
         this.internet = 0;
         this.telephone = 0;
         this.mobile = 0;
-        this.officePercent = 0;
+        this.occupancyPercent = 0;
+        this.dedicatedOffice = true;
     }
     static { this.className = 'HomeOfficeClaim'; }
     getChartAccountsList() {
@@ -10748,10 +10752,10 @@ class HomeOfficeClaim extends ObservableModel {
             .add(list.TELEPHONE, this.telephone)
             .add(list.MOBILE_PHONE, this.mobile);
         if (this.method === HomeOfficeClaimMethodEnum.OCCUPANCY) {
-            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_RENT, this.officePercent);
-            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_LOAN, this.officePercent);
-            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_RATES, this.officePercent);
-            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_OTHER, this.officePercent);
+            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_RENT, this.occupancyPercent);
+            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_LOAN, this.occupancyPercent);
+            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_RATES, this.occupancyPercent);
+            claims.add(BusinessChartAccountsEnum.HOME_OFFICE_OTHER, this.occupancyPercent);
         }
         return claims;
     }
@@ -10763,7 +10767,8 @@ __decorate([
     Type(() => SoleBusiness)
 ], HomeOfficeClaim.prototype, "business", void 0);
 
-class HomeOfficeLog extends AbstractModel {
+class HomeOfficeLog extends ObservableModel {
+    static { this.className = 'HomeOfficeLog'; }
 }
 __decorate([
     Type(() => HomeOfficeClaim)
@@ -15394,6 +15399,7 @@ class TransactionService extends RestService {
         this.listenDepreciationChange();
         this.listenVehicleClaimChanges();
         this.listenHomeOfficeClaim();
+        this.listenHomeOfficeLog();
         this.listenPropertyForecastUpdate();
         this.listenNotifications();
     }
@@ -15583,6 +15589,11 @@ class TransactionService extends RestService {
             this.refreshCache();
         });
     }
+    listenHomeOfficeLog() {
+        this.eventDispatcherService.on2(...HomeOfficeLog.getEventNames('post', 'put', 'delete')).subscribe(() => {
+            this.refreshCache();
+        });
+    }
     /**
      * property forecast includes claimPercent which affects property related expenses
      * @TODO Alex move to forecast api instead of property
@@ -16453,7 +16464,7 @@ class HomeOfficeLogService extends RestService$1 {
     constructor() {
         super(...arguments);
         this.endpointUri = 'home-office-logs';
-        this.modelClass = HomeOfficeClaim;
+        this.modelClass = HomeOfficeLog;
         this.collectionClass = (Collection);
         this.disabledMethods = ['postBatch', 'putBatch', 'deleteBatch'];
     }
@@ -24590,13 +24601,12 @@ class HomeOfficeClaimForm extends AbstractForm {
     constructor(claim = plainToClass(HomeOfficeClaim, {})) {
         super({
             method: new FormControl(claim.method, Validators.required),
-            hours: new FormControl(claim.hours, [Validators.required, Validators.min(0), Validators.max(5000)]),
             electricityAndGas: new FormControl(claim.electricityAndGas, [Validators.required, Validators.min(0), Validators.max(100)]),
             cleaning: new FormControl(claim.cleaning, [Validators.required, Validators.min(0), Validators.max(100)]),
             internet: new FormControl(claim.internet, [Validators.required, Validators.min(0), Validators.max(100)]),
             telephone: new FormControl(claim.telephone, [Validators.required, Validators.min(0), Validators.max(100)]),
             mobile: new FormControl(claim.mobile, [Validators.required, Validators.min(0), Validators.max(100)]),
-            officePercent: new FormControl(claim.officePercent, [Validators.required, Validators.min(0), Validators.max(100)]),
+            occupancyPercent: new FormControl(claim.occupancyPercent, [Validators.required, Validators.min(0), Validators.max(100)]),
         }, claim);
         this.listenEvents();
         this.switchMethod(claim.method);
@@ -24607,11 +24617,8 @@ class HomeOfficeClaimForm extends AbstractForm {
         });
     }
     switchMethod(method) {
-        this.disable({}, [...this.occupancyControls, this.controls.hours]);
+        this.disable({}, this.occupancyControls);
         switch (method) {
-            case HomeOfficeClaimMethodEnum.FIXED:
-                this.controls.hours.enable();
-                break;
             case HomeOfficeClaimMethodEnum.ACTUAL:
                 this.enable({}, this.actualControls);
                 break;
@@ -24624,7 +24631,7 @@ class HomeOfficeClaimForm extends AbstractForm {
         return [this.controls.electricityAndGas, this.controls.cleaning, this.controls.internet, this.controls.telephone, this.controls.mobile];
     }
     get occupancyControls() {
-        return [...this.actualControls, this.controls.officePercent];
+        return [...this.actualControls, this.controls.occupancyPercent];
     }
 }
 
@@ -24642,19 +24649,23 @@ class HomeOfficeCalculatorForm extends AbstractForm {
     constructor(claim = plainToClass(HomeOfficeClaim, {})) {
         super({
             homeArea: new FormControl(claim.homeArea, [Validators.required]),
-            officeArea: new FormControl({ value: claim.officeArea, disabled: !!claim.dedicatedOffice }, [Validators.required]),
+            officeArea: new FormControl(claim.officeArea, [Validators.required]),
             dedicatedOffice: new FormControl(claim.dedicatedOffice, [Validators.required]),
+            workUsage: new FormControl({ value: claim.workUsage, disabled: true }, [Validators.required])
         }, claim);
         this.listenEvents();
     }
     listenEvents() {
         this.get('dedicatedOffice').valueChanges.subscribe(() => {
-            this.toggleEnabledState(this.get('officeArea'));
+            this.toggleEnabledState(this.get('workUsage'));
         });
     }
     submit() {
-        const officePercent = this.value.dedicatedOffice ? 100 : round(this.value.officeArea * 100 / this.value.homeArea, 2);
-        return super.submit({ officePercent });
+        let occupancyPercent = this.value.officeArea * 100 / this.value.homeArea;
+        if (!this.value.dedicatedOffice) {
+            occupancyPercent *= this.value.workUsage / 100;
+        }
+        return super.submit({ occupancyPercent: round(occupancyPercent, 2) });
     }
 }