Project

General

Profile

« Previous | Next » 

Revision 60278

[Library | Trunk]: Paging bold numbers

View differences:

modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/searchPageTableView.component.html
43 43
      <div class="uk-panel uk-margin-small-top uk-grid  uk-flex uk-flex-middle">
44 44
        <div class="uk-width-1-1@s uk-width-1-2@m  uk-text-uppercase"
45 45
             *ngIf="results && searchUtils.totalResults > 0">
46
          {{searchUtils.totalResults|number}}
46
          <span class="uk-text-bold">{{searchUtils.totalResults|number}}</span>
47 47
          <span class="uk-text-muted uk-text-uppercase"> {{type}}, page </span>
48
          {{searchUtils.page | number}}
48
          <span class="uk-text-bold">{{searchUtils.page | number}}</span>
49 49
          <span class="uk-text-muted uk-text-uppercase"> of </span>
50
          {{(totalPages()|number)}}
50
          <span class="uk-text-bold">{{(totalPages()|number)}}</span>
51 51
        </div>
52 52
        <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand" *ngIf=" searchUtils.status != errorCodes.LOADING">
53 53
          <paging-no-load [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [size]="searchUtils.size" (pageChange)="goTo($event.value)"></paging-no-load>
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/searchPaging.component.ts
2 2
import {ErrorCodes} from '../../utils/properties/errorCodes';
3 3

  
4 4
@Component({
5
    selector: 'search-paging',
6
    template: `
7
    <div class= "paging-hr searchPaging uk-margin-small-bottom"
5
  selector: 'search-paging',
6
  template: `
7
    <div class="paging-hr searchPaging uk-margin-small-bottom"
8 8
         *ngIf="(results && searchUtils.totalResults > 0) || (!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING)">
9 9
      <div class="uk-panel uk-margin-small-top uk-grid  uk-flex uk-flex-middle">
10
        <div class="uk-width-1-1@s uk-width-1-2@m  uk-text-uppercase" 
10
        <div class="uk-width-1-1@s uk-width-1-2@m  uk-text-uppercase"
11 11
             *ngIf="results && searchUtils.totalResults > 0">
12
          {{searchUtils.totalResults|number}}
12
          <span class="uk-text-bold">{{searchUtils.totalResults|number}}</span>
13 13
          <span class="uk-text-muted uk-text-uppercase"> {{type}}, page </span>
14
          {{searchUtils.page | number}}
14
          <span class="uk-text-bold">{{searchUtils.page | number}}</span>
15 15
          <span class="uk-text-muted uk-text-uppercase"> of </span>
16
          {{(totalPages(searchUtils.totalResults)|number)}}
16
          <span class="uk-text-bold">{{(totalPages(searchUtils.totalResults)|number)}}</span>
17 17
        </div>
18
        <div class="uk-width-1-1@s uk-width-1-2@m" 
18
        <div class="uk-width-1-1@s uk-width-1-2@m"
19 19
             *ngIf="!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING">
20
          {{oldTotalResults|number}}
20
          <span class="uk-text-bold">{{oldTotalResults|number}}</span>
21 21
          <span class="uk-text-muted uk-text-uppercase"> {{type}}, page </span>
22
          {{searchUtils.page | number}}
22
          <span class="uk-text-bold">{{searchUtils.page | number}}</span>
23 23
          <span class="uk-text-muted uk-text-uppercase"> of </span>
24
          {{(totalPages(oldTotalResults)|number)}}
24
          <span class="uk-text-bold">{{(totalPages(oldTotalResults)|number)}}</span>
25 25
        </div>
26 26
        <!--div class="uk-width-1-1@s uk-width-1-2@m" *ngIf="results && searchUtils.totalResults > 0">
27 27
          {{searchUtils.totalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(searchUtils.totalResults)|number)}}
......
29 29
        <div class="uk-width-1-1@s uk-width-1-2@m" *ngIf="!loadPaging && oldTotalResults > 0 && searchUtils.status == errorCodes.LOADING">
30 30
          {{oldTotalResults|number}} {{type}}, page {{searchUtils.page | number}} of {{(totalPages(oldTotalResults)|number)}}
31 31
        </div-->
32
        <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand" *ngIf="results && searchUtils.totalResults > searchUtils.size">
33
          <paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults"  [baseUrl]="baseUrl" 
34
                  [size]="searchUtils.size"  [parameterNames] = "parameterNames" [parameterValues] = "parameterValues"
35
                  [isDisabled]="isDisabled"> 
32
        <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand"
33
             *ngIf="results && searchUtils.totalResults > searchUtils.size">
34
          <paging [currentPage]="searchUtils.page" [totalResults]="searchUtils.totalResults" [baseUrl]="baseUrl"
35
                  [size]="searchUtils.size" [parameterNames]="parameterNames" [parameterValues]="parameterValues"
36
                  [isDisabled]="isDisabled">
36 37
          </paging>
37 38
        </div>
38
        <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand" *ngIf="!loadPaging && oldTotalResults > searchUtils.size && searchUtils.status == errorCodes.LOADING">
39
          <paging [currentPage]="searchUtils.page" [totalResults]="oldTotalResults"  [baseUrl]="baseUrl" 
40
                  [size]="searchUtils.size"  [parameterNames] = "parameterNames" [parameterValues] = "parameterValues"
41
                  [isDisabled]="isDisabled"> 
39
        <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand"
40
             *ngIf="!loadPaging && oldTotalResults > searchUtils.size && searchUtils.status == errorCodes.LOADING">
41
          <paging [currentPage]="searchUtils.page" [totalResults]="oldTotalResults" [baseUrl]="baseUrl"
42
                  [size]="searchUtils.size" [parameterNames]="parameterNames" [parameterValues]="parameterValues"
43
                  [isDisabled]="isDisabled">
42 44
          </paging>
43 45
        </div>
44 46
      </div>
45 47
    </div>
46
    `
48
  `
47 49
})
48 50

  
49 51
export class SearchPagingComponent {
50
    @Input() isDisabled: boolean = false;
51
    @Input() searchUtils;
52
    @Input() results;
53
    @Input() baseUrl;
54
    @Input() type;
55
    @Input() parameterNames:string[];
56
    @Input() parameterValues:string[];
57

  
58
    @Input() loadPaging: boolean = true;
59
    @Input() oldTotalResults: number = 0;
60

  
61
    public totalResults: number = 0;
62
    public errorCodes:ErrorCodes = new ErrorCodes();
63

  
64
    // @Input() totalResults:number = 0;
65
    constructor () {}
66

  
67
    ngOnInit() {
68
      // this.totalResults = this.searchUtils.totalResults;
69
      // if(!this.loadPaging && this.totalResults == 0) {
70
      //   this.totalResults = this.oldTotalResults;
71
      // }
52
  @Input() isDisabled: boolean = false;
53
  @Input() searchUtils;
54
  @Input() results;
55
  @Input() baseUrl;
56
  @Input() type;
57
  @Input() parameterNames: string[];
58
  @Input() parameterValues: string[];
59
  
60
  @Input() loadPaging: boolean = true;
61
  @Input() oldTotalResults: number = 0;
62
  
63
  public totalResults: number = 0;
64
  public errorCodes: ErrorCodes = new ErrorCodes();
65
  
66
  // @Input() totalResults:number = 0;
67
  constructor() {
68
  }
69
  
70
  ngOnInit() {
71
    // this.totalResults = this.searchUtils.totalResults;
72
    // if(!this.loadPaging && this.totalResults == 0) {
73
    //   this.totalResults = this.oldTotalResults;
74
    // }
75
  }
76
  
77
  totalPages(totalResults: number): number {
78
    let totalPages: any = totalResults / (this.searchUtils.size);
79
    if (!(Number.isInteger(totalPages))) {
80
      totalPages = (parseInt(totalPages, 10) + 1);
72 81
    }
73

  
74
    totalPages(totalResults: number): number {
75
        let totalPages:any = totalResults/(this.searchUtils.size);
76
        if(!(Number.isInteger(totalPages))) {
77
            totalPages = (parseInt(totalPages, 10) + 1);
78
        }
79
        return totalPages;
80
    }
81

  
82

  
82
    return totalPages;
83
  }
84
  
85
  
83 86
}
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/no-load-paging.component.ts
5 5
    template: `
6 6
        <div class="paging-hr searchPaging uk-margin-small-bottom">
7 7
            <div class="uk-panel uk-margin-small-top uk-grid  uk-flex uk-flex-middle">
8
                <div class="uk-width-1-1@s uk-width-1-2@m  uk-text-uppercase" *ngIf="type && totalResults">
9
                    {{totalResults | number}}
8
                <div class="uk-width-1-1@s uk-width-1-2@m uk-text-uppercase" *ngIf="type && totalResults">
9
                    <span class="uk-text-bold">{{totalResults | number}}</span>
10 10
                    <span class="uk-text-muted uk-text-uppercase"> {{type}}, page </span>
11
                    {{page}}
11
                    <span class="uk-text-bold">{{page}}</span>
12 12
                    <span class="uk-text-muted uk-text-uppercase"> of </span>
13
                    {{paging.getTotalPages()}}
13
                    <span class="uk-text-bold">{{paging.getTotalPages()}}</span>
14 14
                </div>
15 15
                <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand">
16 16
                    <paging-no-load  #paging [currentPage]="page"
modules/uoa-services-library/trunk/ng-openaire-library/src/app/claims/claim-utils/claimProjectSearchForm.component.html
174 174
          <div class="uk-panel uk-margin-small-top uk-grid  uk-flex uk-flex-middle">
175 175
            <div class="uk-width-1-1@s uk-width-1-2@m  uk-text-uppercase"
176 176
                 *ngIf="openaireResultsNum > 0">
177
              {{openaireResultsNum|number}}
177
              <span class="uk-text-bold">{{openaireResultsNum|number}}</span>
178 178
              <span class="uk-text-muted uk-text-uppercase"> projects, page </span>
179
              {{openaireResultsPage | number}}
179
              <span class="uk-text-bold">{{openaireResultsPage | number}}</span>
180 180
              <span class="uk-text-muted uk-text-uppercase"> of </span>
181
              {{(totalPages(openaireResultsNum)|number)}}
181
              <span class="uk-text-bold">{{(totalPages(openaireResultsNum)|number)}}</span>
182 182
            </div>
183 183
            <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand uk-padding-remove-left">
184 184
              <paging-no-load class="uk-float-right" [currentPage]="openaireResultsPage"
modules/uoa-services-library/trunk/ng-openaire-library/src/app/claims/claim-utils/claimResultSearchForm.component.html
198 198
              <div class="uk-panel uk-margin-small-top uk-grid  uk-flex uk-flex-middle">
199 199
                <div class="uk-width-1-1@s uk-width-1-2@m  uk-text-uppercase"
200 200
                     *ngIf="openaireResultsNum > 0">
201
                  {{openaireResultsNum|number}}
201
                  <span class="uk-text-bold">{{openaireResultsNum|number}}</span>
202 202
                  <span class="uk-text-muted uk-text-uppercase"> research outcomes, page </span>
203
                  {{openaireResultsPage | number}}
203
                  <span class="uk-text-bold">{{openaireResultsPage | number}}</span>
204 204
                  <span class="uk-text-muted uk-text-uppercase"> of </span>
205
                  {{(countTotalPages(openaireResultsNum)|number)}}
205
                  <span class="uk-text-bold">{{(countTotalPages(openaireResultsNum)|number)}}</span>
206 206
                </div>
207 207
                <div class="float-children-right-at-medium margin-small-top-at-small uk-width-expand uk-padding-remove-left" *ngIf=" openaireResultsStatus != errorCodes.LOADING">
208 208
                  <paging-no-load class="uk-float-right" [currentPage]="openaireResultsPage"

Also available in: Unified diff