dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11238
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-06-20 11:38:07 +0700
message:
  Error to load custom registration form with identifier-types.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties


--
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/patient/PatientIdentifierTypeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java	2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java	2013-06-20 04:38:07 +0000
@@ -48,6 +48,8 @@
     
     PatientIdentifierType getPatientIdentifierType( String name );
     
+    PatientIdentifierType  getPatientIdentifierTypeByUid ( String uid );
+    
     Collection<PatientIdentifierType> getPatientIdentifierTypes( boolean mandatory );
     
     Collection<PatientIdentifierType> getDisplayedPatientIdentifierTypes( boolean personDisplayName );

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java	2013-02-13 15:58:32 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java	2013-06-20 04:38:07 +0000
@@ -93,6 +93,11 @@
         return i18n( i18nService, patientIdentifierTypeStore.getByName( name ) );
     }
 
+    public PatientIdentifierType getPatientIdentifierTypeByUid( String uid )
+    {
+        return i18n( i18nService, patientIdentifierTypeStore.getByUid( uid ) );
+    }
+
     public Collection<PatientIdentifierType> getPatientIdentifierTypes( boolean mandatory )
     {
         return i18n( i18nService, patientIdentifierTypeStore.get( mandatory ) );

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java	2013-05-21 07:15:26 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java	2013-06-20 04:38:07 +0000
@@ -193,7 +193,7 @@
             else if ( identifierMatcher.find() && identifierMatcher.groupCount() > 0 )
             {
                 String uid = identifierMatcher.group( 1 );
-                PatientIdentifierType identifierType = identifierTypeService.getPatientIdentifierType( uid );
+                PatientIdentifierType identifierType = identifierTypeService.getPatientIdentifierTypeByUid( uid );
                 if ( identifierType == null )
                 {
                     inputHtml = "<input value='[" + i18n.getString( "missing_patient_identifier_type" ) + " " + uid

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-06-06 03:06:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-06-20 04:38:07 +0000
@@ -655,4 +655,6 @@
 with = with
 status_events = events
 use_data_element_form_names = Use data element form names
-section = Section
\ No newline at end of file
+section = Section
+orgunit_registered = Organisation registered
+users_in_orgunit_registered = Users in organisation registered
\ No newline at end of file