[Explore|Trunk]

Home Page:
		add numbers about software/orp



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@56075 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2019-06-13 14:54:39 +00:00
parent 51aef8b025
commit 1329c108e5
4 changed files with 560 additions and 472 deletions

View File

@ -1,9 +1,8 @@
<div class="image-front-topbar uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light" tm-header-transparent-placeholder="">
<div class="image-front-topbar uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color"
uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"
tm-header-transparent="light" tm-header-transparent-placeholder="">
<div style=" min-height: calc(7.89999px + 60vh);"
class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom" >
class=" mainPageSearchForm uk-background-norepeat uk-background-cover uk-background-fixed uk-section uk-padding-remove-bottom">
<!-- uk-height-viewport="offset-top: true;offset-bottom: 20"> -->
<div class="uk-position-cover" style="/*background-color: rgba(70, 68, 68, 0.24);*/"></div>
<div class="uk-position-relative uk-panel">
@ -20,17 +19,46 @@
<div class="uk-container uk-container-large uk-margin-medium explore-numbers">
<div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<div id="page#7" class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto uk-animation-fade" uk-scrollspy-class="" style="">
<h2>
<span *ngIf="showPublications && publicationsSize" >{{publicationsSize.number|number}} {{publicationsSize.size}} publications{{((showDatasets && datasetsSize)?",":"")}} </span>
<span *ngIf="showDatasets && datasetsSize">{{datasetsSize.number|number}} {{datasetsSize.size}} research data </span>
<br>
<span *ngIf="showDataProviders && datasourcesSize" > from {{datasourcesSize.number |number}} {{datasourcesSize.size}} content providers</span>
<span *ngIf="showProjects && fundersSize"> {{((showDataProviders && datasourcesSize)?" and ":" from ")}} {{fundersSize.number|number}} {{fundersSize.size}} funders</span>
<span *ngIf = "showPublications || showDatasets || showProjects || showDataProviders" >
linked together for an integrated research search
<div id="page#7"
class="firstPageNumbers uk-margin uk-margin-remove-bottom uk-width-xlarge uk-margin-auto uk-animation-fade"
uk-scrollspy-class="" style="">
<div class="uk-margin-bottom">
<span *ngIf="showPublications && publicationsSize">
<span class="uk-h2">{{publicationsSize.number|number}}{{publicationsSize.size}}</span>
<span class="uk-text-large"> {{((showDatasets || showSoftware || showOrp) ? " publications, "
:" publications ")}}</span>
</span>
</h2>
<span *ngIf="showDatasets && datasetsSize">
<span class="uk-h2">{{datasetsSize.number|number}}{{datasetsSize.size}}</span>
<span
class="uk-text-large">{{((showSoftware || showOrp) ? " research data, " :" research data ")}}</span>
</span>
<span *ngIf="showOrp && otherSize">
<span class="uk-h2">{{otherSize.number|number}}{{otherSize.size}}</span>
<span class="uk-text-large"> {{((showSoftware) ? " other research products, " :" other research products ")}}</span>
</span>
<span *ngIf="showSoftware && softwareSize">
<span class="uk-h2">{{softwareSize.number|number}}{{softwareSize.size}}</span>
<span class="uk-text-large"> software </span>
</span>
<br>
<span *ngIf="showDataProviders && datasourcesSize">
<span class="uk-text-large"> from </span>
<span class="uk-h2">{{datasourcesSize.number|number}}{{datasourcesSize.size}}</span>
<span class="uk-text-large"> content providers </span>
</span>
<span *ngIf="showProjects && fundersSize">
<span class="uk-text-large"> {{((showDataProviders && datasourcesSize) ? " and " : " from ")}} </span>
<span class="uk-h2">{{fundersSize.number|number}}{{fundersSize.size}} </span>
<span class="uk-text-large"> funders </span>
</span>
<span *ngIf="showPublications || showDatasets || showOrp || showSoftware || showProjects ||
showDataProviders"
class="uk-text-large"> linked together for an integrated research search </span>
</div>
</div>
@ -40,18 +68,23 @@
</div>
</div>
</div>
<schema2jsonld [URL]="properties.baseLink" [logoURL] = "properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home" name="OpenAIRE Explore"></schema2jsonld>
</div>
<schema2jsonld [URL]="properties.baseLink"
[logoURL]="properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home"
name="OpenAIRE Explore"></schema2jsonld>
<div class=" uk-section uk-section-small">
<div class=" uk-section uk-section-small">
<div class="uk-container uk-container-small">
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
<div id="page#8" class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-3@m uk-child-width-1-3@l uk-grid-large uk-grid" uk-grid="">
<div id="page#8"
class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-3@m uk-child-width-1-3@l uk-grid-large uk-grid"
uk-grid="">
<div class="uk-first-column">
<div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
<a routerLinkActive="uk-link" routerLink="/search/find" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
<a routerLinkActive="uk-link" routerLink="/search/find"
class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
<img class="" width="80" height="80" src="assets/explore.svg" alt="Explore">
<h3 class="el-title uk-margin uk-h3">
Explore
@ -69,13 +102,14 @@
<div class="">
<div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
<a routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
<a routerLinkActive="uk-link" routerLink="/participate/deposit-publications"
class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
<img class="" width="70" height="70" src="assets/share.svg" alt="Share">
<h3 class="el-title uk-margin uk-h3">
Share
</h3>
<div class="el-content uk-margin uk-text-lead">Deposit in a repository of your choice </div>
<div class="el-content uk-margin uk-text-lead">Deposit in a repository of your choice</div>
<div class=" uk-margin-small-top">
Select an OpenAIRE compatible repository (2.0 +) so that your research is linked to your funding information.
<br>
@ -86,11 +120,11 @@
</div>
<div class="">
<div class="el-item uk-card uk-card-hover uk-card-small uk-card-body">
<img class="" width="60" height="70" src="assets/link.svg" alt="Link">
<a routerLinkActive="uk-link" routerLink="/participate/claim" routerLink="/participate/claim" class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
<a routerLinkActive="uk-link" routerLink="/participate/claim" routerLink="/participate/claim"
class="el-link uk-position-cover uk-position-z-index uk-margin-remove-adjacent"></a>
<h3 class="el-title uk-margin uk-h3">
Link
@ -100,7 +134,8 @@
If you can't find your research results in OpenAIRE, don't worry!
<br>
Use our <strong>LINK OUT service</strong>,
that reaches out to many external sources via APIs, to connect your research results and <em>claim</em> them to your project.
that reaches out to many external sources via APIs, to connect your research results and
<em>claim</em> them to your project.
</div>
</div>
</div>
@ -109,9 +144,9 @@
</div>
</div>
</div>
</div>
</div>
<div class="uk-section-muted uk-section uk-section-small">
<div class="uk-section-muted uk-section uk-section-small">
<div class="uk-container uk-container-large">
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
<div class="uk-width-1-1@m uk-first-column">
@ -126,10 +161,16 @@
<div class="questions">
<div class="el-item uk-card uk-card-small uk-card-body">
<ul class="uk-list uk-list-divider">
<li><a href="https://www.openaire.eu/os-primers">Learn about open science policies and how to align</a></li>
<li><a href="https://www.openaire.eu/rdm-handbook">Learn more on how to manage your data in the open science era</a></li>
<li><a href="https://www.openaire.eu/guides/">Find out how to use OpenAIRE to best serve your needs</a></li>
<li><a href="https://www.openaire.eu/webinars/">View our training material on a variety of related topics</a></li>
<li><a href="https://www.openaire.eu/os-primers">Learn about open science policies and how to align</a>
</li>
<li><a
href="https://www.openaire.eu/rdm-handbook">Learn more on how to manage your data in the open science era</a>
</li>
<li><a href="https://www.openaire.eu/guides/">Find out how to use OpenAIRE to best serve your needs</a>
</li>
<li><a
href="https://www.openaire.eu/webinars/">View our training material on a variety of related topics</a>
</li>
<li><a href="https://www.openaire.eu/contact-us/">Contact us</a></li>
</ul>
</div>
@ -138,9 +179,9 @@
</div>
</div>
</div>
</div>
</div>
<div class="uk-section-default uk-section">
<div class="uk-section-default uk-section">
<div class="uk-container">
<div class="uk-grid-medium uk-margin-medium uk-grid" uk-grid="">
<div class="uk-width-2-3@m uk-first-column">
@ -153,19 +194,27 @@
<div class="uk-grid uk-margin-medium-top">
<div class="uk-width-expand@m">
<!-- <div class="uk-grid uk-child-width-1-2@m"> -->
<p *ngIf="showPublications && publicationsSize">
<span class="emphasis portal-color">{{publicationsSize.count|number}} </span><span class="uk-text-uppercase"> publications</span>
<p *ngIf="showPublications && publicationsSize" class="uk-margin-medium-bottom">
<span class="emphasis portal-color">{{publicationsSize.count|number}} </span><br><span
class="uk-text-uppercase"> publications</span>
</p>
<p *ngIf="showDatasets && datasetsSize">
<span class="emphasis portal-color">{{datasetsSize.count|number}} </span><span class="uk-text-uppercase"> research data</span>
<p *ngIf="showOrp && otherSize" class="uk-margin-medium-bottom">
<span class="emphasis portal-color">{{otherSize.count|number}} </span><br><span
class="uk-text-uppercase"> other research products</span>
</p>
<!-- </div> -->
</div>
<div class="uk-width-expand@m">
<p *ngIf="showDatasets && datasetsSize" class="uk-margin-medium-bottom">
<span class="emphasis portal-color">{{datasetsSize.count|number}} </span><br><span
class="uk-text-uppercase"> research data</span>
</p>
<p *ngIf="showSoftware && softwareSize" class="uk-margin-medium-bottom" >
<span class="emphasis portal-color">{{softwareSize.count|number}} </span><br><span
class="uk-text-uppercase"> software</span>
</p>
</div>
</div>
@ -193,8 +242,6 @@
</div> -->
</div>
</div>
</div>
@ -234,25 +281,20 @@
</div>
</div>
</div>
</div>
</div>
<!-- <div class="uk-section-default uk-section">
<div class="uk-container">
<div class="uk-grid-small uk-margin-medium uk-grid" uk-grid=""> -->
<!--div class="uk-width-expand@m uk-first-column">
<!--div class="uk-width-expand@m uk-first-column">
<h5 class="searchFilterTitle">
<span>New content providers</span>
</h5>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid=""-->
<!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages>
<!-- <errorMessages [status]="[fetchDataproviders.searchUtils.status]" [type]="'content providers'"></errorMessages>
<div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
<div *ngIf="fetchDataproviders.searchUtils.totalResults > 0">
<ul [class]="'uk-list uk-list-divider uk-margin '+custom_class">
<li *ngFor="let result of fetchDataproviders.results" class="uk-animation-fade">
<h4 [title] = result.title.accessMode >
@ -309,8 +351,8 @@
</li>
</ul>
</div> -->
<!--div class="uk-first-column">
</div> -->
<!--div class="uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Aaltodoc Publication Archive
@ -320,8 +362,8 @@
12469 datasets
</div>
</div>
</div>
<div class="uk-grid-margin uk-first-column">
</div>
<div class="uk-grid-margin uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Cambridge Server
@ -331,24 +373,24 @@
4567 publications
</div>
</div>
</div>
</div>
<hr>
<div class="uk-margin">
<a class="" routerLinkActive="uk-link" routerLink="/search/find/dataproviders" >
View all
</a>
</div>
</div>
<div class="uk-width-expand@m">
<h5 class="searchFilterTitle">
<span>New funders</span>
</h5>
<div class="uk-margin uk-text-meta">
Latest funding database incorporated in OpenAIRE
</div>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
</div>
</div>
<hr>
<div class="uk-margin">
<a class="" routerLinkActive="uk-link" routerLink="/search/find/dataproviders" >
View all
</a>
</div>
</div>
<div class="uk-width-expand@m">
<h5 class="searchFilterTitle">
<span>New funders</span>
</h5>
<div class="uk-margin uk-text-meta">
Latest funding database incorporated in OpenAIRE
</div>
<div class="uk-margin-remove-vertical uk-grid-match uk-child-width-1-1 uk-child-width-1-1@m uk-child-width-1-1@l uk-child-width-1-1@xl uk-grid-small uk-grid-divider uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Swiss National Science Foundation
@ -356,8 +398,8 @@
<div class="el-meta uk-margin uk-text-meta">Switzerland</div>
<div class="el-content uk-margin"><span class="uk-label label-grey">OA mandate</span><br> 47.509 publications</div>
</div>
</div>
<div class="uk-grid-margin uk-first-column">
</div>
<div class="uk-grid-margin uk-first-column">
<div class="el-item uk-panel">
<h6 class="el-title uk-margin uk-h6 uk-text-primary uk-margin-remove-adjacent uk-margin-remove-bottom portal-color">
Ministry of Education, Science and Technological Development of Republic of Serbia
@ -365,10 +407,10 @@
<div class="el-meta uk-margin uk-text-meta">Serbia</div>
<div class="el-content uk-margin">7.942 publicatios</div>
</div>
</div>
</div>
</div-->
<!-- <div class="uk-width-medium uk-grid-item-match">
</div>
</div>
</div-->
<!-- <div class="uk-width-medium uk-grid-item-match">
<div class="uk-tile-secondary uk-tile uk-tile-xsmall portal-box" >
@ -397,12 +439,13 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> -->
<div class="uk-section-muted" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
<div class="uk-section-muted"
uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}">
<div class="uk-container uk-container-large">
<div uk-grid="" class="uk-grid uk-margin-large-top uk-margin-large-bottom">
<!--div class="uk-width-expand@m uk-width-1-2@s uk-dark uk-grid-item-match uk-first-column explore">
@ -429,7 +472,8 @@
Join OpenAIRE, use our tools and make your content more visible around the world.
</div>
<p>
<a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'provide.openaire.eu'" class="el-link uk-button uk-button-default">
<a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'provide.openaire.eu'"
class="el-link uk-button uk-button-default">
OpenAIRE.PROVIDE
</a>
</p>
@ -444,7 +488,8 @@
Use a trusted partner to share, link, disseminate and monitor your research.
</div>
<p>
<a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'connect.openaire.eu'" class="el-link uk-button uk-button-default">
<a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.':'')+'connect.openaire.eu'"
class="el-link uk-button uk-button-default">
OpenAIRE.CONNECT
</a>
</p>
@ -459,7 +504,9 @@
Use our monitoring services and easily track all relevant research results.
</div>
<p>
<a target="_blank" [href]="'https://'+(properties.environment =='beta'?'beta.openaire.eu/monitor':'monitor.openaire.eu')" class="el-link uk-button uk-button-default">
<a target="_blank"
[href]="'https://'+(properties.environment =='beta'?'beta.openaire.eu/monitor':'monitor.openaire.eu')"
class="el-link uk-button uk-button-default">
OpenAIRE.MONITOR
</a>
</p>
@ -482,7 +529,7 @@
</div>
</div>
</div>
</div>
</div>
<!--div class="image-front-topbar uk-section-secondary uk-position-relative" uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}" tm-header-transparent="light">

