Project

General

Profile

« Previous | Next » 

Revision 51030

1. Properties file changes.
2. Aggregation details / aggregation object add.
3. Other changes from stef

View differences:

BrowseHistoryWidget.java
8 8
import com.google.gwt.event.dom.client.ClickHandler;
9 9
import com.google.gwt.query.client.Function;
10 10
import com.google.gwt.user.client.Event;
11
import com.google.gwt.user.client.Window;
11 12
import com.google.gwt.user.client.rpc.AsyncCallback;
12 13
import com.google.gwt.user.client.ui.FlowPanel;
13 14
import com.google.gwt.user.client.ui.HTML;
......
304 305
                updateContents(jobsOfUser.getJobs());
305 306
                drawPager(bottomPagerPanel);
306 307
//                drawBottomPager();
308

  
309
                Window.scrollTo(0, 0);
307 310
            }
308 311
        });
309 312
    }
......
678 681

  
679 682
                    contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><div class=\"el-link actions\" href=\"#\">" +
680 683
                            "<div class=\"viewDetailsLinkWrapper\"><a href=\"#" + parentToken + "/" + storedJob.getId() + "\"  id=\"" + storedJob.getId() +
681
                            "#viewDetails\" class=\"viewDetails\">View Results<i class=\"fa fa-info\"></i><i class=\"fa fa-angle-right\"></i></a></div>" +
682
                            "<div><a id=\"" + storedJob.getId() + "#resubmit\" class=\"uk-button uk-button-primary resubmitJob\"><i></i>Resubmit</a></div>" +
684
                            "#viewDetails\" class=\"viewDetails\">View Results<i class=\"fa fa-angle-right\"></i></a></div>" +
685
                            "<div><a id=\"" + storedJob.getId() + "#resubmit\" class=\"resubmitJob\">Resubmit<i class=\"fa fa-repeat\" aria-hidden=\"true\"></i>" +
686
                            "</a></div>" +
683 687
                            "</div></td>";
684 688

  
685 689
                    if(storedJob.getValidationStatus().equals(Constants.VALIDATION_JOB_STATUS_SUCCESSFUL))
686 690
                        contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
687
                                "title=\"Successfull\" src=\"icon_colours-check.jpg\"></td>";
691
                                "title=\"Successfull\" src=\"img/icon_colours-check.jpg\"></td>";
688 692
                    else if(storedJob.getValidationStatus().equals(Constants.VALIDATION_JOB_STATUS_FAILED))
689 693
                        contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
690
                                "title=\"Successfull\" src=\"icon_colours-x.jpg\"></td>";
694
                                "title=\"Successfull\" src=\"img/icon_colours-x.jpg\"></td>";
695
                    else if(storedJob.getValidationStatus().equals(Constants.VALIDATION_JOB_STATUS_ONGOING))
696
                        contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
697
                                "title=\"Ongoing\" src=\"img/icon_colours-question.jpg\"></td>";
691 698
//                    else
692 699
//                        contents += "<td rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
693 700
//                                "title=\"Successfull\" src=\"img/check-icon.png\"></td>";

Also available in: Unified diff