/ - Diff - D-Net - D-Net project tracking tool

     import eu.dnetlib.shared.EligiblePresentAndFutureProjects;
     import eu.dnetlib.shared.FundingWizardState;
     import eu.dnetlib.shared.InitLoad;
     import eu.dnetlib.shared.ProjectInfoAndEligibility;
     import net.tanesha.recaptcha.ReCaptchaImpl;
     import net.tanesha.recaptcha.ReCaptchaResponse;
     import org.springframework.context.ApplicationContext;
-...
+        }
         @Override
         public RequestInfo getProjectInfoAndEligibility(String projectId) {
         public ProjectInfoAndEligibility getProjectInfoAndEligibility(String projectId) {
             RequestInfo requestInfo = new RequestInfo();
             requestInfo.setProject(projectManager.getById(projectId));
             ProjectInfoAndEligibility projectInfoAndEligibility = new ProjectInfoAndEligibility();
             projectInfoAndEligibility.setProjectInfo(projectManager.getById(projectId));
             Request request = new Request();
             request.setProject(projectId);
             requestInfo.setEligibility(eligibilityManager.validate(request));
             projectInfoAndEligibility.setEligibility(eligibilityManager.validate(request));
             return requestInfo;
             return projectInfoAndEligibility;
+        }
         @Override

     package eu.dnetlib.shared;
     import com.google.gwt.user.client.rpc.IsSerializable;
     import eu.dnetlib.goldoa.domain.Eligibility;
     import eu.dnetlib.goldoa.domain.ProjectInfo;
     /**
      * Created by stefania on 4/29/15.
      */
     public class ProjectInfoAndEligibility implements IsSerializable {
         private ProjectInfo projectInfo;
         private Eligibility eligibility;
         public ProjectInfoAndEligibility() {
+        }
         public ProjectInfoAndEligibility(ProjectInfo projectInfo, Eligibility eligibility) {
             this.projectInfo = projectInfo;
             this.eligibility = eligibility;
+        }
         public ProjectInfo getProjectInfo() {
             return projectInfo;
+        }
         public void setProjectInfo(ProjectInfo projectInfo) {
             this.projectInfo = projectInfo;
+        }
         public Eligibility getEligibility() {
             return eligibility;
+        }
         public void setEligibility(Eligibility eligibility) {
             this.eligibility = eligibility;
+        }
+    }

     import eu.dnetlib.client.widgets.FormFieldSet;
     import eu.dnetlib.goldoa.domain.*;
     import eu.dnetlib.shared.FundingWizardState;
     import eu.dnetlib.shared.ProjectInfoAndEligibility;
     /**
      * Created by stefania on 2/25/15.
-...
             projectDisplayInfoPanel.addStyleName("loading");
             projectDisplayInfoPanel.add(loadingWheel);
             dataService.getProjectInfoAndEligibility(projectId, new AsyncCallback<RequestInfo>() {
             dataService.getProjectInfoAndEligibility(projectId, new AsyncCallback<ProjectInfoAndEligibility>() {
                 @Override
                 public void onFailure(Throwable throwable) {
-...
                     projectInfoMessage.setVisible(false);
                     projectInfoPanel.clear();
                     ProjectDisplayInfo projectDisplayInfo = new ProjectDisplayInfo(null);
                     ProjectDisplayInfo projectDisplayInfo = new ProjectDisplayInfo(null, false);
                     projectInfoPanel.add(projectDisplayInfo.asWidget());
                     projectEligibilityPanel.clear();
-...
+                }
                 @Override
                 public void onSuccess(RequestInfo requestInfo) {
                 public void onSuccess(ProjectInfoAndEligibility projectInfoAndEligibility) {
                     projectDisplayInfoPanel.removeStyleName("loading");
                     projectDisplayInfoPanel.remove(loadingWheel);
                     projectInfoMessage.setVisible(false);
                     project = requestInfo.getProject();
                     eligibility = projectInfoAndEligibility.getEligibility();
                     projectEligibilityPanel.clear();
                     EligibilityDisplayWidget eligibilityDisplayWidget = new EligibilityDisplayWidget(projectInfoAndEligibility.getEligibility());
                     projectEligibilityPanel.add(eligibilityDisplayWidget.asWidget());
                     boolean isEligible = false;
                     if(eligibility.getStatus().equals(Eligibility.Status.OK) || eligibility.getStatus().equals(Eligibility.Status.IFFY))
                         isEligible = true;
                     project = projectInfoAndEligibility.getProjectInfo().getProject();
                     projectInfoPanel.clear();
                     ProjectDisplayInfo projectDisplayInfo = new ProjectDisplayInfo(requestInfo.getProject());
                     ProjectDisplayInfo projectDisplayInfo = new ProjectDisplayInfo(projectInfoAndEligibility.getProjectInfo(), isEligible);
                     projectInfoPanel.add(projectDisplayInfo.asWidget());
                     eligibility = requestInfo.getEligibility();
                     projectEligibilityPanel.clear();
                     EligibilityDisplayWidget eligibilityDisplayWidget = new EligibilityDisplayWidget(requestInfo.getEligibility());
                     projectEligibilityPanel.add(eligibilityDisplayWidget.asWidget());
                     if(!requestInfo.getEligibility().getStatus().equals(Eligibility.Status.NONO))
                     if(!projectInfoAndEligibility.getEligibility().getStatus().equals(Eligibility.Status.NONO))
                         projectInfoMessage.setVisible(true);
+                }
             });

     import com.google.gwt.user.client.ui.IsWidget;
     import com.google.gwt.user.client.ui.Widget;
     import eu.dnetlib.goldoa.domain.Project;
     import eu.dnetlib.goldoa.domain.ProjectInfo;
     /**
      * Created by stefania on 3/9/15.
-...
         private DateTimeFormat dtf = DateTimeFormat.getFormat("yyyy/MM/dd");
         public ProjectDisplayInfo(Project project) {
         public ProjectDisplayInfo(ProjectInfo projectInfo, boolean isEligible) {
             if(project==null) {
             if(projectInfo==null || projectInfo.getProject()==null) {
                 errorLabel.setText("System error while retrieving project information");
                 errorLabel.addStyleName("alertLabel");
-...
             } else {
                 Project project = projectInfo.getProject();
                 contents = "<div class=\"displayInfoElement\">";
                 contents += "<div class=\"displayInfoElementTitle\">" + project.getAcronym() + "</div>";
                 contents += "<div class=\"displayInfoElementTitle\">" + project.getAcronym();
                 if(isEligible) {
                     contents += "<span class=\"remainingPublications\">" + projectInfo.getRemainingPublications() + "</span>";
+                }
                 contents += "</div>";
                 if (project.getTitle() != null)
                     contents += "<dl class=\"dl-horizontal\"><dt>TITLE</dt><dd>" + project.getTitle() + "</dd></dl>";

     import eu.dnetlib.shared.EligiblePresentAndFutureProjects;
     import eu.dnetlib.shared.FundingWizardState;
     import eu.dnetlib.shared.InitLoad;
     import eu.dnetlib.shared.ProjectInfoAndEligibility;
     import javax.mail.MessagingException;
     import java.util.Date;
-...
         public Request submitRequest(Request request) throws PersonManagerException;
         public RequestInfo getProjectInfoAndEligibility(String projectId);
         public ProjectInfoAndEligibility getProjectInfoAndEligibility(String projectId);
         public Publication savePublication(Publication publication);

         padding-left: 57px;
+    }
     .remainingPublications {
         border: 1px solid purple;
         color: purple;
         float: right;
         font-size: 18px;
         margin-right: 10px;
         padding: 2px 5px 1px;
+    }
     /*.eligibilityInfo {
         border-radius: 4px;
         width: 91%;

Project

General

Profile

D-Net

Revision 36811

Added by Stefania Martziou about 9 years ago