Project

General

Profile

« Previous | Next » 

Revision 45710

View differences:

ProjectManagerImpl.java
1 1
package eu.dnetlib.goldoa.service;
2 2
import eu.dnetlib.goldoa.domain.Project;
3
import eu.dnetlib.goldoa.domain.Request;
3 4
import eu.dnetlib.goldoa.domain.Vocabulary;
4 5
import eu.dnetlib.goldoa.service.dao.OrganizationDAO;
6
import eu.dnetlib.goldoa.service.dao.RequestDAO;
5 7
import eu.dnetlib.goldoa.service.dao.UserDAO;
6 8
import eu.dnetlib.goldoa.service.dao.ProjectDAO;
7 9
import org.springframework.beans.factory.annotation.Autowired;
......
20 22

  
21 23
    @Autowired
22 24
    private ProjectDAO projectDAO;
25
	@Autowired
26
	private RequestDAO requestDAO;
23 27

  
24 28
	private int maxRequests;
25 29

  
......
32 36
	public Project getById(String projectId) {
33 37

  
34 38
		Project project = projectDAO.getProject(projectId);
39
		List<Request> requests = requestDAO.getForProject(project.getId());
40
		int approved = 0;
41

  
42
		for (Request request : requests)
43
			switch (request.getStatus()) {
44
				case CONDITIONALLY_APPROVED:
45
				case APPROVED:
46
				case ACCOUNTING_PROCESSING:
47
				case ACCOUNTING_ON_HOLD:
48
				case ACCOUNTING_PAID:
49
					approved++;
50
					break;
51
			}
52

  
53
		project.setRemainingPublications(maxRequests - approved);
35 54
		return project;
36 55
	}
37 56

  
38
    /*private ProjectInfo getProjectInfo(Project project) {
39
        ProjectInfo projectInfo = new ProjectInfo();
40
        List<Request> requests = requestDAO.getForProject(project.getId());
41
        int approved = 0;
42

  
43
        for (Request request : requests)
44
            switch (Request.RequestStatus.forStatus(request.getStatus())) {
45
                case CONDITIONALLY_APPROVED:
46
                case APPROVED:
47
                case ACCOUNTING_PROCESSING:
48
                case ACCOUNTING_ON_HOLD:
49
                case ACCOUNTING_PAID:
50
                    approved++;
51
                    break;
52
            }
53

  
54
        projectInfo.setProject(project);
55
        projectInfo.setRemainingPublications(maxRequests - approved);
56

  
57
        return projectInfo;
58
    }*/
59

  
60 57
	@Override
61 58
	public List<Project> getEligibleProjectsForOrganization(String organizationId) {
62 59
		List<Project> projects = projectDAO.getEligibleProjectsForOrganization(organizationId);

Also available in: Unified diff