Merge pull request #23 in ~VLE2FE/definma-ui from development to master
* commit 'bebc69afdee99c1242b1889b7dac63467af3337d': fixed spaces in measurement name
This commit is contained in:
		@@ -1,6 +1,9 @@
 | 
				
			|||||||
import { Component, OnInit } from '@angular/core';
 | 
					import { Component, OnInit } from '@angular/core';
 | 
				
			||||||
import {ApiService} from '../services/api.service';
 | 
					import {ApiService} from '../services/api.service';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// TODO: links to BIC
 | 
				
			||||||
 | 
					// TODO: bic structure image
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Component({
 | 
					@Component({
 | 
				
			||||||
  selector: 'app-documentation',
 | 
					  selector: 'app-documentation',
 | 
				
			||||||
  templateUrl: './documentation.component.html',
 | 
					  templateUrl: './documentation.component.html',
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -132,7 +132,11 @@ export class SamplesComponent implements OnInit {
 | 
				
			|||||||
          const parameterName = encodeURIComponent(parameter.name);
 | 
					          const parameterName = encodeURIComponent(parameter.name);
 | 
				
			||||||
          // exclude spectrum and duplicates
 | 
					          // exclude spectrum and duplicates
 | 
				
			||||||
          if (parameter.name !== 'dpt' && !templateKeys.find(e => new RegExp('.' + parameterName + '$').test(e.id))) {
 | 
					          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({
 | 
					            templateKeys.push({
 | 
				
			||||||
              id: `${collectionNames[collection]}.${parameterName}`,
 | 
					              id: `${collectionNames[collection]}.${parameterName}`,
 | 
				
			||||||
              label: `${this.ucFirst(item.name)} ${parameter.name}`,
 | 
					              label: `${this.ucFirst(item.name)} ${parameter.name}`,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user