taxtank-core 0.21.11 → 0.21.14

package/bundles/taxtank-core.umd.js

@@ -2991,6 +2991,14 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Property.prototype, "forecastedCashPosition", {
+            get: function () {
+                var _a;
+                return ((_a = this.currentYearForecast) === null || _a === void 0 ? void 0 : _a.cashPosition) || 0;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Property.prototype, "firstForecastYear", {
             get: function () {
                 return this.forecasts.reduce(function (min, forecast) {
@@ -4949,20 +4957,6 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(PropertyCollection.prototype, "forecastedRentalReturn", {
-            get: function () {
-                return this.sumBy('forecastedRentalReturn');
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(PropertyCollection.prototype, "forecastedTaxPosition", {
-            get: function () {
-                return this.sumBy('forecastedTaxPosition');
-            },
-            enumerable: false,
-            configurable: true
-        });
         Object.defineProperty(PropertyCollection.prototype, "firstForecastYear", {
             get: function () {
                 return this.items.reduce(function (min, property) {
@@ -4975,7 +4969,7 @@
         });
         Object.defineProperty(PropertyCollection.prototype, "marketValueGrowth", {
             get: function () {
-                return this.sumBy('marketValueGrowth');
+                return (this.marketValue - this.purchasePrice) / this.purchasePrice;
             },
             enumerable: false,
             configurable: true
@@ -9365,8 +9359,7 @@
         workRelatedClothingExpenses: [
             exports.ChartAccountsHeadingListEnum.COMPULSORY_WORK_UNIFORM,
             exports.ChartAccountsHeadingListEnum.PROTECTION_CLOTHING,
-            exports.ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING,
-            exports.ChartAccountsHeadingListEnum.SELF_EDUCATIONAL_EXPENSES
+            exports.ChartAccountsHeadingListEnum.OCCUPATIONAL_SPECIFIC_CLOTHING
         ],
         otherIncomeRelatedExpenses: [
             exports.ChartAccountsHeadingListEnum.OTHER_WORK_RELATED_EXPENSES,
@@ -9504,7 +9497,7 @@
         };
         MyTaxDeductions.prototype.setVehicleClaimData = function () {
             this.klmsMethodClaimAmount = this.vehicleClaim.getKLMsClaimAmount(this.vehicleClaimRate);
-            this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('claimAmount');
+            this.totalExpensesAmount = new VehicleExpenseCollection(this.transactions.getByTankType(this.vehicleClaim.tankType), this.depreciations.getByTankType(this.vehicleClaim.tankType), this.vehicleClaim).sumBy('amount');
         };
         /**
          * Total amount from Other work related expenses and Tools & equipment depreciations
@@ -9512,7 +9505,7 @@
         MyTaxDeductions.prototype.setOtherWorkRelatedExpensesTotalAmount = function () {
             var otherIncomeRelatedExpenses = this.transactions
                 .filterBy('chartAccounts.heading.id', DEDUCTION_CATEGORIES.otherIncomeRelatedExpenses);
-            this.otherWorkRelatedExpensesTotalAmount = Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
+            this.otherWorkRelatedExpensesTotalAmount = -Math.abs(otherIncomeRelatedExpenses.sumBy('claimAmount')) +
                 this.depreciations.filterBy('chartAccounts.heading.id', exports.ChartAccountsHeadingListEnum.TOOLS_EQUIPMENT).sumBy('claimAmount');
         };
         return MyTaxDeductions;
@@ -9813,15 +9806,13 @@
          * property contract date, e.t.c.). Details in the TT-2009 task
          */
         MyTaxRent.prototype.calculateOtherRentalDeductionsAmount = function () {
-            var plantAndEquipmentAmount = Math.abs(this.taxSummaryPropertySection.items
-                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.DEPRECIATION)
-                .amount);
-            var borrowingExpensesAmount = Math.abs(this.taxSummaryPropertySection.items
-                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)
-                .amount);
-            var otherRentalDeductionsAmount = Math.abs(this.taxSummaryPropertySection.items
-                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)
-                .amount);
+            var _a, _b, _c;
+            var plantAndEquipmentAmount = Math.abs(((_a = this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.DEPRECIATION)) === null || _a === void 0 ? void 0 : _a.amount) || 0);
+            var borrowingExpensesAmount = Math.abs(((_b = this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.BORROWING_EXPENSES)) === null || _b === void 0 ? void 0 : _b.amount) || 0);
+            var otherRentalDeductionsAmount = Math.abs(((_c = this.taxSummaryPropertySection.items
+                .findBy('taxReturnCategory.id', exports.TaxReturnCategoryListEnum.OTHER_RENTAL_DEDUCTIONS)) === null || _c === void 0 ? void 0 : _c.amount) || 0);
             return +Math.floor(plantAndEquipmentAmount + borrowingExpensesAmount + otherRentalDeductionsAmount).toFixed(2);
         };
         return MyTaxRent;
@@ -11008,7 +10999,8 @@
                 transactions.forEach(function (transaction, index) {
                     // @TODO backend: need to upload file in the same backend endpoint with transaction add/update
                     // check if passed receipt and upload file
-                    if (transaction.file) {
+                    // @TODO Alex: refactor. Move receipt to separated service and use event dispatcher to handle it
+                    if (transaction.file && (transaction.file instanceof File)) {
                         transaction.id = response[index].id;
                         addedTransactions[index].file = transaction.file;
                         _this.uploadReceipt(addedTransactions[index]);
@@ -11046,7 +11038,8 @@
                 var updatedTransaction = classTransformer.plainToClass(Transaction, response);
                 // @TODO need to upload file in the same backend endpoint with transaction add/update
                 // check if passed new receipt and upload file
-                if (transaction.file) {
+                // @TODO Alex: refactor. Move receipt to separated service and use event dispatcher to handle it
+                if (transaction.file && (transaction.file instanceof File)) {
                     updatedTransaction.file = transaction.file;
                     _this.uploadReceipt(updatedTransaction);
                 }
@@ -13590,12 +13583,12 @@
             }));
         };
         PropertyCalculationService.prototype.taxPositionGrowth = function (properties, transactions, depreciations) {
-            var taxPosition = this.getTaxPosition(transactions, depreciations);
-            // check if taxPosition = 0 to avoid division by zero
-            if (!taxPosition) {
+            var forecastedTaxPosition = properties.sumBy('forecastedTaxPosition');
+            // check if forecastedTaxPosition = 0 to avoid division by zero
+            if (!forecastedTaxPosition) {
                 return 0;
             }
-            return (taxPosition - properties.forecastedTaxPosition) / taxPosition;
+            return (this.getTaxPosition(transactions, depreciations) - forecastedTaxPosition) / forecastedTaxPosition;
         };
         PropertyCalculationService.prototype.taxPositionGrowth$ = function (properties$, transactions$, depreciations$) {
             var _this = this;
@@ -13662,11 +13655,12 @@
         };
         PropertyCalculationService.prototype.getLvrGrowth = function (properties, bankAccounts, loans) {
             var lvr = this.getLvr(properties, bankAccounts);
-            if (!lvr) {
-                // check if lvr = 0 to avoid division by zero
+            var lvrCommencement = this.getLvrCommencement(properties, loans, bankAccounts);
+            if (!lvrCommencement) {
+                // check if lvrCommencement = 0 to avoid division by zero
                 return 0;
             }
-            return (lvr - this.getLvrCommencement(properties, loans, bankAccounts)) / lvr;
+            return (this.getLvr(properties, bankAccounts) - lvrCommencement) / lvrCommencement;
         };
         PropertyCalculationService.prototype.getLvrGrowth$ = function (properties$, bankAccounts$, loans$) {
             var _this = this;
@@ -13679,14 +13673,28 @@
                 return _this.getLvrGrowth(properties, bankAccounts, loans);
             }));
         };
+        /**
+         * Equity position = Market value - current loan value
+         */
         PropertyCalculationService.prototype.getEquityPosition = function (properties, bankAccounts) {
             // Math abs is required for correct percentage calculation
             return properties.marketValue - Math.abs(this.getLoanValue(properties, bankAccounts));
         };
+        /**
+         * Purchase Equity = Purchase price - initial loan value
+         */
         PropertyCalculationService.prototype.getPurchaseEquity = function (properties, bankAccounts, loans) {
             // Math abs is required for correct percentage calculation
             return properties.purchasePrice - Math.abs(this.getLoanAmount(properties, bankAccounts, loans));
         };
+        PropertyCalculationService.prototype.getEquityGrowth = function (properties, bankAccounts, loans) {
+            var purchaseEquity = this.getPurchaseEquity(properties, bankAccounts, loans);
+            // check if purchaseEquity = 0 to avoid division by zero
+            if (!purchaseEquity) {
+                return 0;
+            }
+            return (this.getEquityPosition(properties, bankAccounts) - purchaseEquity) / purchaseEquity;
+        };
         /**
          * Get dictionary of badges for each property in collection
          */
@@ -13698,6 +13706,14 @@
             });
             return badgesByProperty;
         };
+        PropertyCalculationService.prototype.getCashPositionGrowth = function (properties, transactions) {
+            var forecastedCashPosition = properties.sumBy('forecastedCashPosition');
+            // check if forecastedCashPosition = 0 to avoid division by zero
+            if (!forecastedCashPosition) {
+                return 0;
+            }
+            return (transactions.cashPosition - forecastedCashPosition) / forecastedCashPosition;
+        };
         /**
          * Get Badge for single property in collection
          */
@@ -14952,6 +14968,34 @@
                         }] }];
         } });
 
