← Back to branch summary

~registry/dhis2-academy/SingleEvents

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevents/action/GetSingleEventsAction.java

  • Committer: Sigfred Sørensen
  • Date: 2011-10-30 21:07:19 UTC
  • Revision ID: sigfreds@ifi.uio.no-20111030210719-79n34gy9dkjozv31
Added programs Death and Birth to populateSingleEvents class.
Implemented programService in GetSingleEventsAction and GetSingleEventChoicesAction.
Removed now redundat classes SingleEvent.java and SingleEventsService.java.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevents/action/GetSingleEventsAction.java
27
27
 
28
28
package org.hisp.dhis.light.singleevents.action;
29
29
 
30
 
import java.util.ArrayList;
31
 
import java.util.List;
32
 
 
33
 
import org.hisp.dhis.light.singleevents.SingleEventsService;
34
 
import org.hisp.dhis.singleevents.SingleEvent;
35
 
 
 
30
import java.util.Collection;
 
31
import java.util.HashSet;
 
32
import org.hisp.dhis.program.Program;
 
33
import org.hisp.dhis.program.ProgramService;
36
34
import com.opensymphony.xwork2.Action;
37
35
 
38
36
/**
44
42
        // Dependencies
45
43
        // -------------------------------------------------------------------------
46
44
 
47
 
        private SingleEventsService singleEventsService;
48
 
        
49
 
        public void setSingleEventsService( SingleEventsService singleEventsService )
50
 
        {
51
 
                this.singleEventsService = singleEventsService;
52
 
        }
 
45
    private ProgramService programService;
 
46
 
 
47
    public void setProgramService( ProgramService programService )
 
48
    {
 
49
        this.programService = programService;
 
50
    }
53
51
        
54
52
        // -------------------------------------------------------------------------
55
53
        // Input & Output
66
64
        return this.organisationUnitId;
67
65
    }
68
66
 
69
 
        private List<SingleEvent> singleEvents = new ArrayList<SingleEvent>();
 
67
        private Collection<Program> singleEvents = new HashSet<Program>();
70
68
        
71
 
        public List<SingleEvent> getSingleEvents() {
 
69
        public Collection<Program> getSingleEvents() {
72
70
                return singleEvents;
73
71
        }
74
72
        
78
76
 
79
77
        @Override
80
78
        public String execute() {
81
 
        
82
 
                singleEvents = (List<SingleEvent>) singleEventsService.getAllSingleEvents();
83
 
 
 
79
                boolean singleEvent = true;
 
80
                singleEvents = programService.getPrograms(singleEvent);
84
81
                return SUCCESS;
85
82
        }
86
83
}