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

adding searchDataciteService.module for previous commit | minor layout changes 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@47475 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2017-06-13 09:00:48 +00:00
parent fbf296640d
commit a507574a4c
6 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
portal-2/src/app/claims/claim-utils/service/searchDataciteService.module.ts Normal file
View File

@ -0,0 +1,20 @@
import { NgModule} from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {SearchDataciteService} from './searchDatacite.service';
@NgModule({
imports: [
CommonModule, FormsModule
],
declarations: [
],
providers:[
SearchDataciteService
],
exports: [
]
})
export class SearchDataciteServiceModule { }

6
portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts
View File

@ -16,7 +16,7 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';
<form class=" uk-padding uk-panel uk-background-muted "> <form class=" uk-padding uk-panel uk-background-muted ">
<div class="uk-clearfix"> <div class="uk-clearfix">
<a class="uk-float-right" uk-toggle="target: #uploadInfo; animation: uk-animation-fade"><span uk-icon="icon: info"></span> More information about bulk upload? </a> <a class="uk-float-right" uk-toggle="target: #uploadInfo; animation: uk-animation-fade"><span uk-icon="icon: info"></span> What is results bulk mode? </a>
</div> </div>
<div id="uploadInfo" class="uk-card uk-card-default uk-card-body uk-margin-small" hidden> <div id="uploadInfo" class="uk-card uk-card-default uk-card-body uk-margin-small" hidden>
<a uk-toggle="target: #uploadInfo; animation: uk-animation-fade" class="uk-float-right"><span uk-icon="icon: close"></span></a> <a uk-toggle="target: #uploadInfo; animation: uk-animation-fade" class="uk-float-right"><span uk-icon="icon: close"></span></a>
@ -41,10 +41,10 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class';
<div for="exampleInputFile">Upload a DOI csv file:</div> <div for="exampleInputFile">Upload a DOI csv file:</div>
<label for="exampleInputFile">Select a file</label> <label for="exampleInputFile">Select a file</label>
<input id="exampleInputFile" type="file" (change)="fileChangeEvent($event)" placeholder="Upload file..." /> <input id="exampleInputFile" class="uk-width-1-2" type="file" (change)="fileChangeEvent($event)" placeholder="Upload file..." />
<button class="uk-button uk-button-success" [class.disabled]="!enableUpload" type="button" (click)="upload()">Upload</button> <button class="uk-button uk-button-success" [class.disabled]="!enableUpload" type="button" (click)="upload()">Upload</button>
<div *ngIf="showReport" class="uk-alert uk-alert-primary" role="alert" > <div *ngIf="showReport" uk-alert class="uk-alert uk-alert-primary" role="alert" >
<a class="uk-alert-close" uk-close></a> <a class="uk-alert-close" uk-close></a>
<div>Uploaded file contains {{allIds.length}} rows. {{foundIds.length}} results were sucefully fetched from CrossRef and Datacite.</div> <div>Uploaded file contains {{allIds.length}} rows. {{foundIds.length}} results were sucefully fetched from CrossRef and Datacite.</div>
<div *ngIf ="duplicateIds.length > 0" >{{duplicateIds.length}} duplicate DOIs.</div> <div *ngIf ="duplicateIds.length > 0" >{{duplicateIds.length}} duplicate DOIs.</div>

4
portal-2/src/app/claims/linking/insertClaim/insertClaim.component.ts
View File

