Project

General

Profile

« Previous | Next » 

Revision 47340

Added by Konstantina Galouni about 7 years ago

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

View differences:

advancedSearchOrganizations.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/organizations">
22 
                 [csvParams]="csvParams" csvPath="resources" simpleSearchLink="/search/find/organizations"
23 
                 [disableForms]="disableForms">
23 24 
    </advanced-search-page>
24 25 

  		




  25
  26
  
    
    `


  		




  ......




  35
  36
  
    
  public fieldIdsMap  = this.searchFields.ORGANIZATION_FIELDS;


  		




  36
  37
  
    
  public selectedFields:AdvancedField[] =  [];


  		




  37
  38
  
    
  public csvParams: string;


  		




  
  39
  
    
  public disableForms: boolean = false;


  		




  38
  40
  
    

  		




  39
  41
  
    
  @ViewChild (AdvancedSearchPageComponent) searchPage : AdvancedSearchPageComponent ;


  		




  40
  42
  
    

  		




  ......




  78
  80
  
    

  		




  79
  81
  
    
    var errorCodes:ErrorCodes = new ErrorCodes();


  		




  80
  82
  
    
    this.searchUtils.status = errorCodes.LOADING;


  		




  81
  
  
    
    this.searchPage.openLoading();


  		




  
  83
  
    
    //this.searchPage.openLoading();


  		




  
  84
  
    
    this.disableForms = true;


  		




  
  85
  
    
    this.results = [];


  		




  
  86
  
    
    this.searchUtils.totalResults = 0;


  		




  82
  87
  
    

  		




  83
  88
  
    
    console.info("Advanced Search Organizations: Execute search query "+parameters);


  		




  84
  89
  
    
     this._searchOrganizationsService.advancedSearchOrganizations(parameters, page, size).subscribe(


  		




  ......




  92
  97
  
    
            if(this.searchUtils.totalResults == 0 ){


  		




  93
  98
  
    
              this.searchUtils.status = errorCodes.NONE;


  		




  94
  99
  
    
            }


  		




  95
  
  
    
            this.searchPage.closeLoading();


  		




  
  100
  
    
            //this.searchPage.closeLoading();


  		




  
  101
  
    
            this.disableForms = false;


  		




  96
  102
  
    

  		




  97
  103
  
    
        },


  		




  98
  104
  
    
        err => {


  		




  ......




  104
  110
  
    
            // }


  		




  105
  111
  
    
            var errorCodes:ErrorCodes = new ErrorCodes();


  		




  106
  112
  
    
            this.searchUtils.status = errorCodes.NOT_AVAILABLE;


  		




  107
  
  
    
            this.searchPage.closeLoading();


  		




  108
  
  
    

  		




  
  113
  
    
            //this.searchPage.closeLoading();


  		




  
  114
  
    
            this.disableForms = false;


  		




  109
  115
  
    
        }


  		




  110
  116
  
    
    );


  		




  111
  117
  
    
  }


  		












Also available in:  Unified diff