taxtank-core 0.4.1 → 0.5.2-1

package/lib/collections/income-source.collection.d.ts

@@ -2,7 +2,7 @@ import { Collection } from './collection';
 import { IncomeSource } from '../models/income-source/income-source';
 import { TankTypeEnum } from '../db/Enums/tank-type.enum';
 import { IncomeSourceTypeEnum } from '../db/Enums/income-source-type.enum';
-import { ISalaryForecast } from '../interfaces/salary-forecast.interface';
+import { IIncomeSourceForecast } from '../interfaces/income-source-forecast.interface';
 /**
  * Collection of income sources
  */
@@ -21,5 +21,5 @@ export declare class IncomeSourceCollection extends Collection<IncomeSource> {
     /**
      * Get income sources list of forecasts
      */
-    get forecasts(): ISalaryForecast[];
+    get forecasts(): IIncomeSourceForecast[];
 }

package/lib/db/Enums/income-source-type.enum.d.ts

@@ -1,5 +1,6 @@
 export declare enum IncomeSourceTypeEnum {
     SALARY = 1,
     WORK = 2,
-    OTHER = 3
+    OTHER = 3,
+    SOLE = 4
 }

package/lib/db/Models/income-source.d.ts

@@ -1,5 +1,6 @@
 import { User } from './user';
 import { SalaryForecast } from './salary-forecast';
