X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Fapp%2Fvim-accounts%2FResources-Overview%2FResourcesOverviewComponent.ts;h=eb7c8bceffe805ae0808967cd45a794a8bc1f680;hb=refs%2Fchanges%2F63%2F13963%2F2;hp=11d48d70bfd83e126b15dbcbb9e7fd0bed34936c;hpb=1132258413328f80cb8b2453dc4b3d24318bd3e5;p=osm%2FNG-UI.git diff --git a/src/app/vim-accounts/Resources-Overview/ResourcesOverviewComponent.ts b/src/app/vim-accounts/Resources-Overview/ResourcesOverviewComponent.ts index 11d48d7..eb7c8bc 100644 --- a/src/app/vim-accounts/Resources-Overview/ResourcesOverviewComponent.ts +++ b/src/app/vim-accounts/Resources-Overview/ResourcesOverviewComponent.ts @@ -62,6 +62,9 @@ export class ResourcesOverviewComponent implements OnChanges { @Input() public resourcesData: VimAccountDetails; /** Resources data for generating chart @public */ public chartData: RESOURCESDATA[] = []; + /** Count of decimalPoints @private */ + // eslint-disable-next-line @typescript-eslint/no-magic-numbers + private decimalPoints: number = 2; constructor(injector: Injector) { this.injector = injector; this.translateService = this.injector.get(TranslateService); @@ -115,9 +118,9 @@ export class ResourcesOverviewComponent implements OnChanges { let usedColor: string = RANGECOLOR.used; // eslint-disable-next-line security/detect-object-injection const getValuesUsedFree: number[] = Object.values(compute[key]); - const total: number = key === keyValidate ? getValuesUsedFree[0] / CONSTANTNUMBER.oneGB : getValuesUsedFree[0]; - const used: number = key === keyValidate ? getValuesUsedFree[1] / CONSTANTNUMBER.oneGB : getValuesUsedFree[1]; - const remaining: number = total - used; + const total: number = key === keyValidate ? Number((getValuesUsedFree[0] / CONSTANTNUMBER.oneGB).toFixed(this.decimalPoints)) : Number((getValuesUsedFree[0]).toFixed(this.decimalPoints)); + const used: number = key === keyValidate ? Number((getValuesUsedFree[1] / CONSTANTNUMBER.oneGB).toFixed(this.decimalPoints)) : Number((getValuesUsedFree[1]).toFixed(this.decimalPoints)); + const remaining: number = Number((total - used).toFixed(this.decimalPoints)); const usedPercentage: number = (used / total) * range.percentage; if (usedPercentage >= range.nearlyFull && usedPercentage < range.full) { usedColor = RANGECOLOR.nearlyfull; @@ -125,7 +128,7 @@ export class ResourcesOverviewComponent implements OnChanges { if (usedPercentage === range.full) { usedColor = RANGECOLOR.full; } - getData.push(this.generateChartData(key, { total, used, remaining }, [usedColor, '#b9bcc3'] )); + getData.push(this.generateChartData(key, { total, used, remaining }, [usedColor, '#b9bcc3'])); }); return getData; } @@ -140,8 +143,10 @@ export class ResourcesOverviewComponent implements OnChanges { // eslint-disable-next-line security/detect-object-injection title: CONFIGRESOURCESTITLE[setTitle], values: this.generateChartDataValues(setValues.total, setValues.used, setValues.remaining), - data: [{data: [setValues.used, setValues.remaining], backgroundColor: setColor, - hoverBackgroundColor: setColor, hoverBorderColor: setColor}] + data: [{ + data: [setValues.used, setValues.remaining], backgroundColor: setColor, + hoverBackgroundColor: setColor, hoverBorderColor: setColor + }] }; } /**