taxtank-core 2.0.97 → 2.0.99

package/fesm2022/taxtank-core.mjs

@@ -2355,8 +2355,8 @@ class MoneyCalendarEventCollection extends CalendarEventCollection {
     get incomes() {
         return this.filter(event => event.extendedProps.chartAccounts.isIncome());
     }
-    filterByDate(dateFrom = new FinancialYear().startDate, dateTo = new FinancialYear().endDate) {
-        return this.filterByRange('date', dateFrom, dateTo);
+    filterByDate(dateFrom, dateTo) {
+        return this.filterByRange('date', dateFrom ?? new FinancialYear().startDate, dateTo ?? new FinancialYear().endDate);
     }
     getByMonth(index) {
         return new MoneyCalendarEventCollection(this.items.filter(event => event.inMonth(index)));
@@ -8668,11 +8668,11 @@ 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().filterByDate(dateFrom, dateTo).amount;
         this.transactions = transactions;
         this.actual = transactions.sumBy(isGross ? 'grossAmount' : 'amount');
         this.variance = this.actual - this.forecast;
-        this.variancePercent = round(this.actual * 100 / this.forecast, 2);
+        this.variancePercent = round(this.variance * 100 / this.forecast, 2);
     }
     getSource() {
         switch (true) {
@@ -8804,12 +8804,15 @@ 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)));
     }
+    getByDate(dateFrom, dateTo) {
+        return this.filter(rule => !!rule.getCalendarEvents().filterByDate(dateFrom, dateTo).length);
+    }
     getByChartAccountsName(name) {
         const searchQuery = name.toLowerCase().trim();
         return this.filter(rule => rule.chartAccounts.name.toLowerCase().includes(searchQuery));
@@ -8841,8 +8844,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,13 +8860,13 @@ class BudgetRuleItemCollection extends Collection {
      * @TODO move to property to avoid recalculations?
      */
     getForecastByMonth(month) {
-        return this.calendarEvents.getByMonth(month).amount;
+        return this.getCalendarEvents().getByMonth(month).amount;
     }
     /**
      * @TODO move to property to avoid recalculations?
      */
     get variancePercent() {
-        return round(this.sumBy('actual') * 100 / this.sumBy('forecast'), 2);
+        return round(this.sumBy('variance') * 100 / this.sumBy('forecast'), 2);
     }
 }
 
@@ -9965,8 +9968,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 +11724,8 @@ class BudgetRule extends BudgetRule$1 {
     /**
      * creates recurring calendar events based on frequency
      */
-    get calendarEvents() {
-        if (!this.inCalendar) {
+    getCalendarEvents(inCalendar = false) {
+        if (inCalendar && !this.inCalendar) {
             return new MoneyCalendarEventCollection([]);
         }
         const paymentDates = this.frequency
@@ -11974,8 +11977,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);
@@ -27112,11 +27115,8 @@ class TransactionBaseFilterForm extends FormGroup {
         if (value.chartAccounts) {
             rules = rules.getByChartAccountsName(value.chartAccounts);
         }
-        if (dateFrom) {
-            rules = rules.filter(rule => rule.startDate >= dateFrom);
-        }
-        if (dateTo) {
-            rules = rules.filter(rule => (rule.endDate || rule.startDate) <= dateTo);
+        if (dateFrom || dateTo) {
+            rules = rules.getByDate(dateFrom, dateTo);
         }
         if (value.properties?.length) {
             rules = rules.filterByProperties(value.properties);