Project landing & Dataprovider landing: tiny changes in charts for statistics | parsingFunctions.class: bug fix in changeBestAccessMode function | Organization landing: number of badge in projects' tab never changes - project publications (csv): bug fix in queries | Landing pages: check existence for basic info | Loading modal: changes about uikit
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48512 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni
parent
1cca965ba6
commit
8d80576fc1
|
|
@ -7,7 +7,7 @@
|
|||
</form>
|
||||
|
||||
<div *ngIf="showSearchResults" class="uk-margin-top uk-animation">
|
||||
<ul class="uk-tab" data-uk-switcher="{connect:'#claimsearchtabs'}">
|
||||
<ul class="uk-tab" uk-switcher="connect:'#claimsearchtabs'">
|
||||
<li class="active"><a data-toggle="tab" >Crossref <span class="uk-badge uk-badge-notification">{{(crossrefResultsNum)?crossrefResultsNum:0}}</span></a></li>
|
||||
<li><a data-toggle="tab" >Openaire Publications <span class="uk-badge uk-badge-notification">{{ (openairePubsNum)?openairePubsNum:0 }}</span></a></li>
|
||||
<li><a data-toggle="tab" >Orcid <span class="uk-badge uk-badge-notification">{{(orcidResultsNum)?orcidResultsNum:0}}</span></a></li>
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@
|
|||
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
|
||||
</button>
|
||||
|
||||
<ul *ngIf="dataProviderInfo.tabs != undefined" id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="{connect: #tab-content}" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<ul *ngIf="dataProviderInfo.tabs != undefined" id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<li *ngFor="let tab of dataProviderInfo.tabs; let i=index" id="{{dataProviderInfo.tabs[i].content}}">
|
||||
<a
|
||||
(click)="search(tab.content, 1, 10); activeTab=tab.name">
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ export class DataProviderComponent {
|
|||
this.downloadsFrameUrl = OpenaireProperties.getFramesAPIURL()+'merge.php?com=query&data=[{"query":"dtsrcDownloadsTimeline","dtsrcName":"'+this.datasourceId+'","table":"","fields":[{"fld":"sum","agg":"sum","type":"chart","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":30,"sort":"xaxis","xStyle":{"r":-30,"s":"0","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly downloads"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["spline"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true';
|
||||
*/
|
||||
|
||||
this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
|
||||
this.docsTimelineUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcYear","dtsrcName":"'+this.datasourceId+'","table": "result", "fields": [{"fld": "number", "agg": "count", "type": "line", "yaxis":1, "c":true}], "xaxis":{"name": "year", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": -30, "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [{"f":0, "text": "Yearly"}], "filters": [{"name":"year","max":"2016","min":"1997"},{"name": "result_datasources-datasource-name", "values":[""], "to": "-1"}],"having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": "Year"}&w=600&h=250';
|
||||
this.docsTypesUrl = 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubs","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
this.pubsFunderUrl =' https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcPubsFund","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Documents"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
this.dataProjectsUrl ='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"dtsrcProjData","dtsrcName":"'+this.datasourceId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Datasets"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [""], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<div class="uk-width-3-4@l uk-width-3-4@xl uk-width-3-4@m uk-width-1-1@s">
|
||||
<showTitle [title]="datasetInfo.title"></showTitle>
|
||||
<span *ngIf="datasetInfo.types.length > 0"class="uk-label custom-label label-blue " title="Type">{{datasetInfo.types.join(", ")}}</span>
|
||||
<span class="uk-label custom-label label-green " ><!--span [class]="datasetInfo.title.accessMode" -->{{datasetInfo.title.accessMode}}<!--/span--></span>
|
||||
<span *ngIf="datasetInfo.title && datasetInfo.title.accessMode" class="uk-label custom-label label-green " ><!--span [class]="datasetInfo.title.accessMode" -->{{datasetInfo.title.accessMode}}<!--/span--></span>
|
||||
<span *ngIf="datasetInfo.underCurationMessage" class="uk-label custom-label label-yellow " >
|
||||
<span uk-tooltip="pos:right; delay:10"
|
||||
title="{{buildCurationTooltip()}}">
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
<li *ngIf="datasetInfo.publisher"><span class="uk-text-bold">Publisher:</span> {{datasetInfo.publisher}}</li>
|
||||
|
||||
<li *ngIf="datasetInfo.embargoEndDate"><span class="uk-text-bold">Embargo end date:</span> {{datasetInfo.embargoEndDate}}</li>
|
||||
<li *ngIf="datasetInfo.identifiers">
|
||||
<li *ngIf="datasetInfo.identifiers && datasetInfo.identifiers.size > 0">
|
||||
<showIdentifiers [identifiers]="datasetInfo.identifiers"></showIdentifiers>
|
||||
</li>
|
||||
<li *ngIf="datasetInfo.subjects ||datasetInfo.otherSubjects || datasetInfo.classifiedSubjects">
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
|
||||
</button>
|
||||
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="{connect: #tab-content}" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<li (click)="activeTab='Related Research Results'">
|
||||
<a>
|
||||
Related Research Results
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ export class DatasetService {
|
|||
this.datasetInfo.title['url'] = url;
|
||||
}
|
||||
|
||||
if(this.parsingFunctions.changeBestAccessMode(this.datasetInfo.title['accessMode'], instance['licence'].classid)) {
|
||||
if(this.parsingFunctions.changeBestAccessMode(this.datasetInfo.title['accessMode'], instance['licence'])) {
|
||||
this.datasetInfo.title['accessMode'] = instance['licence'].classid;
|
||||
this.datasetInfo.title['url'] = url;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -233,17 +233,21 @@ export class ParsingFunctions {
|
|||
mapStructure.get(key)['accessMode'].push(instance['licence'].classid);
|
||||
}
|
||||
|
||||
if(this.changeBestAccessMode(mapStructure.get(key)['bestAccessMode'], instance['licence'].classid)) {
|
||||
if(this.changeBestAccessMode(mapStructure.get(key)['bestAccessMode'], instance['licence'])) {
|
||||
mapStructure.get(key)['bestAccessMode'] = instance['licence'].classid;
|
||||
}
|
||||
|
||||
} else if(url) {
|
||||
mapStructure.get(key)['accessMode'].push("");
|
||||
}
|
||||
}
|
||||
|
||||
// publication & dataset landing : for downloadFrom and publishedIn
|
||||
changeBestAccessMode(currentAccessMode: string, accessMode: string): boolean {
|
||||
changeBestAccessMode(currentAccessMode: string, accessMode: any): boolean {
|
||||
if(!accessMode) {
|
||||
return false;
|
||||
}
|
||||
accessMode = accessMode.classid;
|
||||
|
||||
switch (currentAccessMode) {
|
||||
case null:
|
||||
return true;
|
||||
|
|
@ -363,7 +367,7 @@ export class ParsingFunctions {
|
|||
classifiedSubjects = new Map<string, string[]>();
|
||||
}
|
||||
|
||||
if(classifiedSubjects.has(subject.classname)) {
|
||||
if(!classifiedSubjects.has(subject.classname)) {
|
||||
classifiedSubjects.set(subject.classname, new Array<string>());
|
||||
}
|
||||
|
||||
|
|
@ -437,7 +441,7 @@ export class ParsingFunctions {
|
|||
}
|
||||
|
||||
parseTypes(types: string[], uniqueTypes: Set<string>, instance: any) {
|
||||
if(instance.hasOwnProperty("instancetype")) {
|
||||
if(instance.hasOwnProperty("instancetype") && instance['instancetype'].classname) {
|
||||
if(!uniqueTypes.has(instance['instancetype'].classname)) {
|
||||
types.push(instance['instancetype'].classname);
|
||||
uniqueTypes.add(instance['instancetype'].classname);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
Projects
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
<!--{{(searchingProjectsTabComponent)?searchingProjectsTabComponent.fetchProjects.totalResults:0}}-->
|
||||
{{fetchProjects.searchUtils.totalResults}}
|
||||
{{fetchProjects.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
|
||||
</button>
|
||||
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="{connect: #tab-content}" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<li (click)="activeTab='Publications'">
|
||||
<a>
|
||||
Publications
|
||||
|
|
@ -66,18 +66,13 @@
|
|||
<a>
|
||||
Projects
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
<!--{{(searchingProjectsTabComponent)?searchingProjectsTabComponent.fetchProjects.totalResults:0}}-->
|
||||
{{fetchProjects.searchUtils.totalResults}}
|
||||
{{fetchProjects.totalResults}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
<li (click)="activeTab='Data Providers'; searchDataprovidersInit()">
|
||||
<a>
|
||||
Data Providers
|
||||
<!--span *ngIf="organizationInfo.dataProviders == undefined" class="badge">0</span>
|
||||
<span *ngIf="organizationInfo.dataProviders != undefined" class="badge">
|
||||
{{organizationInfo.dataProviders.length}}
|
||||
</span-->
|
||||
<span class="uk-badge uk-badge-notification">
|
||||
{{fetchDataproviders.searchUtils.totalResults}}
|
||||
</span>
|
||||
|
|
@ -85,7 +80,6 @@
|
|||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
<ul id="tab-content" class="uk-switcher uk-margin custom-tab-content">
|
||||
<li class="uk-animation-fade">
|
||||
<div *ngIf="fetchPublications.searchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary uk-animation-fade" role="alert">There are no publications</div>
|
||||
|
|
|
|||
|
|
@ -294,13 +294,13 @@ export class OrganizationComponent {
|
|||
this.closeLoading();
|
||||
window.open(window.URL.createObjectURL(new Blob([totalResponse], { type: 'text/csv' })));
|
||||
}
|
||||
} else if(counter == 1 && !title) {
|
||||
} else {
|
||||
title = true;
|
||||
|
||||
this._reportsService.getCSVResponse(url).subscribe(
|
||||
data =>
|
||||
{
|
||||
counter--;
|
||||
|
||||
response[index] = data;
|
||||
|
||||
if(counter == 0) {
|
||||
|
|
@ -308,10 +308,7 @@ export class OrganizationComponent {
|
|||
if(response[i] != "") {
|
||||
totalResponse += response[i];
|
||||
}
|
||||
|
||||
console.info("2response "+i+": "+response[i]);
|
||||
}
|
||||
console.info(totalResponse);
|
||||
this.closeLoading();
|
||||
window.open(window.URL.createObjectURL(new Blob([totalResponse], { type: 'text/csv' })));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<li *ngIf="projectInfo.funding"><span class="uk-text-bold">Funding:</span> {{projectInfo.funding}}</li>
|
||||
<li *ngIf="projectInfo.startDate"><span class="uk-text-bold">Start Date:</span> {{projectInfo.startDate}}</li>
|
||||
<li *ngIf="projectInfo.endDate"><span class="uk-text-bold">End Date:</span> {{projectInfo.endDate}}</li>
|
||||
<li *ngIf="projectInfo.organizations"><span class="uk-text-bold">Organizations:</span>
|
||||
<li *ngIf="projectInfo.organizations && projectInfo.organizations.length > 0"><span class="uk-text-bold">Organizations:</span>
|
||||
|
||||
<span class="list-horizontal-line">
|
||||
<span *ngFor="let organization of projectInfo.organizations let i=index">
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
|
||||
</button>
|
||||
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="{connect: #tab-content}" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<li (click)="activeTab='Publications'">
|
||||
<a>
|
||||
Publications
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ console.info(this.projectInfo.title);
|
|||
//stats tab charts
|
||||
this.chartScientificResultsUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projScient","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "spline", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
this.chartAccessModeUrl='https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projOA","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "pie", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
this.chartDatasourcesUrl= 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "column", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
this.chartDatasourcesUrl= 'https://beta.openaire.eu/stats/chart.php?com=query&persistent=false&data={"query":"projPubsRepos","projTitle":"'+this.projectId+'", "table": "result", "fields": [{"fld": "number", "agg": "count", "type": "bar", "yaxis":1, "c":false}], "xaxis":{"name": "result_classifications-type", "agg": "avg"}, "group": "", "color": "", "type": "chart", "size":30, "sort": "xaxis", "xStyle":{"r": "-", "s": "-", "l": "-", "ft": "-", "wt": "-"}, "yaxisheaders": [""], "fieldsheaders": ["Publications"], "in": [], "filters": [{"name": "result_datasources-datasource-name", "values": [" "], "to": "-1"}], "having": [], "incfilters": [], "inchaving": [], "title": "", "subtitle": "", "xaxistitle": ""}&w=600&h=250';
|
||||
|
||||
this.showLoading = false;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<showTitle [title]="publicationInfo.title"></showTitle>
|
||||
<span *ngIf="publicationInfo.types.length > 0"class="uk-label custom-label label-blue " title="Type">{{publicationInfo.types.join(", ")}}</span>
|
||||
<span *ngIf="publicationInfo.languages.length > 0" class="uk-label custom-label label-grey " title="Language">{{publicationInfo.languages.join(", ")}}</span>
|
||||
<span class="uk-label custom-label label-green " ><!--span [class]="publicationInfo.title.accessMode" -->{{publicationInfo.title.accessMode}}<!--/span--></span>
|
||||
<span *ngIf="publicationInfo.title && publicationInfo.title.accessMode" class="uk-label custom-label label-green " ><!--span [class]="publicationInfo.title.accessMode" -->{{publicationInfo.title.accessMode}}<!--/span--></span>
|
||||
|
||||
<span *ngIf="publicationInfo.underCurationMessage" class="uk-label custom-label label-yellow " >
|
||||
<span uk-tooltip="pos:right; delay:10"
|
||||
|
|
@ -46,10 +46,10 @@
|
|||
</li>
|
||||
|
||||
<li *ngIf="publicationInfo.embargoEndDate"><span class="uk-text-bold">Embargo end date:</span> {{publicationInfo.embargoEndDate}}</li>
|
||||
<li *ngIf="publicationInfo.identifiers">
|
||||
<li *ngIf="publicationInfo.identifiers && publicationInfo.identifiers.size > 0">
|
||||
<showIdentifiers [identifiers]="publicationInfo.identifiers"></showIdentifiers>
|
||||
</li>
|
||||
<li *ngIf="publicationInfo.subjects ||publicationInfo.otherSubjects || publicationInfo.classifiedSubjects">
|
||||
<li *ngIf="publicationInfo.subjects || publicationInfo.otherSubjects || publicationInfo.classifiedSubjects">
|
||||
<showSubjects [subjects]="publicationInfo.subjects"
|
||||
[otherSubjects]="publicationInfo.otherSubjects"
|
||||
[classifiedSubjects]="publicationInfo.classifiedSubjects">
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
|
||||
</button>
|
||||
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@xl" uk-switcher="{connect: #tab-content}" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@xl" uk-switcher="connect: #tab-content" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<li *ngIf="publicationInfo.references" (click)="activeTab='References'">
|
||||
<a>
|
||||
References
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ export class PublicationService {
|
|||
this.publicationInfo.title['url'] = url;
|
||||
}
|
||||
|
||||
if(this.parsingFunctions.changeBestAccessMode(this.publicationInfo.title['accessMode'], instance['licence'].classid)) {
|
||||
if(this.parsingFunctions.changeBestAccessMode(this.publicationInfo.title['accessMode'], instance['licence'])) {
|
||||
this.publicationInfo.title['accessMode'] = instance['licence'].classid;
|
||||
this.publicationInfo.title['url'] = url;
|
||||
}
|
||||
|
|
@ -196,13 +196,13 @@ export class PublicationService {
|
|||
if(data[6] != null) {
|
||||
this.publicationInfo.languages = new Array<string>();
|
||||
|
||||
if(data[6].hasOwnProperty("classname")) {
|
||||
if(data[6].classname != "Undetermined") {
|
||||
this.publicationInfo.languages[0] = data[6].classname;
|
||||
if(!Array.isArray(data[6])) {
|
||||
if(data[6].classname != "Undetermined" && data[6].classname) {
|
||||
this.publicationInfo.languages.push(data[6].classname);
|
||||
}
|
||||
} else {
|
||||
for(let i=0; i<data[6].length; i++) {
|
||||
if(data[6][i].classname != "Undetermined") {
|
||||
if(data[6][i].classname != "Undetermined" && data[6][i].classname) {
|
||||
this.publicationInfo.languages.push(data[6][i].classname);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ import {RouterHelper} from '../../utils/routerHelper.class';
|
|||
<span uk-navbar-toggle-icon></span> <span class="uk-margin-small-left">{{activeTab}}</span>
|
||||
</button>
|
||||
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="{connect: #searchtabs; animation: uk-animation-fade}" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<ul id="toggle-small-tabs" class="uk-subnav uk-subnav-pill uk-dropdown uk-hidden@m" uk-switcher="connect: #searchtabs; animation: uk-animation-fade" uk-dropdown="mode: click" uk-toggle="target: #toggle-small-tabs">
|
||||
<li (click)="searchPublications()" >
|
||||
<a>
|
||||
Publications
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@ import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmit
|
|||
@Component({
|
||||
selector: 'modal-loading',
|
||||
template: `
|
||||
<div [class]="(!isOpen)?'uk-modal ':'uk-modal uk-open uk-animation-fade'" [open]="!isOpen" data-uk-modal="{center:true}" tabindex="-1" role="dialog" >
|
||||
<!--uk-modal="center:true"-->
|
||||
<div [class]="(!isOpen)?'uk-modal ':'uk-modal uk-open uk-animation-fade'" [open]="!isOpen" tabindex="-1" role="dialog" >
|
||||
<div class="uk-modal-dialog" role="">
|
||||
<div class="modal-content">
|
||||
<!--div class="modal-content"-->
|
||||
|
||||
<div class="modal-body">
|
||||
<div class="uk-modal-body">
|
||||
<div >
|
||||
<h3 class="text-center" >{{message}}</h3>
|
||||
<div class="uk-modal-spinner"></div>
|
||||
|
|
@ -15,7 +16,7 @@ import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmit
|
|||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!--/div-->
|
||||
</div>
|
||||
<!--div class="uk-modal uk-open" aria-hidden="false" style="display: block; overflow-y: scroll;">
|
||||
<div class="uk-modal-dialog" tabindex="">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {Component, ViewEncapsulation, ComponentRef, ElementRef, Input, EventEmit
|
|||
@Component({
|
||||
selector: 'modal-select',
|
||||
template: `
|
||||
<div [class]="(!isOpen)?'uk-modal ':'uk-modal uk-open uk-animation-fade'" [open]="!isOpen" data-uk-modal="{center:true}" tabindex="-1" role="dialog" >
|
||||
<div [class]="(!isOpen)?'uk-modal ':'uk-modal uk-open uk-animation-fade'" [open]="!isOpen" uk-modal="center:true" tabindex="-1" role="dialog" >
|
||||
<div class="uk-modal-dialog" role="">
|
||||
<div class="modal-content">
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue