MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 19 Wiki Activity

more checks and changes in publication landing page 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@43089 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2016-06-30 13:31:06 +00:00
parent 0a78e4e143
commit 9de98a9f6f
3 changed files with 165 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/app.component.ts
View File

@ -9,6 +9,9 @@ import {LinkingComponent} from './claimPages/linking/linking.component';
import {LinkingHomeComponent} from './claimPages/linking/linkingHome.component'; import {LinkingHomeComponent} from './claimPages/linking/linkingHome.component';
import {MyClaimsComponent} from './claimPages/myClaims/myClaims.component'; import {MyClaimsComponent} from './claimPages/myClaims/myClaims.component';
import {ProjectComponent} from './landingPages/project/project.component';
import {PublicationComponent} from './landingPages/publication/publication.component';
import 'rxjs/Rx'; import 'rxjs/Rx';
@ -69,7 +72,9 @@ import 'rxjs/Rx';
{ path: '/search', component: SearchComponent, name: 'Search' }, { path: '/search', component: SearchComponent, name: 'Search' },
// { path: '/upload', component: BasicProgressbar, name: 'Upload' }, // { path: '/upload', component: BasicProgressbar, name: 'Upload' },
{ path: '/linking', component: LinkingComponent, name: 'Linking' }, { path: '/linking', component: LinkingComponent, name: 'Linking' },
{ path: '/my-claims', component: MyClaimsComponent, name: 'MyClaims' } { path: '/my-claims', component: MyClaimsComponent, name: 'MyClaims' },
{ path: '/project', component: ProjectComponent, name: 'Project' },
{ path: '/publication', component: PublicationComponent, name: 'Publication' }
]) ])
export class App { export class App {

283
src/app/landingPages/publication/publication.component.ts
View File

@ -13,142 +13,177 @@ import { RouteParams} from '@angular/router-deprecated';
<div *ngIf="publicationInfo != null"> <div *ngIf="publicationInfo != null">
<h2>{{publicationInfo.title}}</h2> <div class="publication">
<h2>{{publicationInfo.title}}</h2>
<p> <p>
{{publicationInfo.authors}} ({{publicationInfo.date}}) {{publicationInfo.authors}} ({{publicationInfo.date}})
</p> </p>
<div class="row" *ngIf="publicationInfo.publisher != undefined && publicationInfo.publisher != ''"> <div class="row" *ngIf="publicationInfo.publisher != undefined && publicationInfo.publisher != ''">
<!--span>Publisher:</span> <div class="col-md-1"> Publisher: </div>
<span>{{publicationInfo.publisher}}</span--> <span>{{publicationInfo.publisher}}</span>
<div class="col-md-1"> Publisher: </div> </div>
<span>{{publicationInfo.publisher}}</span> <div class="row" *ngIf="publicationInfo.journal != undefined && publicationInfo.journal != ''">
<!--div class="col-md-11"> {{publicationInfo.publisher}} </div--> <div class="col-md-1"> Journal: </div>
</div> <span>{{publicationInfo.journal}}</span>
<div class="row" *ngIf="publicationInfo.journal != undefined && publicationInfo.journal != ''"> </div>
<!--span>Journal:</span> <div class="row" *ngIf="publicationInfo.languages != undefined && publicationInfo.languages != 'Undetermined' && publicationInfo.languages != ''">
<span>{{publicationInfo.journal}}</span--> <div class="col-md-1"> Languages: </div>
<div class="col-md-1"> Journal: </div> <span>{{publicationInfo.languages}}</span>
<span>{{publicationInfo.journal}}</span> </div>
<!--div class="col-md-11"> {{publicationInfo.journal}} </div--> <div class="row" *ngIf="publicationInfo.types != undefined">
</div> <div class="col-md-1"> Types: </div>
<div class="row" *ngIf="publicationInfo.languages != undefined && publicationInfo.languages != 'Undetermined' && publicationInfo.languages != ''"> <span>{{publicationInfo.types}}</span>
<!--span>Languages:</span> </div>
<span>{{publicationInfo.languages}}</span--> <div class="row" *ngIf="publicationInfo.subjects != undefined">
<div class="col-md-1"> Languages: </div> <div class="col-md-1"> Subjects: </div>
<span>{{publicationInfo.languages}}</span> <span> {{publicationInfo.subjects}} </span>
<!--div class="col-md-11"> {{publicationInfo.languages}} </div--> </div>
</div> <div class="row" *ngIf="publicationInfo.identifiers != undefined">
<div class="row" *ngIf="publicationInfo.types != undefined"> <div class="col-md-1">Identifiers:</div>
<div class="col-md-1"> Types: </div> <span *ngFor="let key of publicationInfo.identifiers.keys()">
<span>{{publicationInfo.types}}</span> {{key}}: {{publicationInfo.identifiers.get(key)}}
</div> </span>
<div class="row" *ngIf="publicationInfo.subjects != undefined"> </div>
<!--span>Subjects:</span> <div >
<span>{{publicationInfo.subjects}}</span--> <blockquote>
<div class="col-md-1"> Subjects: </div> {{publicationInfo.description}}
<span> {{publicationInfo.subjects}} </span> </blockquote>
</div> </div>
<div class="row" *ngIf="publicationInfo.identifiers != undefined">
<div class="col-md-1">Identifiers:</div>
<span *ngFor="let key of publicationInfo.identifiers.keys()">
{{key}}: {{publicationInfo.identifiers.get(key)}}
</span>
</div>
<div >
<!--div class="col-md-12"-->
{{publicationInfo.description}}
<!--/div-->
</div>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#citationsTab">References</a></li> <li class="active"><a data-toggle="tab" href="#citationsTab">References</a></li>
<li><a data-toggle="tab" href="#dataTab">Related Research Data</a></li> <li><a data-toggle="tab" href="#dataTab">Related Research Data</a></li>
<li><a data-toggle="tab" href="#similarTab">Similar Publications</a></li> <li><a data-toggle="tab" href="#similarTab">Similar Publications</a></li>
<li><a data-toggle="tab" href="#bioentitiesTab">Bioentities</a></li> <li><a data-toggle="tab" href="#bioentitiesTab">Bioentities</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div id="citationsTab" class="tab-pane fade in active">
<h3>REFERENCES</h3>
<div *ngFor="let item of publicationInfo.references"> <div id="citationsTab" class="tab-pane fade in active">
<p *ngIf="item['url'] != undefined"> <h3>REFERENCES</h3>
<a class="custom-external" href="{{item['url']}}" target="_blank">
{{item['text']}} <div *ngIf="publicationInfo.references != undefined">
</a> <div *ngFor="let item of publicationInfo.references">
</p> <div *ngIf="item != undefined">
<p *ngIf="item['url'] == undefined"> <p *ngIf="item['url'] != undefined">
{{item['text']}} <a class="custom-external" href="{{item['url']}}" target="_blank">
</p> {{item['text']}}
</a>
</p>
<p *ngIf="item['url'] == undefined">
{{item['text']}}
</p>
</div>
</div>
</div>
</div>
<div id="dataTab" class="tab-pane fade">
<h3>RELATED RESEARCH DATA</h3>
<table id="inferredTable">
<thead>
<tr role="row">
<th>Title</th>
<th>Trust</th>
</tr>
</thead>
<tbody *ngIf="publicationInfo.relatedResearchData != undefined">
<tr *ngFor="let key of publicationInfo.relatedResearchData.keys()">
<td *ngIf="key != undefined">
<a class="custom-external" href="{{key}}" target="_blank">
{{publicationInfo.relatedResearchData.get(key)[0]}}
</a>
({{publicationInfo.relatedResearchData.get(key)[1]}})
</td>
<td>
<div class="progress">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="29" aria-valuemin="0" aria-valuemax="100" [style.width] = "publicationInfo.relatedResearchData.get(key)[2]">
{{publicationInfo.relatedResearchData.get(key)[2]}}
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<div id="similarTab" class="tab-pane fade">
<h3>SIMILAR PUBLICATIONS</h3>
<table id="similarTable">
<thead>
<tr>
<th>Title</th>
<th>Trust</th>
</tr>
</thead>
<tbody *ngIf="publicationInfo.similarPublications != undefined">
<tr *ngFor="let key of publicationInfo.similarPublications.keys()">
<td *ngIf="key != undefined">
<a class="custom-external" href="{{key}}" target="_blank">
{{publicationInfo.similarPublications.get(key)[0]}}
</a>
({{publicationInfo.similarPublications.get(key)[1]}})
</td>
<td class="progress">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="29" aria-valuemin="0" aria-valuemax="100" [style.width] = "publicationInfo.similarPublications.get(key)[2]">
{{publicationInfo.similarPublications.get(key)[2]}}
</div>
</td>
</tr>
</tbody>
</table>
</div>
<div id="bioentitiesTab" class="tab-pane fade">
<h3>BIOENTITIES</h3>
<table id="bioentitiesTable">
<thead>
<tr>
<th>Bio Entity</th>
<th>Site Name</th>
</tr>
</thead>
<div *ngIf="publicationInfo.bioentities != undefined">
<tbody *ngFor="let key of publicationInfo.bioentities.keys()">
<div *ngIf="publicationInfo.bioentities.get(key) != undefined">
<tr *ngFor="let keyIn of publicationInfo.bioentities.get(key).keys()">
<td *ngIf="keyIn != undefined">
<a href="{{publicationInfo.bioentities.get(key).get(keyIn)}}" target="_blank">
{{keyIn}}
</a>
</td>
<td>
{{key}}
</td>
</tr>
</div>
</tbody>
</div>
</table>
</div> </div>
</div> </div>
<div id="dataTab" class="tab-pane fade">
<h3>dataTab</h3>
<!--div *ngFor="let key of publicationInfo.relatedResearchData.keys()"> </div>
<span *ngIf="key != undefined">
<a class="custom-external" href="{{key}}" target="_blank"> <div class="mainFunctionsBlock">
{{publicationInfo.relatedResearchData.get(key)[0]}} <div class="functionsSection" *ngIf="publicationInfo.collectedFrom != undefined">
<h3 class="title">Collected from</h3>
<ul class="line" *ngFor="let key of publicationInfo.collectedFrom.keys()">
<li class="collectedFrom">
<a href="{{publicationInfo.collectedFrom.get(key)}}">
{{key}}
</a> </a>
</span> </li>
<span> </ul>
({{publicationInfo.relatedResearchData.get(key)[1]}})
</span>
<span class="badge">{{publicationInfo.relatedResearchData.get(key)[2]}}</span>
</div>
</div-->
<table id="inferredTable" class="display inferredTable dataTable no-footer" role="grid">
<thead>
<tr role="row">
<th class="sorting" tabindex="0" aria-controls="inferredTable" rowspan="1" colspan="1" aria-label="Title: activate to sort column ascending">Title</th>
<th class="sorting_desc" tabindex="0" aria-controls="inferredTable" rowspan="1" colspan="1" style="width: 93px;" aria-sort="descending" aria-label="Trust: activate to sort column ascending">Trust</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let key of publicationInfo.relatedResearchData.keys()" role="row">
<td *ngIf="key != undefined">
<a class="custom-external" href="{{key}}" target="_blank">
{{publicationInfo.relatedResearchData.get(key)[0]}}
</a>
({{publicationInfo.relatedResearchData.get(key)[1]}})
</td>
<!--td class="badge">{{publicationInfo.relatedResearchData.get(key)[2]}}</td-->
<td class="progress">
<div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="29" aria-valuemin="0" aria-valuemax="100" [style.width] = "publicationInfo.relatedResearchData.get(key)[2]">
{{publicationInfo.relatedResearchData.get(key)[2]}}
</div>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div>
<div id="similarTab" class="tab-pane fade">
<h3>similarTab</h3>
<p>Some content in similarTab.</p>
</div>
<div id="bioentitiesTab" class="tab-pane fade">
<p> YO men </p>
</div>
<!--p>
<span>Identifiers:</span>
<span *ngFor="let key of publicationInfo.identifiers.keys()">
{{key}}:
<span *ngFor="let value of publicationInfo.identifiers.values()">{{value}}</span>
,
</span>
</p-->
</div> </div>

27
src/app/services/publication.service.ts
View File

@ -85,13 +85,10 @@ export class PublicationService {
} }
if(mydata['funding'].hasOwnProperty("funding_level_2")) { if(mydata['funding'].hasOwnProperty("funding_level_2")) {
funding = mydata['funding']['funding_level_2'].content; funding = mydata['funding']['funding_level_2'].content;
//this.publicationInfo.fundedByProjects.get(mydata.code)[4] = mydata['funding']['funding_level_2'].content;
} else if(mydata['funding'].hasOwnProperty("funding_level_1")) { } else if(mydata['funding'].hasOwnProperty("funding_level_1")) {
funding = mydata['funding']['funding_level_1'].content; funding = mydata['funding']['funding_level_1'].content;
//this.publicationInfo.fundedByProjects.get(mydata.code)[4] = mydata['funding']['funding_level_1'].content;
} else if(mydata['funding'].hasOwnProperty("funding_level_0")) { } else if(mydata['funding'].hasOwnProperty("funding_level_0")) {
funding = mydata['funding']['funding_level_0'].content; funding = mydata['funding']['funding_level_0'].content;
//this.publicationInfo.fundedByProjects.get(mydata.code)[4] = mydata['funding']['funding_level_0'].content;
} }
if(funding != undefined) { if(funding != undefined) {
@ -107,16 +104,6 @@ export class PublicationService {
if(this.publicationInfo.relatedResearchData == undefined) { if(this.publicationInfo.relatedResearchData == undefined) {
this.publicationInfo.relatedResearchData = new Map<string, string[]>();//Array<{}>(); this.publicationInfo.relatedResearchData = new Map<string, string[]>();//Array<{}>();
} }
/*
this.publicationInfo.relatedResearchData[counter] = {};
this.publicationInfo.relatedResearchData[counter]['title'] = mydata['title'].content;
this.publicationInfo.relatedResearchData[counter]['year'] = mydata.dateofacceptance.substring(0,4);
this.publicationInfo.relatedResearchData[counter]['trust'] = Math.round(mydata.trust*100)+"%";
let link = "https://beta.openaire.eu/search/publication?articleId=";
this.publicationInfo.relatedResearchData[counter]['link'] = link+mydata['to'].content;
counter++;
*/
let url = "https://beta.openaire.eu/search/publication?articleId="+mydata['to'].content; let url = "https://beta.openaire.eu/search/publication?articleId="+mydata['to'].content;
this.publicationInfo.relatedResearchData.set(url, new Array<string>()); this.publicationInfo.relatedResearchData.set(url, new Array<string>());
@ -137,14 +124,6 @@ export class PublicationService {
} }
} }
} }
//for(let i in this.publicationInfo.relatedResearchData) {
// for(let key in this.publicationInfo.relatedResearchData[i]) {
// console.info(key+" : "+this.publicationInfo.relatedResearchData[i][key]);
// }
//}
} }
if(data[3] != null) { if(data[3] != null) {
@ -214,7 +193,6 @@ export class PublicationService {
if(data[5] != null) { if(data[5] != null) {
this.publicationInfo.journal = data[5].content; this.publicationInfo.journal = data[5].content;
//console.info(this.publicationInfo.journal);
} }
if(data[6] != null) { if(data[6] != null) {
@ -338,11 +316,6 @@ export class PublicationService {
} }
console.info("\n"); console.info("\n");
/*for(let i in this.publicationInfo.relatedResearchData) {
for(let key in this.publicationInfo.relatedResearchData[i]) {
console.info(key+" : "+this.publicationInfo.relatedResearchData[i][key]);
}
}*/
console.info("\nRELATED RESEARCH DATA:"); console.info("\nRELATED RESEARCH DATA:");
if(this.publicationInfo.relatedResearchData != undefined) { if(this.publicationInfo.relatedResearchData != undefined) {
this.publicationInfo.relatedResearchData.forEach(function (value, key, map) { this.publicationInfo.relatedResearchData.forEach(function (value, key, map) {