dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8019
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-09-07 17:18:43 +0700
message:
  Fixed Bug
modified:
  dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/SmsConfigurationManagerImpl.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm


--
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-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/SmsConfigurationManagerImpl.java'
--- dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/SmsConfigurationManagerImpl.java	2012-09-05 03:16:04 +0000
+++ dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/SmsConfigurationManagerImpl.java	2012-09-07 10:18:43 +0000
@@ -117,6 +117,11 @@
     @Override
     public SmsGatewayConfig checkInstanceOfGateway( Class<?> clazz )
     {
+        if( getSmsConfiguration() == null)
+        {
+            SmsConfiguration smsConfig = new SmsConfiguration( true );
+            updateSmsConfiguration( smsConfig );
+        }
         for ( SmsGatewayConfig gateway : getSmsConfiguration().getGateways() )
         {
             if ( gateway.getClass().equals( clazz ) )

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java	2012-07-30 10:54:31 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java	2012-09-07 10:18:43 +0000
@@ -339,7 +339,7 @@
 
         for ( PatientIdentifierType patientIdentifierType : patientIdentifierTypeService.getAllPatientIdentifierTypes() )
         {
-            if ( patientIdentifierType.getProgram() == null )
+//            if ( patientIdentifierType.getProgram() == null )
             {
                 String key = "IDT" + patientIdentifierType.getId();
                 String value = parameterMap.get( key );
@@ -382,7 +382,7 @@
         for ( PatientAttribute patientAttribute : patientAttributeService.getAllPatientAttributes() )
         {
             patientAttributeSet.add( patientAttribute );
-            if ( patientAttribute.getProgram() == null )
+//            if ( patientAttribute.getProgram() == null )
             {
                 String key = "AT" + patientAttribute.getId();
                 String value = parameterMap.get( key ).trim();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js	2012-09-05 16:25:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js	2012-09-07 10:18:43 +0000
@@ -30,7 +30,7 @@
 function getValidationRulesGateway()
 {
 	var rules = {};
-
+	alert('outside');
 	if ( currentType == 'modem' ) {
 		rules = {
 			'modemFields input[id=name]' : { 'required' : true },
@@ -43,6 +43,8 @@
 			'modemFields select[id=inbound]' : { 'required' : true },
 			'modemFields select[id=outbound]' : { 'required' : true }
 		};
+		alert(currentType);
+		alert('hehehhe');
 	} else if ( currentType == 'bulksms' ) {
 		rules = {
 			'bulksmsFields input[id=name]' : { 'required' : true },

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-09-05 03:16:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-09-07 10:18:43 +0000
@@ -141,11 +141,11 @@
 				<td><input type="text" name="name" id="name" style="width: 28em" value="$!encoder.htmlEncode( $!clickatellGateway.name )"/></td>
 			</tr>
 			<tr>
-				<td>$i18n.getString( "username" ):</td>
+				<td>$i18n.getString( "username" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
 				<td><input type="text" name="username" id="username" style="width: 28em" value="$!clickatellGateway.username"/></td>
 			</tr>
 			<tr>
-				<td>$i18n.getString( "password" ):</td>
+				<td>$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
 				<td><input type="password" name="password" id="password" style="width: 28em" value="$!clickatellGateway.password"/></td>
 			</tr>
 			<tr>
@@ -161,11 +161,11 @@
 				<td><input type="text" name="name" id="name" style="width: 28em" value="$!encoder.htmlEncode( $!httpGateway.name )"/></td>
 			</tr>
 			<tr>
-				<td>$i18n.getString( "username" ):</td>
+				<td>$i18n.getString( "username" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
 				<td><input type="text" name="username" id="username" style="width: 28em" value="$!params.get( 'username' )"/></td>
 			</tr>
 			<tr>
-				<td>$i18n.getString( "password" ):</td>
+				<td>$i18n.getString( "password" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
 				<td><input type="password" name="password" id="password" style="width: 28em" value="$!params.get( 'password' )"/></td>
 			</tr>
 			<tr>