taxtank-core 0.33.47 → 0.33.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.33.47",
+  "version": "0.33.50",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^17.0.0",

package/src/lib/collections/home-office/home-office-claim.collection.d.ts

@@ -0,0 +1,5 @@
+import { HomeOfficeClaim, SoleBusiness } from '../../models';
+import { Collection } from '../collection';
+export declare class HomeOfficeClaimCollection extends Collection<HomeOfficeClaim> {
+    findByBusiness(business?: SoleBusiness): HomeOfficeClaim;
+}

package/src/lib/collections/home-office/index.d.ts

@@ -0,0 +1 @@
+export * from './home-office-claim.collection';

package/src/lib/collections/index.d.ts

@@ -31,3 +31,4 @@ export * from './holding';
 export * from './asset-sale.collection';
 export * from './user/user.collection';
 export * from './chart-accounts';
+export * from './home-office';

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

@@ -22,6 +22,7 @@ export declare class BestVehicleLogbookCollection extends VehicleLogbookCollecti
     private constructor();
     /**
      * 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: VehicleLogbookCollection): boolean;
     static getPeriods(logbooks: VehicleLogbookCollection): DateRange[];

package/src/lib/db/Enums/chart-accounts/business-chart-accounts.enum.d.ts

@@ -33,5 +33,14 @@ export declare enum BusinessChartAccountsEnum {
     GST_REFUND = 864,
     PAYG_INSTALLMENTS = 878,
     INTEREST_EARNED = 879,
-    HOME_OFFICE_HOURS = 888
+    HOME_OFFICE_HOURS = 888,
+    ELECTRICITY_AND_GAS = 892,
+    HOME_OFFICE_CLEANING = 893,
+    INTERNET = 705,
+    TELEPHONE = 11860,
+    MOBILE_PHONE = 719,
+    HOME_OFFICE_RENT = 889,
+    HOME_OFFICE_LOAN = 890,
+    HOME_OFFICE_RATES = 891,
+    HOME_OFFICE_OTHER = 894
 }

package/src/lib/db/Enums/chart-accounts/chart-accounts-list.enum.d.ts

@@ -50,5 +50,10 @@ export declare enum ChartAccountsListEnum {
     PERSONAL_INCOME = 630,
     PLATFORM_FEES = 857,
     AUSTRALIAN_GOVERNMENT_SPECIAL_PAYMENTS = 871,
-    FHSS = 872
+    FHSS = 872,
+    MOBILE_PHONE = 90,
+    INTERNET = 94,
+    ELECTRICITY_AND_GAS = 234,
+    TELEPHONE = 255,
+    HOME_OFFICE_CLEANING = 11861
 }

package/src/lib/db/Enums/chart-accounts/index.d.ts

@@ -14,4 +14,3 @@ export * from './chart-accounts-type.enum';
 export * from './chart-accounts-keep-sign.enum';
 export * from './chart-accounts-holding-untaxed-income-list.enum';
 export * from './chart-accounts-property-adjustments-list.enum';
-export * from './home-office-chart-accounts.enum';

package/src/lib/forms/abstract.form.d.ts

@@ -32,7 +32,7 @@ export declare abstract class AbstractForm<Model, Controls extends ControlsInter
     protected constructor(controls: Controls, model?: Model, validatorOrOpts?: ValidatorFn | ValidatorFn[] | AbstractControlOptions | null, asyncValidator?: AsyncValidatorFn | AsyncValidatorFn[] | null);
     get saved(): boolean;
     get currentValue(): Model;
-    toggleEnabledState(): void;
+    toggleEnabledState(control: AbstractControl): void;
     /**
      * Check validation and return a new instance of generic model.
      * Merge form value to initial object

package/src/lib/forms/home-office/home-office-calculator.form.d.ts

@@ -0,0 +1,8 @@
+import { AbstractForm } from '../abstract.form';
+import { HomeOfficeClaim } from '../../models';
+import { IEventListener } from '../../interfaces';
+export declare class HomeOfficeCalculatorForm extends AbstractForm<HomeOfficeClaim> implements IEventListener {
+    constructor(claim?: HomeOfficeClaim);
+    listenEvents(): void;
+    submit(): HomeOfficeClaim;
+}

package/src/lib/forms/home-office/home-office-log.form.d.ts

@@ -1,5 +1,5 @@
 import { AbstractForm } from '../abstract.form';
-import { HomeOfficeLog } from '../../models/home-office';
+import { HomeOfficeLog } from '../../models';
 export declare class HomeOfficeLogForm extends AbstractForm<HomeOfficeLog> {
     constructor(log?: HomeOfficeLog);
 }

package/src/lib/forms/home-office/index.d.ts

@@ -1,2 +1,3 @@
 export * from './home-office-claim.form';
 export * from './home-office-log.form';
+export * from './home-office-calculator.form';

package/src/lib/forms/transaction/work/work-expense.form.d.ts

@@ -1,11 +1,13 @@
 import { IEventListener } from '../../../interfaces';
-import { Transaction, TransactionAllocation } from '../../../models';
+import { HomeOfficeClaim, Transaction, TransactionAllocation } from '../../../models';
 import { WorkTransactionForm } from './work-transaction.form';
 import { AbstractControl } from '@angular/forms';
 export declare class WorkExpenseForm extends WorkTransactionForm implements IEventListener {
-    constructor(transaction: Transaction, registeredForGst: boolean, allocations: TransactionAllocation[], controls?: {
+    private homeOfficeClaim;
+    constructor(transaction: Transaction, registeredForGst: boolean, allocations: TransactionAllocation[], homeOfficeClaim: HomeOfficeClaim, controls?: {
         [key: string]: AbstractControl;
     });
     listenEvents(): void;
     watchChartAccountsMetaFields(): void;
+    watchChartAccounts(): void;
 }

package/src/lib/models/bank/bank-transaction-chart-data.d.ts

@@ -1,6 +1,6 @@
 import { BankTransaction } from './bank-transaction';
-import { IChartData } from '../../interfaces/chart-data.interface';
-import { MonthNumberEnum } from '../financial-year/month-number.enum';
+import { IChartData } from '../../interfaces';
+import { MonthNumberEnum } from '../financial-year';
 /**
  * bank transactions collection UI class with frontend specific data
  */

