taxtank-core 2.1.6 → 2.1.8

package/fesm2022/taxtank-core.mjs

@@ -477,7 +477,11 @@ let IncomeSourceForecast$1 = class IncomeSourceForecast extends AbstractModel {
 let IncomeSourceType$1 = class IncomeSourceType extends AbstractModel {
 };
 
-let IncomeSource$1 = class IncomeSource extends AbstractModel {
+let IncomeSource$1 = class IncomeSource extends ObservableModel {
+    constructor() {
+        super(...arguments);
+        this.className = 'IncomeSource';
+    }
 };
 
 let SalaryForecast$1 = class SalaryForecast extends AbstractModel {
@@ -1447,6 +1451,7 @@ var CalendarEventTypeEnum;
     CalendarEventTypeEnum[CalendarEventTypeEnum["INCOMES"] = 1] = "INCOMES";
     CalendarEventTypeEnum[CalendarEventTypeEnum["EXPENSES"] = 2] = "EXPENSES";
     CalendarEventTypeEnum[CalendarEventTypeEnum["GOALS"] = 3] = "GOALS";
+    CalendarEventTypeEnum[CalendarEventTypeEnum["REMINDERS"] = 4] = "REMINDERS";
 })(CalendarEventTypeEnum || (CalendarEventTypeEnum = {}));
 
 var CalendarReminderTypeEnum;
@@ -2413,9 +2418,6 @@ class LoanCollection extends Collection {
 class CalendarEventCollection extends Collection {
 }
 
-class CalendarReminderCollection extends Collection {
-}
-
 class MoneyCalendarEventCollection extends CalendarEventCollection {
     constructor(items) {
         super(items);
@@ -2438,6 +2440,19 @@ class MoneyCalendarEventCollection extends CalendarEventCollection {
     }
 }
 
+class CalendarReminderCollection extends Collection {
+    getCalendarEvents() {
+        return new MoneyCalendarEventCollection(this.map(reminder => reminder.getCalendarEvents().items).flat());
+    }
+    getByDate(dateFrom, dateTo) {
+        return this.filter(reminder => !!reminder.getCalendarEvents().filterByDate(dateFrom, dateTo).length);
+    }
+    filterByProperties(properties) {
+        const propertyIds = properties.map(property => property.id);
+        return this.filter(reminder => propertyIds.includes(reminder.property?.id));
+    }
+}
+
 class PropertySaleCollection extends Collection {
     /**
      * Property sales are CGT applicable unless it has "Principle place of residence" exemption type
@@ -11347,14 +11362,77 @@ class MoneyCalendarEvent extends CalendarEvent {
     }
 }
 
+/**
+ * Generates a list of recurring dates between a start and end date
+ * based on a given frequency (monthly, weekly, fortnightly).
+ *
+ * - Uses WEEKLY as the default recurrence pattern.
+ * - Converts both start and end dates to "start of day" to avoid time drift.
+ * - 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(frequency, startDate, endDate) {
+    endDate = endDate ?? new FinancialYear().endDate;
+    let duration;
+    let amount = 1;
+    switch (frequency) {
+        case AnnualFrequencyEnum.DAILY:
+            duration = 'day';
+            break;
+        case AnnualFrequencyEnum.WEEKLY:
+            duration = 'week';
+            break;
+        case AnnualFrequencyEnum.FORTNIGHTLY:
+            duration = 'week';
+            amount = 2;
+            break;
+        case AnnualFrequencyEnum.MONTHLY:
+            duration = 'month';
+            break;
+        case AnnualFrequencyEnum.QUARTERLY:
+            duration = 'quarters';
+            break;
+        default:
+            duration = 'year';
+            break;
+    }
+    const dates = [];
+    let current = moment$1(startDate).startOf('day');
+    const end = moment$1(endDate).startOf('day');
+    while (current.isSameOrBefore(end)) {
+        dates.push(current.toDate());
+        current = current.add(amount, duration);
+    }
+    return dates;
+}
+
 class CalendarReminder extends AbstractModel {
     static { this.className = 'CalendarReminder'; }
+    /**
+     * creates recurring calendar events based on frequency
+     */
+    getCalendarEvents() {
+        const paymentDates = recurringDates(this.frequency, this.startDate, this.endDate);
+        return new MoneyCalendarEventCollection(paymentDates.map(date => plainToClass(MoneyCalendarEvent, {
+            title: this.name,
+            subTitle: this.property?.name ?? this.business?.name ?? this.incomeSource?.name ?? '',
+            date: date,
+            extendedProps: {
+                date: date,
+                model: this,
+                type: CalendarEventTypeEnum.REMINDERS,
+                tankType: this.tankType,
+                propertyId: this.property?.id,
+                businessId: this.business?.id,
+            }
+        })));
+    }
 }
 __decorate([
-    Type(() => Date)
+    TransformDate()
 ], CalendarReminder.prototype, "startDate", void 0);
 __decorate([
-    Type(() => Date)
+    TransformDate()
 ], CalendarReminder.prototype, "endDate", void 0);
 __decorate([
     Type(() => AppFile)
@@ -11820,51 +11898,6 @@ var SharesightPortfolioMessages;
     SharesightPortfolioMessages["PUT"] = "We\u2019re syncing your Sharesight trades, which might take a few minutes. We\u2019ll let you know when they\u2019re ready.";
 })(SharesightPortfolioMessages || (SharesightPortfolioMessages = {}));
 
-/**
- * Generates a list of recurring dates between a start and end date
- * based on a given frequency (monthly, weekly, fortnightly).
- *
- * - Uses WEEKLY as the default recurrence pattern.
- * - Converts both start and end dates to "start of day" to avoid time drift.
- * - 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(frequency, startDate, endDate) {
-    endDate = endDate ?? new FinancialYear().endDate;
-    let duration;
-    let amount;
-    switch (frequency) {
-        case AnnualFrequencyEnum.WEEKLY:
-            duration = 'week';
-            amount = 1;
-            break;
-        case AnnualFrequencyEnum.FORTNIGHTLY:
-            duration = 'week';
-            amount = 2;
-            break;
-        case AnnualFrequencyEnum.MONTHLY:
-            duration = 'month';
-            amount = 1;
-            break;
-        case AnnualFrequencyEnum.QUARTERLY:
-            duration = 'quarters';
-            amount = 1;
-            break;
-        default:
-            duration = 'year';
-            amount = 1;
-            break;
-    }
-    const dates = [];
-    let current = moment$1(startDate).startOf('day');
-    const end = moment$1(endDate).startOf('day');
-    while (current.isSameOrBefore(end)) {
-        dates.push(current.toDate());
-        current = current.add(amount, duration);
-    }
-    return dates;
-}
-
 class BudgetRule extends BudgetRule$1 {
     constructor() {
         super(...arguments);
@@ -11884,10 +11917,12 @@ class BudgetRule extends BudgetRule$1 {
         return new MoneyCalendarEventCollection(paymentDates.map((date) => plainToClass(MoneyCalendarEvent, {
             date: date,
             title: this.chartAccounts.name,
+            subTitle: this.property?.name ?? this.business?.name ?? this.incomeSource?.name ?? '',
             extendedProps: {
-                id: this.id,
-                class: BudgetRule.className,
+                type: this.chartAccounts.isIncome() ? CalendarEventTypeEnum.INCOMES : CalendarEventTypeEnum.EXPENSES,
                 amount: this.amount,
+                model: this,
+                date: date,
                 chartAccounts: this.chartAccounts,
                 tankType: this.chartAccounts.tankType,
                 isIncome: this.chartAccounts.isIncome(),
@@ -11913,10 +11948,10 @@ __decorate([
     Type(() => ChartAccounts)
 ], BudgetRule.prototype, "chartAccounts", void 0);
 __decorate([
-    Type(() => Date)
+    TransformDate()
 ], BudgetRule.prototype, "startDate", void 0);
 __decorate([
-    Type(() => Date)
+    TransformDate()
 ], BudgetRule.prototype, "endDate", void 0);
 __decorate([
     Type(() => BankAccount)
@@ -12142,8 +12177,9 @@ class FinancialGoal extends ObservableModel {
             title: this.name,
             date: date,
             extendedProps: {
-                id: this.id,
-                class: FinancialGoal.className,
+                model: this,
+                date: date,
+                type: CalendarEventTypeEnum.GOALS,
                 amount: this.paymentAmount
             }
         })));
@@ -13959,14 +13995,22 @@ var FinancialGoalMessagesEnum;
     FinancialGoalMessagesEnum["CONFIRM_COMPLETE"] = "Are you sure? Complete goals can not be made active again. Would you like to continue?";
 })(FinancialGoalMessagesEnum || (FinancialGoalMessagesEnum = {}));
 
+/**
+ * CalendarReminder need to show information from SoleBusiness, IncomeSource
+ * service helps to keep information updated by listening of their change events
+ */
 class CalendarReminderService extends RestService$1 {
-    constructor() {
-        super(...arguments);
+    constructor(environment) {
+        super(environment);
+        this.environment = environment;
         this.endpointUri = 'calendar-reminders';
         this.modelClass = CalendarReminder;
         this.collectionClass = CalendarReminderCollection;
+        this.roles = [UserRolesEnum.MONEY_TANK];
+        this.listenCSE(SoleBusiness, this.refreshCache, ['put']);
+        this.listenCSE(IncomeSource, this.refreshCache, ['put']);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: CalendarReminderService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: CalendarReminderService, deps: [{ token: 'environment' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: CalendarReminderService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImport: i0, type: CalendarReminderService, decorators: [{
@@ -13974,7 +14018,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.10", ngImpo
             args: [{
                     providedIn: 'root',
                 }]
-        }] });
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['environment']
+                }] }] });
 
 var CalendarReminderMessagesEnum;
 (function (CalendarReminderMessagesEnum) {
@@ -23975,7 +24022,7 @@ class CalendarReminderForm extends AbstractForm {
             tankType: new UntypedFormControl(reminder.tankType ?? TankTypeEnum.PERSONAL, Validators.required),
             type: new UntypedFormControl(reminder.type, Validators.required),
             startDate: new FormControl(reminder.startDate, Validators.required),
-            endDate: new FormControl({ value: reminder.endDate, disabled: !reminder.frequency }, [Validators.required, conditionalValidator(() => this.get('frequency').value, compareWithControlValidator('startDate', '>', 'Reminder start date'))]),
+            endDate: new FormControl({ value: reminder.endDate, disabled: !reminder.frequency }, [conditionalValidator(() => this.get('frequency').value, compareWithControlValidator('startDate', '>', 'Reminder start date'))]),
             frequency: new FormControl(reminder.frequency),
             description: new UntypedFormControl(reminder.description),
             file: new UntypedFormControl(reminder.file),
@@ -23987,6 +24034,14 @@ class CalendarReminderForm extends AbstractForm {
     }
     listenEvents() {
         this.listenFrequency();
+        this.listenTankType();
+    }
+    listenTankType() {
+        this.get('tankType').valueChanges.subscribe(() => {
+            this.get('business').reset();
+            this.get('property').reset();
+            this.get('incomeSource').reset();
+        });
     }
     listenFrequency() {
         this.get('frequency').valueChanges.subscribe((value) => {
@@ -24132,17 +24187,11 @@ class MoneyScheduleFilterForm extends AbstractForm {
         // calendar year start and FinYear start are different. we need to convert FinYear to regular one
         this.onFilter.emit(new Date(new FinancialYear().getYearByMonth(monthIndex), monthIndex, 1));
         let filteredEvents = calendarEvents;
-        if (value.eventType === CalendarEventTypeEnum.GOALS) {
-            filteredEvents = filteredEvents.filterBy('extendedProps.class', 'FinancialGoal');
-        }
-        if (value.eventType === CalendarEventTypeEnum.EXPENSES) {
-            filteredEvents = filteredEvents.filter(event => event.extendedProps.chartAccounts?.isExpense());
-        }
-        if (value.eventType === CalendarEventTypeEnum.INCOMES) {
-            filteredEvents = filteredEvents.filter(event => event.extendedProps.chartAccounts?.isIncome());
+        if (value.eventType !== CalendarEventTypeEnum.ALL) {
+            filteredEvents = filteredEvents.filterBy('extendedProps.type', value.eventType);
         }
         if (value.tankType) {
-            filteredEvents = filteredEvents.filterBy('extendedProps.chartAccounts.tankType', value.tankType);
+            filteredEvents = filteredEvents.filterBy('extendedProps.tankType', value.tankType);
         }
         if (value.business) {
             filteredEvents = filteredEvents.filterBy('extendedProps.businessId', this.get('business').value.id);
@@ -27182,6 +27231,7 @@ class HoldingExpenseForm extends TransactionForm {
 class TransactionBaseFilter {
 }
 
+// @todo: vik refactor filterBudgetRules + filterCalendarReminders placement
 class TransactionBaseFilterForm extends FormGroup {
     constructor(model = plainToClass(TransactionBaseFilter, {})) {
         super({
@@ -27256,6 +27306,23 @@ class TransactionBaseFilterForm extends FormGroup {
         }
         return rules;
     }
+    filterCalendarReminders(reminders) {
+        const value = this.value;
+        const [dateFrom, dateTo] = value.dateRange || [];
+        if (value.tankType) {
+            reminders = reminders.filterBy('tankType', value.tankType);
+        }
+        if (dateFrom || dateTo) {
+            reminders = reminders.getByDate(dateFrom, dateTo);
+        }
+        if (value.properties?.length) {
+            reminders = reminders.filterByProperties(value.properties);
+        }
+        if (value.business) {
+            reminders = reminders.filterBy('business.id', value.business.id);
+        }
+        return reminders;
+    }
 }
 
 class DepreciationForm extends TransactionBaseForm {