From 2cc64b9e4eee58a494c4492baed0771d9d3ce04d Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 12 Mar 2020 10:48:04 +0000 Subject: [PATCH] [Trunk | Library]: searchSorting.module - searchSorting.component.ts & searchResultsPerPage.component.ts & searchFilter.module.ts - searchFilter.component.html & browseStatistic.component.html - browseEntities.module.ts & citeThis.module.ts - citeThis.component.ts & metadataPreview.module.ts - metadataPreview.component.html & linkingGeneric.module.ts - linkingGeneric.component.html & displayClaims.module.ts - displayClaims.component.html & claimResultSearchForm.module.ts - claimResultSearchForm.component.html: Use material select ( - - - + + Choose another one: + {{authors[i].authorGivenName}} {{authors[i].authorFamilyName}} : {{authors[i].id}} + diff --git a/claims/claim-utils/claimResultSearchForm.module.ts b/claims/claim-utils/claimResultSearchForm.module.ts index e579acc0..352d70aa 100644 --- a/claims/claim-utils/claimResultSearchForm.module.ts +++ b/claims/claim-utils/claimResultSearchForm.module.ts @@ -2,6 +2,7 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '../../shared/shared.module'; import { CommonModule } from '@angular/common'; +import { MatSelectModule } from "@angular/material"; import {ClaimResultSearchFormComponent} from './claimResultSearchForm.component'; import {ClaimResultsModule} from './claimResults.module'; @@ -17,7 +18,7 @@ import {SearchFilterModule} from '../../searchPages/searchUtils/searchFilter.mod @NgModule({ imports: [SharedModule, CommonModule, SearchResearchResultsServiceModule, PagingModule, SearchCrossrefServiceModule, - SearchDataciteServiceModule, HelperModule, SearchFilterModule, ClaimResultsModule], + SearchDataciteServiceModule, HelperModule, SearchFilterModule, ClaimResultsModule, MatSelectModule], providers:[ SearchOrcidService ], diff --git a/claims/claim-utils/displayClaims/displayClaims.component.html b/claims/claim-utils/displayClaims/displayClaims.component.html index 3d94c6f6..a0cc16e4 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.html +++ b/claims/claim-utils/displayClaims/displayClaims.component.html @@ -73,10 +73,12 @@ data-uk-grid-margin="">
Results per page - + + {{size}} +
diff --git a/claims/claim-utils/displayClaims/displayClaims.module.ts b/claims/claim-utils/displayClaims/displayClaims.module.ts index 2f8850b5..ce4b738e 100644 --- a/claims/claim-utils/displayClaims/displayClaims.module.ts +++ b/claims/claim-utils/displayClaims/displayClaims.module.ts @@ -2,6 +2,7 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; +import { MatSelectModule } from "@angular/material"; import {ClaimServiceModule} from '../service/claimsService.module'; import {DisplayClaimsComponent} from './displayClaims.component'; import {LoadingModalModule} from '../../../utils/modal/loadingModal.module'; @@ -18,7 +19,7 @@ import {PiwikServiceModule} from "../../../utils/piwik/piwikService.module"; imports: [ CommonModule, FormsModule, RouterModule, ClaimServiceModule, LoadingModalModule, AlertModalModule, ClaimEntityFormatterModule, PagingModule, HelperModule, Schema2jsonldModule, SEOServiceModule, PiwikServiceModule, - IndexInfoServiceModule + IndexInfoServiceModule, MatSelectModule ], declarations: [ diff --git a/claims/linking/linkingGeneric.component.html b/claims/linking/linkingGeneric.component.html index cde9de23..3512ca0b 100644 --- a/claims/linking/linkingGeneric.component.html +++ b/claims/linking/linkingGeneric.component.html @@ -27,15 +27,17 @@
LINK TO - + + PROJECTS + RESEARCH + RESULTS + COMMUNITIES + +
Type - + +
Access mode - + + {{type}} +
Type - + +
Access mode - + + {{type}} +
- + + select a citation style + {{style}} +
diff --git a/landingPages/landing-utils/citeThis/citeThis.module.ts b/landingPages/landing-utils/citeThis/citeThis.module.ts index 4a14a36a..3ea2ffed 100644 --- a/landingPages/landing-utils/citeThis/citeThis.module.ts +++ b/landingPages/landing-utils/citeThis/citeThis.module.ts @@ -3,11 +3,12 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import {CiteThisComponent} from './citeThis.component'; +import {MatSelectModule} from "@angular/material"; @NgModule({ imports: [ - CommonModule, FormsModule + CommonModule, FormsModule, MatSelectModule ], declarations: [ CiteThisComponent diff --git a/searchPages/searchUtils/browseEntities.module.ts b/searchPages/searchUtils/browseEntities.module.ts index 2d8d3cda..2f8313d1 100644 --- a/searchPages/searchUtils/browseEntities.module.ts +++ b/searchPages/searchUtils/browseEntities.module.ts @@ -2,6 +2,7 @@ import { NgModule} from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; +import { MatSelectModule } from "@angular/material"; import {RefineFieldResultsServiceModule} from '../../services/refineFieldResultsService.module'; @@ -13,7 +14,8 @@ import {ErrorMessagesModule} from '../../utils/errorMessages.module'; @NgModule({ imports: [ CommonModule, FormsModule, ErrorMessagesModule, - RefineFieldResultsServiceModule, RouterModule + RefineFieldResultsServiceModule, RouterModule, + MatSelectModule ], declarations: [ BrowseEntitiesComponent, diff --git a/searchPages/searchUtils/browseStatistic.component.html b/searchPages/searchUtils/browseStatistic.component.html index 25497fe0..e6b756ed 100644 --- a/searchPages/searchUtils/browseStatistic.component.html +++ b/searchPages/searchUtils/browseStatistic.component.html @@ -46,10 +46,13 @@

{{filter.title}}

- + + Sort by results number + Sort by name +
    diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index 3f3f32f0..6ebeb9b0 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -67,12 +67,13 @@ Sort by: - + + Results number + Name +
diff --git a/searchPages/searchUtils/searchFilter.module.ts b/searchPages/searchUtils/searchFilter.module.ts index 3cc6792b..cb1dbcd5 100644 --- a/searchPages/searchUtils/searchFilter.module.ts +++ b/searchPages/searchUtils/searchFilter.module.ts @@ -5,10 +5,11 @@ import { FormsModule } from '@angular/forms'; import {SearchFilterComponent} from './searchFilter.component'; import{SearchFilterModalComponent} from './searchFilterModal.component'; import {ModalModule} from '../../utils/modal/modal.module'; +import {MatSelectModule} from "@angular/material"; @NgModule({ imports: [ - CommonModule, FormsModule, ModalModule + CommonModule, FormsModule, ModalModule, MatSelectModule ], declarations: [ SearchFilterComponent, SearchFilterModalComponent diff --git a/searchPages/searchUtils/searchResultsPerPage.component.ts b/searchPages/searchUtils/searchResultsPerPage.component.ts index a93b87ad..d717be38 100644 --- a/searchPages/searchUtils/searchResultsPerPage.component.ts +++ b/searchPages/searchUtils/searchResultsPerPage.component.ts @@ -4,13 +4,15 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; selector: 'search-results-per-page', template: ` Results per page: - + + 5 + 10 + 20 + 50 + ` }) diff --git a/searchPages/searchUtils/searchResultsPerPage.module.ts b/searchPages/searchUtils/searchResultsPerPage.module.ts index 48294e75..eabf2971 100644 --- a/searchPages/searchUtils/searchResultsPerPage.module.ts +++ b/searchPages/searchUtils/searchResultsPerPage.module.ts @@ -3,11 +3,12 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import{SearchResultsPerPageComponent} from './searchResultsPerPage.component'; +import {SearchResultsPerPageComponent} from './searchResultsPerPage.component'; +import {MatSelectModule} from "@angular/material"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule + CommonModule, FormsModule, RouterModule, MatSelectModule ], declarations: [ SearchResultsPerPageComponent diff --git a/searchPages/searchUtils/searchSorting.component.ts b/searchPages/searchUtils/searchSorting.component.ts index 74efb6a5..266db3e0 100644 --- a/searchPages/searchUtils/searchSorting.component.ts +++ b/searchPages/searchUtils/searchSorting.component.ts @@ -4,22 +4,26 @@ import {Component, Input, Output, EventEmitter} from '@angular/core'; selector: 'search-sorting', template: ` Sort by: - - + [(ngModel)]="sortBy" (ngModelChange)="sortByChanged()" + [disableOptionCentering]="true" + panelClass="matSelectionPanel"> + Title + Creation Date (most recent) + Creation Date (least recent) + ` }) diff --git a/searchPages/searchUtils/searchSorting.module.ts b/searchPages/searchUtils/searchSorting.module.ts index f29aeaca..2294115a 100644 --- a/searchPages/searchUtils/searchSorting.module.ts +++ b/searchPages/searchUtils/searchSorting.module.ts @@ -4,10 +4,11 @@ import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import{SearchSortingComponent} from './searchSorting.component'; +import {MatSelectModule} from "@angular/material"; @NgModule({ imports: [ - CommonModule, FormsModule, RouterModule + CommonModule, FormsModule, RouterModule, MatSelectModule ], declarations: [ SearchSortingComponent