+    // @TODO Artem: implement cache and extend rest?
+    var TutorialVideoService = /** @class */ (function () {
+        function TutorialVideoService(http, environment) {
+            this.http = http;
+            this.environment = environment;
+        }
+        TutorialVideoService.prototype.get = function () {
+            return this.http.get(TutorialVideoService.googleUrl + "&q='" + TutorialVideoService.parents + "'+in+parents&key=" + this.environment.googleDriveId)
+                .pipe(operators.map(function (response) { return response.files; }));
+        };
+        return TutorialVideoService;
+    }());
+    TutorialVideoService.googleUrl = "https://www.googleapis.com/drive/v3/files?fields=*&mimeType='video/mp4'&orderBy=name";
+    TutorialVideoService.parents = '1uLMLzi8WUy2go9xhfzJEwgFwOM43dukM';
+    TutorialVideoService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TutorialVideoService, deps: [{ token: i1__namespace.HttpClient }, { token: 'environment' }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    TutorialVideoService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TutorialVideoService, providedIn: 'root' });
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TutorialVideoService, decorators: [{
+                type: i0.Injectable,
+                args: [{
+                        providedIn: 'root'
+                    }]
+            }], ctorParameters: function () {
+            return [{ type: i1__namespace.HttpClient }, { type: undefined, decorators: [{
+                            type: i0.Inject,
+                            args: ['environment']
+                        }] }];
+        } });
+
     // deep clone for entity
     function cloneDeep(array) {
         return JSON.parse(JSON.stringify(array));
@@ -15125,8 +15169,8 @@
     var BankAccountPropertiesForm = /** @class */ (function (_super) {
         __extends(BankAccountPropertiesForm, _super);
         function BankAccountPropertiesForm(bankAccountProperties) {
-            if (bankAccountProperties === void 0) { bankAccountProperties = [classTransformer.plainToClass(BankAccountProperty, {})]; }
-            return _super.call(this, bankAccountProperties.map(function (bankAccountProperty) {
+            return _super.call(this, ((bankAccountProperties === null || bankAccountProperties === void 0 ? void 0 : bankAccountProperties.length) ? bankAccountProperties : [classTransformer.plainToClass(BankAccountProperty, {})])
+                .map(function (bankAccountProperty) {
                 return new forms.FormGroup({
                     property: new forms.FormControl(bankAccountProperty === null || bankAccountProperty === void 0 ? void 0 : bankAccountProperty.property, forms.Validators.required),
                     percent: new forms.FormControl(bankAccountProperty.percent, forms.Validators.required)
@@ -15745,7 +15789,7 @@
                     disabled: true
                 }),
                 fundName: new forms.FormControl(''),
-                hasFund: new forms.FormControl(false),
+                hasFund: new forms.FormControl(true),
                 fundABN: new forms.FormControl(''),
                 fundTFN: new forms.FormControl(''),
                 fundAccountNumber: new forms.FormControl(''),
@@ -16325,6 +16369,7 @@
     exports.TransactionReceipt = TransactionReceipt;
     exports.TransactionService = TransactionService;
     exports.TtCoreModule = TtCoreModule;
+    exports.TutorialVideoService = TutorialVideoService;
     exports.USER_ROLES = USER_ROLES;
     exports.USER_WORK_POSITION = USER_WORK_POSITION;
     exports.User = User;