diff --git a/src/app/asset-calculator/asset-calculator.component.ts b/src/app/asset-calculator/asset-calculator.component.ts
index c7d1e77..b502832 100644
--- a/src/app/asset-calculator/asset-calculator.component.ts
+++ b/src/app/asset-calculator/asset-calculator.component.ts
@@ -2,7 +2,7 @@ import {Component, OnInit } from '@angular/core';
import {FormsModule} from '@angular/forms';
import {CurrencyPipe,DecimalPipe,PercentPipe} from '@angular/common';
import {AssetsModule} from './assets/assets.module'
-import {Asset, Positions, AssetPlanPosition } from './assets/asset';
+import {Asset, Positions, AssetPlanPosition, TypeDepreciation } from './assets/asset';
import {AssetService} from './assets/service/asset.service'
@Component({
@@ -37,6 +37,7 @@ import {AssetService} from './assets/service/asset.service'
[ngModel]="asset.year "
(ngModelChange)="asset.year=$event;calculate()"
/>
+
| Metoda amortyzacji |
- |
-
-
- |
+
+ |
+
+ @if( TypeDepreciation.digressive === asset.type ){
+
+
+ |
+ }
+
@@ -79,8 +84,8 @@ import {AssetService} from './assets/service/asset.service'
| {{$index+1}} |
- {{position.when.year}} |
- {{position.when.month}} |
+ {{ position.when.year }} |
+ {{ position.when.month }} |
{{ position.calculatedDepreciation | number:'1.2-2' }} |
{{ position.sum | number:'1.2-2' }} |
@@ -97,7 +102,7 @@ export class AssetCalculatorComponent implements OnInit{
}
-
+ TypeDepreciation = TypeDepreciation;
asset = new Asset();
positions = new Positions();
@@ -115,6 +120,7 @@ export class AssetCalculatorComponent implements OnInit{
}
clazz(pos : AssetPlanPosition ){
+
return pos.when.year % 2 === 0 ? "table-light" : "table-dark";
}
diff --git a/src/app/asset-calculator/assets/asset.ts b/src/app/asset-calculator/assets/asset.ts
index c6138d9..51844ba 100644
--- a/src/app/asset-calculator/assets/asset.ts
+++ b/src/app/asset-calculator/assets/asset.ts
@@ -1,8 +1,16 @@
+
+export enum TypeDepreciation{
+ linear, digressive
+}
+
export class Asset {
initialValueAsset = 2000;
- depreciationRate = 20;
+
year = 2024;
month = 10;
+
+ type = TypeDepreciation.linear;
+ depreciationRate = 20;
factorValue = 2;
}
diff --git a/src/app/asset-calculator/assets/service/asset.service.ts b/src/app/asset-calculator/assets/service/asset.service.ts
index 807f986..f736483 100644
--- a/src/app/asset-calculator/assets/service/asset.service.ts
+++ b/src/app/asset-calculator/assets/service/asset.service.ts
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs';
let assetUrl: string ='https://api.arti24.eu/rest-api/assets/calculate';
+//let assetUrl: string ='http://localhost:8801/rest-api/assets/calculate';
@Injectable({