diff --git a/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts b/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts index 4b408edb..00ef65ac 100644 --- a/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts +++ b/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts @@ -13,19 +13,20 @@ import {ErrorCodes} from '../../login/utils/guardHelper.class'; selector: 'claim-contexts-search-form', template: ` -
-
Search for Communities:
- +
+
Search for Communities
+
- - - - - - + + + + + diff --git a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.module.ts b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.module.ts index 98fb7eaf..4c71a15a 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPageTableView.module.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPageTableView.module.ts @@ -24,7 +24,7 @@ import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.gua @NgModule({ imports: [ - CommonModule, FormsModule,RouterModule, SearchFormModule, SearchResultsModule, /*DatasourceTableViewModule,*/ LoadingModalModule, + CommonModule, FormsModule,RouterModule, SearchFormModule, SearchResultsModule, LoadingModalModule, ReportsServiceModule, SearchPagingModule, SearchDownloadModule, ModalModule, PagingModule, DataTableModule, SearchFilterModule, PiwikServiceModule ], declarations: [ diff --git a/portal-2/src/app/searchPages/simple/searchDataProviders.module.ts b/portal-2/src/app/searchPages/simple/searchDataProviders.module.ts index 7752bf52..a121c99d 100644 --- a/portal-2/src/app/searchPages/simple/searchDataProviders.module.ts +++ b/portal-2/src/app/searchPages/simple/searchDataProviders.module.ts @@ -18,7 +18,7 @@ import {FreeGuard} from'../../login/freeGuard.guard'; CommonModule, FormsModule, DataProvidersServiceModule, - SearchFormModule, SearchResultsModule, SearchDataProvidersRoutingModule, SearchPageModule//, SearchFilterModalModule + SearchFormModule, SearchResultsModule, SearchDataProvidersRoutingModule, SearchPageModule ], declarations: [ diff --git a/portal-2/src/app/searchPages/simple/searchDatasets.module.ts b/portal-2/src/app/searchPages/simple/searchDatasets.module.ts index 98e27db0..c8d5b8d2 100644 --- a/portal-2/src/app/searchPages/simple/searchDatasets.module.ts +++ b/portal-2/src/app/searchPages/simple/searchDatasets.module.ts @@ -18,7 +18,7 @@ import {FreeGuard} from'../../login/freeGuard.guard'; CommonModule, FormsModule, DatasetsServiceModule, - SearchFormModule, SearchResultsModule, SearchDatasetsRoutingModule, SearchPageModule//, SearchFilterModalModule + SearchFormModule, SearchResultsModule, SearchDatasetsRoutingModule, SearchPageModule ], declarations: [ diff --git a/portal-2/src/app/searchPages/simple/searchOrganizations.module.ts b/portal-2/src/app/searchPages/simple/searchOrganizations.module.ts index 42414911..4f50fe2a 100644 --- a/portal-2/src/app/searchPages/simple/searchOrganizations.module.ts +++ b/portal-2/src/app/searchPages/simple/searchOrganizations.module.ts @@ -9,7 +9,6 @@ import {SearchResultsModule } from '../searchUtils/searchResults.module'; import {OrganizationsServiceModule} from '../../services/organizationsService.module'; import {SearchFormModule} from '../searchUtils/searchForm.module'; -//import {SearchFilterModalModule} from '../searchUtils/searchFilterModal.module'; import {SearchPageModule} from '../searchUtils/searchPage.module'; import {FreeGuard} from'../../login/freeGuard.guard'; @@ -18,7 +17,7 @@ import {FreeGuard} from'../../login/freeGuard.guard'; CommonModule, FormsModule, OrganizationsServiceModule, - SearchFormModule, SearchResultsModule, SearchOrganizationsRoutingModule, SearchPageModule//, SearchFilterModalModule + SearchFormModule, SearchResultsModule, SearchOrganizationsRoutingModule, SearchPageModule ], declarations: [ diff --git a/portal-2/src/app/searchPages/simple/searchProjects.module.ts b/portal-2/src/app/searchPages/simple/searchProjects.module.ts index f79b2f98..5b7da323 100644 --- a/portal-2/src/app/searchPages/simple/searchProjects.module.ts +++ b/portal-2/src/app/searchPages/simple/searchProjects.module.ts @@ -18,7 +18,7 @@ import {FreeGuard} from'../../login/freeGuard.guard'; CommonModule, FormsModule, ProjectsServiceModule, - SearchFormModule, SearchResultsModule, SearchProjectsRoutingModule, SearchPageModule//, SearchFilterModalModule + SearchFormModule, SearchResultsModule, SearchProjectsRoutingModule, SearchPageModule ], declarations: [ diff --git a/portal-2/src/app/searchPages/simple/searchPublications.module.ts b/portal-2/src/app/searchPages/simple/searchPublications.module.ts index b8c2ebb2..272a50ee 100644 --- a/portal-2/src/app/searchPages/simple/searchPublications.module.ts +++ b/portal-2/src/app/searchPages/simple/searchPublications.module.ts @@ -18,7 +18,7 @@ import {FreeGuard} from'../../login/freeGuard.guard'; CommonModule, FormsModule, PublicationsServiceModule, - SearchFormModule, SearchResultsModule, SearchPublicationsRoutingModule, SearchPageModule//, SearchFilterModalModule + SearchFormModule, SearchResultsModule, SearchPublicationsRoutingModule, SearchPageModule ], declarations: [ diff --git a/portal-2/src/app/services/searchProjects.service.ts b/portal-2/src/app/services/searchProjects.service.ts index cad88c20..abcf601e 100644 --- a/portal-2/src/app/services/searchProjects.service.ts +++ b/portal-2/src/app/services/searchProjects.service.ts @@ -119,24 +119,24 @@ export class SearchProjectsService { .map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "project")]); } getFunders():any { - let url = OpenaireProperties.getSearchAPIURLLast()+"projects?refine=true&fields=funderid&size=0"+ "&format=json";; + let url = OpenaireProperties.getSearchAPIURLLast()+"projects?refine=true&fields=funder&size=0"+ "&format=json";; let key = url; if (this._cache.has(key)) { - return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, res['refineResults']['funderid']]); + return Observable.of(this._cache.get(key)).map(res => [res['meta'].total, res['refineResults']['funder']]); } return this.http.get(url) .map(res => res.json()) .do(res => { this._cache.set(key, res); }) - .map(res => [res['meta'].total, res['refineResults']['funderid']]); + .map(res => [res['meta'].total, res['refineResults']['funder']]); } searchForProjectsObs(keyword:string, funderId:string):any { let url = 'search?action=search&sTransformer=projects_openaire&query='+ - '%28oaftype+exact+project%29+and+%28%28projecttitle+%3D+%22'+keyword+'%22%29+or+%28projectacronym+%3D+%22'+keyword+'%22%29+or+%28projectcode+%3D+%22'+keyword+'%22%29%29+and+%28funderid+exact+'+funderId+'%29&size=10&locale=en_GB&format=json'; + '%28oaftype+exact+project%29+and+%28%28projecttitle+%3D+%22'+keyword+'%22%29+or+%28projectacronym+%3D+%22'+keyword+'%22%29+or+%28projectcode+%3D+%22'+keyword+'%22%29%29+and+%28funder+exact+'+funderId+'%29&size=10&locale=en_GB&format=json'; let key = url; if (this._cache.has(key)) { return Observable.of(this._cache.get(key)); diff --git a/portal-2/src/app/sharedComponents/navigationBar.component.ts b/portal-2/src/app/sharedComponents/navigationBar.component.ts index b2c4bd4f..5c9fa208 100644 --- a/portal-2/src/app/sharedComponents/navigationBar.component.ts +++ b/portal-2/src/app/sharedComponents/navigationBar.component.ts @@ -21,9 +21,9 @@ import {Session} from '../login/utils/helper.class'; -
+
@@ -51,12 +51,12 @@ import {Session} from '../login/utils/helper.class';
  • - Link -
      + +
    • Resources @@ -67,6 +67,7 @@ import {Session} from '../login/utils/helper.class';
    • Journals
    • +
    @@ -144,7 +145,7 @@ import {Session} from '../login/utils/helper.class';
  • -
    +
  • @@ -173,8 +174,25 @@ import {Session} from '../login/utils/helper.class';
    • -
    - +
    + + + + +
    diff --git a/portal-2/src/app/utils/entitiesAutoComplete/entitySearch.service.ts b/portal-2/src/app/utils/entitiesAutoComplete/entitySearch.service.ts index a047b660..22474230 100644 --- a/portal-2/src/app/utils/entitiesAutoComplete/entitySearch.service.ts +++ b/portal-2/src/app/utils/entitiesAutoComplete/entitySearch.service.ts @@ -15,7 +15,7 @@ export class EntitiesSearchService { searchProjectsByFunder(keyword:string, funderId:string):any { this.ready = false; - let url = OpenaireProperties. getSearchAPIURLLast()+"projects?"+((keyword && keyword.length > 0)?("q=" +keyword):"")+((funderId && funderId.length > 0 )?"&fq=funderid exact " + '"'+funderId+ '"':"")+"&size=10&page=0&format=json"; + let url = OpenaireProperties. getSearchAPIURLLast()+"projects?"+((keyword && keyword.length > 0)?("q=" +keyword):"")+((funderId && funderId.length > 0 )?"&fq=funder exact " + '"'+funderId+ '"':"")+"&size=10&page=0&format=json"; return this.http.get(url).toPromise() .then(request => { diff --git a/portal-2/src/app/utils/piwik/piwik.service.ts b/portal-2/src/app/utils/piwik/piwik.service.ts index 85087760..c3c17746 100644 --- a/portal-2/src/app/utils/piwik/piwik.service.ts +++ b/portal-2/src/app/utils/piwik/piwik.service.ts @@ -23,7 +23,7 @@ export class PiwikService { var url = OpenaireProperties.getPiwikBaseURL()+"&rec=1&url="+StringUtils.URIEncode(location.href)+"&action_name="+StringUtils.URIEncode(title)+ ((ua != null && ua.length > 0)?('&ua='+StringUtils.URIEncode(ua)):'')+ ((referrer != null && referrer.length > 0)?('&urlref='+StringUtils.URIEncode(referrer)):''); - console.log("Piwik - trackDownload: " + url); + console.log("Piwik - View: " + url); return this.http.get( url); // .do(request => console.info("Piwik request completed" )); diff --git a/portal-2/src/assets/discover-custom.css b/portal-2/src/assets/discover-custom.css index 14d3069a..998a4374 100644 --- a/portal-2/src/assets/discover-custom.css +++ b/portal-2/src/assets/discover-custom.css @@ -450,6 +450,11 @@ h2, h4{ background-color: #D6352B; color: #fff } +.uk-pagination>.uk-active>* { + color: #fff !important; + background-color: #296EE9 !important; + +} .uk-pagination>*>* { color:#666 !important; }
    - + + + @@ -115,10 +116,10 @@ public selectedCategoryId:string ="0"; public query = ''; public filteredList = []; -public communities:string[]; +public communities:any; public selectedCommunityLabel:string = "Community:"; -public categories:string[]; +public categories:any; public selectedCategoryLabel:string ="Category:"; public concepts = []; public conceptsClass = []; @@ -158,7 +159,7 @@ isSelected(id):boolean{ this.selectedList.push(context); UIkit.notification({ - message : 'A context is selected.', + message : 'A new concept is selected.', status : 'info', timeout : 1000, pos : 'top-center' @@ -166,7 +167,7 @@ isSelected(id):boolean{ }else{ UIkit.notification({ - message : 'The context is already on your list.', + message : 'The concept is already on your list.', status : 'warning', timeout : 1000, pos : 'top-center' @@ -301,22 +302,26 @@ getCommunities () { console.log(this.selectedCommunityId +" "); this.warningMessage = ""; this.infoMessage = ""; - if(this.selectedCommunityId != communityId){ - this.selectedCommunityId = communityId; - this.selectedCommunityLabel = communityLabel; - this.getCategories(); + for(var i = 0; i< this.communities.length; i++){ + if(this.communities[i].id==this.selectedCommunityId){ + this.selectedCommunityLabel = this.communities[i].label; + break; + } } - + this.selectedCategoryId = "0"; + this.selectedCategoryLabel="Select Category:"; + this.getCategories(); } - categoryChanged(categoryId:string, categoryLabel:string){ + categoryChanged(){ this.warningMessage = ""; this.infoMessage = ""; - if(this.selectedCategoryId != categoryId){ - this.selectedCategoryId = categoryId; - this.selectedCategoryLabel = categoryLabel; - this.getConcepts(); + for(var i = 0; i< this.categories.length; i++){ + if(this.categories[i].id==this.selectedCategoryId){ + this.selectedCategoryLabel = this.categories[i].label; + break; + } } - + this.getConcepts(); } addCommunityInConcepts(){ this.concepts.push({"id":this.selectedCommunityId, "label":this.selectedCommunityLabel}); diff --git a/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.component.ts b/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.component.ts index 617748f1..d6a7c1fb 100644 --- a/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.component.ts +++ b/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.component.ts @@ -2,7 +2,7 @@ import {Component, Input,Output, ElementRef, EventEmitter, ViewChild} from '@ang import {Observable} from 'rxjs/Observable'; import {SearchProjectsService} from '../../services/searchProjects.service'; import {ProjectService} from '../../landingPages/project/project.service'; -import {ModalLoading} from '../../utils/modal/loading.component'; +// import {ModalLoading} from '../../utils/modal/loading.component'; import { Subject } from 'rxjs/Subject'; import {ClaimProject} from './claimEntities.class'; declare var UIkit:any; @@ -12,20 +12,20 @@ declare var UIkit:any; template: `
    -
    - + +
    - Search for projects: + Search for projects
    -
    - + @@ -37,7 +37,7 @@ export class ClaimProjectsSearchFormComponent { ngOnInit() { this.getFunders(); } - @ViewChild (ModalLoading) loading : ModalLoading ; + // @ViewChild (ModalLoading) loading : ModalLoading ; // @Input() public inline: boolean = false ; // for claimed started from landing pages public query = ''; @@ -132,7 +132,7 @@ select(item){ value: true }); UIkit.notification({ - message : 'A project "'+item.projectName+'" is selected.', + message : 'A new project is selected.', status : 'info', timeout : 1000, pos : 'top-center' @@ -173,7 +173,7 @@ getFunders () { this._projectService.getFunders().subscribe( data => { this.funders = data[1]; - + console.log("this.funders"); }, err => console.log(err) ); diff --git a/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.module.ts b/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.module.ts index ab5c00bb..660cb500 100644 --- a/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.module.ts +++ b/portal-2/src/app/claims/claim-utils/claimProjectSearchForm.module.ts @@ -4,7 +4,7 @@ import { SharedModule } from '../../shared/shared.module'; import { CommonModule } from '@angular/common'; import {ClaimProjectsSearchFormComponent} from './claimProjectSearchForm.component'; -import {LoadingModalModule} from '../../utils/modal/loadingModal.module'; +// import {LoadingModalModule} from '../../utils/modal/loadingModal.module'; import {ProjectServiceModule} from '../../landingPages/project/projectService.module'; import {ProjectsServiceModule} from '../../services/projectsService.module'; @@ -12,7 +12,9 @@ import {EntitiesAutocompleteModule} from '../../utils/entitiesAutoComplete/entit @NgModule({ imports: [ - SharedModule, CommonModule, LoadingModalModule, ProjectServiceModule, ProjectsServiceModule, EntitiesAutocompleteModule + SharedModule, CommonModule, + // LoadingModalModule, + ProjectServiceModule, ProjectsServiceModule, EntitiesAutocompleteModule ], providers:[ ], diff --git a/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html b/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html index df56a359..825c3352 100644 --- a/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html +++ b/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.html @@ -1,5 +1,5 @@ -
    -
    Search for research results:
    + +
    Search for research results
    authorIds - +
    - Results for - {{authorGivenName}} {{authorFamilyName}} - {{authorId}} : - +
    diff --git a/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.ts b/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.ts index 8108a922..26b6cd4d 100644 --- a/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.ts +++ b/portal-2/src/app/claims/claim-utils/claimResultSearchForm.component.ts @@ -9,6 +9,7 @@ import {SearchDatasetsService} from '../../services/searchDatasets.service'; import { ErrorCodes} from '../../utils/properties/openaireProperties'; import {ClaimResult} from '../claim-utils/claimEntities.class'; import{DOI} from '../../utils/string-utils.class'; +declare var UIkit:any; @Component({ selector: 'claim-result-search-form', @@ -87,6 +88,7 @@ export class ClaimResultSearchFormComponent { orcidPage : number = 1; orcidStatus:number = this.errorCodes.NONE; authorId: string; + selectAuthorId: string = "0"; authorGivenName: string; authorFamilyName: string; @@ -318,7 +320,8 @@ private getCrossrefResults (term: string, size : number, page : number) { private getOrcidAuthors (term: string) { this.orcidResultsNum = null; - + this.selectAuthorId = "0"; + this.orcidStatus = this.errorCodes.LOADING; //passing structures in order to fill them in service this._searchOrcidService.searchOrcidAuthors(term, this.authorIds, this.authorGivenNames, this.authorFamilyNames).subscribe( @@ -348,12 +351,15 @@ private getCrossrefResults (term: string, size : number, page : number) { } } private getOrcidResultsById (id:string) { - + if(id=="0"){ + return; + } var index = this.authorIds.indexOf(id); this.authorGivenName = this.authorGivenNames[index]; this.authorFamilyName = this.authorFamilyNames[index]; this.authorId = id; console.info("getOrcidResultsById: "+id); + this.orcidStatus = this.errorCodes.LOADING; this._searchOrcidService.searchOrcidPublications(id).subscribe( data => { if(data != null) { @@ -547,11 +553,23 @@ openaireDataPageChange($event) { this.warningMessage = ""; if (!found) { this.selectedResults.push(result); - // this.resultsChange.emit({ - // value: this.selectedResults - // }); + + UIkit.notification({ + message : 'A new research result is selected.', + status : 'info', + timeout : 1000, + pos : 'top-center' + }); + + }else{ this.warningMessage = "Research Data already in selected list"; + UIkit.notification({ + message : 'The research result is already on your list.', + status : 'warning', + timeout : 1000, + pos : 'top-center' + }); } } diff --git a/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html b/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html index adfa98ff..a59fbd93 100644 --- a/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/portal-2/src/app/claims/claim-utils/displayClaims/displayClaims.component.html @@ -4,12 +4,20 @@
    Filter By: -
    +
    - - - - + + + +
    diff --git a/portal-2/src/app/claims/claim-utils/entityFormatter/claimEntityFormatter.component.ts b/portal-2/src/app/claims/claim-utils/entityFormatter/claimEntityFormatter.component.ts index 6dfa7d15..5055b32f 100644 --- a/portal-2/src/app/claims/claim-utils/entityFormatter/claimEntityFormatter.component.ts +++ b/portal-2/src/app/claims/claim-utils/entityFormatter/claimEntityFormatter.component.ts @@ -7,19 +7,19 @@ import {Component, Input} from '@angular/core'; selector: 'claim-entity', template: `
    - (Publication) +
    - (Dataset) +
    - (Project) - + +
    - (Community) + {{entity.title}}
    ` diff --git a/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts index 4b9b8829..08b3dc11 100644 --- a/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ b/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts @@ -14,8 +14,8 @@ import { Meta} from '../../../angular2-meta';
    -
    -

    Claims Administrator

    +
    + Claims Administrator
    Add more Links?
    diff --git a/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts b/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts index 4aab0051..955210d4 100644 --- a/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts +++ b/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts @@ -43,13 +43,15 @@ import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe';
    -

    +
    + Claims Administrator {{project['name']}} ({{project['funderName']}}) -

    + +

    Pending Claims

    diff --git a/portal-2/src/app/claims/directLinking/directLinking.component.ts b/portal-2/src/app/claims/directLinking/directLinking.component.ts index 24011950..936ee70e 100644 --- a/portal-2/src/app/claims/directLinking/directLinking.component.ts +++ b/portal-2/src/app/claims/directLinking/directLinking.component.ts @@ -15,9 +15,9 @@ import { Meta} from '../../../angular2-meta';
    -
    -

    Link

    -
    +
    + Link +
    diff --git a/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts b/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts index 4ab16d2b..bc9ea125 100644 --- a/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts +++ b/portal-2/src/app/claims/linking/bulkClaim/bulkClaim.component.ts @@ -12,7 +12,7 @@ import {ClaimResult} from '../../claim-utils/claimEntities.class'; @Component({ selector: 'bulk-claim', template: ` -
    +
    diff --git a/portal-2/src/app/claims/linking/linkingGeneric.component.ts b/portal-2/src/app/claims/linking/linkingGeneric.component.ts index 601fe0e6..42f798b8 100644 --- a/portal-2/src/app/claims/linking/linkingGeneric.component.ts +++ b/portal-2/src/app/claims/linking/linkingGeneric.component.ts @@ -16,43 +16,40 @@ declare var UIkit:any;
    -
    -

    Link

    -
    -
    - - - More Information -
    - - +
    + Link +
    +
    + + + + + +
    + @@ -69,7 +66,8 @@ declare var UIkit:any; - - - - - +
  • + + +
    • +
  • + + +
    • - -
    - - + +
    +
    +
    + + + + + + + + + + + + +
    + + +
    +
    +
    + +
    -
      - -
    • Review Metadata
      • -
    • +
    • Previous
      • + +
    • + Next +
      • +
    • @@ -217,6 +241,7 @@ export class LinkingGenericComponent { }); }else{ this.show = 'claim'; + this.step = 3; } } } diff --git a/portal-2/src/app/claims/linking/linkingGeneric.module.ts b/portal-2/src/app/claims/linking/linkingGeneric.module.ts index 6443833c..4fded1dd 100644 --- a/portal-2/src/app/claims/linking/linkingGeneric.module.ts +++ b/portal-2/src/app/claims/linking/linkingGeneric.module.ts @@ -13,6 +13,11 @@ import { LinkingRoutingModule } from './linking-routing.module'; import {StartOverModule} from '../claim-utils/startOver.module'; import {LoginGuard} from'../../login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard'; +import {ClaimContextSearchFormModule} from '../claim-utils/claimContextSearchForm.module'; +import {ClaimProjectsSearchFormModule} from '../claim-utils/claimProjectSearchForm.module'; +import {BulkClaimModule} from './bulkClaim/bulkClaim.module'; +import {ClaimResultSearchFormModule} from '../claim-utils/claimResultSearchForm.module'; +// import {AlertModalModule} from '../../utils/modal/alertModal.module'; @NgModule({ imports: [ @@ -20,6 +25,8 @@ import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.gua SelectedPublicationsModule, InsertClaimsModule, EntitySearchServiceModule, PublicationsServiceModule, DatasetsServiceModule, LinkingRoutingModule, StartOverModule, + ClaimContextSearchFormModule, ClaimProjectsSearchFormModule, BulkClaimModule, ClaimResultSearchFormModule + // AlertModalModule ], providers:[LoginGuard, PreviousRouteRecorder], declarations: [ diff --git a/portal-2/src/app/claims/linking/selected/selectedContexts.component.ts b/portal-2/src/app/claims/linking/selected/selectedContexts.component.ts index 9cb913e2..c45f571e 100644 --- a/portal-2/src/app/claims/linking/selected/selectedContexts.component.ts +++ b/portal-2/src/app/claims/linking/selected/selectedContexts.component.ts @@ -7,34 +7,28 @@ import {ClaimContext} from '../../claim-utils/claimEntities.class'; - -
      +
      -
      + +

      Selected Communities ({{contexts.length}})

      • {{context.community }} > {{context.category}} > {{context.concept.label}} + +
      -
      There are no communities
      +
      There are no selected communities
      - + ` diff --git a/portal-2/src/app/claims/linking/selected/selectedContexts.module.ts b/portal-2/src/app/claims/linking/selected/selectedContexts.module.ts index 746c5edd..08d3d059 100644 --- a/portal-2/src/app/claims/linking/selected/selectedContexts.module.ts +++ b/portal-2/src/app/claims/linking/selected/selectedContexts.module.ts @@ -2,11 +2,12 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../../shared/shared.module'; import {ClaimSelectedContextsComponent} from './selectedContexts.component'; -import {ClaimContextSearchFormModule} from '../../claim-utils/claimContextSearchForm.module'; +// import {ClaimContextSearchFormModule} from '../../claim-utils/claimContextSearchForm.module'; @NgModule({ imports: [ - SharedModule, ClaimContextSearchFormModule + SharedModule, + // ClaimContextSearchFormModule ], declarations: [ ClaimSelectedContextsComponent diff --git a/portal-2/src/app/claims/linking/selected/selectedProjects.component.ts b/portal-2/src/app/claims/linking/selected/selectedProjects.component.ts index 9c9179ad..5850f11b 100644 --- a/portal-2/src/app/claims/linking/selected/selectedProjects.component.ts +++ b/portal-2/src/app/claims/linking/selected/selectedProjects.component.ts @@ -6,34 +6,28 @@ import {RouterHelper} from '../../../utils/routerHelper.class'; selector: 'claim-selected-projects', template: ` - - -
      - -
      -
      + - -
      • -
    -
    There are no projects
    +
    + +
    There are no selected projects
    -
    - + ` diff --git a/portal-2/src/app/claims/linking/selected/selectedProjects.module.ts b/portal-2/src/app/claims/linking/selected/selectedProjects.module.ts index 528ee92f..e3d96ef7 100644 --- a/portal-2/src/app/claims/linking/selected/selectedProjects.module.ts +++ b/portal-2/src/app/claims/linking/selected/selectedProjects.module.ts @@ -4,11 +4,12 @@ import { RouterModule } from '@angular/router'; import { SharedModule } from '../../../shared/shared.module'; import {ClaimSelectedProjectsComponent} from './selectedProjects.component'; -import {ClaimProjectsSearchFormModule} from '../../claim-utils/claimProjectSearchForm.module'; +// import {ClaimProjectsSearchFormModule} from '../../claim-utils/claimProjectSearchForm.module'; @NgModule({ imports: [ - SharedModule, RouterModule, ClaimProjectsSearchFormModule + SharedModule, RouterModule, + // ClaimProjectsSearchFormModule ], declarations: [ ClaimSelectedProjectsComponent diff --git a/portal-2/src/app/claims/linking/selected/selectedResults.component.ts b/portal-2/src/app/claims/linking/selected/selectedResults.component.ts index 1259a456..b4d55ffa 100644 --- a/portal-2/src/app/claims/linking/selected/selectedResults.component.ts +++ b/portal-2/src/app/claims/linking/selected/selectedResults.component.ts @@ -9,29 +9,32 @@ import {Dates} from '../../../utils/string-utils.class'; template: ` - -
    -
    + + +
    -
    -
    -

    {{title}} ({{results.length}})

    - -
    There are no research results
    - -
      -
    • -
      -
      + +
      +
      There are no selected research results
      +
      +

      {{title}} ({{results.length}})

      + + + + + + + + + + + - -
      - - -
      - - + + + + +
      Research Result Change type and access mode
      - Publisher: {{pub.publisher}} - Journal: {{pub.result['journal-title'].value}} - ({{pub.date.substring(0,4)}}) -
      Authors: {{author}}{{(i < (pub.authors.slice(0,10).length-1))?"; ":""}}{{(i == pub.authors.slice(0,10).length-1 && pub.authors.length > 10)?"...":""}}
      + Publisher: {{pub.publisher}} + Journal: {{pub.result['journal-title'].value}} + ({{pub.date.substring(0,4)}}) + +
      Authors: {{author}}{{(i < (pub.authors.slice(0,10).length-1))?"; ":""}}{{(i == pub.authors.slice(0,10).length-1 && pub.authors.length > 10)?"...":""}}
      -
      Editors: {{author.family}} {{author.given}}{{(i < (pub.result.editor.slice(0,10).length-1))?"; ":""}}{{(i == pub.result.editor.slice(0,10).length-1 && pub.result.editor.length > 10)?"...":""}}
      +
      Editors: {{author.family}} {{author.given}}{{(i < (pub.result.editor.slice(0,10).length-1))?"; ":""}}{{(i == pub.result.editor.slice(0,10).length-1 && pub.result.editor.length > 10)?"...":""}}
      -
      Authors: {{author.name}}{{(i < (pub.result.authors.slice(0,10).length-1))?"; ":""}}{{(i == pub.result.authors.slice(0,10).length-1 && pub.result.authors.length > 10)?"...":""}}
      +
      Authors: {{author.name}}{{(i < (pub.result.authors.slice(0,10).length-1))?"; ":""}}{{(i == pub.result.authors.slice(0,10).length-1 && pub.result.authors.length > 10)?"...":""}}
      @@ -63,46 +67,43 @@ import {Dates} from '../../../utils/string-utils.class'; -
      {{pub.source}}
      - -
      -
      +
      {{pub.source}} + {{pub.accessRights}} + {{pub.type}} +
      +
      		+ - -
      + -
      - -
      -
      + [(ngModel)]="nextDate" (dateChanged)="onDateChanged($event,pub)" > + +       		+ Currently you cannot change metadata from openaire - - - - +
      +
      + + +
      - +
      + ` diff --git a/portal-2/src/app/claims/linking/selected/selectedResults.module.ts b/portal-2/src/app/claims/linking/selected/selectedResults.module.ts index 4d21b36a..0b12fb2d 100644 --- a/portal-2/src/app/claims/linking/selected/selectedResults.module.ts +++ b/portal-2/src/app/claims/linking/selected/selectedResults.module.ts @@ -3,13 +3,16 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../../shared/shared.module'; import {ClaimSelectedResultsComponent} from './selectedResults.component'; import {AlertModalModule} from '../../../utils/modal/alertModal.module'; -import {ClaimResultSearchFormModule} from '../../claim-utils/claimResultSearchForm.module'; import { MyDatePickerModule } from '../../../utils/my-date-picker/my-date-picker.module'; -import {BulkClaimModule} from '../bulkClaim/bulkClaim.module'; +// import {BulkClaimModule} from '../bulkClaim/bulkClaim.module'; +// import {ClaimResultSearchFormModule} from '../../claim-utils/claimResultSearchForm.module'; @NgModule({ imports: [ - SharedModule, AlertModalModule, ClaimResultSearchFormModule, MyDatePickerModule, BulkClaimModule + SharedModule, + AlertModalModule, + MyDatePickerModule, + // BulkClaimModule, ClaimResultSearchFormModule, ], declarations: [ ClaimSelectedResultsComponent diff --git a/portal-2/src/app/claims/myClaims/myClaims.component.ts b/portal-2/src/app/claims/myClaims/myClaims.component.ts index 755d1256..f3d5adc3 100644 --- a/portal-2/src/app/claims/myClaims/myClaims.component.ts +++ b/portal-2/src/app/claims/myClaims/myClaims.component.ts @@ -11,8 +11,8 @@ import { Meta} from '../../../angular2-meta';
      -
      -

      My Linked research resutls

      +
      + My Claims
      Add more Links?
      diff --git a/portal-2/src/app/deposit/datasets/depositBySubject.component.ts b/portal-2/src/app/deposit/datasets/depositBySubject.component.ts index 45172fe4..a61f1500 100644 --- a/portal-2/src/app/deposit/datasets/depositBySubject.component.ts +++ b/portal-2/src/app/deposit/datasets/depositBySubject.component.ts @@ -10,10 +10,10 @@ import {OpenaireProperties, ErrorCodes} from '../../utils/properties/openairePro template: `
      -

      Or search for content providers via Classifications

      +

      Or search for domain specific repositories

      - +
    NameTypeCountryInstitutionCompatibilityName + + + + + Type + + + + + Country + + + + + Institution + + + + + Compatibility + + + + +