arti24
/
arti-angular-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New version of communication with service from assets

This commit is contained in:
Artur 2024-11-04 22:49:41 +01:00
parent d985d87086
commit bf41271041
9 changed files with 148 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/asset-calculator/asset-calculator.component.html
View File

@ -24,13 +24,13 @@
<div class="form-group row align-items-center">
<div class="col-5 col-lg-6 text-start ">
<label class="form-label" for="depreciationRate" >Stawka amortyzacyjna:</label>
<label class="form-label" for="rate" >Stawka amortyzacyjna:</label>
</div>
<div class="col-3 col-lg-3">
<input class="form-control" formControlName="depreciationRate" type="number" id="depreciationRate" />
<input class="form-control" formControlName="rate" type="number" id="rate" />
</div>
<div class="col-1 col-lg-1 text-start">
<label for="depreciationRate">%</label>
<label for="rate">%</label>
</div>
</div>
@ -60,10 +60,10 @@
@if( TypeDepreciation.digressive === assetsDepreciationFormGroup.get( 'typeDepreciation' )?.value ) {
<div class="form-group row align-items-center">
<div class="col-5 col-lg text-start ">
<label for="factorValue" class="form-label">Wspólczynnki degresji</label>
<label for="factor" class="form-label">Wspólczynnki degresji</label>
</div>
<div class="col col-lg" >
<input type="text" class="form-control" formControlName="factorValue" />
<input type="text" class="form-control" formControlName="factor" id="factor" />
</div>
</div>
}

49
src/app/asset-calculator/asset-calculator.component.ts
View File