package/src/lib/models/chart-accounts/chart-accounts.d.ts

@@ -12,6 +12,7 @@ export declare class ChartAccounts extends ChartAccountsBase {
     static GSTCoefficient: number;
     static GSTPercent: number;
     static systemList: (ChartAccountsListEnum | BusinessChartAccountsEnum)[];
+    static homeOfficeList: (ChartAccountsListEnum | BusinessChartAccountsEnum)[];
     heading: ChartAccountsHeading;
     metaFields: ChartAccountsMetaField[];
     values: ChartAccountsValue[];
@@ -118,6 +119,7 @@ export declare class ChartAccounts extends ChartAccountsBase {
     isTaxable(): boolean;
     isTransfer(): boolean;
     isDividends(): boolean;
+    isHomeOfficeExpense(): boolean;
     isHomeOfficeWorkHours(): boolean;
     /**
      * income requiring extra data like adjustments/payer/etc

package/src/lib/models/dictionary/dictionary.d.ts

@@ -6,8 +6,8 @@ export declare class Dictionary<Model> {
     items: {
         [key: string]: Model;
     };
-    constructor(items: Model[], path?: string);
-    add(key: string | number, value: Model): void;
+    constructor(items?: Model[], path?: string);
+    add(key: string | number, value: Model): Dictionary<Model>;
     get(key: string | number): Model;
     merge(dictionary: Dictionary<Model>): this;
     toArray(): Model[];

package/src/lib/models/home-office/home-office-claim.d.ts

@@ -1,22 +1,26 @@
-import { HomeOfficeClaimMethodEnum } from '../../db/Enums';
+import { BusinessChartAccountsEnum, ChartAccountsListEnum, HomeOfficeClaimMethodEnum } from '../../db/Enums';
 import { User } from '../user';
 import { SoleBusiness } from '../sole';
 import { ObservableModel } from '../../db/Models';
 import { HomeOfficeClaimInterface } from './home-office-claim.interface';
-import { TransactionCollection } from '../../collections';
+import { Dictionary } from '../dictionary';
 export declare class HomeOfficeClaim extends ObservableModel implements HomeOfficeClaimInterface {
     static className: string;
     id: number;
     user: User;
     method: HomeOfficeClaimMethodEnum;
     financialYear: number;
-    hours?: number;
     electricityAndGas?: number;
     cleaning?: number;
     internet?: number;
     telephone?: number;
     mobile?: number;
-    area?: number;
+    occupancyPercent?: number;
+    homeArea?: number;
+    officeArea?: number;
+    dedicatedOffice?: boolean;
+    workUsage?: number;
     business?: SoleBusiness;
-    getExpenses(transactions: TransactionCollection): number;
+    getChartAccountsList(): typeof ChartAccountsListEnum | typeof BusinessChartAccountsEnum;
+    getChartAccountsClaims(): Dictionary<number>;
 }

package/src/lib/models/home-office/home-office-claim.interface.d.ts

@@ -1,4 +1,4 @@
-import { HomeOfficeClaimMethodEnum } from '../../db/Enums/home-office/home-office-claim-method.enum';
+import { HomeOfficeClaimMethodEnum } from '../../db/Enums';
 import { User } from '../user';
 import { SoleBusiness } from '../sole';
 export interface HomeOfficeClaimInterface {
@@ -6,12 +6,16 @@ export interface HomeOfficeClaimInterface {
     user: User;
     method: HomeOfficeClaimMethodEnum;
     financialYear: number;
-    hours?: number;
     electricityAndGas?: number;
     cleaning?: number;
     internet?: number;
     telephone?: number;
     mobile?: number;
-    area?: number;
+    occupancyPercent?: number;
+    workPercent?: number;
+    homeArea?: number;
+    officeArea?: number;
+    dedicatedOffice?: boolean;
+    workUsage?: number;
     business?: SoleBusiness;
 }

package/src/lib/models/home-office/home-office-log.d.ts

@@ -1,8 +1,9 @@
 import { HomeOfficeClaim } from './home-office-claim';
 import { SoleBusiness } from '../sole';
-import { AbstractModel } from '../../db/Models';
+import { ObservableModel } from '../../db/Models';
 import { HomeOfficeLogInterface } from './home-office-log.interface';
-export declare class HomeOfficeLog extends AbstractModel implements HomeOfficeLogInterface {
+export declare class HomeOfficeLog extends ObservableModel implements HomeOfficeLogInterface {
+    static className: string;
     claim: HomeOfficeClaim;
     date: Date;
     hours: number;

package/src/lib/models/transaction/transaction.d.ts

@@ -10,7 +10,7 @@ import { TransactionAllocation } from './transaction-allocation';
 import { TransactionAllocationCollection } from '../../collections';
 import { Depreciation } from '../depreciation';
 import { Expense } from '../../interfaces';
-import { SoleInvoiceItem } from '../sole';
+import { SoleBusiness, SoleInvoiceItem } from '../sole';
 export declare class Transaction extends TransactionBase implements Expense {
     static className: string;
     /**
@@ -26,6 +26,7 @@ export declare class Transaction extends TransactionBase implements Expense {
     date: Date;
     allocations: TransactionAllocation[];
     invoiceItem: SoleInvoiceItem;
+    business: SoleBusiness;
     tax: number;
     operation: TransactionOperationEnum;
     claimPercent: number;

package/src/lib/services/http/home-office/home-office-claim.service.d.ts

@@ -1,11 +1,11 @@
 import { RestMethod, RestService } from '../rest';
-import { Collection } from '../../../collections';
-import { HomeOfficeClaim, HomeOfficeClaimInterface } from '../../../models/home-office';
+import { HomeOfficeClaimCollection } from '../../../collections';
+import { HomeOfficeClaim, HomeOfficeClaimInterface } from '../../../models';
 import * as i0 from "@angular/core";
-export declare class HomeOfficeClaimService extends RestService<HomeOfficeClaimInterface, HomeOfficeClaim, Collection<HomeOfficeClaim>> {
+export declare class HomeOfficeClaimService extends RestService<HomeOfficeClaimInterface, HomeOfficeClaim, HomeOfficeClaimCollection> {
     protected endpointUri: string;
     modelClass: typeof HomeOfficeClaim;
-    collectionClass: typeof Collection<HomeOfficeClaim>;
+    collectionClass: typeof HomeOfficeClaimCollection;
     disabledMethods: RestMethod[];
     static ɵfac: i0.ɵɵFactoryDeclaration<HomeOfficeClaimService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomeOfficeClaimService>;

package/src/lib/services/http/home-office/home-office-log.service.d.ts

@@ -1,11 +1,11 @@
 import { RestMethod, RestService } from '../rest';
 import { Collection } from '../../../collections';
-import { HomeOfficeClaim, HomeOfficeLog, HomeOfficeLogInterface } from '../../../models/home-office';
+import { HomeOfficeLog, HomeOfficeLogInterface } from '../../../models';
 import * as i0 from "@angular/core";
 export declare class HomeOfficeLogService extends RestService<HomeOfficeLogInterface, HomeOfficeLog, Collection<HomeOfficeLog>> {
     protected endpointUri: string;
-    modelClass: typeof HomeOfficeClaim;
-    collectionClass: typeof Collection<HomeOfficeClaim>;
+    modelClass: typeof HomeOfficeLog;
+    collectionClass: typeof Collection<HomeOfficeLog>;
     disabledMethods: RestMethod[];
     static ɵfac: i0.ɵɵFactoryDeclaration<HomeOfficeLogService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HomeOfficeLogService>;

package/src/lib/services/http/rest/rest-old.service.d.ts

@@ -112,6 +112,10 @@ export declare abstract class RestService<BaseModel, Model extends BaseModel> {
      * @param model instance that we will use as constructor options
      */
     protected createModelInstance(model: BaseModel | object): Model;
+    /**
+     * never return cache directly to prevent update
+     */
+    getCache(): Model[];
     static ɵfac: i0.ɵɵFactoryDeclaration<RestService<any, any>, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<RestService<any, any>>;
 }

package/src/lib/services/http/rest/rest.service.d.ts

@@ -10,6 +10,7 @@ import { UserRolesEnum } from 'taxtank-core/common';
 import { ToastService } from '../../toast';
 import * as i0 from "@angular/core";
 /**
+ * @TODO refactor to behavior subject?
  * Abstract base service that implements common services functionality
  * and describe abstract methods/properties that have to be implemented in child services
  * Model - entity service is working with

package/src/lib/services/http/transaction/transaction.service.d.ts

@@ -73,6 +73,7 @@ export declare class TransactionService extends RestService<TransactionBase, Tra
     private listenDepreciationChange;
     private listenVehicleClaimChanges;
     private listenHomeOfficeClaim;
+    private listenHomeOfficeLog;
     /**
      * property forecast includes claimPercent which affects property related expenses
      * @TODO Alex move to forecast api instead of property

package/esm2022/src/lib/db/Enums/chart-accounts/home-office-chart-accounts.enum.mjs

@@ -1,18 +0,0 @@
-export var HomeOfficeChartAccountsEnum;
-(function (HomeOfficeChartAccountsEnum) {
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["MOBILE_PHONE"] = 90] = "MOBILE_PHONE";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["INTERNET"] = 94] = "INTERNET";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["ELECTRICITY_AND_GAS"] = 234] = "ELECTRICITY_AND_GAS";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["TELEPHONE"] = 255] = "TELEPHONE";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["HOME_OFFICE_CLEANING"] = 11861] = "HOME_OFFICE_CLEANING";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["BUSINESS_ELECTRICITY_AND_GAS"] = 892] = "BUSINESS_ELECTRICITY_AND_GAS";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["BUSINESS_HOME_OFFICE_CLEANING"] = 893] = "BUSINESS_HOME_OFFICE_CLEANING";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["BUSINESS_INTERNET"] = 705] = "BUSINESS_INTERNET";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["BUSINESS_TELEPHONE"] = 11860] = "BUSINESS_TELEPHONE";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["BUSINESS_MOBILE_PHONE"] = 719] = "BUSINESS_MOBILE_PHONE";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["HOME_OFFICE_RENT"] = 889] = "HOME_OFFICE_RENT";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["HOME_OFFICE_LOAN"] = 890] = "HOME_OFFICE_LOAN";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["HOME_OFFICE_RATES"] = 891] = "HOME_OFFICE_RATES";
-    HomeOfficeChartAccountsEnum[HomeOfficeChartAccountsEnum["HOME_OFFICE_OTHER"] = 894] = "HOME_OFFICE_OTHER";
-})(HomeOfficeChartAccountsEnum || (HomeOfficeChartAccountsEnum = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZS1vZmZpY2UtY2hhcnQtYWNjb3VudHMuZW51bS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9kYi9FbnVtcy9jaGFydC1hY2NvdW50cy9ob21lLW9mZmljZS1jaGFydC1hY2NvdW50cy5lbnVtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBTixJQUFZLDJCQWVYO0FBZkQsV0FBWSwyQkFBMkI7SUFDckMsOEZBQWlCLENBQUE7SUFDakIsc0ZBQWEsQ0FBQTtJQUNiLDZHQUF5QixDQUFBO0lBQ3pCLHlGQUFlLENBQUE7SUFDZixpSEFBNEIsQ0FBQTtJQUM1QiwrSEFBa0MsQ0FBQTtJQUNsQyxpSUFBbUMsQ0FBQTtJQUNuQyx5R0FBdUIsQ0FBQTtJQUN2Qiw2R0FBMEIsQ0FBQTtJQUMxQixpSEFBMkIsQ0FBQTtJQUMzQix1R0FBc0IsQ0FBQTtJQUN0Qix1R0FBc0IsQ0FBQTtJQUN0Qix5R0FBdUIsQ0FBQTtJQUN2Qix5R0FBdUIsQ0FBQTtBQUN6QixDQUFDLEVBZlcsMkJBQTJCLEtBQTNCLDJCQUEyQixRQWV0QyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEhvbWVPZmZpY2VDaGFydEFjY291bnRzRW51bSB7XG4gIE1PQklMRV9QSE9ORSA9IDkwLFxuICBJTlRFUk5FVCA9IDk0LFxuICBFTEVDVFJJQ0lUWV9BTkRfR0FTID0gMjM0LFxuICBURUxFUEhPTkUgPSAyNTUsXG4gIEhPTUVfT0ZGSUNFX0NMRUFOSU5HID0gMTE4NjEsXG4gIEJVU0lORVNTX0VMRUNUUklDSVRZX0FORF9HQVMgPSA4OTIsXG4gIEJVU0lORVNTX0hPTUVfT0ZGSUNFX0NMRUFOSU5HID0gODkzLFxuICBCVVNJTkVTU19JTlRFUk5FVCA9IDcwNSxcbiAgQlVTSU5FU1NfVEVMRVBIT05FID0gMTE4NjAsXG4gIEJVU0lORVNTX01PQklMRV9QSE9ORSA9IDcxOSxcbiAgSE9NRV9PRkZJQ0VfUkVOVCA9IDg4OSxcbiAgSE9NRV9PRkZJQ0VfTE9BTiA9IDg5MCxcbiAgSE9NRV9PRkZJQ0VfUkFURVMgPSA4OTEsXG4gIEhPTUVfT0ZGSUNFX09USEVSID0gODk0LFxufVxuIl19

package/src/lib/db/Enums/chart-accounts/home-office-chart-accounts.enum.d.ts

@@ -1,16 +0,0 @@
-export declare enum HomeOfficeChartAccountsEnum {
-    MOBILE_PHONE = 90,
-    INTERNET = 94,
-    ELECTRICITY_AND_GAS = 234,
-    TELEPHONE = 255,
-    HOME_OFFICE_CLEANING = 11861,
-    BUSINESS_ELECTRICITY_AND_GAS = 892,
-    BUSINESS_HOME_OFFICE_CLEANING = 893,
-    BUSINESS_INTERNET = 705,
-    BUSINESS_TELEPHONE = 11860,
-    BUSINESS_MOBILE_PHONE = 719,
-    HOME_OFFICE_RENT = 889,
-    HOME_OFFICE_LOAN = 890,
-    HOME_OFFICE_RATES = 891,
-    HOME_OFFICE_OTHER = 894
-}