Project

General

Profile

« Previous | Next » 

Revision 49542

Move Edit Request button for statuses : Approved, Processing Payment , ACCOUNTING_PAID

View differences:

modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/monitor/RequestInfoElement.java
637 637
        }
638 638

  
639 639
        actionButtons.add(addDOI);
640
        actionButtons.add(editRequest);
640

  
641
        if   (!request.getStatus().equals(Request.RequestStatus.ACCOUNTING_PAID) &&
642
                !request.getStatus().equals(Request.RequestStatus.APPROVED) &&
643
                !request.getStatus().equals(Request.RequestStatus.ACCOUNTING_PROCESSING))
644
            actionButtons.add(editRequest);
645

  
646

  
641 647
        requestInfoPanel.add(actionButtons);
642 648
    }
643 649

  
modules/uoa-goldoa-portal/branches/hibernate/src/main/java/eu/dnetlib/client/fundingrequest/existingrequests/ExistingRequestElement.java
183 183
        requestInfoPanel.add(eligibilityDisplayWidget.asWidget());
184 184
        requestInfoPanel.add(firstDivider);
185 185
        requestInfoPanel.add(requestSummaryPanel);
186

  
186
/*
187 187
        if(!request.getStatus().equals(Request.RequestStatus.ACCOUNTING_PAID) || (request.getRequestComments()!=null && !request.getRequestComments().isEmpty())) {
188 188

  
189 189
            requestInfoPanel.add(secondDivider);
......
200 200
            if(!request.getStatus().equals(Request.RequestStatus.ACCOUNTING_PAID)) {
201 201
                actionButtons.add(goToFundingWizard);
202 202
            }
203

  
204

  
203 205
            actionButtons.add(addDOI);
204 206
            requestInfoPanel.add(actionButtons);
207
        }*/
208

  
209

  
210
        if (request.getRequestComments()!=null && !request.getRequestComments().isEmpty()){
211
            requestInfoPanel.add(secondDivider);
212

  
213
            if(request.getRequestComments()!=null && !request.getRequestComments().isEmpty()) {
214
                List<Comment> comments = new ArrayList<>();
215
                for(Comment rc : request.getRequestComments())
216
                    comments.add(rc);
217
                CommentsInfo commentsInfo = new CommentsInfo(comments);
218
                commentsInfo.addStyleName("requestComments");
219
                requestInfoPanel.add(commentsInfo.asWidget());
220
            }
221

  
205 222
        }
223

  
224
        if   (!request.getStatus().equals(Request.RequestStatus.ACCOUNTING_PAID) &&
225
                !request.getStatus().equals(Request.RequestStatus.APPROVED) &&
226
                !request.getStatus().equals(Request.RequestStatus.ACCOUNTING_PROCESSING)){
227
            actionButtons.add(goToFundingWizard);
228
            actionButtons.add(addDOI);
229
            requestInfoPanel.add(actionButtons);
230
        }
231

  
232

  
233

  
206 234
    }
207 235

  
208 236
    @Override

Also available in: Unified diff