diff --git a/src/breeding-insight/model/Scale.ts b/src/breeding-insight/model/Scale.ts index 0b726a421..94169fc44 100644 --- a/src/breeding-insight/model/Scale.ts +++ b/src/breeding-insight/model/Scale.ts @@ -19,7 +19,6 @@ import {Category} from "@/breeding-insight/model/Category"; export enum DataType { Date = "Date", - Duration = "Duration", Nominal = "Nominal", Numerical = "Numerical", Ordinal = "Ordinal", diff --git a/src/components/ontology/OntologyTable.vue b/src/components/ontology/OntologyTable.vue index 6c90981de..35a11954a 100644 --- a/src/components/ontology/OntologyTable.vue +++ b/src/components/ontology/OntologyTable.vue @@ -132,7 +132,7 @@ {{ StringFormatters.toStartCase(data.traitDescription) }} - {{ data.method.description + " " + StringFormatters.toStartCase(data.method.methodClass) }} + {{ (data.method.description ? data.method.description : "") + " " + StringFormatters.toStartCase(data.method.methodClass) }} {{ TraitStringFormatters.getScaleTypeString(data.scale) }} @@ -471,9 +471,6 @@ export default class OntologyTable extends Vue { } else if (Scale.dataTypeEquals(trait.scale!.dataType!, DataType.Numerical)) { // Rename scale name to unit handler.overrideMessage(0, 'scale.scaleName', 'Missing unit', 400); - } else if (Scale.dataTypeEquals(trait.scale!.dataType!, DataType.Duration)) { - // Rename scale name to unit of time - handler.overrideMessage(0, 'scale.scaleName', 'Missing unit of time', 400); } return deletions; } diff --git a/src/components/trait/TraitDetailPanel.vue b/src/components/trait/TraitDetailPanel.vue index 09b6ff0e1..03aeac707 100644 --- a/src/components/trait/TraitDetailPanel.vue +++ b/src/components/trait/TraitDetailPanel.vue @@ -54,12 +54,12 @@ {{data.entity}} {{data.attribute | capitalize}} - - - -