diff --git a/package.json b/package.json index 6dec766df..01def4181 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v0.4.0+154", + "version": "v0.4.0+156", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -85,5 +85,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.6.10" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/c844a2adadf300738dde3ee777a648613416e1c2" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/ada688a7b8cbc12ed5075e1cdd6439175ae32f11" } diff --git a/src/components/layouts/UserSideBarLayout.vue b/src/components/layouts/UserSideBarLayout.vue index a6e35a3f9..63391f194 100644 --- a/src/components/layouts/UserSideBarLayout.vue +++ b/src/components/layouts/UserSideBarLayout.vue @@ -179,9 +179,9 @@ - Traits + Ontology
  • - Trait List + Ontology List
  • @@ -206,12 +206,12 @@ v-if="$ability.can('create', 'Trait')" > - Import Traits + Import Ontology
  • - Archived Traits + Archived Ontology
  • @@ -307,7 +307,7 @@ private homeMenuId: string = "usersidebarlayout-home-menu"; private importFileMenuId: string = "usersidebarlayout-import-file-menu"; - private traitsMenuId: string = "usersidebarlayout-traits-menu"; + private ontologyMenuId: string = "usersidebarlayout-ontology-menu"; private programManagementMenuId: string = "usersidebarlayout-program-management-menu"; private brAPIMenuId: string = "usersidebarlayout-brapi-menu"; diff --git a/src/components/trait/TraitListsTable.vue b/src/components/trait/TraitListsTable.vue index d9da1f4d6..e65c09ab8 100644 --- a/src/components/trait/TraitListsTable.vue +++ b/src/components/trait/TraitListsTable.vue @@ -45,7 +45,7 @@ -
    +
    +
    @@ -116,17 +132,22 @@ v-if="!data.active && data.active !== undefined"> Archived - {{ data.traitName }} + {{ data.observationVariableName }} - - {{ data.programObservationLevel.name }} + + {{ StringFormatters.toStartCase(data.traitDescription) }} - {{ StringFormatters.toStartCase(data.method.methodClass) }} + {{ data.method.description + " " + StringFormatters.toStartCase(data.method.methodClass) }} - + {{ TraitStringFormatters.getScaleTypeString(data.scale) }} - + + + +