← 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/GetSingleEventChoicesAction.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/GetSingleEventChoicesAction.java
27
27
 
28
28
package org.hisp.dhis.light.singleevents.action;
29
29
 
30
 
import org.hisp.dhis.light.singleevents.SingleEventsService;
31
 
 
 
30
import org.hisp.dhis.program.ProgramService;
32
31
import com.opensymphony.xwork2.Action;
33
32
 
34
33
/**
40
39
        // Dependencies
41
40
        // -------------------------------------------------------------------------
42
41
        
43
 
        private SingleEventsService singleEventsService;
44
 
        
45
 
        public void setSingleEventsService( SingleEventsService singleEventsService )
46
 
        {
47
 
                this.singleEventsService = singleEventsService;
48
 
        }
 
42
    private ProgramService programService;
 
43
 
 
44
    public void setProgramService( ProgramService programService )
 
45
    {
 
46
        this.programService = programService;
 
47
    }
49
48
        
50
49
        // -------------------------------------------------------------------------
51
50
        // Input & Output
80
79
 
81
80
        @Override
82
81
        public String execute() {
83
 
 
84
 
                eventName = singleEventsService.getEventById(singleEventId).getName();
85
 
                
 
82
                eventName = programService.getProgram(singleEventId).getName();
86
83
                return SUCCESS;
87
84
        }
88
85
}