taxtank-core 0.33.110 → 0.33.112

package/fesm2022/taxtank-core.mjs

@@ -352,6 +352,11 @@ __decorate([
 ], TransactionBase.prototype, "gstClaimAmount", null);
 
 let Depreciation$1 = class Depreciation extends TransactionBase {
+    constructor() {
+        super(...arguments);
+        this.financialYear = new FinancialYear().year;
+        this.closeBalance = 0;
+    }
 };
 
 let DocumentFolder$1 = class DocumentFolder extends AbstractModel {
@@ -5778,6 +5783,12 @@ class Property extends Property$1 {
     getForecastByYear(year) {
         return this.forecasts.find((forecast) => forecast.financialYear === year) ?? plainToClass(PropertyForecast, {});
     }
+    getValuationByYear(year) {
+        return new PropertyValuationCollection(this.valuations).filter(valuation => valuation.date <= new FinancialYear(year).endDate).last;
+    }
+    get valuation() {
+        return this.getValuationByYear(new FinancialYear().year);
+    }
     get isShared() {
         return this.shares.length > 1;
     }
@@ -5933,9 +5944,6 @@ __decorate([
 __decorate([
     Type(() => PropertyValuation)
 ], Property.prototype, "valuations", void 0);
-__decorate([
-    Type(() => PropertyValuation)
-], Property.prototype, "valuation", void 0);
 __decorate([
     Type(() => User)
 ], Property.prototype, "user", void 0);
@@ -6210,13 +6218,15 @@ class PropertyEquityChartData {
         if (year > this.currentYear) {
             return bankAccounts.items.reduce((totalSum, bankAccount) => totalSum + (bankAccount.getPropertyPercentage(property.id) * (loans.getByBankAccountId(bankAccount.id)?.getLastPaymentByYear(year)?.totalOwed || 0)), 0) - offset;
         }
-        return ((property.getForecastByYear(year) || first(property.forecasts)).marketValue) - offset;
+        return property.getForecastByYear(year).loanBalance;
+        // @TODO TT-4888 no idea why it was calculated like that
+        // return property.getValuationByYear(year).marketValue - offset;
     }
     getMarketValueForPropertyByYear(property, year) {
         if (new FinancialYear(property.contractDate).year > year) {
             return 0;
         }
-        return (property.getForecastByYear(year) || first(property.forecasts)).marketValue;
+        return property.getValuationByYear(year).marketValue;
     }
     /**
      * Check if loan balance is 0 and set it as null (to not to draw point on the chart)
@@ -6981,8 +6991,8 @@ class TransactionCollection extends TransactionBaseCollection {
     getExpenseTransactions() {
         return new TransactionCollection(this.items.filter((transaction) => transaction.isExpense() && !transaction.isInterest()));
     }
-    get claimIncome() {
-        return this.getIncomeTransactions().claimAmount;
+    get grossClaimIncome() {
+        return this.getIncomeTransactions().grossClaimAmount;
     }
     get claimExpense() {
         return this.getExpenseTransactions().claimAmount;
@@ -11557,7 +11567,7 @@ let RestService$1 = class RestService extends DataService {
     post(model, path = this.apiUrl) {
         this.handleAccessError('post');
         return this.http.post(path, classToPlain(model))
-            .pipe(map((response) => {
+            .pipe(first$1(), map((response) => {
             const result = this.createModelInstance(response);
             if (!this.mercureTopic) {
                 this.handleResponse([result], 'post');
@@ -11571,7 +11581,7 @@ let RestService$1 = class RestService extends DataService {
     postBatch(models) {
         this.handleAccessError('postBatch');
         return this.http.post(this.apiUrl, classToPlain(models))
-            .pipe(map((response) => {
+            .pipe(first$1(), map((response) => {
             const result = response.map((item) => this.createModelInstance(item));
             if (!this.mercureTopic) {
                 this.handleResponse(result, 'post');
@@ -11585,7 +11595,7 @@ let RestService$1 = class RestService extends DataService {
     put(model, path = `${this.apiUrl}/${model.id}`) {
         this.handleAccessError('put');
         return this.http.put(path, classToPlain(model))
-            .pipe(map((response) => {
+            .pipe(first$1(), map((response) => {
             const result = this.createModelInstance(response);
             if (!this.mercureTopic) {
                 this.handleResponse([result], 'put');
@@ -11599,7 +11609,7 @@ let RestService$1 = class RestService extends DataService {
     putBatch(models) {
         this.handleAccessError('putBatch');
         return this.http.put(this.apiUrl, classToPlain(models))
-            .pipe(map((response) => {
+            .pipe(first$1(), map((response) => {
             const result = response.map((item) => this.createModelInstance(item));
             if (!this.mercureTopic) {
                 this.handleResponse(result, 'put');
@@ -11613,7 +11623,7 @@ let RestService$1 = class RestService extends DataService {
     delete(model, path = `${this.apiUrl}/${model.id}`) {
         this.handleAccessError('delete');
         return this.http.delete(path)
-            .pipe(map(() => {
+            .pipe(first$1(), map(() => {
             if (!this.mercureTopic) {
                 this.handleResponse([model], 'delete');
             }
@@ -11625,7 +11635,7 @@ let RestService$1 = class RestService extends DataService {
     deleteBatch(models) {
         this.handleAccessError('deleteBatch');
         return this.http.post(`${this.apiUrl}/delete`, classToPlain(models))
-            .pipe(map(() => {
+            .pipe(first$1(), map(() => {
             if (!this.mercureTopic) {
                 this.handleResponse(models, 'delete');
             }
@@ -11637,7 +11647,7 @@ let RestService$1 = class RestService extends DataService {
     deleteBatchV2(models) {
         this.handleAccessError('deleteBatch');
         return this.http.delete(`${this.apiUrl}`, { body: { ids: models.map(model => model.id) } })
-            .pipe(map(() => {
+            .pipe(first$1(), map(() => {
             if (!this.mercureTopic) {
                 this.handleResponse(models, 'delete');
             }
@@ -14474,10 +14484,9 @@ class PropertyService extends RestService$1 {
         // property caches child entities to improve performance
         this.listenCSE(PropertyValuation, (valuations) => {
             const property = this.getCache().findBy('id', valuations[0].property.id);
-            if (property.valuation.date <= valuations[0].date) {
-                property.valuation = valuations[0];
-                this.updateCache([property], 'put');
-            }
+            property.valuations.push(valuations[0]);
+            property.valuations = orderBy(property.valuations, 'date');
+            this.updateCache([property], 'put');
         });
         this.listenCSE(PropertyCategoryMovement, this.refreshCache);
     }
@@ -16671,6 +16680,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                 }]
         }] });
 
+var HoldingTradeImportMessagesEnum;
+(function (HoldingTradeImportMessagesEnum) {
+    HoldingTradeImportMessagesEnum["CREATED"] = "Import created successfully";
+    HoldingTradeImportMessagesEnum["UPDATED"] = "Import updated successfully";
+    HoldingTradeImportMessagesEnum["CONFIRM_DELETE"] = "Are you sure you want to delete this import?";
+    HoldingTradeImportMessagesEnum["DELETED"] = "Import deleted successfully";
+    HoldingTradeImportMessagesEnum["DELETE_ERROR"] = "Import including sold assets can not be deleted";
+})(HoldingTradeImportMessagesEnum || (HoldingTradeImportMessagesEnum = {}));
+
 class HoldingTradeImportService extends RestService$1 {
     constructor() {
         super(...arguments);
@@ -16688,6 +16706,7 @@ class HoldingTradeImportService extends RestService$1 {
         return this.http.post(this.apiUrl, formData).pipe(map((response) => {
             const holdingTradeImport = this.createModelInstance(response);
             this.handleResponse([holdingTradeImport], 'post');
+            this.toastService.success(HoldingTradeImportMessagesEnum.CREATED);
             return holdingTradeImport;
         }), catchError((error) => {
             if (error.status === 400) {
@@ -16706,15 +16725,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
                 }]
         }] });
 
-var HoldingTradeImportMessagesEnum;
-(function (HoldingTradeImportMessagesEnum) {
-    HoldingTradeImportMessagesEnum["CREATED"] = "Import created successfully";
-    HoldingTradeImportMessagesEnum["UPDATED"] = "Import updated successfully";
-    HoldingTradeImportMessagesEnum["CONFIRM_DELETE"] = "Are you sure you want to delete this import?";
-    HoldingTradeImportMessagesEnum["DELETED"] = "Import deleted successfully";
-    HoldingTradeImportMessagesEnum["DELETE_ERROR"] = "Import including sold assets can not be deleted";
-})(HoldingTradeImportMessagesEnum || (HoldingTradeImportMessagesEnum = {}));
-
 var HoldingTypeExchanges = [
 	{
 		id: 2,
@@ -19898,7 +19908,7 @@ class PropertyCalculationService {
         ]).pipe(map(([properties, transactions, depreciations]) => this.taxPositionGrowth(properties, transactions, depreciations)));
     }
     getRentalReturn(properties, transactions) {
-        return transactions.claimIncome / properties.marketValue;
+        return transactions.grossClaimIncome / properties.marketValue;
     }
     getLoanAmount(properties, bankAccounts, loans) {
         return properties.items.reduce((totalAmount, property) => totalAmount + bankAccounts.items
@@ -20058,6 +20068,7 @@ class PropertyTransactionReportService {
      * Get collection of property transactions
      */
     getTransactions() {
+        // @TODO TT-4886
         return this.transactionService.getWithoutTaxFreeProperty().pipe(map((transactions) => new TransactionCollection(transactions)
             .getByChartAccountsCategories(CHART_ACCOUNTS_CATEGORIES.property)
             .filter(transaction => transaction.claimPercent > 0)));
@@ -24891,7 +24902,7 @@ class DepreciationForm extends TransactionBaseForm {
             this.setEnabledState(this.get('claimStartDate'), chartAccounts.isBuildingAtCost());
         });
     }
-    submit(data = {}, includeDisabledFields = false) {
+    submit(data = {}) {
         return super.submit(data, true);
     }
 }