Project

General

Profile

« Previous | Next » 

Revision 39788

Added by Stefania Martziou over 8 years ago

Fixed the status dropdown for the lists of requests to account for the new status

View differences:

AccountingMonitorFundingRequestsWidget.java
85 85 

  		




  86
  86
  
    
        List<Vocabulary> statusOptions = new ArrayList<>();


  		




  87
  87
  
    
        statusOptions.add(new Vocabulary(Request.RequestStatus.APPROVED.name(), Request.RequestStatus.APPROVED.getValue()));


  		




  
  88
  
    
        statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PROCESSING.name(), Request.RequestStatus.ACCOUNTING_PROCESSING.getValue()));


  		




  88
  89
  
    
        statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_PAID.name(), Request.RequestStatus.ACCOUNTING_PAID.getValue()));


  		




  89
  90
  
    
        statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_ON_HOLD.name(), Request.RequestStatus.ACCOUNTING_ON_HOLD.getValue()));


  		




  90
  91
  
    
        statusOptions.add(new Vocabulary(Request.RequestStatus.ACCOUNTING_DENIED.name(), Request.RequestStatus.ACCOUNTING_DENIED.getValue()));


  		




  ......




  201
  202
  
    
        sortByTypes.setSelectedValue(RequestSort.DATE.name());


  		




  202
  203
  
    
        timer = null;


  		




  203
  204
  
    

  		




  204
  
  
    
        loadRequests(null, null, RequestSort.DATE, RequestSortOrder.ASCENDING, null, null, new Request.RequestStatus[] {Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, 0, 9);


  		




  
  205
  
    
        loadRequests(null, null, RequestSort.DATE, RequestSortOrder.ASCENDING, null, null, new Request.RequestStatus[] {Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PROCESSING, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, 0, 9);


  		




  205
  206
  
    
    }


  		




  206
  207
  
    

  		




  207
  208
  
    
    @Override


  		




  ......




  377
  378
  
    
                    List<String> selectedStatuses = dropdownCheckbox.getSelectedStatuses();


  		




  378
  379
  
    

  		




  379
  380
  
    
                    if(selectedStatuses.isEmpty()) {


  		




  380
  
  
    
                        loadRequests(null, null, requestSort, requestSortOrder, null, term, new Request.RequestStatus[] {Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, 0, 9);


  		




  
  381
  
    
                        loadRequests(null, null, requestSort, requestSortOrder, null, term, new Request.RequestStatus[] {Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PROCESSING, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, 0, 9);


  		




  381
  382
  
    
                    } else {


  		




  382
  383
  
    
                        Request.RequestStatus[] statuses = new Request.RequestStatus[selectedStatuses.size()];


  		




  383
  384
  
    
                        for(int i=0; i<selectedStatuses.size(); i++) {


  		




  ......




  700
  701
  
    
            List<String> selectedStatuses = dropdownCheckbox.getSelectedStatuses();


  		




  701
  702
  
    

  		




  702
  703
  
    
            if (selectedStatuses.isEmpty()) {


  		




  703
  
  
    
                loadRequests(null, null, requestSort, requestSortOrder, null, term, new Request.RequestStatus[]{Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, from, to);


  		




  
  704
  
    
                loadRequests(null, null, requestSort, requestSortOrder, null, term, new Request.RequestStatus[]{Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PROCESSING, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, from, to);


  		




  704
  705
  
    
            } else {


  		




  705
  706
  
    
                Request.RequestStatus[] statuses = new Request.RequestStatus[selectedStatuses.size()];


  		




  706
  707
  
    
                for (int i = 0; i < selectedStatuses.size(); i++) {


  		




  ......




  729
  730
  
    
            List<String> selectedStatuses = dropdownCheckbox.getSelectedStatuses();


  		




  730
  731
  
    

  		




  731
  732
  
    
            if (selectedStatuses.isEmpty()) {


  		




  732
  
  
    
                loadRequests(null, null, requestSort, requestSortOrder, null, term, new Request.RequestStatus[]{Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, from, to);


  		




  
  733
  
    
                loadRequests(null, null, requestSort, requestSortOrder, null, term, new Request.RequestStatus[]{Request.RequestStatus.APPROVED, Request.RequestStatus.ACCOUNTING_PROCESSING, Request.RequestStatus.ACCOUNTING_PAID, Request.RequestStatus.ACCOUNTING_ON_HOLD, Request.RequestStatus.ACCOUNTING_DENIED}, from, to);


  		




  733
  734
  
    
            } else {


  		




  734
  735
  
    
                Request.RequestStatus[] statuses = new Request.RequestStatus[selectedStatuses.size()];


  		




  735
  736
  
    
                for (int i = 0; i < selectedStatuses.size(); i++) {


  		












Also available in:  Unified diff