@ -2,7 +2,7 @@ import {Component, Input, Output, EventEmitter, ViewChild} from '@angular/core';
import {Observable} from 'rxjs/Observable'; import {Observable} from 'rxjs/Observable';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {ClaimsService} from '../../claim-utils/service/claims.service'; import {ClaimsService} from '../../claim-utils/service/claims.service';
import {ModalLoading} from '../../../utils/modal/loading.component'; import {ModalLoading} from '../../../utils/modal/loading.component';
import {AlertModal} from '../../../utils/modal/alert'; import {AlertModal} from '../../../utils/modal/alert';
import {Md5} from 'ts-md5/dist/md5'; import {Md5} from 'ts-md5/dist/md5';
@ -190,7 +190,7 @@ private validateDates(){
var result = this.results[i]; var result = this.results[i];
if(result.date && result.date != null){ if(result.date && result.date != null){
console.info("Date :"+ result.date + " & embargoEndDate :" +result.embargoEndDate ); console.info("Date :"+ result.date + " & embargoEndDate :" +result.embargoEndDate );
if((project.startDate && result.date < project.startDate) || ( project.endDate && result.date > project.endDate) ){ if((project.startDate && result.date < project.startDate) || ( project.endDate && result.date > (project.endDate+5)) ){
this.confirmOpen(); this.confirmOpen();
return false; return false;
} }

8
portal-2/src/app/claims/linking/selected/selectedResults.component.ts
View File

@ -14,10 +14,10 @@ import {Dates} from '../../../utils/string-utils.class';
<div class="uk-accordion-content uk-grid uk-width-1-1" > <div class="uk-accordion-content uk-grid uk-width-1-1" >
<div *ngIf="showSearch " class="uk-width-1-2 "> <div *ngIf="showSearch " class="uk-width-1-2 ">
<div class="uk-clearfix"><button (click)="bulkMode = !bulkMode;" class="uk-button uk-button-default uk-animation uk-float-right"> <div class="uk-clearfix"><a (click)="bulkMode = !bulkMode;" class=" uk-animation uk-float-right">
<span *ngIf="!bulkMode">Bulk mode <i uk-icon="icon: upload"></i></span> <span *ngIf="!bulkMode">Switch to Bulk mode <i uk-icon="icon: upload"></i></span>
<span *ngIf="bulkMode">Search mode <i uk-icon="icon: search"></i></span> <span *ngIf="bulkMode">Switch to Search mode <i uk-icon="icon: search"></i></span>
</button></div><!-- (resultsChange)="resultsChanged($event)" --> </a></div><!-- (resultsChange)="resultsChanged($event)" -->
<claim-result-search-form *ngIf="!bulkMode" [selectedResults]="results" > </claim-result-search-form> <claim-result-search-form *ngIf="!bulkMode" [selectedResults]="results" > </claim-result-search-form>
<bulk-claim *ngIf="bulkMode" [results]="results" > </bulk-claim> <bulk-claim *ngIf="bulkMode" [results]="results" > </bulk-claim>
</div> </div>

68
portal-2/src/app/sharedComponents/navigationBar.component.ts
View File

@ -18,7 +18,7 @@ import {Session} from '../login/utils/helper.class';
</a> </a>
</div> </div>
<div class="uk-navbar-center"> <div class="uk-navbar-center">
<a class="uk-navbar-item uk-logo" routerLinkActive="router-link-active" routerLink="/search/find" > <a class="uk-navbar-item uk-logo" routerLinkActive="uk-link" routerLink="/search/find" >
<img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"> </a> <img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"> </a>
</div> </div>
<div class="uk-navbar-right"> <div class="uk-navbar-right">
@ -35,34 +35,34 @@ import {Session} from '../login/utils/helper.class';
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Search Search
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/search/find/publications" class="uk-offcanvas-close custom-offcanvas-close">Publications</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/publications" class="uk-offcanvas-close custom-offcanvas-close">Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/datasets" class="uk-offcanvas-close custom-offcanvas-close">Datasets</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/datasets" class="uk-offcanvas-close custom-offcanvas-close">Datasets</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/projects" class="uk-offcanvas-close custom-offcanvas-close">Projects</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/projects" class="uk-offcanvas-close custom-offcanvas-close">Projects</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/dataproviders" class="uk-offcanvas-close custom-offcanvas-close">Data Providers</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/dataproviders" class="uk-offcanvas-close custom-offcanvas-close">Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/organizations" class="uk-offcanvas-close custom-offcanvas-close">Organizations</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/organizations" class="uk-offcanvas-close custom-offcanvas-close">Organizations</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/people" class="uk-offcanvas-close custom-offcanvas-close">People</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/people" class="uk-offcanvas-close custom-offcanvas-close">People</a></li>
</ul> </ul>
</li> </li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Data Providers Data Providers
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/search/data-providers" class="uk-offcanvas-close custom-offcanvas-close" >Compatible Data Providers</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/data-providers" class="uk-offcanvas-close custom-offcanvas-close" >Compatible Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Entity Registries</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries" class="uk-offcanvas-close custom-offcanvas-close" >Entity Registries</a></li>
</ul> </ul>
</li> </li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Deposit Deposit
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-publications" class="uk-offcanvas-close custom-offcanvas-close" >Deposit Publications</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="uk-offcanvas-close custom-offcanvas-close" >Deposit Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-datasets" class="uk-offcanvas-close custom-offcanvas-close" >Deposit Research Data</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/deposit-datasets" class="uk-offcanvas-close custom-offcanvas-close" >Deposit Research Data</a></li>
</ul> </ul>
</li> </li>
<li class="uk-nav-header uk-parent"> <li class="uk-nav-header uk-parent">
Linking Linking
<ul class="uk-nav-sub"> <ul class="uk-nav-sub">
<li><a routerLinkActive="router-link-active" routerLink="/participate/claim" class="uk-offcanvas-close custom-offcanvas-close" >Linking</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/claim" class="uk-offcanvas-close custom-offcanvas-close" >Linking</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/myclaims" class="uk-offcanvas-close custom-offcanvas-close">My Claims</a></li> <li><a routerLinkActive="uk-link" routerLink="/myclaims" class="uk-offcanvas-close custom-offcanvas-close">My Claims</a></li>
<li *ngIf="isAuthorized"><a routerLinkActive="router-link-active" routerLink="/claims" class="uk-offcanvas-close custom-offcanvas-close">Manage all Claims</a></li> <li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims" class="uk-offcanvas-close custom-offcanvas-close">Manage all Claims</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -97,7 +97,7 @@ import {Session} from '../login/utils/helper.class';
<div class="uk-panel inner" id="module-119"> <div class="uk-panel inner" id="module-119">
<ul class="uk-subnav uk-subnav-line"> <ul class="uk-subnav uk-subnav-line">
<li class="uk-active"><a href="http://dl119.madgik.di.uoa.gr/"><img class="uk-responsive-height" src="assets/dl119_files/Home-icon.png" alt="home"></a></li> <li class="uk-active"><a href="http://dl119.madgik.di.uoa.gr/"><img class="uk-responsive-height" src="assets/dl119_files/Home-icon.png" alt="home"></a></li>
<li class="custom-discover-li"><a routerLinkActive="router-link-active" routerLink="/search/find" >Discover/Share</a></li> <li class="custom-discover-li"><a routerLinkActive="uk-link" routerLink="/search/find" >Discover/Share</a></li>
<li><a href="#">Join</a></li> <li><a href="#">Join</a></li>
<li><a href="#">Connect</a></li> <li><a href="#">Connect</a></li>
<li><a href="#">Monitor_</a></li> <li><a href="#">Monitor_</a></li>
@ -114,67 +114,67 @@ import {Session} from '../login/utils/helper.class';
<div class="uk-container uk-container-expand"> <div class="uk-container uk-container-expand">
<nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}"> <nav class="uk-navbar" uk-navbar="{&quot;align&quot;:&quot;left&quot;}">
<div class="uk-navbar-left uk-visible@l "> <div class="uk-navbar-left uk-visible@l ">
<a routerLinkActive="router-link-active" routerLink="/search/find" class="uk-logo uk-navbar-item"> <a routerLinkActive="uk-link" routerLink="/search/find" class="uk-logo uk-navbar-item">
<img src="assets/OA DISCOVER_B.png" alt="OpenAIRE" class="uk-responsive-height"></a> <img src="assets/OA DISCOVER_B.png" alt="OpenAIRE" class="uk-responsive-height"></a>
</div> </div>
<div class="uk-navbar-left uk-visible@m uk-hidden@l"> <div class="uk-navbar-left uk-visible@m uk-hidden@l">
<a routerLinkActive="router-link-active" routerLink="/search/find" class="uk-logo uk-navbar-item"> <a routerLinkActive="uk-link" routerLink="/search/find" class="uk-logo uk-navbar-item">
<img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"></a> <img src="assets/OA DISCOVER_A.png" alt="OpenAIRE" class="uk-responsive-height"></a>
</div> </div>
<div class="uk-navbar-center"> <div class="uk-navbar-center">
<ul *ngIf= "isClient" class="uk-navbar-nav"> <ul *ngIf= "isClient" class="uk-navbar-nav">
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/search/find" class="" aria-expanded="false">Search</a> <a routerLinkActive="uk-link" routerLink="/search/find" class="" aria-expanded="false">Search</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 0px;" id="searchMenu" (click)="onClick('searchMenu')"> <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 0px;" id="searchMenu" (click)="onClick('searchMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav"> <ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="router-link-active" routerLink="/search/find/publications">Publications</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/publications">Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/datasets">Datasets</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/datasets">Datasets</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/projects">Projects</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/projects">Projects</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/dataproviders">Data Providers</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/dataproviders">Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/organizations">Organizations</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/organizations">Organizations</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/find/people">People</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/find/people">People</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/search/data-providers" class="" aria-expanded="false">Data Providers</a> <a routerLinkActive="uk-link" routerLink="/search/data-providers" class="" aria-expanded="false">Data Providers</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')"> <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 113px;" id="dpMenu" (click)="onClick('dpMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav"> <ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="router-link-active" routerLink="/search/data-providers">Compatible Data Providers</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/data-providers">Compatible Data Providers</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/search/entity-registries">Entity Registries</a></li> <li><a routerLinkActive="uk-link" routerLink="/search/entity-registries">Entity Registries</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/participate/deposit-publications" class="" aria-expanded="false">Deposit</a> <a routerLinkActive="uk-link" routerLink="/participate/deposit-publications" class="" aria-expanded="false">Deposit</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 240px;" id="depositMenu" (click)="onClick('depositMenu')"> <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 240px;" id="depositMenu" (click)="onClick('depositMenu')">
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav"> <ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-publications">Deposit Publications</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/deposit-publications">Deposit Publications</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/participate/deposit-datasets">Deposit Research Data</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/deposit-datasets">Deposit Research Data</a></li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li class="uk-parent"> <li class="uk-parent">
<a routerLinkActive="router-link-active" routerLink="/participate/claim" class="" aria-expanded="false">Linking</a> <a routerLinkActive="uk-link" routerLink="/participate/claim" class="" aria-expanded="false">Linking</a>
<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 358px;" id="linkingMenu" (click)="onClick('linkingMenu')" > <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left" style="top: 80px; left: 358px;" id="linkingMenu" (click)="onClick('linkingMenu')" >
<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid=""> <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
<div class="uk-first-column"> <div class="uk-first-column">
<ul class="uk-nav uk-navbar-dropdown-nav"> <ul class="uk-nav uk-navbar-dropdown-nav">
<li><a routerLinkActive="router-link-active" routerLink="/participate/claim">Linking</a></li> <li><a routerLinkActive="uk-link" routerLink="/participate/claim">Linking</a></li>
<li><a routerLinkActive="router-link-active" routerLink="/myclaims">My Claims</a></li> <li><a routerLinkActive="uk-link" routerLink="/myclaims">My Claims</a></li>
<li *ngIf="isAuthorized"><a routerLinkActive="router-link-active" routerLink="/claims">Manage all Claims</a></li> <li *ngIf="isAuthorized"><a routerLinkActive="uk-link" routerLink="/claims">Manage all Claims</a></li>
</ul> </ul>
</div> </div>
</div> </div>

3
portal-2/src/assets/custom.css
View File

@ -147,3 +147,6 @@ max-height:265px;
right: 0; right: 0;
top: 0; top: 0;
} }
.uk-link{
color: #292C3D !important;
}