taxtank-core 2.0.76 → 2.0.78

package/fesm2022/taxtank-core.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { Inject, Injectable, inject, EventEmitter, NgModule, InjectionToken, Pipe } from '@angular/core';
 import * as i1$1 from '@angular/common';
-import { formatDate, CommonModule as CommonModule$1, CurrencyPipe, DatePipe } from '@angular/common';
+import { formatDate, CurrencyPipe, CommonModule as CommonModule$1, DatePipe } from '@angular/common';
 import * as i1 from '@angular/common/http';
 import { HttpClient, HttpErrorResponse, HttpParams, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { map, filter, catchError, finalize, switchMap, first as first$1, take, mergeMap, startWith, debounceTime, distinctUntilChanged } from 'rxjs/operators';
@@ -8618,13 +8618,14 @@ class BudgetReportItem {
         this.category = ChartAccountsCategoryEnum[rules.first.chartAccounts.category];
         this.chartAccounts = rules.first.chartAccounts.name;
         this.forecast = rules.sumBy('amount');
-        this.actual = Math.abs(transactions.sumBy('amount'));
-        this.difference = this.forecast - this.actual;
-        this.differencePercent = round(this.actual * 100 / this.forecast, 2);
+        this.net = Math.abs(transactions.sumBy('amount'));
+        this.gross = Math.abs(transactions.sumBy('grossAmount'));
+        this.variance = this.forecast - this.net;
+        this.variancePercent = round(this.net * 100 / this.forecast, 2);
         this.isIncome = rules.first.chartAccounts.isIncome();
     }
     onTrack() {
-        return (this.isIncome && this.difference <= 0) || (!this.isIncome && this.difference >= 0);
+        return (this.isIncome && this.variance <= 0) || (!this.isIncome && this.variance >= 0);
     }
 }
 
@@ -11051,6 +11052,15 @@ class AppEvent2 {
  * https://primefaces.github.io/primefaces/jsdocs/classes/node_modules__fullcalendar_common_main.EventApi.html#extendedProps
  */
 class CalendarEvent {
+    constructor() {
+        this.today = moment().startOf('day');
+    }
+    get isOverdue() {
+        return moment(this.date).isBefore(this.today, 'day');
+    }
+    get isUpcoming() {
+        return moment(this.date).isAfter(this.today, 'day');
+    }
 }
 
 /**
@@ -11519,7 +11529,8 @@ var SharesightPortfolioMessages;
  * - Iteratively adds the appropriate duration (week/month) until the end date is reached.
  * - Returns all occurrence dates including the start date and the last valid recurrence.
  */
-function recurringDates(startDate, endDate = new FinancialYear().endDate, frequency) {
+function recurringDates(frequency, startDate, endDate) {
+    endDate = endDate ?? new FinancialYear().endDate;
     let duration;
     let amount;
     switch (frequency) {
@@ -11560,7 +11571,7 @@ class BudgetRule extends BudgetRule$1 {
             return [];
         }
         const paymentDates = this.frequency
-            ? recurringDates(this.startDate, this.endDate, this.frequency)
+            ? recurringDates(this.frequency, this.startDate, this.endDate)
             : [this.startDate];
         return paymentDates.map((date) => plainToClass(MoneyCalendarEvent, {
             date: date,
@@ -11568,7 +11579,7 @@ class BudgetRule extends BudgetRule$1 {
             extendedProps: {
                 id: this.id,
                 class: BudgetRule.className,
-                amount: this.amount,
+                amount: this.chartAccounts.isExpense() ? -this.amount : this.amount,
                 isIncome: this.chartAccounts.isIncome(),
                 isExpense: this.chartAccounts.isExpense(),
                 isProperty: this.chartAccounts.isPropertyTank(),
@@ -11735,9 +11746,12 @@ class FinancialGoal extends ObservableModel {
     get forecast() {
         return this.paymentAmount * this.calculatePaymentsByDate(new Date());
     }
-    get forecastPercent() {
+    get variancePercent() {
         return round(this.progress / this.forecast, 2);
     }
+    get variance() {
+        return round(this.progress - this.forecast);
+    }
     /**
      *  How much user saved so far.
      */
@@ -11774,6 +11788,7 @@ class FinancialGoal extends ObservableModel {
         return round(this.progress / this.target, 2);
     }
     getBadge() {
+        const variance = new CurrencyPipe('en-AU').transform(this.variance, 'USD', 'symbol', '1.0-2');
         if (this.isPropertyType() && this.status === FinancialGoalStatusEnum.ACTIVE && this.progress > 0 && !this.isAchieved()) {
             return new Badge('Active', BadgeColorEnum.GREEN);
         }
@@ -11785,15 +11800,15 @@ class FinancialGoal extends ObservableModel {
             case this.isAchieved():
                 return new Badge('Achieved', BadgeColorEnum.GREEN);
             case this.forecast === 0:
-                return this.progress ? new Badge(`Ahead`, BadgeColorEnum.GREEN) : new Badge(`On track`, BadgeColorEnum.PRIMARY);
-            case this.forecastPercent >= 1.05:
-                return new Badge(`Ahead by ${this.forecastPercent} %`, BadgeColorEnum.GREEN);
-            case this.forecastPercent >= 0.95 && this.forecastPercent <= 1.05:
+                return this.progress ? new Badge(`Ahead ${this.variancePercent}`, BadgeColorEnum.GREEN) : new Badge(`On track`, BadgeColorEnum.PRIMARY);
+            case this.variancePercent >= 1.05:
+                return new Badge(`Ahead by ${variance}`, BadgeColorEnum.GREEN);
+            case this.variancePercent >= 0.95 && this.variancePercent <= 1.05:
                 return new Badge('On track', BadgeColorEnum.PRIMARY);
-            case this.forecastPercent >= 0.8 && this.forecastPercent <= 0.95:
-                return new Badge(`Behind by ${this.forecastPercent}%`, BadgeColorEnum.GOLD);
+            case this.variancePercent >= 0.8 && this.variancePercent <= 0.95:
+                return new Badge(`Behind by ${variance}`, BadgeColorEnum.GOLD);
             default:
-                return new Badge(`Behind by ${this.forecastPercent}%`, BadgeColorEnum.ERROR);
+                return new Badge(`Behind by ${this.variancePercent}%`, BadgeColorEnum.ERROR);
         }
     }
     /**
@@ -11826,7 +11841,7 @@ class FinancialGoal extends ObservableModel {
         if (!this.inCalendar || this.isPropertyType()) {
             return [];
         }
-        const paymentDates = recurringDates(this.startDate, this.endDate, this.paymentFrequency);
+        const paymentDates = recurringDates(this.paymentFrequency, this.startDate, this.endDate);
         return paymentDates.map(date => plainToClass(MoneyCalendarEvent, {
             title: this.name,
             date: date,