Project

General

Profile

« Previous | Next » 

Revision 58238

[Library | Landing-redesign]: Merge from trunk

View differences:

modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/services/searchDataproviders.service.ts
13 13

  
14 14
@Injectable()
15 15
export class SearchDataprovidersService {
16
    private sizeOfDescription: number = 270;
17

  
16 18
    constructor(private http: HttpClient ) {}
17 19

  
18 20
    searchDataproviders (params: string, refineParams:string, page: number, size: number, refineFields:string[], properties:EnvProperties, usedBy: string="search" ):any {
......
303 305

  
304 306
            result['type'] = this.getDataproviderType(resData);
305 307

  
308
            if(!Array.isArray(resData['description'])) {
309
              result.description = (resData['description']) ? String(resData['description']) : "";
310
            } else {
311
              result.description = (resData['description'][0]) ? String(resData['description'][0]) : "";
312
            }
313

  
314
            if (result.description && result.description.length > this.sizeOfDescription) {
315
              result.description = result.description.substring(0, this.sizeOfDescription) + "...";
316
            }
317

  
306 318
            let typeid: string = resData['datasourcetype'].classid;
307 319
            //console.info(typeid);
308 320
            if(typeid != "entityregistry" && typeid != "entityregistry::projects" && typeid != "entityregistry::repositories") {
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/services/searchResearchResults.service.ts
243 243
            if (relation['to'].class == "isProducedBy") {
244 244
              result['projects'] = this.parseProjects(result['projects'], relation);
245 245
            }
246

  
247
            if(resData['country'] && resData['country'] != null) {
248
              result.countriesForResults = new Array<string>();
249

  
250
              if(!Array.isArray(resData['country'])) {
251
                if(resData['country'].classname != "Undetermined" && resData['country'].classname) {
252
                  result.countriesForResults.push(resData['country'].classname);
253
                }
254
              } else {
255
                for(let i=0; i<resData['country'].length; i++) {
256
                  if(resData['country'][i].classname != "Undetermined" && resData['country'][i].classname) {
257
                    result.countriesForResults.push(resData['country'][i].classname);
258
                  }
259
                }
260
              }
261
            }
262

  
263
            result['title'] = {"name": '', "accessMode": '', "sc39": ''};
264

  
265
            if(Array.isArray(resData['title'])) {
266
                result['title'].name = (resData['title'][0] && resData['title'][0].content) ? String(resData['title'][0].content) : "";
267
            } else {
268
                result['title'].name = (resData['title'] && resData['title'].content) ? String(resData['title'].content) : "";
269
            }
270

  
271
            result['id'] = Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
272
            if(resData['bestaccessright'] && resData['bestaccessright'].hasOwnProperty("classname")) {
273
                result['title'].accessMode = resData['bestaccessright'].classname;
274
            }
275
            if(resData['rels'].hasOwnProperty("rel")) {
276
                let relLength = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'].length : 1;
277

  
278
                for(let j=0; j<relLength; j++) {
279
                    let relation = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'][j] : resData['rels']['rel'];
280

  
281
                    if(relation.hasOwnProperty("to")) {
282
                        if(relation['to'].class == "isProducedBy") {
283
                            result['projects'] = this.parseProjects(result['projects'], relation);
284
                        }
285
                    }
286
                }
287
            }
288

  
289
            if(resData.hasOwnProperty("creator") && resData['creator'] != null) {
290
              if(result['authors'] == undefined) {
291
                result['authors'] = new Array<{"fullName": string, "orcid": string}>();
292
              }
293

  
294
              let authors = resData['creator'];
295
              let length = Array.isArray(authors) ? authors.length : 1;
296

  
297
              for(let i=0; i<length; i++) {
298
                let author = Array.isArray(authors) ? authors[i] : authors;
299
                if(author) {
300
                  result['authors'][author.rank] = {"fullName": author.content, "orcid": author.ORCID};
301
                }
302
              }
303
              result.authors = result.authors.filter(function (item) {
304
                return (item != undefined && item.fullName != undefined);
305
              });
306
            }
307

  
308
            var date:string = (resData.dateofacceptance)+""; // transform to string in case it is an integer
309
            result.year = (date && (date).indexOf('-') !== -1)?date.split('-')[0]:date;
310

  
311
            if(!Array.isArray(resData.description)) {
312
                result.description = (resData.description) ? String(resData.description) : "";
313
            } else {
314
                result.description = (resData.description[0]) ? String(resData.description[0]) : "";
315
            }
316

  
317
            if(result.description && result.description.length > this.sizeOfDescription) {
318
                result.description = result.description.substring(0, this.sizeOfDescription) + "...";
319
            }
320

  
321
            if(resData.embargoenddate && resData.embargoenddate != '') {
322
              result.embargoEndDate = new Date(resData.embargoenddate);
323
            }
324

  
325
            if(!Array.isArray(resData.publisher)) {
326
              result.publisher = resData.publisher;
327
            } else {
328
              for(let i=0; i<resData.publisher.length; i++) {
329
                if(result.publisher != undefined){
330
                  result.publisher += ', '+resData['publisher'][i];
331
                } else {
332
                  result.publisher = resData['publisher'][i];
333
                }
334
              }
335
            }
336

  
337
            results.push(result);
246 338
          }
247 339
        }
248 340
      }
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/services/searchProjects.service.ts
156 156

  
157 157
            result.id = Array.isArray(data) ? data[i]['result']['header']['dri:objIdentifier'] : data['result']['header']['dri:objIdentifier'];
