dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10091
committer: Long <Long@Long-Laptop>
branch nick: dhis2
timestamp: Sat 2013-03-09 09:24:46 +0700
message:
  fix compilation error
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserType.java
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java
  dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.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/sms/parse/ParserType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserType.java	2012-08-30 12:47:05 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserType.java	2013-03-09 02:24:46 +0000
@@ -2,5 +2,6 @@
 
 public enum ParserType
 {
-    KEY_VALUE_PARSER
+    KEY_VALUE_PARSER,
+    J2ME_PARSER;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java	2013-03-08 16:34:59 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java	2013-03-09 02:24:46 +0000
@@ -50,7 +50,7 @@
         orgUnits.setClientVersion( DataStreamSerializable.TWO_POINT_EIGHT );
         return orgUnits;
     }
-    
+
     @RequestMapping( method = RequestMethod.GET, value = "/{version}" )
     @ResponseBody
     public OrgUnits getOrgUnitsForUser( HttpServletRequest request, @PathVariable String version )
@@ -74,7 +74,7 @@
         orgUnits.setClientVersion( version );
         return orgUnits;
     }
-    
+
     @RequestMapping( method = RequestMethod.GET, value = "/{version}/" )
     @ResponseBody
     public OrgUnits getOrgUnitsForUserLWUIT( HttpServletRequest request, @PathVariable String version )
@@ -115,7 +115,7 @@
         orgUnit.setSearchUrl( getUrl( request, unit.getId(), "search" ) );
         orgUnit.setUpdateContactUrl( getUrl( request, unit.getId(), "updateContactForMobile" ) );
         orgUnit.setFindPatientUrl( getUrl( request, unit.getId(), "findPatient" ) );
-        //orgUnit.setRegisterPerson(getUrl(request, unit.getId(), "registerPerson")); TODO
+        orgUnit.setRegisterPersonUrl( getUrl( request, unit.getId(), "registerPerson" ) );
         orgUnit.setUploadProgramStageUrl( getUrl( request, unit.getId(), "uploadProgramStage" ) );
         orgUnit.setEnrollProgramUrl( getUrl( request, unit.getId(), "enrollProgram" ) );
 
@@ -124,14 +124,14 @@
         String root = full.substring( 0, full.length() - UrlUtils.buildRequestUrl( request ).length() );
         String updateNewVersionUrl = root + "/dhis-web-api-mobile/updateClient.action";
         orgUnit.setUpdateNewVersionUrl( updateNewVersionUrl );
-        
+
         return orgUnit;
     }
 
     private static String getUrl( HttpServletRequest request, int id, String path )
     {
         String url = UrlUtils.buildFullRequestUrl( request );
-        if( url.endsWith( "/" ))
+        if ( url.endsWith( "/" ) )
         {
             url = url + "orgUnits/" + id + "/" + path;
         }

=== modified file 'dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2013-03-08 09:38:34 +0000
+++ dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java	2013-03-09 02:24:46 +0000
@@ -353,7 +353,7 @@
 	@ResponseBody
 	public Patient findPatientByName(@PathVariable int id,
 			@RequestHeader("name") String fullName) throws NotAllowedException {
-		return activityReportingService.findPatient(fullName);
+		return activityReportingService.findPatient(fullName, id);
 	}
 
 	@RequestMapping( method = RequestMethod.POST, value = "{clientVersion}/orgUnits/{id}/uploadProgramStage" )