taxtank-core 0.33.7 → 0.33.9

package/package.json

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

package/src/lib/collections/depreciation.collection.d.ts

@@ -1,11 +1,12 @@
 import { TankTypeEnum } from '../db/Enums/tank-type.enum';
-import { Collection } from './collection';
 import { Depreciation } from '../models';
 import { DepreciationCapitalProject } from '../models';
 import { TransactionCollection } from './transaction';
 import { ChartAccountsCategoryEnum } from '../db/Enums';
 import { VehicleClaim } from '../models';
-export declare class DepreciationCollection extends Collection<Depreciation> {
+import { TransactionBaseCollection } from './transaction';
+import { ExportCell } from '../models/export/export-cell';
+export declare class DepreciationCollection extends TransactionBaseCollection<Depreciation> {
     getSoleDepreciations(): this;
     getCurrentYearBuy(): this;
     /**
@@ -44,4 +45,6 @@ export declare class DepreciationCollection extends Collection<Depreciation> {
      * Get depreciations by vehicle claim. Only vehicle depreciations may be related to vehicle claim
      */
     getByVehicleClaim(vehicleClaim: VehicleClaim): this;
+    getExportBody(params: object): ExportCell[][];
+    getExportHeader(): string[];
 }

package/src/lib/collections/exportable.collection.d.ts

@@ -1,10 +1,10 @@
 import { Collection } from './collection';
 import { ExportDataTable } from '../models/export/export-data-table';
 import { ExportCell } from '../models/export/export-cell';
-import { AbstractModel } from '../db/Models/abstract-model';
+import { AbstractModel } from '../db/Models';
 export declare abstract class ExportableCollection<Model extends AbstractModel> extends Collection<Model> {
     abstract getExportHeader(): string[];
-    abstract getExportBody(params: {}): ExportCell[][];
+    abstract getExportBody(params: object): ExportCell[][];
     getExportFooter(): ExportCell[];
     getBodyAoa(exportData: any): any;
     export(params?: any): ExportDataTable;

package/src/lib/collections/holding/holding.collection.d.ts

@@ -10,6 +10,7 @@ export declare class HoldingCollection extends ExportableCollection<Holding> {
     getOthers(): this;
     getPurchaseValue(): number;
     get marketValue(): number;
+    get sharedMarketValue(): number;
     getGrowthCoefficient(): number;
     getUnsold(): this;
 }

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

@@ -1,2 +1,3 @@
 export * from './transaction.collection';
 export * from './transaction-allocation.collection';
+export * from './transaction-base.collection';

package/src/lib/collections/transaction/transaction-base.collection.d.ts

@@ -0,0 +1,4 @@
+import { ExportableCollection } from '../exportable.collection';
+import { TransactionBase } from '../../db/Models';
+export declare abstract class TransactionBaseCollection<Model extends TransactionBase> extends ExportableCollection<Model> {
+}

package/src/lib/collections/transaction/transaction.collection.d.ts

@@ -2,16 +2,16 @@ import { Dictionary, Transaction, TransactionMetaField, VehicleClaim } from '../
 import { TransactionAllocationCollection } from './transaction-allocation.collection';
 import { ChartAccountsCategoryEnum } from '../../db/Enums';
 import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
-import { ExportableCollection } from '../exportable.collection';
 import { ExportCell } from '../../models/export/export-cell';
 import { Collection } from '../collection';
 import { ChartData } from '../../models/chart/chart-data';
 import { Depreciation } from '../../models';
 import { SoleInvoiceCollection } from '../sole';
+import { TransactionBaseCollection } from './transaction-base.collection';
 /**
  * Collection of transactions
  */
-export declare class TransactionCollection extends ExportableCollection<Transaction> {
+export declare class TransactionCollection extends TransactionBaseCollection<Transaction> {
     /**
      * we use depreciations as expense transactions a lot
      */

package/src/lib/db/Models/bank/bank-account.d.ts

@@ -15,6 +15,7 @@ export declare class BankAccount extends ObservableModel {
     nickname?: string;
     accountNumber?: string;
     currentBalance?: number;
+    closeBalance?: number;
     currency?: string;
     migrateFrom?: Date;
     migrateTo?: Date;

package/src/lib/forms/transaction/transaction-base-filter.form.d.ts

@@ -2,17 +2,18 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { ControlsInterface } from '../abstract.form';
 import { Collection } from '../../collections';
 import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
-import { SoleBusiness } from '../../models';
+import { Property, SoleBusiness } from '../../models';
 import { IEventListener } from '../../interfaces';
 import { TransactionBase } from '../../db/Models';
 interface ITransactionBaseFilterControls extends ControlsInterface {
     tankType: FormControl<TankTypeEnum>;
     business: FormControl<SoleBusiness>;
+    properties: FormControl<Property[]>;
     dateFrom: FormControl<Date>;
     dateTo: FormControl<Date>;
 }
 export declare class TransactionBaseFilterForm extends FormGroup<ITransactionBaseFilterControls> implements IEventListener {
-    constructor(tankType?: TankTypeEnum, business?: SoleBusiness);
+    constructor(tankType?: TankTypeEnum, business?: SoleBusiness, properties?: Property[]);
     listenEvents(): void;
     filter<ModelClass extends TransactionBase, CollectionClass extends Collection<ModelClass>>(collection: CollectionClass): CollectionClass;
 }

package/src/lib/models/report/report.interface.d.ts

@@ -1,7 +1,8 @@
-import { UserRolesEnum } from 'taxtank-core/common';
 export interface IReport {
     title: string;
     description: string;
-    route: string;
-    roles: UserRolesEnum[];
+    routerLink: string;
+    queryParams?: {
+        [key: string]: number;
+    };
 }

package/src/lib/models/report/reports.const.d.ts

@@ -1,3 +1,3 @@
 import { IReport } from './report.interface';
-import { Collection } from '../../collections';
-export declare const REPORTS: Collection<IReport>;
+import { UserRolesEnum } from 'taxtank-core/common';
+export declare const REPORTS: Partial<Record<UserRolesEnum, IReport[]>>;

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

@@ -5,10 +5,10 @@ import { ClientDetails } from '../client';
 import { EmployeeDetails } from '../employee/employee-details';
 import { Phone } from '../phone/phone';
 import { ServiceSubscription } from '../service-subscription';
-import { ServiceSubscriptionItem } from '../service-subscription';
 import { SoleDetails } from '../sole';
 import { AppFile } from '../file';
 import { AccountSetupItem } from '../account-setup/account-setup-item';
+import { TankTypeEnum } from '../../db/Enums/tank-type.enum';
 export declare class User extends BaseUser {
     subscriptions: ServiceSubscription[];
     clientDetails: ClientDetails;
@@ -33,6 +33,7 @@ export declare class User extends BaseUser {
      * search roles including hierarchy
      */
     hasRoles(roles: UserRolesEnum | UserRolesEnum[]): boolean;
+    getTankTypes(): TankTypeEnum[];
     isOnboarding(): boolean;
     isInactive(): boolean;
     hasSubscription(): boolean;
@@ -48,19 +49,6 @@ export declare class User extends BaseUser {
     isFirmOwner(): boolean;
     isTopManager(): boolean;
     isManager(): boolean;
-    /**
-     * check if user has property tank access
-     */
-    hasPropertyTank(): boolean;
-    /**
-     * check if user has property tank access
-     */
-    hasWorkTank(): boolean;
-    /**
-     * Get user subscription role by provided role type
-     * @param roleType by which role should be returned
-     */
-    getSubscriptionRole(roleType: UserRolesEnum): ServiceSubscriptionItem;
     isCurrentFinancialYear(): boolean;
     /**
      * financial years available in the app for user

package/src/lib/services/http/holding/holding-sale.service.d.ts

@@ -2,12 +2,14 @@ import { HoldingSale as HoldingSaleBase } from '../../../db/Models';
 import { HoldingSale } from '../../../models';
 import { RestMethod, RestService } from '../rest';
 import { HoldingSaleCollection } from '../../../collections';
+import { UserRolesEnum } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
 export declare class HoldingSaleService extends RestService<HoldingSaleBase, HoldingSale, HoldingSaleCollection> {
     modelClass: typeof HoldingSale;
     collectionClass: typeof HoldingSaleCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
+    roles: UserRolesEnum[];
     static ɵfac: i0.ɵɵFactoryDeclaration<HoldingSaleService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<HoldingSaleService>;
 }

package/src/lib/services/http/property/property-sale/property-sale.service.d.ts

@@ -2,12 +2,14 @@ import { PropertySale as PropertySaleBase } from '../../../../db/Models';
 import { PropertySale } from '../../../../models';
 import { RestMethod, RestService } from '../../rest';
 import { PropertySaleCollection } from '../../../../collections';
+import { UserRolesEnum } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
 export declare class PropertySaleService extends RestService<PropertySaleBase, PropertySale, PropertySaleCollection> {
     modelClass: typeof PropertySale;
     collectionClass: typeof PropertySaleCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
+    roles: UserRolesEnum[];
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertySaleService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PropertySaleService>;
 }

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

@@ -4,6 +4,7 @@ import { Property } from '../../../models';
 import { IEventListener } from '../../../interfaces';
 import { RestMethod, RestService } from '../rest';
 import { PropertyCollection } from '../../../collections';
+import { UserRolesEnum } from 'taxtank-core/common';
 import * as i0 from "@angular/core";
 /**
  * @Todo Alex remove functionality related to PropertyShare
@@ -16,6 +17,7 @@ export declare class PropertyService extends RestService<PropertyBase, Property,
     collectionClass: typeof PropertyCollection;
     endpointUri: string;
     disabledMethods: RestMethod[];
+    roles: UserRolesEnum[];
     constructor(environment: any);
     /**
      * @TODO remove when forecast moved to separated api