Merge pull request #23 in ~VLE2FE/definma-ui from development to master

* commit 'bebc69afdee99c1242b1889b7dac63467af3337d':
  fixed spaces in measurement name
This commit is contained in:
Veit Lukas (PEA4-Fe) 2020-08-18 08:07:48 +02:00
commit 0f59c14156
2 changed files with 8 additions and 1 deletions

View File

@ -1,6 +1,9 @@
import { Component, OnInit } from '@angular/core';
import {ApiService} from '../services/api.service';
// TODO: links to BIC
// TODO: bic structure image
@Component({
selector: 'app-documentation',
templateUrl: './documentation.component.html',

View File

@ -132,7 +132,11 @@ export class SamplesComponent implements OnInit {
const parameterName = encodeURIComponent(parameter.name);
// exclude spectrum and duplicates
if (parameter.name !== 'dpt' && !templateKeys.find(e => new RegExp('.' + parameterName + '$').test(e.id))) {
const collectionNames = {material: 'material.properties', condition: 'condition', measurement: 'measurements.' + item.name};
const collectionNames = {
material: 'material.properties',
condition: 'condition',
measurement: 'measurements.' + encodeURIComponent(item.name)
};
templateKeys.push({
id: `${collectionNames[collection]}.${parameterName}`,
label: `${this.ucFirst(item.name)} ${parameter.name}`,