+import { SoleForecast } from './sole-forecast';
 import { IncomeSourceForecast } from './income-source-forecast';
 import { IncomeSourceTypeEnum } from '../Enums/income-source-type.enum';
 export declare class IncomeSource {
@@ -15,6 +16,7 @@ export declare class IncomeSource {
     user?: User;
     salaryForecasts?: SalaryForecast[];
     incomeSourceForecasts?: IncomeSourceForecast[];
+    soleForecasts?: SoleForecast[];
     createdBy?: User;
     updatedBy?: User;
 }

package/lib/db/Models/sole-forecast.d.ts

@@ -0,0 +1,8 @@
+import { IncomeSource } from './income-source';
+export declare class SoleForecast {
+    financialYear?: number;
+    amount?: number;
+    taxInstalments?: number;
+    id?: number;
+    incomeSource?: IncomeSource;
+}

package/lib/interfaces/income-source-forecast.interface.d.ts

@@ -1,7 +1,10 @@
+import { IncomeSource } from "../models/income-source/income-source";
 /**
  * Interface for income source forecasts
  */
 export interface IIncomeSourceForecast {
-    id: number;
-    tax: number;
+    id?: number;
+    financialYear?: number;
+    incomeSource?: IncomeSource;
+    netPay?: number;
 }

package/lib/models/income-source/income-source-forecast.d.ts

@@ -1,10 +1,9 @@
 import { IncomeSourceForecast as IncomeSourceForecastBase } from '../../db/Models/income-source-forecast';
 import { SalaryForecastFrequencyEnum } from '../../db/Enums/salary-forecast-frequency.enum';
 import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
-import { ISalaryForecast } from '../../interfaces/salary-forecast.interface';
 import { IncomeSourceType } from './income-source-type';
 import { IncomeSource } from './income-source';
-export declare class IncomeSourceForecast extends IncomeSourceForecastBase implements IIncomeSourceForecast, ISalaryForecast {
+export declare class IncomeSourceForecast extends IncomeSourceForecastBase implements IIncomeSourceForecast {
     id: number;
     incomeSourceType: IncomeSourceType;
     tax: number;

package/lib/models/income-source/income-source-type.d.ts

@@ -4,5 +4,6 @@ export declare class IncomeSourceType extends IncomeSourceTypeBase {
     isSalary(): boolean;
     isWork(): boolean;
     isOther(): boolean;
+    isSole(): boolean;
     get type(): IncomeSourceTypeEnum;
 }

package/lib/models/income-source/income-source.d.ts

@@ -1,20 +1,22 @@
 import { IncomeSource as IncomeSourceBase } from '../../db/Models/income-source';
-import { ISalaryForecast } from '../../interfaces/salary-forecast.interface';
 import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
 import { SalaryForecast } from './salary-forecast';
+import { SoleForecast } from './sole-forecast';
 import { IncomeSourceForecast } from './income-source-forecast';
 export declare class IncomeSource extends IncomeSourceBase {
     salaryForecasts: SalaryForecast[];
+    soleForecasts: SoleForecast[];
     incomeSourceForecasts: IncomeSourceForecast[];
     dateFrom: Date;
     dateTo: Date;
     isSalaryIncome(): boolean;
+    isSoleIncome(): boolean;
     isWorkIncome(): boolean;
     isOtherIncome(): boolean;
     /**
      * Get salary and other income forecasts
      */
-    get forecasts(): ISalaryForecast[];
+    get forecasts(): IIncomeSourceForecast[];
     /**
      * Get actual (1st from the list) forecast
      */

package/lib/models/income-source/salary-forecast.d.ts

@@ -1,9 +1,8 @@
 import { SalaryForecast as SalaryForecastBase } from '../../db/Models/salary-forecast';
-import { ISalaryForecast } from '../../interfaces/salary-forecast.interface';
 import { SalaryForecastFrequencyEnum } from '../../db/Enums/salary-forecast-frequency.enum';
 import { IncomeSource } from './income-source';
 import { IIncomeSourceForecast } from '../../interfaces/income-source-forecast.interface';
-export declare class SalaryForecast extends SalaryForecastBase implements IIncomeSourceForecast, ISalaryForecast {
+export declare class SalaryForecast extends SalaryForecastBase implements IIncomeSourceForecast {
     id: number;
     grossAmount: number;
     tax: number;

package/lib/models/income-source/sole-forecast.d.ts

@@ -0,0 +1,10 @@
+import { IncomeSource } from './income-source';
+import { SoleForecast as SoleForecastBase } from "../../db/Models/sole-forecast";
+import { IIncomeSourceForecast } from "../../interfaces/income-source-forecast.interface";
+export declare class SoleForecast extends SoleForecastBase implements IIncomeSourceForecast {
+    financialYear?: number;
+    amount?: number;
+    taxInstalments?: number;
+    id?: number;
+    incomeSource: IncomeSource;
+}

package/lib/services/income-source/sole-forecast.service.d.ts

@@ -0,0 +1,33 @@
+import { HttpClient } from '@angular/common/http';
+import { SoleForecast as SoleForecastBase } from '../../db/Models/sole-forecast';
+import { BaseRestService } from '../base-rest.service';
+import { SoleForecast } from '../../models/income-source/sole-forecast';
+import { EventDispatcherService } from '../event/event-dispatcher.service';
+import * as i0 from "@angular/core";
+export declare class SoleForecastService extends BaseRestService<SoleForecastBase, SoleForecast> {
+    protected http: HttpClient;
+    protected eventDispatcherService: EventDispatcherService;
+    protected environment: any;
+    modelClass: typeof SoleForecast;
+    url: string;
+    constructor(http: HttpClient, eventDispatcherService: EventDispatcherService, environment: any);
+    /**
+     * Listen to Income Sources events
+     */
+    listenEvents(): void;
+    /**
+     * Listen to EventDispatcherService event related to added Income Sources
+     */
+    private listenToAddedIncomeSources;
+    /**
+     * Listen to EventDispatcherService event related to updated Income Sources
+     */
+    private listenToUpdatedIncomeSources;
+    /**
+     * Assign sole forecasts based on provided income sources
+     * @param incomeSources by which sole forecasts will be assigned
+     */
+    private assignSoleForecasts;
+    static ɵfac: i0.ɵɵFactoryDeclaration<SoleForecastService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<SoleForecastService>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.4.1",
+  "version": "0.5.2-1",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",

package/public-api.d.ts

@@ -183,6 +183,7 @@ export * from './lib/models/income-source/income-source-chart-data';
 export * from './lib/models/income-source/income-source-forecast';
 export * from './lib/models/income-source/income-source-type';
 export * from './lib/models/income-source/salary-forecast';
+export * from './lib/models/income-source/sole-forecast';
 export * from './lib/models/loan/loan';
 export * from './lib/models/loan/loan-max-number-of-payments.enum';
 export * from './lib/models/loan/loan-payment';
@@ -281,6 +282,7 @@ export * from './lib/services/header-title/header-title.service';
 export * from './lib/services/income-source/income-source.service';
 export * from './lib/services/income-source/income-source-forecast.service';
 export * from './lib/services/income-source/salary-forecast.service';
+export * from './lib/services/income-source/sole-forecast.service';
 export * from './lib/services/intercom/intercom.service';
 export * from './lib/services/loan/loan.service';
 export * from './lib/services/notification/notification.service';
@@ -325,7 +327,6 @@ export * from './lib/interfaces/income-source-forecast.interface';
 export * from './lib/interfaces/option.interface';
 export * from './lib/interfaces/photoable';
 export * from './lib/interfaces/receipt.interface';
-export * from './lib/interfaces/salary-forecast.interface';
 export * from './lib/interfaces/tank.interface';
 /**
  * Functions

package/esm2015/lib/interfaces/salary-forecast.interface.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2FsYXJ5LWZvcmVjYXN0LmludGVyZmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3R0LWNvcmUvc3JjL2xpYi9pbnRlcmZhY2VzL3NhbGFyeS1mb3JlY2FzdC5pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFNhbGFyeUZvcmVjYXN0RnJlcXVlbmN5RW51bSB9IGZyb20gJy4uL2RiL0VudW1zL3NhbGFyeS1mb3JlY2FzdC1mcmVxdWVuY3kuZW51bSc7XG5pbXBvcnQgeyBJbmNvbWVTb3VyY2UgfSBmcm9tICcuLi9tb2RlbHMvaW5jb21lLXNvdXJjZS9pbmNvbWUtc291cmNlJztcblxuLyoqXG4gKiBJbnRlcmZhY2UgZm9yIGluY29tZSBzb3VyY2UgZm9yZWNhc3RzIHRoYXQgcmVsYXRlZCB0byBTYWxhcnkgY2F0ZWdvcnlcbiAqL1xuZXhwb3J0IGludGVyZmFjZSBJU2FsYXJ5Rm9yZWNhc3Qge1xuICBpZDogbnVtYmVyO1xuICB0YXg6IG51bWJlcjtcbiAgbmV0UGF5OiBudW1iZXI7XG4gIGdyb3NzQW1vdW50OiBudW1iZXI7XG4gIHBheWdJbmNvbWU6IG51bWJlcjtcbiAgZmluYW5jaWFsWWVhcjogbnVtYmVyO1xuICBmcmVxdWVuY3k6IFNhbGFyeUZvcmVjYXN0RnJlcXVlbmN5RW51bTtcbiAgaXNUYXhGcmVlOiBib29sZWFuO1xuICBpbmNvbWVTb3VyY2U6IEluY29tZVNvdXJjZTtcbn1cbiJdfQ==

package/lib/interfaces/salary-forecast.interface.d.ts

@@ -1,16 +0,0 @@
-import { SalaryForecastFrequencyEnum } from '../db/Enums/salary-forecast-frequency.enum';
-import { IncomeSource } from '../models/income-source/income-source';
-/**
- * Interface for income source forecasts that related to Salary category
- */
-export interface ISalaryForecast {
-    id: number;
-    tax: number;
-    netPay: number;
-    grossAmount: number;
-    paygIncome: number;
-    financialYear: number;
-    frequency: SalaryForecastFrequencyEnum;
-    isTaxFree: boolean;
-    incomeSource: IncomeSource;
-}