taxtank-core 2.0.97 → 2.0.98

package/fesm2022/taxtank-core.mjs

@@ -8668,7 +8668,7 @@ class BudgetRuleItem {
         if (rule.property) {
             transactions = transactions.filterBy('property.id', rule.property.id);
         }
-        this.forecast = rule.calendarEvents.filterByDate(dateFrom, dateTo).amount;
+        this.forecast = rule.getCalendarEvents(false).filterByDate(dateFrom, dateTo).amount;
         this.transactions = transactions;
         this.actual = transactions.sumBy(isGross ? 'grossAmount' : 'amount');
         this.variance = this.actual - this.forecast;
@@ -8804,8 +8804,8 @@ class BudgetRuleCollection extends Collection {
         const propertyIds = properties.map(property => property.id);
         return this.filter(rule => propertyIds.includes(rule.property?.id));
     }
-    get calendarEvents() {
-        return new MoneyCalendarEventCollection(this.map(rule => rule.calendarEvents.items).flat());
+    getCalendarEvents(inCalendar = true) {
+        return new MoneyCalendarEventCollection(this.map(rule => rule.getCalendarEvents(inCalendar).items).flat());
     }
     getByMonth(index) {
         return new BudgetRuleCollection(this.items.filter(rule => rule.inMonth(index)));
@@ -8841,8 +8841,8 @@ class BudgetRuleItemCollection extends Collection {
     get rules() {
         return new BudgetRuleCollection(this.mapBy('rule'));
     }
-    get calendarEvents() {
-        return new MoneyCalendarEventCollection(this.map(item => item.rule.calendarEvents.toArray()).flat());
+    getCalendarEvents(inCalendar = false) {
+        return new MoneyCalendarEventCollection(this.map(item => item.rule.getCalendarEvents(inCalendar).toArray()).flat());
     }
     onTrack() {
         return this.sumBy('variance') >= 0;
@@ -8857,7 +8857,7 @@ class BudgetRuleItemCollection extends Collection {
      * @TODO move to property to avoid recalculations?
      */
     getForecastByMonth(month) {
-        return this.calendarEvents.getByMonth(month).amount;
+        return this.getCalendarEvents(false).getByMonth(month).amount;
     }
     /**
      * @TODO move to property to avoid recalculations?
@@ -9965,8 +9965,8 @@ class FinancialGoalCollection extends Collection {
     //     const loan = '';
     //   });
     // }
-    get calendarEvents() {
-        return new MoneyCalendarEventCollection(this.map(rule => rule.calendarEvents.items).flat());
+    getCalendarEvents(inCalendar = false) {
+        return new MoneyCalendarEventCollection(this.map(rule => rule.getCalendarEvents(inCalendar).items).flat());
     }
 }
 
@@ -11721,8 +11721,8 @@ class BudgetRule extends BudgetRule$1 {
     /**
      * creates recurring calendar events based on frequency
      */
-    get calendarEvents() {
-        if (!this.inCalendar) {
+    getCalendarEvents(inCalendar = true) {
+        if (inCalendar && !this.inCalendar) {
             return new MoneyCalendarEventCollection([]);
         }
         const paymentDates = this.frequency
@@ -11974,8 +11974,8 @@ class FinancialGoal extends ObservableModel {
     /**
      * creates recurring calendar events based on paymentFrequency
      */
-    get calendarEvents() {
-        if (!this.inCalendar || this.isPropertyType()) {
+    getCalendarEvents(inCalendar = false) {
+        if (inCalendar && (!this.inCalendar || this.isPropertyType())) {
             return new MoneyCalendarEventCollection([]);
         }
         const paymentDates = recurringDates(this.paymentFrequency, this.startDate, this.endDate);