diff --git a/src/components/display/pharma_display/PhDJsonld.vue b/src/components/display/pharma_display/PhDJsonld.vue
index f496cf95783f8a374f44770d91ef2746fa83aaac..7bd009350692896fa84274d7f1a8e92aa5dad70b 100644
--- a/src/components/display/pharma_display/PhDJsonld.vue
+++ b/src/components/display/pharma_display/PhDJsonld.vue
@@ -31,6 +31,7 @@
</template>
<template v-else-if="p.startsWith('role:')" slot="role">
+
<p-d-entity :role="p" :entity="e" v-for="(e, j) in o" :key="componentid+'entity'+p+j"></p-d-entity>
</template>
@@ -367,11 +368,12 @@
<v-flex xs1 class="subheading">
- <a :href="l.id" target="_blank">{{l.category}}</a>
+ <div class="text-xs-center">
+ <a :href="l.id" target="_blank">{{l.category}}</a> </div>
</v-flex>
<v-flex xs11>
<v-card v-for="(inputf,index) in l.fields" :key="index+'subjectField'">
- <!-- <v-flex xs2 v-if="inputf.selection">{{getLabel(inputf.data['@type'])}}</v-flex>-->
+ inputf {{inputf}}
<p-d-skos-preflabel
v-if="getSkosexactMatch(inputf)==undefined"
:p="getLabel(inputf['@type'])"
diff --git a/src/components/display/pharma_display/PhDMetadata.vue b/src/components/display/pharma_display/PhDMetadata.vue
index a7bac9ee6ac8196cad4e102d24178e6c595cc286..0a1b923506c96661015342ee98ed27630fc7b4cf 100644
--- a/src/components/display/pharma_display/PhDMetadata.vue
+++ b/src/components/display/pharma_display/PhDMetadata.vue
@@ -2,131 +2,149 @@
<v-flex>
<v-layout column>
<v-flex>
- <template v-for="(l, i) in data">
- <v-layout :key="'lay'+i">
+ hello o {{ o }} p {{ p }} etData {{getData}}
+ <template v-for="(l, i) in det">
+ l {{ l }}
+ <v-layout :key="'lay' + i">
<v-flex
- v-if="i=='skos:prefLabel'"
+ v-if="i == 'skos:prefLabel'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Label</v-flex>
+ :key="'l' + i"
+ >Label</v-flex
+ >
+ <v-flex md8 xs12 v-if="i == 'skos:prefLabel'" class="valuefield">{{
+ getSkosprefLabel(data)
+ }}</v-flex>
<v-flex
- md8
- xs12
- v-if="i=='skos:prefLabel'"
- class="valuefield"
- >{{ getSkosprefLabel(data) }}</v-flex>
- <v-flex
- v-if="i=='skos:exactMatch'"
+ v-if="i == 'skos:exactMatch'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Persistent identifier</v-flex>
+ :key="'l' + i"
+ >Persistent identifier</v-flex
+ >
- <v-flex md8 xs12 v-if="i=='skos:exactMatch'">
+ <v-flex md8 xs12 v-if="i == 'skos:exactMatch'">
<a
class="valuefield"
:href="getSkosexactMatch(data)"
target="_blank"
- >{{ getSkosexactMatch(data) }}</a>
+ >{{ getSkosexactMatch(data) }}</a
+ >
</v-flex>
<!--<v-flex md8 xs12 v-if="o['skos:exactMatch']" :key="'t-id'+i"><a class="valuefield" :href="o['skos:exactMatch'][0]" target="_blank">{{ l['@value'] }}</a></v-flex>-->
<v-flex
- v-if="i=='cellLineName'"
+ v-if="i == 'cellLineName'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Cell Line Name</v-flex>
- <v-flex md8 xs12 v-if="i=='cellLineName'" class="valuefield">{{ getCelllinename(data) }}</v-flex>
+ :key="'l' + i"
+ >Cell Line Name</v-flex
+ >
+ <v-flex md8 xs12 v-if="i == 'cellLineName'" class="valuefield">{{
+ getCelllinename(data)
+ }}</v-flex>
<v-flex
- v-if="i=='accessionNumber'"
+ v-if="i == 'accessionNumber'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Cellosaurus Accession Number</v-flex>
+ :key="'l' + i"
+ >Cellosaurus Accession Number</v-flex
+ >
+ <v-flex md8 xs12 v-if="i == 'accessionNumber'" class="valuefield">{{
+ getAccessionnumber(data)
+ }}</v-flex>
<v-flex
- md8
- xs12
- v-if="i=='accessionNumber'"
- class="valuefield"
- >{{ getAccessionnumber(data) }}</v-flex>
- <v-flex
- v-if="i=='uniprotName'"
+ v-if="i == 'uniprotName'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Uniprot Name</v-flex>
- <v-flex md8 xs12 v-if="i=='uniprotName'" class="valuefield">{{ getUniprotName(data) }}</v-flex>
+ :key="'l' + i"
+ >Uniprot Name</v-flex
+ >
+ <v-flex md8 xs12 v-if="i == 'uniprotName'" class="valuefield">{{
+ getUniprotName(data)
+ }}</v-flex>
<v-flex
- v-if="i=='proteinRecommendedName'"
+ v-if="i == 'proteinRecommendedName'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Protein Recommended Name</v-flex>
+ :key="'l' + i"
+ >Protein Recommended Name</v-flex
+ >
<v-flex
md8
xs12
- v-if="i=='proteinRecommendedName'"
+ v-if="i == 'proteinRecommendedName'"
class="valuefield"
- >{{ getProteinRecommendedName(data) }}</v-flex>
+ >{{ getProteinRecommendedName(data) }}</v-flex
+ >
<v-flex
- v-if="i=='uniprotAccession'"
+ v-if="i == 'uniprotAccession'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Uniprot Accession Number</v-flex>
+ :key="'l' + i"
+ >Uniprot Accession Number</v-flex
+ >
<v-flex
md8
xs12
- v-if="i=='uniprotAccession'"
+ v-if="i == 'uniprotAccession'"
class="valuefield"
- >{{ getUniprotAccession(data) }}</v-flex>
+ >{{ getUniprotAccession(data) }}</v-flex
+ >
<v-flex
- v-if="i=='organismName'"
+ v-if="i == 'organismName'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Organism name</v-flex>
+ :key="'l' + i"
+ >Organism name</v-flex
+ >
- <v-flex md8 xs12 v-if="i=='organismName'" class="valuefield">{{ getOrganismName(data) }}</v-flex>
+ <v-flex md8 xs12 v-if="i == 'organismName'" class="valuefield">{{
+ getOrganismName(data)
+ }}</v-flex>
<v-flex
- v-if="i=='proteinAlternativeName'"
+ v-if="i == 'proteinAlternativeName'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Organism name</v-flex>
+ :key="'l' + i"
+ >Organism name</v-flex
+ >
<v-flex
md8
xs12
- v-if="i=='proteinAlternativeName'"
+ v-if="i == 'proteinAlternativeName'"
class="valuefield"
- >{{ getProteinAlternativeName(data) }}</v-flex>
+ >{{ getProteinAlternativeName(data) }}</v-flex
+ >
<v-flex
- v-if="i=='skos:altLabel'"
+ v-if="i == 'skos:altLabel'"
md4
xs12
class="pdlabel primary--text"
- :key="'l'+i"
- >Alternative Labels</v-flex>
+ :key="'l' + i"
+ >Alternative Labels</v-flex
+ >
- <v-flex md8 xs12 v-if="i=='skos:altLabel'" class="valuefield">{{ getSynonyms(data) }}</v-flex>
+ <v-flex md8 xs12 v-if="i == 'skos:altLabel'" class="valuefield">{{
+ getSynonyms(data)
+ }}</v-flex>
</v-layout>
</template>
</v-flex>
@@ -152,14 +170,20 @@ export default {
}
},
mounted: function() {
- this.getMetadata();
+ this.getData;
},
computed: {
getIri() {
return this.getSkosexactMatch(this.o);
},
getData() {
- return this.o;
+ return this.getMetadata(this.getSkosexactMatch(this.o));
+ console.log(
+ "O",
+
+ this.getSkosexactMatch(this.o),
+ this.getMetadata(this.getSkosexactMatch(this.o))
+ );
},
displaylang: function() {
let lang;
@@ -175,13 +199,15 @@ export default {
},
data() {
return {
- data: {}
+ det: {}
+ //data: {}
};
},
methods: {
- getMetadata: function() {
+ getMetadata: function(iri) {
var self = this;
- var iri = this.getIri;
+ var data = {};
+ console.log("irir", iri);
//before I was getting it all in an array in the parent component
@@ -216,12 +242,14 @@ export default {
return response.json();
})
.then(function(body) {
- self.data = body;
+ data = body;
//if body is empty, then just use whatever was there already in the data getData
if (body.result == "empty") {
- self.data = self.getData;
+ data = self.o;
}
+ console.log("in getMetadata", data);
+ return data;
})
.catch(function(error) {