@ -3,16 +3,16 @@ import { ReactiveFormsModule, FormGroup, Validators, FormControl, FormArray } f
import { CurrencyPipe,DecimalPipe,PercentPipe } from '@angular/common';
import {Asset, Positions, AssetPlanPosition, TypeDepreciation, YearMonth, AssetLifeChange, YearMonthUtil } from './assets/asset';
import {AssetService} from './assets/service/asset.service'
import {Asset, Positions, AssetPlanPosition, TypeDepreciation, YearMonth, AssetLifeChange, AssetDepreciationMethod, YearMonthUtil } from '../assets/asset';
import {AssetService} from '../assets/service/asset.service'
interface FormValues {
initialValueAsset: number;
depreciationRate: number;
rate: number;
year_month: string;
typeDepreciation: TypeDepreciation;
factorValue: number;
factor: number;
}
@Component({
selector: 'app-asset-calculator',
@ -22,18 +22,19 @@ templateUrl: "asset-calculator.component.html",
styleUrl: 'asset-calculator.component.css'
})
export class AssetCalculatorComponent implements OnInit, OnDestroy{
TypeDepreciation = TypeDepreciation;
amortizations = new Positions();
TypeDepreciation = TypeDepreciation;
lifeFormArray = new FormArray<FormGroup>([]);
assetsDepreciationFormGroup = new FormGroup( {
initialValueAsset : new FormControl( 3000, [ Validators.required, this.currencyValidator ]),
depreciationRate : new FormControl( 20 ) ,
initialValueAsset : new FormControl( 5000, [ Validators.required, this.currencyValidator ]),
rate : new FormControl( 20 ) ,
year_month : new FormControl( "2024-10" ),
typeDepreciation : new FormControl( TypeDepreciation.linear ),
factorValue : new FormControl( 2, [Validators.required,Validators.max(2)] ),
factor : new FormControl( 2/*, [Validators.required,Validators.max(2)]*/ ),
} );
@ -43,33 +44,32 @@ export class AssetCalculatorComponent implements OnInit, OnDestroy{
}
ngOnInit(): void{
const savedAsset = localStorage.getItem('assetForCalculator');
if (savedAsset) this.assetToControls(JSON.parse(savedAsset));
const savedAsset = localStorage.getItem('assetForCalculator');
if (savedAsset) this.assetToControls(JSON.parse(savedAsset));
}
ngOnDestroy(): void {
// Zapisywanie danych przed zniszczeniem komponentu
localStorage.setItem('assetForCalculator', JSON.stringify(this.controlsToAsset()));
}
private assetToControls( asset : Asset ) {
if( asset.life.length > 0 ){
const year_month = YearMonthUtil.toString( asset.life[0].when );
const year_month = YearMonthUtil.toTxt( asset.life[0].when );
this.assetsDepreciationFormGroup.patchValue({
year_month : year_month,
initialValueAsset : asset.life[0].initial,
depreciationRate : asset.depreciationRate,
typeDepreciation : asset.type,
factorValue : asset.factorValue,
rate : asset.depreciationMethods[0].rate,
typeDepreciation : asset.depreciationMethods[0].type,
factor : asset.depreciationMethods[0].factor,
})
asset.life.slice(1).forEach( lifeChange => {
this.addChangeValue();
const row = this.lifeFormArray.at( this.lifeFormArray.length - 1 ) as FormGroup;
row.patchValue( {
initialValueAsset: lifeChange.initial,
year_month: YearMonthUtil.toString( lifeChange.when )
year_month: YearMonthUtil.toTxt( lifeChange.when )
} );
});
}
@ -79,15 +79,20 @@ export class AssetCalculatorComponent implements OnInit, OnDestroy{
private controlsToAsset() : Asset {
const formValues = this.assetsDepreciationFormGroup.value as FormValues;
const when = new YearMonth( formValues.year_month );
const asset = new Asset( formValues.depreciationRate, when, formValues.typeDepreciation, formValues.factorValue );
const creationlifeChange = new AssetLifeChange(when, formValues.initialValueAsset , 0, 0);
const when = new YearMonth( formValues.year_month );
const asset = new Asset( when );
const method = new AssetDepreciationMethod( when.year, formValues.rate, formValues.typeDepreciation, formValues.factor );
asset.addMethod( method );
const creationlifeChange = new AssetLifeChange( when, formValues.initialValueAsset, 0, 0 );
asset.addChange( creationlifeChange );
this.lifeFormArray.controls.forEach(control => {
const initialValue = control.get('initialValueAsset')?.value;
const yearMonth = control.get('year_month')?.value;
asset.addChange(new AssetLifeChange(new YearMonth(yearMonth), initialValue, 0, 0));
const yearMonth = control.get('year_month')?.value;
asset.addChange( new AssetLifeChange( new YearMonth(yearMonth), initialValue, 0, 0 ) );
})
return asset;

0
src/app/asset-calculator/assets/asset.spec.ts → src/app/assets/asset.spec.ts
View File

52
src/app/asset-calculator/assets/asset.ts → src/app/assets/asset.ts
View File

@ -17,14 +17,20 @@ export class YearMonth{
}
export class YearMonthUtil{
static toString( ym : YearMonth ):string{
static toTxt( ym : YearMonth ):string{
return ym.year + '-' + ym.month ;
}
static toToday( ):YearMonth{
const today = new Date();
return new YearMonth( today.getFullYear() + '-' +today.getMonth()+1 );
}
}
export class AssetLifeChange{
readonly when : YearMonth;
readonly initial : number;
readonly residual : number;
@ -34,37 +40,51 @@ export class AssetLifeChange{
initial : number,
residual : number,
depreciation: number ){
this.when = when;
this.initial = initial;
this.residual = residual;
this.depreciation = depreciation;
}
}
export class AssetDepreciationMethod{
readonly year : number;
readonly type : TypeDepreciation;
readonly rate : number ;
readonly factor : number;
constructor( year : number,
rate : number,
type : TypeDepreciation,
factor : number ){
this.year = year;
this.rate = rate;
this.type = type;
this.factor = factor;
}
}
export class Asset {
start : YearMonth ;
depreciationRate : number ;
type : TypeDepreciation;
factorValue : number;
life : AssetLifeChange[]=[];
life : AssetLifeChange[]=[];
depreciationMethods : AssetDepreciationMethod[]=[];
addChange( change : AssetLifeChange ){
this.life.push( change );
}
constructor( depreciationRate : number,
start : YearMonth,
type : TypeDepreciation,
factorValue : number ){
this.depreciationRate = depreciationRate;
addMethod( method : AssetDepreciationMethod ){
this.depreciationMethods.push( method );
}
constructor( start : YearMonth ){
this.start = start;
this.type = type;
this.factorValue = factorValue;
}
}
@ -73,10 +93,6 @@ export class AssetsContainer{
assets: Map<string,Asset> = new Map();
constructor(){
}
delete( nrInv: string ){
this.assets.delete(nrInv);
}

0
src/app/asset-calculator/assets/assets.module.ts → src/app/assets/assets.module.ts
View File

0
src/app/asset-calculator/assets/service/asset.service.spec.ts → src/app/assets/service/asset.service.spec.ts
View File

2
src/app/asset-calculator/assets/service/asset.service.ts → src/app/assets/service/asset.service.ts
View File

@ -12,7 +12,7 @@ import { Observable } from 'rxjs';
})
export class AssetService {
// private assetUrl: string ='http://localhost:8800/rest-api/assets/calculate';
// private assetUrl: string ='http://localhost:8800/rest-api/assets/calculate';
//private assetUrl: string ='http://localhost:5001/rest-api/assets/calculate';

105
src/app/fixed-asset/fixed-asset.component.ts
View File

@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { AssetsContainer, Asset, TypeDepreciation, YearMonth } from '../asset-calculator/assets/asset';
import { ReactiveFormsModule, FormBuilder, FormGroup, Validators, FormControl, FormArray} from '@angular/forms';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Asset, TypeDepreciation, YearMonthUtil, AssetLifeChange } from '../assets/asset';
import { ReactiveFormsModule, FormBuilder, FormGroup, FormArray, ValidatorFn, ValidationErrors, AbstractControl } from '@angular/forms';
@Component({
@ -19,8 +20,8 @@ import { ReactiveFormsModule, FormBuilder, FormGroup, Validators, FormControl, F
<th class="col-2">Numer inwentarzowy</th>
<th class="col-2">Wartość</th>
<th class="col-2">Metoda amortyzacji</th>
<th class="col-2">Stawka</th>
<th class="col-2"></th>
<!-- <th class="col-2">Stawka</th>
<th class="col-2"></th> -->
</tr>
</thead>
@ -28,15 +29,16 @@ import { ReactiveFormsModule, FormBuilder, FormGroup, Validators, FormControl, F
@for( assetFormGroup of assetFormArray.controls; track $index ) {
<tr [formGroup] = "assetFormGroup">
<td> <input class="form-control" formControlName="nr" type="text" readonly></td>
<td> <input class="form-control" formControlName="nrInv" type="text" readonly></td>
<td> <input class="form-control" formControlName="initialValue" type="number" placeholder="Wprowadź wartość"></td>
<td>
<select class="form-select" formControlName="typeDepreciation" >
<!-- <td>
<select class="form-select" formControlName="typeDepreciation" >
<option [ngValue]=TypeDepreciation.linear selected="selected">Liniowa</option>
<option [ngValue]=TypeDepreciation.digressive >Dygresywna</option>
</select>
</td>
<td> <input class="form-control" formControlName="depreciationRate" type="number" /> </td>
<td> <input class="form-control" formControlName="depreciationRate" type="number" /> </td> -->
<td class="col-2">
<input type="button" class="btn btn-outline-secondary" (click)="delete($index)" value="Usuń Składnik">
@ -50,55 +52,92 @@ import { ReactiveFormsModule, FormBuilder, FormGroup, Validators, FormControl, F
</div>
<input type="button" (click)=addNew() class="btn btn-outline-secondary" value="Dodaj Składnik">
</div>
`,
styleUrl: './fixed-asset.component.css'
})
export class FixedAssetComponent {
static STORAGE_KEY = "fixed_assets";
static indexNr = 1;
TypeDepreciation = TypeDepreciation;
assetsContainer : AssetsContainer;
assetFormArray : FormArray<FormGroup>;
constructor( private fb: FormBuilder ){
this.assetsContainer = new AssetsContainer ();
this.assetFormArray = this.fb.array<FormGroup>([])
}
ngOnInit(): void {
const savedAssets = localStorage.getItem( FixedAssetComponent.STORAGE_KEY) ;
if( savedAssets ) {
this.assetsToControls( JSON.parse( savedAssets ) );
}
}
ngOnDestroy(): void {
localStorage.setItem( FixedAssetComponent.STORAGE_KEY, JSON.stringify( this.controlsToAssets() ) );
}
private assetsToControls( assetsArray: [ string, Asset ][]) {
const assetsMap = new Map<string, Asset>( assetsArray );
assetsMap.forEach( (asset, key) => {
this.addRow( key, asset.life[0].initial );
});
}
private controlsToAssets(): [string, Asset][] {
const assets = new Map<string, Asset>();
this.assetFormArray.controls.forEach( control => {
const nrInv = control.get('nrInv')?.value;
const initialValue = control.get('initialValue')?.value;
const yearMonth = YearMonthUtil.toToday();
const asset = new Asset( yearMonth );
const assetLifeChange = new AssetLifeChange( yearMonth, initialValue, 0, 0 );
asset.addChange( assetLifeChange );
assets.set( nrInv, asset );
});
return Array.from( assets.entries() );
}
delete( index : number ){
this.assetFormArray.removeAt( index );
this.assetFormArray.removeAt( index );
}
addNew(){
this.addNr("NrInv" + FixedAssetComponent.indexNr++ );
this.addRow( "NrInv" + FixedAssetComponent.indexNr++, 1000 );
}
addNr( nrInv:string ):void{
addRow( nrInv_:string, initial_: number ):void{
const newRow = this.fb.group({
nrInv : [ nrInv_ ],
initialValue : [ initial_ ],
});
const today = new Date();
const year = today.getFullYear();
const month = today.getMonth() + 1;
const year_month = year +'-'+month;
const yearMonth = new YearMonth( year_month ) ;
const asset = new Asset( 20, yearMonth, TypeDepreciation.linear, 10 );
const newRow= this.fb.group({
nr : [ nrInv ],
initialValue : [ 10000 ],
depreciationRate : [ 10 ],
typeDepreciation : [ TypeDepreciation.linear ],
year_month : [ year_month ]
})
// typeDepreciation : [ TypeDepreciation.linear ],
// depreciationRate : [ 10 ],
// year_month : [ year_month ]
this.assetFormArray.push( newRow );
}
// uniqueColumnValidator(): ValidatorFn {
// return (control: AbstractControl): ValidationErrors | null => {
// const values = this.assetFormArray.map(field => field.value) || [];
// const uniqueValues = new Set(values);
// return uniqueValues.size !== values.length ? { uniqueColumn: true } : null;
// };
// }
}

9
src/app/validators/unique-column.validator.ts Normal file
View File

@ -0,0 +1,9 @@
import { AbstractControl, ValidationErrors, ValidatorFn } from '@angular/forms';
export function uniqueColumnValidator(columnName: string): ValidatorFn {
return (control: AbstractControl): ValidationErrors | null => {
const formArray = control.get(columnName) as AbstractControl[];
const values = formArray?.map(field => field.value) || [];
const uniqueValues = new Set(values);
return uniqueValues.size !== values.length ? { uniqueColumn: true } : null;
};