From 8bac59417af44c77fb1c4ae9c9891accb6ff35ac Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Fri, 14 Jul 2017 10:16:52 +0000 Subject: [PATCH] fix parsing for new communities | change layout in all pages | change form background and position in home page| fix tabs line | use funder field in refine not funderid | In search pages put browse and results in the same height | change main page tab content from ul .uk-switcher to simple divs git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@48566 d315682c-612b-4755-9ff5-7f18f6832af3 --- portal-2/src/app/app.component.ts | 29 +-- .../claimContextSearchForm.component.ts | 3 +- .../claimsAdmin/claimsAdmin.component.ts | 25 ++- .../claimsByToken/claimsByToken.component.ts | 8 +- .../directLinking/directLinking.component.ts | 8 +- .../insertClaim/insertClaim.component.ts | 1 + .../linking/linkingGeneric.component.ts | 8 +- .../app/claims/myClaims/myClaims.component.ts | 8 +- .../depositBySubjectResult.component.ts | 7 + .../datasets/depositDatasets.component.ts | 7 + .../app/deposit/depositResult.component.ts | 7 + .../depositPublications.component.ts | 7 + .../dataProvider/dataProvider.component.html | 7 + .../dataset/dataset.component.html | 7 + .../htmlProjectReport.component.ts | 8 + .../organization/organization.component.html | 13 +- .../organization/organization.component.ts | 4 +- .../project/project.component.html | 7 + .../publication/publication.component.html | 7 + .../searchingProjectsInTab.component.ts | 4 +- portal-2/src/app/login/user.component.ts | 6 + .../app/searchPages/find/search.component.ts | 205 ++++++++++++------ .../advancedSearchPage.component.ts | 7 +- .../searchUtils/browseStatistic.component.ts | 6 +- .../searchUtils/searchFilter.component.ts | 4 +- .../searchUtils/searchPage.component.ts | 41 ++-- .../searchPageTableView.component.ts | 7 +- .../searchUtils/searchResult.component.ts | 4 +- .../services/refineFieldResults.service.ts | 1 + .../servicesUtils/refineResults.class.ts | 18 +- .../fetchProjects.class.ts | 2 +- .../src/app/utils/properties/searchFields.ts | 19 +- portal-2/src/assets/custom.css | 29 ++- portal-2/src/assets/formImageLight.jpg | Bin 267164 -> 0 bytes portal-2/src/assets/globe_tech.jpg | Bin 0 -> 270491 bytes 35 files changed, 380 insertions(+), 144 deletions(-) delete mode 100644 portal-2/src/assets/formImageLight.jpg create mode 100644 portal-2/src/assets/globe_tech.jpg diff --git a/portal-2/src/app/app.component.ts b/portal-2/src/app/app.component.ts index 818671c3..5520a503 100644 --- a/portal-2/src/app/app.component.ts +++ b/portal-2/src/app/app.component.ts @@ -29,32 +29,25 @@ export class XLargeDirective { -
+ +
-
- - -
- + - OpenAIRE uses cookies in order to function properly.
- Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. - By using the OpenAIRE portal you accept our use of cookies. Read more - - + OpenAIRE uses cookies in order to function properly.
+ Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. + By using the OpenAIRE portal you accept our use of cookies. Read more + + 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 1023ea0c..d80b7808 100644 --- a/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts +++ b/portal-2/src/app/claims/claim-utils/claimContextSearchForm.component.ts @@ -207,7 +207,8 @@ getCommunities () { var token=Session.getUserJwt(); this._contextService.getCategories(this.selectedCommunityId).subscribe( data => { - this.categories = data.category; + + this.categories = (Array.isArray(data.category))? data.category:[data.category]; this.concepts = []; this.addCommunityInConcepts(); this.filteredList = []; diff --git a/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts b/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts index d5a360b1..48f7f7eb 100644 --- a/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts +++ b/portal-2/src/app/claims/claimsAdmin/claimsAdmin.component.ts @@ -6,15 +6,26 @@ import { Meta} from '../../../angular2-meta'; @Component({ selector: 'claims-admin', template: ` -
-
-

Claims Administrator

-
-
-
Add more Links?
- +
+
+
+ +
+
+
+
+
+

Claims Administrator

+
+ +
+
+ `, }) diff --git a/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts b/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts index 1487a0b8..7d2f9770 100644 --- a/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts +++ b/portal-2/src/app/claims/claimsByToken/claimsByToken.component.ts @@ -18,6 +18,9 @@ import {ClaimsDatatablePipe} from '../../utils/pipes/claimsDatatable.pipe'; @Component({ selector: 'claims-project-manager', template: ` +
+ +
diff --git a/portal-2/src/app/landingPages/organization/organization.component.ts b/portal-2/src/app/landingPages/organization/organization.component.ts index 70d0215c..9e28732d 100644 --- a/portal-2/src/app/landingPages/organization/organization.component.ts +++ b/portal-2/src/app/landingPages/organization/organization.component.ts @@ -109,7 +109,7 @@ export class OrganizationComponent { }); this.downloadURLAPI = OpenaireProperties.getCsvAPIURL(); - this.csvProjectParamsHead = 'format=csv&type=projects&page=0&query=( (oaftype exact project)and (funderid exact "'; + this.csvProjectParamsHead = 'format=csv&type=projects&page=0&query=( (oaftype exact project)and (funder exact "'; //this.csvPublicationParamsHead = 'format=csv-special&type=publications&page=0&query=((((oaftype exact result) and (resulttypeid exact publication)) and (funderid exact '; } @@ -133,7 +133,7 @@ export class OrganizationComponent { this.updateTitle(this.organizationInfo.title.name); this.updateDescription("Organization, country, projects, search, repositories, open access"+this.organizationInfo.title.name); - var refineFields:string [] = ["funderid"]; + var refineFields:string [] = ["funder"]; this.searchPublications(); diff --git a/portal-2/src/app/landingPages/project/project.component.html b/portal-2/src/app/landingPages/project/project.component.html index dc97ec44..9a4d3bb1 100644 --- a/portal-2/src/app/landingPages/project/project.component.html +++ b/portal-2/src/app/landingPages/project/project.component.html @@ -1,3 +1,7 @@ +
+
+
+
@@ -307,3 +311,6 @@
+
+
+
diff --git a/portal-2/src/app/landingPages/publication/publication.component.html b/portal-2/src/app/landingPages/publication/publication.component.html index 17dbfb1d..c90cad4c 100644 --- a/portal-2/src/app/landingPages/publication/publication.component.html +++ b/portal-2/src/app/landingPages/publication/publication.component.html @@ -1,3 +1,7 @@ +
+
+
+
@@ -605,3 +609,6 @@
+
+
+
diff --git a/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts b/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts index 119d80dc..73860358 100644 --- a/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts +++ b/portal-2/src/app/landingPages/searchingProjectsInTab.component.ts @@ -21,7 +21,7 @@ import {RouterHelper} from '../utils/routerHelper.class';
- View all {{fetchProjects.searchUtils.totalResultsNoFilters}} results @@ -81,7 +81,7 @@ export class SearchingProjectsTabComponent { search(refine:boolean, filterQuery:string){ - var refineFields:string [] = ["funderid"]; + var refineFields:string [] = ["funder"]; this.fetchProjects.getResultsForOrganizations(this.organizationId, filterQuery, this.page, this.size,(refine)?refineFields:[]); } diff --git a/portal-2/src/app/login/user.component.ts b/portal-2/src/app/login/user.component.ts index 9146c6ef..dab92a58 100644 --- a/portal-2/src/app/login/user.component.ts +++ b/portal-2/src/app/login/user.component.ts @@ -11,6 +11,9 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties'; @Component({ selector: 'user', template: ` +
+
+
@@ -57,6 +60,9 @@ import {OpenaireProperties} from '../utils/properties/openaireProperties';
+
+
+
` }) diff --git a/portal-2/src/app/searchPages/find/search.component.ts b/portal-2/src/app/searchPages/find/search.component.ts index 1e37ea80..44914349 100644 --- a/portal-2/src/app/searchPages/find/search.component.ts +++ b/portal-2/src/app/searchPages/find/search.component.ts @@ -27,17 +27,82 @@ import {RouterHelper} from '../../utils/routerHelper.class'; encapsulation: ViewEncapsulation.Emulated, selector: 'search-find', template: ` + + +
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+

+ 16 mi publications +

+
+
+
+
+

+ 83 K datasets +

+
+
+
+
+

+ 7900 data sources +

+
+
+
+
+

+ 15 funders +

+
+
+
+
+ all linked together +
+
+
+
+
+
+
+
+ +
+
+
-
+ +
+
- View all {{fetchOrganizations.searchUtils.totalResults}} results - - - -
+ View all {{fetchOrganizations.searchUtils.totalResults}} results + + + +
-
+
- - +
+
+ +
- +
+
` }) @@ -345,10 +421,13 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr; } public searchProjects() { this.activeTab = "projects"; + console.log("searchProjects"); if(this.reloadProjects && this.fetchProjects.searchUtils.status != this.errorCodes.NONE && this.fetchProjects.searchUtils.status != this.errorCodes.ERROR) { this.reloadProjects = false; + console.log("do the search searchProjects"); + this.fetchProjects.getResultsByKeyword(this.keyword, 1, 10); this.linkToSearchProjects = OpenaireProperties.getLinkToSearchProjects();// + "?keyword=" + this.keyword; } diff --git a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts index 355e2ebd..279324e5 100644 --- a/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/advancedSearchPage.component.ts @@ -13,7 +13,9 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties'; @Component({ selector: 'advanced-search-page', template: ` - +
+
+

{{pageTitle}}

@@ -44,6 +46,9 @@ import {OpenaireProperties} from '../../utils/properties/openaireProperties';
+
+
+
` }) diff --git a/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts b/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts index 303c5f83..fdfb9f34 100644 --- a/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/browseStatistic.component.ts @@ -17,13 +17,13 @@ import {RouterHelper} from '../../utils/routerHelper.class';

{{filter.title}}

-