Project

General

Profile

« Previous | Next » 

Revision 51870

fixed pagination in tables

View differences:

modules/uoa-repository-dashboard-gui/trunk/app/pages/compatibility/compatibility-validation-history.component.ts
75 75
  }
76 76

  
77 77
  goToNextPage(){
78
    if(this.currentPage < this.totalPages) {
78
    if( (this.currentPage+1) < this.totalPages) {
79 79
      this.currentPage++;
80 80
      console.log(`Get me page ${this.currentPage}!`);
81 81
      this.getJobs();
modules/uoa-repository-dashboard-gui/trunk/app/pages/compatibility/compatibility-validation-history.component.html
36 36
                  <div class="filterLabel">Filter by job type:</div>
37 37
                  <div class="inlineBlock">
38 38
                    <select class="form-control" #selectType (change)="getJobType(selectType.value)">
39
                      <option value="noneSelected">--none selected--</option>
39
                      <option value="">--none selected--</option>
40 40
                      <option *ngFor="let type of jobTypes" value="{{type}}">{{type}}</option>
41 41
                    </select>
42 42
                  </div>
modules/uoa-repository-dashboard-gui/trunk/app/pages/content/content-events-of-repo-eventslist.component.ts
232 232
    }*/
233 233

  
234 234
    /* DELETE WHEN ADVANCED SHOW EVENTS IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
235
    if(this.currentPage < this.eventsPage.totalPages) {
235
    if( (this.currentPage+1) < this.eventsPage.totalPages) {
236 236
      this.currentPage = this.currentPage+1;
237 237
      console.log(`Get me page ${this.currentPage}!`);
238 238
      this.getEventsPage(this.currentPage);
modules/uoa-repository-dashboard-gui/trunk/app/pages/content/content-notifications-of-subscription.component.ts
58 58
    }*/
59 59

  
60 60
    /* DELETE WHEN getNotificationsBySubscriptionId IS FIXED AND SENDS CORRECT VALUE FOR CURRENT PAGE */
61
    if(this.currentPage < this.eventsPage.totalPages) {
61
    if( (this.currentPage+1) < this.eventsPage.totalPages) {
62 62
      this.currentPage = this.currentPage+1;
63 63
      console.log(`Get me page ${this.currentPage}!`);
64 64
      this.getEventsPage(this.currentPage);
modules/uoa-repository-dashboard-gui/trunk/app/shared/topmenu/topmenu.component.html
53 53
              </div>-->
54 54
              <div>
55 55
                <a *ngIf="!getIsUserLoggedIn()" (click)="login()">Sign up/Register</a>
56
                <a *ngIf="getIsUserLoggedIn()">{{getUserName()}}</a>
56
                <span *ngIf="getIsUserLoggedIn()">{{getUserName()}}</span>
57 57
                <ul *ngIf="getIsUserLoggedIn()" class="uk-list uk-margin-top">
58 58
                  <li>
59 59
                    <a class="uk-search-input" [routerLink]="['dashboard']" [routerLinkActive]="['uk-active']">Dashboard</a>

Also available in: Unified diff