Project

General

Profile

« Previous | Next » 

Revision 47340

Removed modal for loading in Search Pages and added an alert message (while loading all forms, inputs, buttons are disabled)

View differences:

advancedSearchPublications.component.ts
19 19
                 [(searchUtils)] = "searchUtils"
20 20
                 [(fieldIds)]="fieldIds" [(fieldIdsMap)]="fieldIdsMap"   [(selectedFields)]="selectedFields"
21 21
                 (queryChange)="queryChanged($event)"
22
                 [csvParams]="csvParams" csvPath="resources" simpleSearchLink="/search/find/publications">
22
                 [csvParams]="csvParams" csvPath="resources" simpleSearchLink="/search/find/publications"
23
                 [disableForms]="disableForms">
23 24
    </advanced-search-page>
24 25
    `
25 26
 })
......
36 37
   public selectedFields:AdvancedField[] =  [];
37 38
   public resourcesQuery = "((oaftype exact result) and (resulttypeid exact publication))";
38 39
   public csvParams: string;
40
   public disableForms: boolean = false;
39 41

  
40 42
  @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;
41 43

  
......
79 81

  
80 82
    var errorCodes:ErrorCodes = new ErrorCodes();
81 83
    this.searchUtils.status = errorCodes.LOADING;
82
    this.searchPage.openLoading();
84
    //this.searchPage.openLoading();
85
    this.disableForms = true;
86
    this.results = [];
87
    this.searchUtils.totalResults = 0;
83 88

  
84 89
    console.info("Advanced Search Publications: Execute search query "+parameters);
85 90
     this._searchPublicationsService.advancedSearchPublications(parameters, page, size).subscribe(
......
93 98
            if(this.searchUtils.totalResults == 0 ){
94 99
              this.searchUtils.status = errorCodes.NONE;
95 100
            }
96
            this.searchPage.closeLoading();
101
            //this.searchPage.closeLoading();
102
            this.disableForms = false;
97 103

  
98 104
        },
99 105
        err => {
......
105 111
            // }
106 112
            var errorCodes:ErrorCodes = new ErrorCodes();
107 113
            this.searchUtils.status = errorCodes.NOT_AVAILABLE;
108
            this.searchPage.closeLoading();
114
            //this.searchPage.closeLoading();
115
            this.disableForms = false;
109 116

  
110 117
        }
111 118
    );

Also available in: Unified diff