diff --git a/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.html b/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.html index 1bbc3e3f67fcdb1f9b71cde608a8f552e2df1099..ae4439717741051b3fd783d2bf3f38d1dd6bb356 100644 --- a/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.html +++ b/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.html @@ -41,10 +41,10 @@ </div> <!-- Display the value. If it is url, display a link --> <div *ngSwitchDefault class="property-value"> - <span - *ngIf="!isUrl(properties[key])">{{ (properties[key] && properties[key] !== '') ? properties[key] : '-' }}</span> + <span *ngIf="isFloat(properties[key]) && !isUrl(properties[key])">{{ roundTo(properties[key], 2) }}</span> + <span *ngIf="!isFloat(properties[key]) && !isUrl(properties[key])">{{ (properties[key] && properties[key] !== '') ? properties[key] : '-' }}</span> <a [href]="properties[key]" target="_blank" *ngIf="isUrl(properties[key])">{{ properties[key] }}</a> </div> </ng-container> </div> -</div> \ No newline at end of file +</div> diff --git a/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.ts b/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.ts index 33efab5687f5c682a1385a97ac5a15c810ce9341..687b0065fb173eb7c08daaa9075c1daa809ac900 100644 --- a/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.ts +++ b/src/app/dataset-detail/components/dataset-data-details/dataset-data-detail-properties/dataset-data-detail-properties.component.ts @@ -94,4 +94,13 @@ export class DatasetDataDetailPropertiesComponent implements OnInit { const isStringAndNotNull = value ? typeof value === 'string' : false; return isStringAndNotNull ? value.match(regex) : false; } + + isFloat(n: any) { + return Number(n) === n && n % 1 !== 0; + } + + roundTo(num: number, places: number) { + const factor = 10 ** places; + return Math.round(num * factor) / factor; + } } diff --git a/src/app/dataset-detail/components/dataset-table/dataset-table.component.html b/src/app/dataset-detail/components/dataset-table/dataset-table.component.html index 72108716e5c10f0fc678096a3053fe15c32e87ef..8d952fae062b039e0fd18ec646ff1af9962910ef 100644 --- a/src/app/dataset-detail/components/dataset-table/dataset-table.component.html +++ b/src/app/dataset-detail/components/dataset-table/dataset-table.component.html @@ -20,12 +20,9 @@ *ngFor="let key of displayedProperties; let indexRow=index;" (click)="emitSelectedData(element)" [attr.role]="'cell'"> <ng-container *ngIf="!isPropertyComplex(element,key)"> - <span *ngIf="!isUrl(element.properties[key]); else urlPropTemplate" - class="data-property-value">{{ element.properties[key] }}</span> - <ng-template #urlPropTemplate> - <a class="data-property-value" target="_blank" - [href]="element.properties[key]">{{ element.properties[key] }}</a> - </ng-template> + <span *ngIf="isFloat(element.properties[key]) && !isUrl(element.properties[key])" class="data-property-value">{{ roundTo(element.properties[key], 2) }}</span> + <span *ngIf="!isFloat(element.properties[key]) && !isUrl(element.properties[key])" class="data-property-value">{{ element.properties[key] }}</span> + <a *ngIf="isUrl(element.properties[key])" [href]="element.properties[key]" target="_blank" class="data-property-value">{{ element.properties[key] }}</a> </ng-container> <span *ngIf="isPropertyComplex(element,key)"> <span i18n-data-tooltip="@@dataset.data.tooltip" diff --git a/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts b/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts index 8f571dac8b8d29c22152d4f630c624bb418c2408..4565953b24c47d0af37c0a6ead8d2777a26ef972 100644 --- a/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts +++ b/src/app/dataset-detail/components/dataset-table/dataset-table.component.ts @@ -166,4 +166,13 @@ export class DatasetTableComponent implements OnInit, OnDestroy { // Make there are no duplicates in the array this.visitedFeatures = [...new Set(this.visitedFeatures)] } + + isFloat(n: any) { + return Number(n) === n && n % 1 !== 0; + } + + roundTo(num: number, places: number) { + const factor = 10 ** places; + return Math.round(num * factor) / factor; + } }