158 158

  
159
            if(!Array.isArray(resData['summary'])) {
160
              result.description = (resData['summary']) ? String(resData['summary']) : "";
161
            } else {
162
              result.description = (resData['summary'][0]) ? String(resData['summary'][0]) : "";
163
            }
164

  
165
            if (result.description && result.description.length > this.sizeOfDescription) {
166
              result.description = result.description.substring(0, this.sizeOfDescription) + "...";
167
            }
168

  
159 169
            if(resData['rels'].hasOwnProperty("rel")) {
160 170
                let relLength = Array.isArray(resData['rels']['rel']) ? resData['rels']['rel'].length : 1;
161 171

  
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/browseEntities.module.ts
2 2
import { CommonModule }        from '@angular/common';
3 3
import { FormsModule }         from '@angular/forms';
4 4
import { RouterModule } from '@angular/router';
5
import { MatSelectModule } from "@angular/material";
5 6

  
6 7
import {RefineFieldResultsServiceModule} from '../../services/refineFieldResultsService.module';
7 8

  
......
13 14
@NgModule({
14 15
  imports: [
15 16
    CommonModule, FormsModule, ErrorMessagesModule,
16
    RefineFieldResultsServiceModule, RouterModule
17
    RefineFieldResultsServiceModule, RouterModule,
18
    MatSelectModule
17 19
  ],
18 20
  declarations: [
19 21
      BrowseEntitiesComponent,
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchResultsPerPage.component.ts
4 4
    selector: 'search-results-per-page',
5 5
    template: `        
6 6
    <span> Results per page:</span>
7
    <select class="uk-select uk-width-auto uk-text-bold" id="form-horizontal-select" name="select_results_per_page"
8
            [(ngModel)]="size" (ngModelChange)="sizeChanged()">
9
      <option [ngValue]="5" > 5</option>
10
      <option [ngValue]="10">10</option>
11
      <option [ngValue]="20">20</option>
12
      <option [ngValue]="50">50</option>
13
    </select>
7
    <mat-select class="uk-select uk-width-auto uk-text-bold matSelection" id="form-horizontal-select" name="select_results_per_page"
8
                [(ngModel)]="size" (ngModelChange)="sizeChanged()"
9
                [disableOptionCentering]="true"
10
                panelClass="matSelectionPanel">
11
      <mat-option [value]="5" > 5</mat-option>
12
      <mat-option [value]="10">10</mat-option>
13
      <mat-option [value]="20">20</mat-option>
14
      <mat-option [value]="50">50</mat-option>
15
    </mat-select>
14 16
    `
15 17
})
16 18

  
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchFilter.module.ts
5 5
import {SearchFilterComponent} from './searchFilter.component';
6 6
import{SearchFilterModalComponent} from './searchFilterModal.component';
7 7
import {ModalModule} from '../../utils/modal/modal.module';
8
import {MatSelectModule} from "@angular/material";
8 9

  
9 10
@NgModule({
10 11
  imports: [
11
    CommonModule, FormsModule, ModalModule
12
    CommonModule, FormsModule, ModalModule, MatSelectModule
12 13
  ],
13 14
  declarations: [
14 15
    SearchFilterComponent, SearchFilterModalComponent
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchSorting.module.ts
4 4
import { RouterModule }       from '@angular/router';
5 5

  
6 6
import{SearchSortingComponent} from './searchSorting.component';
7
import {MatSelectModule} from "@angular/material";
7 8

  
8 9
@NgModule({
9 10
  imports: [
10
    CommonModule, FormsModule, RouterModule
11
    CommonModule, FormsModule, RouterModule, MatSelectModule
11 12
  ],
12 13
  declarations: [
13 14
    SearchSortingComponent
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/browseStatistic.component.html
46 46
          <h4 class="tm-article-subtitle">{{filter.title}}</h4>
47 47
          <div class="uk-grid uk-margin-left uk-margin-right">
48 48
            <input   class="uk-input   uk-margin-small-bottom uk-width-1-2  " name="filter-keyword"  placeholder="Search for {{filter.title}}" type="text" [(ngModel)]="keyword">
49
            <select   [(ngModel)]="sortBy"      class="uk-select  uk-margin-small-bottom uk-width-1-2 uk-padding-remove"  name="select_order"   >
50
              <option  value="num"  >Sort by results number</option>
51
              <option  value="name"  >Sort by name</option>
52
            </select>
49
            <mat-select   [(ngModel)]="sortBy"      class="uk-select  uk-margin-small-bottom uk-width-1-2 uk-padding-remove matSelection"
50
                          name="select_order"
51
                          [disableOptionCentering]="true"
52
                          panelClass="matSelectionPanel">
53
              <mat-option  value="num"  >Sort by results number</mat-option>
54
              <mat-option  value="name"  >Sort by name</mat-option>
55
            </mat-select>
53 56
          </div>
54 57

  
55 58
          <ul *ngIf="filter.values.length > 0" class="uk-list uk-list-line   browseFilters">
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchResultsPerPage.module.ts
3 3
import { FormsModule }         from '@angular/forms';
4 4
import { RouterModule }       from '@angular/router';
5 5

  
6
import{SearchResultsPerPageComponent} from './searchResultsPerPage.component';
6
import {SearchResultsPerPageComponent} from './searchResultsPerPage.component';
7
import {MatSelectModule} from "@angular/material";
7 8

  
8 9
@NgModule({
9 10
  imports: [
10
    CommonModule, FormsModule, RouterModule
11
    CommonModule, FormsModule, RouterModule, MatSelectModule
11 12
  ],
12 13
  declarations: [
13 14
    SearchResultsPerPageComponent
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchFilter.component.html
67 67

  
68 68
              <span *ngIf = "showResultCount === true" class="uk-width-5-6@m uk-width-1-1@s uk-align-right uk-margin-small-bottom">
69 69
                <span class="uk-width-1-4 uk-text-muted"> Sort by:</span>
70
                <select [(ngModel)]="sortBy"
71
                        class="uk-select uk-width-3-4@m uk-width-auto"
72
                        id="form-horizontal-select" name="select_order">
73
                  <option  value="num">Results number</option>
74
                  <option  value="name">Name</option>
75
                </select>
70
                <mat-select [(ngModel)]="sortBy"
71
                        class="uk-select uk-width-3-4@m uk-width-auto matSelection"
72
                        id="form-horizontal-select" name="select_order"
73
                        [disableOptionCentering]="true" panelClass="matSelectionPanel">
74
                  <mat-option  value="num">Results number</mat-option>
75
                  <mat-option  value="name">Name</mat-option>
76
                </mat-select>
76 77
              </span>
77 78
            </div>
78 79

  
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchResult.component.ts
15 15
  @Input() status: number;
16 16
  @Input() type: string;
17 17
  @Input() showLoading: boolean = false;
18
  @Input() showSubjects: boolean = false;
18
  @Input() showSubjects: boolean = true;
19 19
  @Input() showOrganizations: boolean = true;
20 20
  @Input() custom_class: string = "search-results";
21 21
  @Input() properties: EnvProperties;
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/searchPages/searchUtils/searchSorting.component.ts
4 4
    selector: 'search-sorting',
5 5
    template: `        
6 6
      <span class="uk-width-1-4"> Sort by:</span>
7
      <select *ngIf="(entityType != 'community' && entityType != 'funder' )" 
8
              class="uk-select uk-width-auto uk-text-bold" 
7
      <mat-select *ngIf="(entityType != 'community' && entityType != 'funder' )" 
8
              class="uk-select uk-width-auto uk-text-bold matSelection" 
9 9
              id="form-horizontal-select" name="select_results_per_page"
10
              [disableOptionCentering]="true"
11
              panelClass="matSelectionPanel"
10 12
              [(ngModel)]="sortBy" (ngModelChange)="sortByChanged()">
11
              <option value="">Relevance</option>
12
              <option value="resultdateofacceptance,descending">Date (most recent)</option>
13
              <option value="resultdateofacceptance,ascending">Date (least recent)</option>
14
      </select>
15
      <select *ngIf="(entityType == 'community' || entityType == 'funder')" 
16
              class="uk-select uk-width-auto uk-text-bold" 
13
              <mat-option value="">Relevance</mat-option>
14
              <mat-option value="resultdateofacceptance,descending">Date (most recent)</mat-option>
15
              <mat-option value="resultdateofacceptance,ascending">Date (least recent)</mat-option>
16
      </mat-select>
17
      <mat-select *ngIf="(entityType == 'community' || entityType == 'funder')" 
18
              class="uk-select uk-width-auto uk-text-bold matSelection" 
17 19
              id="form-horizontal-select" name="select_results_per_page"
18
              [(ngModel)]="sortBy" (ngModelChange)="sortByChanged()">
19
              <option value="">Title</option>
20
              <option value="creationdate,descending">Creation Date (most recent)</option>
21
              <option value="creationdate,ascending">Creation Date (least recent)</option>
22
      </select>
20
              [(ngModel)]="sortBy" (ngModelChange)="sortByChanged()"
21
              [disableOptionCentering]="true"
22
              panelClass="matSelectionPanel">
23
              <mat-option value="">Title</mat-option>
24
              <mat-option value="creationdate,descending">Creation Date (most recent)</mat-option>
25
              <mat-option value="creationdate,ascending">Creation Date (least recent)</mat-option>
26
      </mat-select>
23 27
    `
24 28
})
25 29

  
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/landingPages/landing-utils/citeThis/citeThis.component.ts
13 13
    <dl class="uk-description-list-line">
14 14
      <!--dt class="title">Cite this {{type}}</dt-->
15 15
      <dd class="line"  >
16
        <select class="select" id="citations" name="citeselect" [(ngModel)]="selectedStyle" (ngModelChange)="styleChanged()">
17
          <option   value="0">select a citation style</option>
18
          <option *ngFor=" let  style of this.citation.templates let i = index" [value]="style">{{style}}</option>
19
        </select>
16
        <mat-select class="select matSelection" id="citations" name="citeselect" [(ngModel)]="selectedStyle" (ngModelChange)="styleChanged()"
17
                    [disableOptionCentering]="true"
18
                    panelClass="matSelectionPanel">
19
          <mat-option   value="0">select a citation style</mat-option>
20
          <mat-option *ngFor=" let  style of this.citation.templates let i = index" [value]="style">{{style}}</mat-option>
21
        </mat-select>
20 22
        <div *ngIf="selectedStyle!='0'" id="citation" class="box-content uk-padding-small uk-overflow-auto" [innerHTML]=citationText></div>
21 23
      </dd>
22 24
    </dl>
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/landingPages/landing-utils/citeThis/citeThis.module.ts
3 3
import { FormsModule }         from '@angular/forms';
4 4

  
5 5
 import {CiteThisComponent} from './citeThis.component';
6
import {MatSelectModule} from "@angular/material";
6 7

  
7 8
@NgModule({
8 9
  imports: [
9 10

  
10
    CommonModule, FormsModule
11
    CommonModule, FormsModule, MatSelectModule
11 12
   ],
12 13
  declarations: [
13 14
     CiteThisComponent
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/landingPages/result/resultLanding.service.ts
93 93
      this.resultLandingInfo.dateofacceptance = data[0].dateofacceptance?new Date(data[0].dateofacceptance):null;
94 94
      this.resultLandingInfo.publisher = data[0].publisher;
95 95
      if(!Array.isArray(data[0].description)) {
96
        this.resultLandingInfo.description = (data[0].description) ? String(data[0].description) : "";
96
        //this.resultLandingInfo.description = String(data[0].description);
97
        this.resultLandingInfo.description = (data[0] && data[0].description) ? String(data[0].description) : "";
97 98
      } else {
98
        this.resultLandingInfo.description = (data[0].description[0]) ? String(data[0].description[0]) : "";
99
        //this.resultLandingInfo.description = String(data[0].description[0]);
100
        this.resultLandingInfo.description = (data[0] && data[0].description[0]) ? String(data[0].description[0]) : "";
99 101
      }
100 102
      this.resultLandingInfo.embargoEndDate = data[0].embargoenddate?new Date(data[0].embargoenddate):null;
101 103
    }
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/landingPages/result/resultLanding.component.ts
521 521
    }
522 522
    this._location.go(this.linkToLandingPage + this.id);
523 523
  }
524
  updateUrlWithType(){
525
    this.type = this.resultLandingInfo.resultType;
526
    if(this.type == "publication") {
527
      this._location.go("test");
528
      this.linkToLandingPage = this.properties.searchLinkToPublication;
529
      this.linkToSearchPage = this.properties.searchLinkToPublications;
530
    } else if(this.type == "dataset") {
531
      this.linkToLandingPage = this.properties.searchLinkToDataset;
532
      this.linkToSearchPage = this.properties.searchLinkToDatasets;
533
    } else if(this.type == "software") {
534
      this.linkToLandingPage = this.properties.searchLinkToSoftware;
535
      this.linkToSearchPage = this.properties.searchLinkToSoftwareLanding;
536
    } else if(this.type == "other") {
537
      this.type="orp";
538
      this.linkToLandingPage = this.properties.searchLinkToOrp;
539
      this.linkToSearchPage = this.properties.searchLinkToOrps;
540
    }
541
    this._location.go(this.linkToLandingPage + this.id);
542
  }
524 543
}
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/utils/entities/searchResult.ts
37 37
  title: ResultTitle;
38 38
  id: string;
39 39
  DOI: string;
40
  
40

  
41
  //publications & datasets & orp & software & projects & dataproviders:
42
  description: string;
43

  
41 44
  //publications & datasets & orp & software & organizations:
42 45
  projects: Project[];
43 46
  
44 47
  //datasets & orp & publications & software
45
  description: string;
46 48
  year: string;
47 49
  embargoEndDate: Date | string;
48 50
  authors: Author[];
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/claim-utils/claimResultSearchForm.component.ts
620 620
      entity.result.url = prefixUrl + entity.id;
621 621
      entity.result.source = String("openaire");
622 622
      entity.result.date = (item.year && item.year != "") ? item.year : null;
623
      entity.result.accessRights = String(item.title.accessMode);
623
      entity.result.accessRights = (item.title && item.title.accessMode) ? String(item.title.accessMode) : "";
624 624

  
625 625
      entity.type = type;
626 626
      entity.result.embargoEndDate = (item.embargoEndDate && item.embargoEndDate != "") ? item.embargoEndDate : entity.result.embargoEndDate;
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/claim-utils/displayClaims/displayClaims.component.html
73 73
         data-uk-grid-margin="">
74 74
      <div class="uk-width-1-2 uk-margin-top uk-margin-bottom">
75 75
        <span> Results per page
76
          <select *ngIf="resultsNum>10" class="uk-width-1-5 uk-select" [(ngModel)]="size" name="select_size"
77
                  (ngModelChange)="changeSize()" [disabled]="pageLoading">
78
            <option *ngFor="let size of sizes" [value]="size">{{size}}</option>
79
          </select>
76
          <mat-select *ngIf="resultsNum>10" class="uk-width-1-5 uk-select matSelection" [(ngModel)]="size" name="select_size"
77
                  (ngModelChange)="changeSize()" [disabled]="pageLoading"
78
                  [disableOptionCentering]="true"
79
                  panelClass="matSelectionPanel">
80
            <mat-option *ngFor="let size of sizes" [value]="size">{{size}}</mat-option>
81
          </mat-select>
80 82
        </span>
81 83
      </div>
82 84
      <div class="uk-grid">
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/claim-utils/displayClaims/displayClaims.module.ts
2 2
import { CommonModule }        from '@angular/common';
3 3
import { FormsModule }         from '@angular/forms';
4 4
import { RouterModule } from '@angular/router';
5
import { MatSelectModule } from "@angular/material";
5 6
import {ClaimServiceModule} from '../service/claimsService.module';
6 7
import {DisplayClaimsComponent} from './displayClaims.component';
7 8
import {LoadingModalModule} from '../../../utils/modal/loadingModal.module';
......
18 19
  imports: [
19 20
    CommonModule, FormsModule, RouterModule, ClaimServiceModule, LoadingModalModule, AlertModalModule,
20 21
    ClaimEntityFormatterModule, PagingModule, HelperModule, Schema2jsonldModule, SEOServiceModule, PiwikServiceModule,
21
    IndexInfoServiceModule
22
    IndexInfoServiceModule, MatSelectModule
22 23

  
23 24
  ],
24 25
  declarations: [
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/claim-utils/claimResultSearchForm.component.html
226 226

  
227 227
          <div class="dropdown">
228 228

  
229
            <select [(ngModel)]="selectAuthorId" name="select_author"
230
                    (ngModelChange)="getOrcidResultsById(selectAuthorId)" class="uk-select">
231
              <option [value]="0">Choose another one:</option>
232
              <option *ngFor=" let item of authors let i = index"
233
                      [value]="authors[i].id">{{authors[i].authorGivenName}} {{authors[i].authorFamilyName}} : {{authors[i].id}} </option>
234
            </select>
229
            <mat-select [(ngModel)]="selectAuthorId" name="select_author"
230
                    (ngModelChange)="getOrcidResultsById(selectAuthorId)" class="uk-select matSelection"
231
                    [disableOptionCentering]="true"
232
                    panelClass="matSelectionPanel">
233
              <mat-option [value]="0">Choose another one:</mat-option>
234
              <mat-option *ngFor=" let item of authors let i = index"
235
                      [value]="authors[i].id">{{authors[i].authorGivenName}} {{authors[i].authorFamilyName}} : {{authors[i].id}} </mat-option>
236
            </mat-select>
235 237
          </div>
236 238

  
237 239
        </div>
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/claim-utils/claimResultSearchForm.module.ts
2 2

  
3 3
import { SharedModule } from '../../shared/shared.module';
4 4
import { CommonModule }        from '@angular/common';
5
import { MatSelectModule } from "@angular/material";
5 6
import {ClaimResultSearchFormComponent} from './claimResultSearchForm.component';
6 7
import {ClaimResultsModule} from './claimResults.module';
7 8

  
......
17 18

  
18 19
 @NgModule({
19 20
  imports: [SharedModule, CommonModule, SearchResearchResultsServiceModule, PagingModule, SearchCrossrefServiceModule,
20
    SearchDataciteServiceModule, HelperModule, SearchFilterModule, ClaimResultsModule],
21
    SearchDataciteServiceModule, HelperModule, SearchFilterModule, ClaimResultsModule, MatSelectModule],
21 22
  providers:[
22 23
     SearchOrcidService
23 24
  ],
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/linking/linkingGeneric.module.ts
1 1
import { NgModule } from '@angular/core';
2
import { MatSelectModule } from "@angular/material";
2 3

  
3 4
import { SharedModule } from '../../shared/shared.module';
4 5
import {SelectedProjectsModule} from './selected/selectedProjects.module';
......
29 30
     StartOverModule,
30 31
    ClaimContextSearchFormModule, ClaimProjectsSearchFormModule, BulkClaimModule, ClaimResultSearchFormModule,
31 32
    HelperModule, Schema2jsonldModule, SEOServiceModule, MetadataPreviewModule, ClaimEntitiesMetadataModule, AlertModalModule,
32
    PiwikServiceModule
33
    PiwikServiceModule,
34
    MatSelectModule
33 35
  ],
34 36
  providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
35 37
  declarations: [
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/linking/linkingGeneric.component.html
27 27
                      <div class="uk-h5">
28 28
                           <span *ngIf="showOptions.show!='source' && showOptions.show != 'claim'">
29 29
                             <span>LINK TO </span>
30
                             <select [(ngModel)]="showOptions.show" class="uk-select uk-width-auto  uk-text-bold "
31
                                     *ngIf="showOptions.linkToEntities.length > 1">
32
                               <option *ngIf="showOptions.linkToEntities.indexOf('project')!=-1 "
33
                                       value="project">PROJECTS</option>
34
                               <option *ngIf="showOptions.linkToEntities.indexOf('result')!=-1 " value="result">RESEARCH
35
                                 RESULTS</option>
36
                               <option *ngIf="showOptions.linkToEntities.indexOf('context')!=-1 " value="context">COMMUNITIES
37
                               </option>
38
                             </select>
30
                             <mat-select [(ngModel)]="showOptions.show" class="uk-select uk-width-auto  uk-text-bold matSelection"
31
                                     *ngIf="showOptions.linkToEntities.length > 1"
32
                                     [disableOptionCentering]="true"
33
                                     panelClass="matSelectionPanel">
34
                               <mat-option *ngIf="showOptions.linkToEntities.indexOf('project')!=-1 "
35
                                       value="project">PROJECTS</mat-option>
36
                               <mat-option *ngIf="showOptions.linkToEntities.indexOf('result')!=-1 " value="result">RESEARCH
37
                                 RESULTS</mat-option>
38
                               <mat-option *ngIf="showOptions.linkToEntities.indexOf('context')!=-1 " value="context">COMMUNITIES
39
                               </mat-option>
40
                             </mat-select>
39 41
                             <span class=" uk-width-auto  uk-text-bold "
40 42
                                   *ngIf="showOptions.linkToEntities.length ==1">
41 43
                               <span *ngIf="showOptions.linkToEntities.indexOf('project')!=-1 "
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/linking/selected/metadataPreview.component.html
113 113
                             class="uk-grid uk-margin-remove-top uk-text-small">
114 114
                          <div class="uk-width-1-2">
115 115
                            <span class="uk-text-muted">Type </span>
116
                            <select [(ngModel)]="entity.type" name="{{'select_type_'+entity.id}}"
117
                                    class="uk-select uk-width-small">
118
                              <option [value]="'publication'"
116
                            <mat-select [(ngModel)]="entity.type" name="{{'select_type_'+entity.id}}"
117
                                    class="uk-select uk-width-small matSelection"
118
                                    [disableOptionCentering]="true"
119
                                    panelClass="entitiesSelectionPanel">
120
                              <mat-option [value]="'publication'"
119 121
                                      (click)="onTypeChanged('publication',entity, false)">Publication
120
                              </option>
121
                              <option [value]="'dataset'"
122
                              </mat-option>
123
                              <mat-option [value]="'dataset'"
122 124
                                      (click)="onTypeChanged('dataset',entity, false)">Research data
123
                              </option>
124
                              <option [value]="'software'" (click)="onTypeChanged('software',entity, false)">Software
125
                              </option>
126
                              <option [value]="'other'"
125
                              </mat-option>
126
                              <mat-option [value]="'software'" (click)="onTypeChanged('software',entity, false)">Software
127
                              </mat-option>
128
                              <mat-option [value]="'other'"
127 129
                                      (click)="onTypeChanged('other',entity, false)">Other research product
128
                              </option>
129
                            </select>
130
                              </mat-option>
131
                            </mat-select>
130 132
                          </div>
131 133
                          <div class="uk-width-1-2 uk-padding-remove-left ">
132 134
                            <div class="uk-grid">
133 135
                              <span class="uk-text-muted uk-margin-small-top uk-padding-remove-left">Access mode</span>
134
                              <select [(ngModel)]="entity.result.accessRights" name="{{'select_rights_'+entity.id}}"
135
                                      class="uk-select uk-width-small uk-padding-remove-left uk-margin-left">
136
                                <option *ngFor="let type of accessTypes" [value]="type"
137
                                        (click)="accessRightsTypeChanged(type,entity, false)">{{type}}</option>
138
                              </select>
136
                              <mat-select [(ngModel)]="entity.result.accessRights" name="{{'select_rights_'+entity.id}}"
137
                                      class="uk-select uk-width-small uk-padding-remove-left uk-margin-left matSelection"
138
                                      [disableOptionCentering]="true"
139
                                      panelClass="matSelectionPanel">
140
                                <mat-option *ngFor="let type of accessTypes" [value]="type"
141
                                        (click)="accessRightsTypeChanged(type,entity, false)">{{type}}</mat-option>
142
                              </mat-select>
139 143
                              <mat-form-field *ngIf="entity.result.accessRights== 'EMBARGO'">
140 144
                                <input matInput [matDatepicker]="picker" placeholder="Choose embargo end date"
141 145
                                       (click)="picker.open()" [ngModel]="embargoEndDates[entity.id+'_source']"
......
253 257
                             class="uk-grid uk-text-small uk-margin-remove-top">
254 258
                          <div class="uk-width-1-2">
255 259
                            <span class="uk-text-muted">Type </span>
256
                            <select [(ngModel)]="entity.type" name="{{'select_type_'+entity.id}}"
257
                                    class="uk-select uk-width-small">
258
                              <option [value]="'publication'"
260
                            <mat-select [(ngModel)]="entity.type" name="{{'select_type_'+entity.id}}"
261
                                    class="uk-select uk-width-small matSelection"
262
                                    [disableOptionCentering]="true"
263
                                    panelClass="matSelectionPanel">
264
                              <mat-option [value]="'publication'"
259 265
                                      (click)="onTypeChanged('publication',entity, false)">Publication
260
                              </option>
261
                              <option [value]="'dataset'"
266
                              </mat-option>
267
                              <mat-option [value]="'dataset'"
262 268
                                      (click)="onTypeChanged('dataset',entity, false)">Research data
263
                              </option>
264
                              <option [value]="'software'" (click)="onTypeChanged('software',entity, false)">Software
265
                              </option>
266
                              <option [value]="'other'"
269
                              </mat-option>
270
                              <mat-option [value]="'software'" (click)="onTypeChanged('software',entity, false)">Software
271
                              </mat-option>
272
                              <mat-option [value]="'other'"
267 273
                                      (click)="onTypeChanged('other',entity, false)">Other research product
268
                              </option>
269
                            </select>
274
                              </mat-option>
275
                            </mat-select>
270 276
                          </div>
271 277
                          <div class="uk-width-1-2 uk-padding-remove-left ">
272 278
                            <div class="uk-grid">
273 279
                              <span class="uk-text-muted uk-margin-small-top uk-padding-remove-left">Access mode</span>
274
                              <select [(ngModel)]="entity.result.accessRights" name="{{'select_rights_'+entity.id}}"
275
                                      class="uk-select uk-width-small uk-padding-remove-left uk-margin-left">
276
                                <option *ngFor="let type of accessTypes" [value]="type"
277
                                        (click)="accessRightsTypeChanged(type,entity, true)">{{type}}</option>
278
                              </select>
280
                              <mat-select [(ngModel)]="entity.result.accessRights" name="{{'select_rights_'+entity.id}}"
281
                                      class="uk-select uk-width-small uk-padding-remove-left uk-margin-left matSelection"
282
                                      [disableOptionCentering]="true"
283
                                      panelClass="matSelectionPanel">
284
                                <mat-option *ngFor="let type of accessTypes" [value]="type"
285
                                        (click)="accessRightsTypeChanged(type,entity, true)">{{type}}</mat-option>
286
                              </mat-select>
279 287
                              <mat-form-field *ngIf="entity.result.accessRights== 'EMBARGO'">
280 288
                                <input matInput [matDatepicker]="picker" placeholder="Choose embargo end date"
281 289
                                       (click)="picker.open()" [ngModel]="embargoEndDates[entity.id+'_result']"
modules/uoa-services-library/branches/landing-redesign/ng-openaire-library/src/app/claims/linking/selected/metadataPreview.module.ts
4 4
import {AlertModalModule} from '../../../utils/modal/alertModal.module';
5 5
import {ClaimEntitiesMetadataModule} from "./ClaimEntitiesMetadata.module";
6 6
import {InsertClaimsModule} from "../insertClaim/insertClaim.module";
7
import { MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule} from '@angular/material';
7
import { MatDatepickerModule, MatNativeDateModule, MatFormFieldModule, MatInputModule, MatSelectModule} from '@angular/material';
8 8
import {HelperModule} from "../../../utils/helper/helper.module";
9 9

  
10 10
@NgModule({
......
13 13
    AlertModalModule,
14 14
    ClaimEntitiesMetadataModule,
15 15
    InsertClaimsModule,
16
    MatDatepickerModule,   MatNativeDateModule, MatFormFieldModule, MatInputModule, HelperModule
16
    MatDatepickerModule,   MatNativeDateModule, MatFormFieldModule, MatInputModule, MatSelectModule,
17
    HelperModule
17 18
  ],
18 19
  declarations: [MetadataPreviewComponent],
19 20
  exports:[MetadataPreviewComponent]

Also available in: Unified diff