taxtank-core 3.0.13 → 3.0.14

package/fesm2022/taxtank-core.mjs

@@ -8241,7 +8241,19 @@ class DepreciationCollection extends TransactionBaseCollection {
     getForecasts() {
         return new DepreciationForecastCollection(this.map(depreciation => depreciation.forecasts).flat());
     }
-    getCurrentYearForecastAmount() {
+    getCurrentYearForecastAmount(dateRange = null) {
+        if (dateRange) {
+            const financialYear = new FinancialYear();
+            let amount = 0;
+            this.items.forEach(depreciation => {
+                const forecast = depreciation.currentYearForecast;
+                const from = moment.max(moment(forecast.fromDate).startOf('day'), moment(dateRange[0] ?? financialYear.startDate).startOf('day'));
+                const to = moment.min(moment(forecast.toDate).startOf('day'), moment(dateRange[1] ?? financialYear.endDate).startOf('day'));
+                const days = to.diff(from, 'days');
+                amount += depreciation.currentYearForecast.dailyClaimAmount * days;
+            });
+            return amount;
+        }
         return this.sumBy('currentYearForecast.amount');
     }
     get closeBalance() {
@@ -9125,10 +9137,9 @@ const DEPRECIATION_TYPE_LABELS = {
  * Class with depreciation-based property transactions report entities
  */
 class PropertyReportItemDepreciation extends PropertyReportItem {
-    constructor(depreciations, property, chartAccounts) {
+    constructor(depreciations, property, chartAccounts, dateRange) {
         super(property, chartAccounts);
-        this.depreciations = depreciations;
-        this.amount = Math.abs(depreciations.getCurrentYearForecastAmount());
+        this.amount = Math.abs(depreciations.getCurrentYearForecastAmount(dateRange));
         this.description = DEPRECIATION_TYPE_LABELS[depreciations.first.type];
     }
     get claimAmount() {
@@ -9482,16 +9493,16 @@ class PropertyReportItemCollection extends Collection {
  * Collection to work with depreciation-based property report items
  */
 class PropertyReportItemDepreciationCollection extends PropertyReportItemCollection {
-    constructor(depreciations, properties, chartAccounts) {
+    constructor(depreciations, properties, chartAccounts, dateRange) {
         super();
-        this.setItems(depreciations, properties, chartAccounts);
+        this.setItems(depreciations, properties, chartAccounts, dateRange);
     }
-    setItems(depreciations, properties, chartAccounts) {
+    setItems(depreciations, properties, chartAccounts, dateRange) {
         this.items = [];
         properties.items.forEach((property) => {
             const depreciationsByType = depreciations.filterBy('property.id', property.id).groupBy('type');
             depreciationsByType.keys.map((type) => {
-                this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id)));
+                this.items.push(new PropertyReportItemDepreciation(depreciationsByType.get(type), property, chartAccounts.findBy('id', depreciationsByType.get(type).first.chartAccounts.id), dateRange));
             });
         });
     }
@@ -24564,12 +24575,12 @@ class PropertyTransactionReportService {
         }));
     }
     filter(filterForm) {
-        return this.create(filterForm.filter(this.transactions), filterForm.filter(this.depreciations), this.properties, this.chartAccounts);
+        return this.create(filterForm.filter(this.transactions), this.depreciations, this.properties, this.chartAccounts, filterForm.value.dateRange);
     }
-    create(transactions, depreciations, properties, chartAccounts) {
+    create(transactions, depreciations, properties, chartAccounts, dateRange = null) {
         return new PropertyReportItemCollection([
             ...new PropertyReportItemTransactionCollection(transactions, properties, chartAccounts).items,
-            ...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts).items,
+            ...new PropertyReportItemDepreciationCollection(depreciations, properties, chartAccounts, dateRange).items,
         ]).sortBy('subCode', 'asc').groupBy('propertyId');
     }
     /**