View File

@ -20,6 +20,8 @@ import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties
import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service';
import {SearchSoftwareService} from "../openaireLibrary/services/searchSoftware.service";
import {SearchOrpsService} from "../openaireLibrary/services/searchOrps.service";
@Component({
selector: 'home',
@ -38,6 +40,8 @@ export class HomeComponent {
public publicationsSize:any = null;
public datasetsSize:any = null;
public softwareSize: any = null;
public otherSize: any = null;
public fundersSize:any = null;
public projectsSize:any = null;
public datasourcesSize:any = null;
@ -47,15 +51,20 @@ export class HomeComponent {
showPublications:boolean= false;
showDatasets:boolean= false;
showSoftware: boolean = false;
showOrp: boolean = false;
showProjects:boolean= false;
showDataProviders:boolean= false;
properties: EnvProperties;
public subPub;public subData;public subProjects;public subOrg; public subDataPr;
public subSoft;
public subOrp;
constructor (
private route: ActivatedRoute,
private _router: Router,
private _searchPublicationsService: SearchPublicationsService,
private _searchSoftwareService: SearchSoftwareService,
private _searchOrpsService: SearchOrpsService,
private _searchDataprovidersService: SearchDataprovidersService,
private _searchProjectsService: SearchProjectsService,
private _searchDatasetsService: SearchDatasetsService,
@ -98,6 +107,8 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
}
this.showPublications = showEntity["publication"];
this.showDatasets = showEntity["dataset"];
this.showSoftware = showEntity["software"];
this.showOrp = showEntity["orp"];
this.showProjects = showEntity["project"];
this.showDataProviders = showEntity["datasource"];
this.getNumbers();
@ -166,6 +177,34 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
}
);
}
if (this.showSoftware) {
this.subSoft = this._searchSoftwareService.numOfSearchSoftware("", this.properties).subscribe(
data => {
if (data && data > 0) {
this.softwareSize = NumberUtils.roundNumber(data);
}else{
this.showSoftware = false;
}
},
err => {
this.handleError("Error getting number of software data", err);
}
);
}
if (this.showOrp) {
this.subOrp = this._searchOrpsService.numOfSearchOrps("", this.properties).subscribe(
data => {
if (data && data > 0) {
this.otherSize = NumberUtils.roundNumber(data);
}else{
this.showOrp = false;
}
},
err => {
this.handleError("Error getting number of software data", err);
}
);
}
if(this.showProjects){
this.subfunders = this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties).subscribe(
data => {

View File

@ -24,13 +24,15 @@ import {Schema2jsonldModule} from '../openaireLibrary/sharedComponents/schema2js
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
import {ErrorMessagesModule} from '../openaireLibrary/utils/errorMessages.module';
import {OrpsServiceModule} from "../openaireLibrary/services/orpsService.module";
import {SoftwareServiceModule} from "../openaireLibrary/services/softwareService.module";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule,
RefineFieldResultsServiceModule,
DataProvidersServiceModule, DatasetsServiceModule, ProjectsServiceModule,
PublicationsServiceModule,
PublicationsServiceModule, SoftwareServiceModule, OrpsServiceModule,
OrganizationsServiceModule,
SearchFormModule,
PiwikServiceModule,

View File

@ -121,6 +121,6 @@
.portal-color.emphasis {
color: #37C7E9;
font-size: 60px;
font-size: 50px;
font-weight: 300;
}