dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12132
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-09-18 16:17:43 +0700
message:
  Rename method enrollmentPatient to enrollPatient
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java	2013-09-18 06:54:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java	2013-09-18 09:17:43 +0000
@@ -110,7 +110,7 @@
     Collection<MessageConversation> sendMessageConversations( ProgramInstance programInstance,
         int sendWhenToC0mpletedEvent, I18nFormat format );
 
-    ProgramInstance enrollmentPatient( Patient patient, Program program, Date enrollmentDate, Date dateOfIncident,
+    ProgramInstance enrollPatient( Patient patient, Program program, Date enrollmentDate, Date dateOfIncident,
         OrganisationUnit orgunit, I18nFormat format );
 
     boolean canAutoCompleteProgramInstanceStatus( ProgramInstance programInstance );

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-09-18 06:54:48 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-09-18 09:17:43 +0000
@@ -606,7 +606,7 @@
     }
 
     @Override
-    public ProgramInstance enrollmentPatient( Patient patient, Program program, Date enrollmentDate,
+    public ProgramInstance enrollPatient( Patient patient, Program program, Date enrollmentDate,
         Date dateOfIncident, OrganisationUnit orgunit, I18nFormat format )
     {
         if ( enrollmentDate == null )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java	2013-09-18 06:54:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java	2013-09-18 09:17:43 +0000
@@ -180,7 +180,7 @@
 
         if ( programInstance == null )
         {
-            programInstance = programInstanceService.enrollmentPatient( patient, program, enrollment, incident,
+            programInstance = programInstanceService.enrollPatient( patient, program, enrollment, incident,
                 orgunit, format );
         }