=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java	2013-09-13 12:36:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java	2013-09-16 09:47:59 +0000
@@ -73,5 +73,5 @@
     Collection<PatientIdentifier> getPatientIdentifiers( Collection<PatientIdentifierType> identifierTypes,
         Patient patient );
 
-    boolean checkDuplicateIdentifier( String identifier );
+    boolean checkDuplicateIdentifier( Integer patientId, String identifier );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierStore.java	2013-09-13 12:36:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierStore.java	2013-09-16 09:47:59 +0000
@@ -69,6 +69,6 @@
 
     Collection<PatientIdentifier> get( Collection<PatientIdentifierType> identifierTypes, Patient patient );
 
-    boolean checkDuplicateIdentifier( String identifier );
+    boolean checkDuplicateIdentifier( Integer patientId, String identifier );
 
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2013-09-11 15:26:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2013-09-16 09:47:59 +0000
@@ -143,6 +143,8 @@
     private Boolean relationshipFromA;
 
     private Program relatedProgram;
+    
+    private Boolean dataEntryMethod;
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -617,4 +619,17 @@
         this.relationshipFromA = relationshipFromA;
     }
 
+    @JsonProperty
+    @JsonView( { DetailedView.class, ExportView.class } )
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+    public Boolean getDataEntryMethod()
+    {
+        return dataEntryMethod;
+    }
+
+    public void setDataEntryMethod( Boolean dataEntryMethod )
+    {
+        this.dataEntryMethod = dataEntryMethod;
+    }
+
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java	2013-09-16 09:47:59 +0000
@@ -78,8 +78,6 @@
 
     private Boolean allowDateInFuture;
 
-    private Boolean displayAsRadioButton;
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -193,20 +191,7 @@
     {
         this.allowDateInFuture = allowDateInFuture;
     }
-
-    @JsonProperty
-    @JsonView( { DetailedView.class, ExportView.class } )
-    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public Boolean getDisplayAsRadioButton()
-    {
-        return displayAsRadioButton;
-    }
-
-    public void setDisplayAsRadioButton( Boolean displayAsRadioButton )
-    {
-        this.displayAsRadioButton = displayAsRadioButton;
-    }
-
+    
     // -------------------------------------------------------------------------
     // hashCode, equals and toString
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java	2013-09-13 12:36:44 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java	2013-09-16 09:47:59 +0000
@@ -142,8 +142,8 @@
     }
 
     @Override
-    public boolean checkDuplicateIdentifier( String identifier )
+    public boolean checkDuplicateIdentifier( Integer patientId, String identifier )
     {
-        return patientIdentifierStore.checkDuplicateIdentifier( identifier );
+        return patientIdentifierStore.checkDuplicateIdentifier( patientId, identifier );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierStore.java	2013-09-13 12:36:44 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierStore.java	2013-09-16 09:47:59 +0000
@@ -29,7 +29,6 @@
  */
 
 import java.util.Collection;
-import java.util.Set;
 
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
@@ -130,9 +129,9 @@
             .list();
     }
 
-    public boolean checkDuplicateIdentifier( String identifier )
+    public boolean checkDuplicateIdentifier( Integer patientId, String identifier )
     {
-        Number rs = (Number) getCriteria( Restrictions.ilike( "identifier", identifier ) ).setProjection(
+        Number rs = (Number) getCriteria( Restrictions.eq( "patient.id", patientId ) , Restrictions.ilike( "identifier", identifier ) ).setProjection(
             Projections.rowCount() ).uniqueResult();
         return ( rs != null & rs.intValue() > 0 )? true: false;
     }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-09-12 07:19:15 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java	2013-09-16 09:47:59 +0000
@@ -232,7 +232,7 @@
         executeSql( "ALTER TABLE program DROP COLUMN blockEntryForm" );
         executeSql( "ALTER TABLE program DROP COLUMN remindCompleted" );
         executeSql( "ALTER TABLE program DROP COLUMN displayProvidedOtherFacility" );
-        executeSql( "UPDATE programstage_dataelements SET displayAsRadioButton=false WHERE displayAsRadioButton is null" );
+        executeSql( "UPDATE program SET dataEntryMethod=false WHERE dataEntryMethod is null" );
         executeSql( "UPDATE patientreminder SET messageType=1 WHERE messageType is null" );
         executeSql( "UPDATE programstage SET allowGenerateNextVisit=false WHERE allowGenerateNextVisit is null" );
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml	2013-09-05 17:59:57 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml	2013-09-16 09:47:59 +0000
@@ -99,6 +99,8 @@
 		
 		<many-to-one name="relatedProgram" class="org.hisp.dhis.program.Program"
 			column="relatedprogramid" foreign-key="fk_program_relatedprogram" />
+			
+		<property name="dataEntryMethod" />
 
 		<!-- Access properties -->
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml	2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml	2013-09-16 09:47:59 +0000
@@ -22,8 +22,6 @@
 	<property name="displayInReports"/>
 	
 	<property name="allowDateInFuture"/>
-	
-	<property name="displayAsRadioButton"/>
 
   </class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java	2013-09-12 07:26:17 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java	2013-09-16 09:47:59 +0000
@@ -191,7 +191,7 @@
 
                     if ( StringUtils.isNotBlank( value ) )
                     {
-                        boolean isDuplicate = patientIdentifierService.checkDuplicateIdentifier( value );
+                        boolean isDuplicate = patientIdentifierService.checkDuplicateIdentifier( id, value );
 
                         if ( isDuplicate )
                         {

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm	2013-09-16 09:47:59 +0000
@@ -68,7 +68,7 @@
 					#end
 				#end
 				#if($value=="")
-					#set($value=$patient.name)
+					#set($value=$patient.getFullName())
 				#end
 				
 				$value

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm	2013-09-16 09:47:59 +0000
@@ -51,7 +51,7 @@
     <td class='information'>
         <table>  
 			 <tr>
-                <td>$encoder.htmlEncode( $patient.name ) $i18n.getString( "is" )</td>
+                <td>$encoder.htmlEncode( $patient.getFullName() ) $i18n.getString( "is" )</td>
                <td>
                     <select id="relationshipTypeId" name="relationshipTypeId" class="{validate:{required:true}}" style='width:205px;'>
                         <option value="">[$i18n.getString( "select_relationship" )]</option>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm	2013-09-16 09:47:59 +0000
@@ -61,8 +61,8 @@
 			<select name="relationshipTypeId" id="relationshipTypeId" class="{validate:{required:true}}" >
 				<option value="">[$i18n.getString( "please_select" )]</option>        
 				#foreach ($relationship in $relationshipTypes)
-					<option value="$relationship.id" relationshipFromA='true'>$encoder.htmlEncode(${relationship.aIsToB}) $i18n.getString("of") $encoder.htmlEncode($patient.name) ($encoder.htmlEncode(${relationship.bIsToA}))</option>
-					<option value="$relationship.id" relationshipFromA='false'>$encoder.htmlEncode(${relationship.bIsToA}) $i18n.getString("of") $encoder.htmlEncode($patient.name) ($encoder.htmlEncode(${relationship.aIsToB}))</option>
+					<option value="$relationship.id" relationshipFromA='true'>$encoder.htmlEncode(${relationship.aIsToB}) $i18n.getString("of") $encoder.htmlEncode($patient.getFullName()) ($encoder.htmlEncode(${relationship.bIsToA}))</option>
+					<option value="$relationship.id" relationshipFromA='false'>$encoder.htmlEncode(${relationship.bIsToA}) $i18n.getString("of") $encoder.htmlEncode($patient.getFullName()) ($encoder.htmlEncode(${relationship.aIsToB}))</option>
 				#end
 			</select>
 		</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm	2013-09-16 09:47:59 +0000
@@ -7,7 +7,7 @@
 		#if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
 			<tr>            
 				<td class="bold">$i18n.getString( "full_name" ):</td>
-				<td>$encoder.htmlEncode( $patient.name )<td>
+				<td>$encoder.htmlEncode( $patient.getFullName() )<td>
 			</tr>
 			<tr>
 				<td class="bold">$i18n.getString( "gender" ):</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm	2013-09-16 09:47:59 +0000
@@ -69,7 +69,7 @@
 					#end
 				#end
 				#if($value=="")
-					#set($value=$patient.name)
+					#set($value=$patient.getFullName())
 				#end
 				
 				$value

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2013-09-09 10:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2013-09-16 09:47:59 +0000
@@ -70,9 +70,12 @@
 					#end
 				</script> 
 			#elseif($hasOptionSet=='true')
-				#if(($displayOptionSetAsRadioButton=='dropdown') || ( $displayOptionSetAsRadioButton=='' && $programStageDataElement.displayAsRadioButton =='false' ) )
+				#if( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && (($displayOptionSetAsRadioButton=='dropdown') 
+					|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='false' ) ) )
 					<input id='$id' name="entryfield" data-optionset="$!programStageDataElement.dataElement.optionSet.uid" options='$hasOptionSet' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="auto-field optionset" />
-				#elseif(($displayOptionSetAsRadioButton=='radio' && $programStageDataElement.displayAsRadioButton =='true' ) || ( $displayOptionSetAsRadioButton=='' && $programStageDataElement.displayAsRadioButton =='true' ) )
+				#elseif( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && 
+					(($displayOptionSetAsRadioButton=='radio' && $program.dataEntryMethod =='true' ) 
+					|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='true' ) ) )
 					<table style='width:100%'>
 						<tr>
 							<td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultPatientForm.vm	2013-09-16 09:47:59 +0000
@@ -15,7 +15,7 @@
 #if($patientRegistrationForm.fixedAttributes.contains( 'fullName' ))
 	<tr>
 		<td class='text-column'><label for="fullName">$i18n.getString( "full_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.name" class="{validate:{required:true, rangelength:[3,50]}}"></td>
+		<td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, rangelength:[3,50]}}"></td>
 	</tr>
 #end
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm	2013-09-16 09:47:59 +0000
@@ -83,7 +83,7 @@
 					#end
 				#end
 				#if($value=="")
-					#set($value=$patient.name)
+					#set($value=$patient.getFullName())
 				#end
 				<td style="cursor:pointer;" onclick="javascript:showUpdatePatientForm('$patient.id');">
 					<a>$encoder.htmlEncode($value)</a>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm	2013-09-16 09:47:59 +0000
@@ -19,10 +19,10 @@
 		</p>
 		<div class="contentProviderTable">
 			<table>
-				#if( $!patient.name!='' )
+				#if( $!patient.getFullName()!='' )
 				<tr>
 					<td>$i18n.getString("full_name")</td>
-					<td>$encoder.htmlEncode($!patient.name)</td>
+					<td>$encoder.htmlEncode($!patient.getFullName())</td>
 				</tr>
 				#end
 				
@@ -228,7 +228,7 @@
 							<td><a href='#'>$rel.relationshipType.bIsToA</a></td>
 							<td>
 								#set($patient=$rel.patientB)
-								#set($value=$!patient.name)
+								#set($value=$!patient.getFullName())
 								#foreach( $identifier in $patient.identifiers)
 									#if($!identifier.identifierType)
 										#set($value=$identifier.identifier)
@@ -248,7 +248,7 @@
 							<td><a href='#'>$rel.relationshipType.aIsToB</a></td>
 							<td><a href='#'>
 								#set($patient=$rel.patientA)
-								#set($value=$!patient.name)
+								#set($value=$!patient.getFullName())
 								#foreach( $identifier in $patient.identifiers)
 									#if($!identifier.identifierType)
 										#set($value=$identifier.identifier)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-09-16 09:47:59 +0000
@@ -29,7 +29,7 @@
 
 	<tr name='propertiesField'>
 		<td class='text-column'><label for="fullName">$i18n.getString( "full_name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
-		<td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.name" class="{validate:{required:true, rangelength:[3,50]}}"></td>
+		<td class="input-column"><input type="text" id="fullName" name="fullName" value="$!patient.getFullName()" class="{validate:{required:true, rangelength:[3,50]}}"></td>
 	</tr>
 
 	<tr name='propertiesField'>
@@ -270,6 +270,7 @@
 	#else
 		jQuery('#patientForm [name=propertiesField] input').attr('disabled',true);
 		jQuery('#patientForm [name=propertiesField] select').attr('disabled',true);
+		jQuery('#patientForm [name=attr*] select').attr('disabled',true);
 	#end
 	
 	#if( $auth.hasAccess( "dhis-web-caseentry", "allowEditPatientAttributes" ) )

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm	2013-09-16 09:47:59 +0000
@@ -20,7 +20,7 @@
 		#end
 	#end
 	#if($value=="")
-		#set($value=$!patient.name)
+		#set($value=$!patient.getFullName())
 	#else
 		#set($flag=true)
 	#end
@@ -28,7 +28,7 @@
 		#set($value=$systemId)
 	#end
 					
-	#if($patient.name=='')
+	#if($patient.getFullName()=='')
 	<tr>
 		<td>
 			#if($flag==true)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm	2013-09-16 09:47:59 +0000
@@ -127,7 +127,7 @@
 					#end
 					
 					#if($value=="")
-						#set($value=$!patient.name)
+						#set($value=$!patient.getFullName())
 					#end
 					#if($value=="")
 						#set($value=$systemId)
@@ -169,7 +169,7 @@
                   #if( $auth.hasAccess( "dhis-web-caseentry", "getPatientLocation" ) )
 				  <a href="javascript:isDashboard=false;getPatientLocation( '$patient.id' );" title='$i18n.getString( "change_location" )'><img src="../icons/dataentry.png" alt='$i18n.getString( "change_patient_location" )' style='width:25px; height:25px'></a>
 				  #end
-				  <a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getName() )', i18n_confirm_delete_patient )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
+				  <a href="javascript:removePatient( '$patient.id', '$encoder.jsEncode( $patient.getFullName() )', i18n_confirm_delete_patient )" title='$i18n.getString( "remove" )'><img src="../images/delete.png" alt='$i18n.getString( "remove" )'></a>
 				  <a href="javascript:showPatientHistory( '$patient.id' )" title='$i18n.getString( "patient_details_and_history" )'><img src="../images/information.png" alt='$i18n.getString( "patient_details_and_history" )'></a>
 				</td>
 				

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm	2013-09-16 09:47:59 +0000
@@ -26,7 +26,7 @@
 					#end
 				#end
 				#if($value=="")
-					#set($value=$!patient.name)
+					#set($value=$!patient.getFullName())
 					#set($title= $encoder.htmlEncode($i18n.getString( "full_name" )))
 				#end
 				#if($value=="")

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm	2013-09-16 09:47:59 +0000
@@ -56,7 +56,7 @@
 					#end
 				#end
 				#if($value=="")
-					#set($value=$patient.name)
+					#set($value=$patient.getFullName())
 				#end
 				
 				$value

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm	2013-09-16 09:47:59 +0000
@@ -1,7 +1,7 @@
 <table>
 	<tr>
 	    <td class="bold">$i18n.getString( "full_name" ):</td>
-	    <td>$encoder.htmlEncode( $patient.name )</td>
+	    <td>$encoder.htmlEncode( $patient.getFullName() )</td>
 	</tr>
 	<tr>
 	    <td class="bold">$i18n.getString( "gender" ):</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm	2013-09-16 09:47:59 +0000
@@ -15,7 +15,7 @@
 			<table>
 				<tr>
 					<td class="bold text-column">$i18n.getString( "full_name" ): </td>
-					<td>$encoder.htmlEncode( $patient.name )<td>
+					<td>$encoder.htmlEncode( $patient.getFullName() )<td>
 				</tr>
 				<tr>
 					<td class="bold text-column">$i18n.getString( "gender" ): </td>
@@ -95,7 +95,7 @@
 				
 				<td style="text-align:center">
 					<a href="javascript:manageRepresentative( '$patient.id', $partnerId )" title="$i18n.getString( 'set_as_representative' )"><img src="images/representative.png" alt="$i18n.getString( 'manage_representative' )"></a>
-					<a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getName() )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+					<a href="javascript:removeRelationship( '$relationship.id', '$encoder.jsEncode( $relationship.patientA.getFullName() )', '$encoder.jsEncode( $relationship.relationshipType.aIsToB )', '$encoder.jsEncode( $relationship.patientB.getFullName() )' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 				</td>   						
 			</tr>
 			#set( $mark = !$mark)

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm	2013-09-16 09:47:59 +0000
@@ -39,7 +39,7 @@
 			<td>$velocityCount</td>
 			
 			<td style="cursor:pointer;" onclick="javascript:isDashboard=true;showPatientDashboardForm( '$patient.id' )">
-				<a>$encoder.htmlEncode($patient.name)</a>
+				<a>$encoder.htmlEncode($patient.getFullName())</a>
 			</td>
 			
 			<td>#if($!patient.gender) $i18n.getString($!patient.gender) #end</td>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm	2013-09-16 09:47:59 +0000
@@ -34,7 +34,7 @@
 							#end
 						#end
 						#if($value=="")
-							#set( $value=$programInstance.patient.name)
+							#set( $value=$programInstance.patient.getFullName())
 						#end
 							
 						<input type='button' class='patient-object' value="$value"

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm	2013-09-16 09:47:59 +0000
@@ -1,5 +1,5 @@
 <div id='reportTitle' name='reportTitle' style="display:none;">
-	<h3>$i18n.getString('records_of') $encoder.htmlEncode( $patient.name )  $i18n.getString('at') $programStage.displayName $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
+	<h3>$i18n.getString('records_of') $encoder.htmlEncode( $patient.getFullName() )  $i18n.getString('at') $programStage.displayName $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
 	<hr/>
 </div>
 
@@ -11,7 +11,7 @@
 					<span class='bold' id="patientName">$i18n.getString( "full_name" ):</span>
 				</td>
 				<td class='coordinates2'>
-					$encoder.htmlEncode( $patient.name )
+					$encoder.htmlEncode( $patient.getFullName() ) 
 					#if($patient.gender=='F')
 						<img src='images/female_small.png'>
 					#else
@@ -74,7 +74,7 @@
 			enable('completeBtn');
 			disable('uncompleteBtn');
 		#end
-		setInnerHTML("patientNameLbl", "&raquo; " + "$encoder.jsEncode( $patient.name )");
+		setInnerHTML("patientNameLbl", "&raquo; " + "$encoder.jsEncode( $patient.getFullName() )");
 	});
 	
 	var i18n_value_must_integer = '$encoder.jsEscape( $i18n.getString( "value_must_integer" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDataElements.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDataElements.vm	2013-09-12 07:33:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDataElements.vm	2013-09-16 09:47:59 +0000
@@ -3,11 +3,6 @@
   #if( $auth.hasAccess( "dhis-web-caseentry", "accessPatientAttributes" ) )
   
   {
-	"id": "fixedAttr_name",
-	"name": "$i18n.getString('name')",
-	"valueType": "string"
-  },
-  {
 	"id": "fixedAttr_firstName",
 	"name": "$i18n.getString('first_name')",
 	"valueType": "string"

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm	2013-09-16 09:47:59 +0000
@@ -3,7 +3,7 @@
 #foreach( $patient in $patients )
 <patient>
   <id>$patient.id</id>  
-  <fullName>$encoder.xmlEncode( $patient.name )</fullName>
+  <fullName>$encoder.xmlEncode( $patient.getFullName() )</fullName>
   <gender>$encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
   <dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
   <age>$encoder.xmlEncode( $patient.getAge() )</age>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm	2013-09-16 09:47:59 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <patient>
   <id>$patient.id</id>  
-  <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
+  <fullName>$!encoder.xmlEncode( $patient.getFullName() )</fullName>
   <gender>$!encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
   <dobType>#if($!patient.dobType)$!patient.dobType#else $i18n.getString('none') #end</dobType>
   <dateOfBirth>$!format.formatDate( $!patient.birthDate )</dateOfBirth>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm	2013-09-16 09:47:59 +0000
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <patient>
   <id>$patient.id</id>  
-  <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
+  <fullName>$!encoder.xmlEncode( $patient.getFullName() )</fullName>
   <gender>$!encoder.xmlEncode( $i18n.getString($patient.gender ))</gender>
   <dateOfBirth>$!format.formatDate( $patient.birthDate )</dateOfBirth>
   <age>$!encoder.xmlEncode( $patient.getAge() )</age>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm	2013-09-16 09:47:59 +0000
@@ -3,7 +3,7 @@
 #foreach( $patient  in $patients )
 <patient>
   <id>$patient.id</id>  
-  <fullName>$!encoder.xmlEncode( $patient.name )</fullName>
+  <fullName>$!encoder.xmlEncode( $patient.getFullName() )</fullName>
   <gender>$!encoder.xmlEncode( $i18n.getString( $patient.gender ))</gender>
   <dateOfBirth>$format.formatDate( $patient.birthDate )</dateOfBirth>
   <age>$!encoder.xmlEncode( $patient.getAge() )</age>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm	2013-09-12 08:40:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm	2013-09-16 09:47:59 +0000
@@ -3,7 +3,7 @@
 #foreach( $patient in $patients )
   {
     "id": $!{patient.id},
-    "fullName": "$!encoder.jsonEncode( ${patient.name} )"
+    "fullName": "$!encoder.jsonEncode( ${patient.getFullName()} )"    
   }#if( $velocityCount < $size ),#end
 #end
 ] }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-09-09 10:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-09-16 09:47:59 +0000
@@ -81,9 +81,12 @@
 										#end
 									</script> 
 								#elseif($hasOptionSet=='true')
-									#if(($displayOptionSetAsRadioButton=='dropdown') || ( $displayOptionSetAsRadioButton=='' && $programStageDataElement.displayAsRadioButton =='false' ) )
+									#if( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && (($displayOptionSetAsRadioButton=='dropdown') 
+										|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='false' ) ) )
 										<input id='$id' name="entryfield" data-optionset="$!programStageDataElement.dataElement.optionSet.uid" options='$hasOptionSet' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" class="auto-field optionset" />
-									#elseif(($displayOptionSetAsRadioButton=='radio' && $programStageDataElement.displayAsRadioButton =='true' ) || ( $displayOptionSetAsRadioButton=='' && $programStageDataElement.displayAsRadioButton =='true' ) )
+									#elseif( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && 
+										(($displayOptionSetAsRadioButton=='radio' && $program.dataEntryMethod =='true' ) 
+										|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='true' ) ) )
 										<table style='width:100%'>
 											<tr>
 												<td>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2013-09-03 14:59:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm	2013-09-16 09:47:59 +0000
@@ -4,6 +4,7 @@
 	"name": "$!encoder.jsEncode( ${program.name} )",
 	"description": "$!encoder.jsEncode( ${program.description} )",
 	"type": "$!program.type",
+	"dataEntryMethod": "$!program.dataEntryMethod",
 	"displayIncidentDate": "$!program.displayIncidentDate",
 	"ignoreOverdueEvents": "$!program.ignoreOverdueEvents",
 	"dateOfEnrollmentDescription": "$!encoder.jsEncode( ${program.dateOfEnrollmentDescription} )",

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm	2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm	2013-09-16 09:47:59 +0000
@@ -68,11 +68,11 @@
 </div>
 
 
-<div class="settingLabel">$i18n.getString( "refer_option_set_fields_in_data_entry_form_as_dropdown_box_or_ratio_button" )</div>
+<div class="settingLabel">$i18n.getString( "preferred_mode_of_data_entry" )</div>
 <div class="setting">
 	<select id="displayOptionSetAsRadioButton" name="displayOptionSetAsRadioButton">
 		<option value="" #if( "" == $displayOptionSetAsRadioButton ) selected="selected" #end>[$i18n.getString( "please_select" )]</option>
-		<option value="dropdown" #if( "dropdown" == $displayOptionSetAsRadioButton ) selected="selected" #end>$i18n.getString( "drowndown_box" )</option>
+		<option value="dropdown" #if( "dropdown" == $displayOptionSetAsRadioButton ) selected="selected" #end>$i18n.getString( "dropdown_box" )</option>
 		<option value="radio" #if( "radio" == $displayOptionSetAsRadioButton ) selected="selected" #end>$i18n.getString( "radio_button" )</option>
 	</select>
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-09-16 09:47:59 +0000
@@ -402,7 +402,7 @@
 server_memory=Server memory
 cpu_cores=CPU cores
 user_groups=User groups
-refer_option_set_fields_in_data_entry_form_as_dropdown_box_or_ratio_button = Refer option set fields in data entry form as dropdown/ratio button
+preferred_mode_of_data_entry = Preferred mode of data entry
 dropdown_box = Dropdown box
 radio_button = Radio button
 please_select = Please select

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java	2013-09-11 16:02:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java	2013-09-16 09:47:59 +0000
@@ -302,7 +302,14 @@
     {
         this.relationshipFromA = relationshipFromA;
     }
-    
+
+    private Boolean dataEntryMethod;
+
+    public void setDataEntryMethod( Boolean dataEntryMethod )
+    {
+        this.dataEntryMethod = dataEntryMethod;
+    }
+
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -318,6 +325,7 @@
         useBirthDateAsEnrollmentDate = (useBirthDateAsEnrollmentDate == null) ? false : useBirthDateAsEnrollmentDate;
         selectEnrollmentDatesInFuture = (selectEnrollmentDatesInFuture == null) ? false : selectEnrollmentDatesInFuture;
         selectIncidentDatesInFuture = (selectIncidentDatesInFuture == null) ? false : selectIncidentDatesInFuture;
+        dataEntryMethod = (dataEntryMethod == null) ? false : dataEntryMethod;
 
         Program program = new Program();
 
@@ -334,7 +342,8 @@
         program.setUseBirthDateAsEnrollmentDate( useBirthDateAsEnrollmentDate );
         program.setSelectEnrollmentDatesInFuture( selectEnrollmentDatesInFuture );
         program.setSelectIncidentDatesInFuture( selectIncidentDatesInFuture );
-        
+        program.setDataEntryMethod( dataEntryMethod );
+
         if ( type == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
         {
             program.setIgnoreOverdueEvents( ignoreOverdueEvents );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java	2013-09-16 09:47:59 +0000
@@ -327,6 +327,13 @@
         this.relatedProgramId = relatedProgramId;
     }
 
+    private Boolean dataEntryMethod;
+
+    public void setDataEntryMethod( Boolean dataEntryMethod )
+    {
+        this.dataEntryMethod = dataEntryMethod;
+    }
+
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -345,6 +352,7 @@
         useBirthDateAsEnrollmentDate = (useBirthDateAsEnrollmentDate == null) ? false : useBirthDateAsEnrollmentDate;
         selectEnrollmentDatesInFuture = (selectEnrollmentDatesInFuture == null) ? false : selectEnrollmentDatesInFuture;
         selectIncidentDatesInFuture = (selectIncidentDatesInFuture == null) ? false : selectIncidentDatesInFuture;
+        dataEntryMethod = (dataEntryMethod == null) ? false : dataEntryMethod;
 
         Program program = programService.getProgram( id );
         program.setName( name );
@@ -360,6 +368,7 @@
         program.setUseBirthDateAsEnrollmentDate( useBirthDateAsEnrollmentDate );
         program.setSelectEnrollmentDatesInFuture( selectEnrollmentDatesInFuture );
         program.setSelectIncidentDatesInFuture( selectIncidentDatesInFuture );
+        program.setDataEntryMethod( dataEntryMethod );
 
         if ( type == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java	2013-09-12 05:49:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java	2013-09-16 09:47:59 +0000
@@ -152,13 +152,6 @@
         this.allowProvidedElsewhere = allowProvidedElsewhere;
     }
 
-    private List<Boolean> displayAsRadioButtons = new ArrayList<Boolean>();
-
-    public void setDisplayAsRadioButtons( List<Boolean> displayAsRadioButtons )
-    {
-        this.displayAsRadioButtons = displayAsRadioButtons;
-    }
-
     private Boolean irregular;
 
     public void setIrregular( Boolean irregular )
@@ -367,14 +360,12 @@
             Boolean allowed = allowProvidedElsewhere.get( i ) == null ? false : allowProvidedElsewhere.get( i );
             Boolean displayInReport = displayInReports.get( i ) == null ? false : displayInReports.get( i );
             Boolean allowDate = allowDateInFutures.get( i ) == null ? false : allowDateInFutures.get( i );
-            Boolean displayRadioButton = displayAsRadioButtons.get( i ) == null ? false : displayAsRadioButtons.get( i );
-
+           
             ProgramStageDataElement programStageDataElement = new ProgramStageDataElement( programStage, dataElement,
                 this.compulsories.get( i ), new Integer( i ) );
             programStageDataElement.setAllowProvidedElsewhere( allowed );
             programStageDataElement.setDisplayInReports( displayInReport );
             programStageDataElement.setAllowDateInFuture( allowDate );
-            programStageDataElement.setDisplayAsRadioButton( displayRadioButton );
             programStageDataElementService.addProgramStageDataElement( programStageDataElement );
         }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java	2013-09-12 05:49:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java	2013-09-16 09:47:59 +0000
@@ -278,13 +278,6 @@
         this.remindCompleted = remindCompleted;
     }
 
-    private List<Boolean> displayAsRadioButtons = new ArrayList<Boolean>();
-
-    public void setDisplayAsRadioButtons( List<Boolean> displayAsRadioButtons )
-    {
-        this.displayAsRadioButtons = displayAsRadioButtons;
-    }
-
     private Boolean allowGenerateNextVisit;
 
     public void setAllowGenerateNextVisit( Boolean allowGenerateNextVisit )
@@ -368,8 +361,7 @@
             Boolean allowed = allowProvidedElsewhere.get( i ) == null ? false : allowProvidedElsewhere.get( i );
             Boolean displayInReport = displayInReports.get( i ) == null ? false : displayInReports.get( i );
             Boolean allowDate = allowDateInFutures.get( i ) == null ? false : allowDateInFutures.get( i );
-            Boolean displayRadioButton = displayAsRadioButtons.get( i ) == null ? false : displayAsRadioButtons.get( i );
-
+           
             ProgramStageDataElement programStageDataElement = programStageDataElementService.get( programStage,
                 dataElement );
 
@@ -380,7 +372,6 @@
                 programStageDataElement.setAllowProvidedElsewhere( allowed );
                 programStageDataElement.setDisplayInReports( displayInReport );
                 programStageDataElement.setAllowDateInFuture( allowDate );
-                programStageDataElement.setDisplayAsRadioButton( displayRadioButton );
                 programStageDataElementService.addProgramStageDataElement( programStageDataElement );
             }
             else
@@ -390,7 +381,6 @@
                 programStageDataElement.setAllowProvidedElsewhere( allowed );
                 programStageDataElement.setDisplayInReports( displayInReport );
                 programStageDataElement.setAllowDateInFuture( allowDate );
-                programStageDataElement.setDisplayAsRadioButton( displayRadioButton );
                 programStageDataElementService.updateProgramStageDataElement( programStageDataElement );
 
                 programStageDataElements.remove( programStageDataElement );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-09-12 05:49:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-09-16 09:47:59 +0000
@@ -471,4 +471,5 @@
 message_type = Message type
 both = Both
 direct_sms = Direct SMS
-remind_creating_next_event_on_this_event_completed = Remind creating next event on this event completed
\ No newline at end of file
+remind_creating_next_event_on_this_event_completed = Remind creating next event on this event completed
+data_entry_method = Data entry method
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm	2013-09-16 09:47:59 +0000
@@ -127,6 +127,14 @@
 			<td></td>
 		</tr>
 		
+		<tr>
+			<td><label>$i18n.getString( "default_data_entry_method" ) </label></td>
+			<td>
+				<input type='checkbox' id='dataEntryMethod' name='dataEntryMethod' value='true' >
+			</td>
+			<td></td>
+		</tr>
+		
 		<tr name='nonAnonymous'>
 			<th colspan="2">$i18n.getString( "enrollment_details" )</th>
 		</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-09-12 05:49:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm	2013-09-16 09:47:59 +0000
@@ -128,7 +128,6 @@
 			<select id="allowProvidedElsewhere" name='allowProvidedElsewhere' multiple="multiple" class="hidden"></select>     
 			<select id="displayInReports" name='displayInReports' multiple="multiple" class="hidden"></select>     
 			<select id="allowDateInFutures" name='allowDateInFutures' multiple="multiple" class="hidden"></select>   
-			<select id="displayAsRadioButtons" name='displayAsRadioButtons' multiple="multiple" class="hidden"></select>      
 		</th>
       </tr>
     </thead>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addProgramStageForm.js	2013-09-16 09:47:59 +0000
@@ -19,9 +19,6 @@
 		var allowDateInFutures = jQuery( "#allowDateInFutures" );
 		allowDateInFutures.empty();
 		
-		var displayAsRadioButtons = jQuery( "#displayAsRadioButtons" );
-		displayAsRadioButtons.empty();
-		
 		var templateMessages = jQuery( "#templateMessages" );
 		templateMessages.empty();
 		
@@ -59,10 +56,6 @@
 			var allowDateInFuture = jQuery( item ).find( "input[name='allowDateInFuture']:first");
 			checked = allowDateInFuture.attr('checked') ? true : false;
 			allowDateInFutures.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
-			
-			var displayAsRadioButton = jQuery( item ).find( "input[name='displayAsRadioButton']:first");
-			checked = displayAsRadioButton.attr('checked') ? true : false;
-			displayAsRadioButtons.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 		});
 		jQuery(".daysAllowedSendMessage").each( function( i, item ){ 
 			var days = (jQuery(item).attr('realvalue')==undefined) ? 0 : jQuery(item).attr('realvalue');

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js	2013-09-16 09:47:59 +0000
@@ -41,6 +41,9 @@
 		var selectIncidentDatesInFuture= ( json.program.selectIncidentDatesInFuture == 'true') ? i18n_yes : i18n_no;
 		setInnerHTML( 'selectIncidentDatesInFutureField', selectIncidentDatesInFuture );   	
 		
+		var dataEntryMethod= ( json.program.dataEntryMethod == 'true') ? i18n_yes : i18n_no;
+		setInnerHTML( 'dataEntryMethodField', dataEntryMethod );   	
+		
 		setInnerHTML( 'dateOfEnrollmentDescriptionField', json.program.dateOfEnrollmentDescription );   
 		setInnerHTML( 'dateOfIncidentDescriptionField', json.program.dateOfIncidentDescription );   		
 		setInnerHTML( 'programStageCountField',  json.program.programStageCount );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2013-09-12 05:49:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js	2013-09-16 09:47:59 +0000
@@ -128,14 +128,6 @@
 				html += "<td align='center'><input type='hidden' name='allowDateInFuture'></td>";
 			}
 			
-			if( jQuery(item).attr('valuetype') =='optionset')
-			{
-				html += "<td align='center'><input type='checkbox' name='displayAsRadioButton'></td>";
-			}
-			else{
-				html += "<td align='center'><input type='hidden' name='displayAsRadioButton'></td>";
-			}
-			
 			html += "</tr>";
 			selectedList.append( html );
 			jQuery( item ).remove();
@@ -160,14 +152,6 @@
 			html += "<td align='center'><input type='hidden' name='allowDateInFuture'></td>";
 		}
 		
-		if( jQuery(item).attr('valuetype') =='optionset')
-		{
-			html += "<td align='center'><input type='checkbox' name='displayAsRadioButton'></td>";
-		}
-		else{
-			html += "<td align='center'><input type='hidden' name='displayAsRadioButton'></td>";
-		}
-		
 		html += "</tr>";
 		selectedList.append( html );
 		jQuery( item ).remove();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updateProgramStageForm.js	2013-09-16 09:47:59 +0000
@@ -17,9 +17,6 @@
 		var allowDateInFutures = jQuery( "#allowDateInFutures" );
 		allowDateInFutures.empty();
 		
-		var displayAsRadioButtons = jQuery( "#displayAsRadioButtons" );
-		displayAsRadioButtons.empty();
-		
 		var daysAllowedSendMessages = jQuery( "#daysAllowedSendMessages" );
 		daysAllowedSendMessages.empty();
 		
@@ -60,10 +57,6 @@
 			var allowDateInFuture = jQuery( item ).find( "input[name='allowDateInFuture']:first");
 			checked = allowDateInFuture.attr('checked') ? true : false;
 			allowDateInFutures.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
-			
-			var displayAsRadioButton = jQuery( item ).find( "input[name='displayAsRadioButton']:first");
-			checked = displayAsRadioButton.attr('checked') ? true : false;
-			displayAsRadioButtons.append( "<option value='" + checked + "' selected='true'>" + checked + "</option>" );
 		});
 		jQuery(".daysAllowedSendMessage").each( function( i, item ){ 
 			var days = (jQuery(item).attr('realvalue')==undefined) ? 0 : jQuery(item).attr('realvalue');

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2013-09-03 14:59:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm	2013-09-16 09:47:59 +0000
@@ -87,6 +87,7 @@
 				<p><label class="bold">$i18n.getString( "name" ):</label><br><span id="nameField"></span></p>
 				<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>				
 				<p><label class="bold">$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>                           
+				<p><label class="bold">$i18n.getString( "data_entry_method" ):</label><br><span id="dataEntryMethodField"></span></p>                           
 				<p><label class="bold">$i18n.getString( "display_date_of_incident" ):</label><br><span id="displayIncidentDateField"></span></p>
 				<p><label class="bold">$i18n.getString( "allow_select_enrollment_date_in_future" ):</label><br><span id="selectEnrollmentDatesInFutureField"></span></p>
 				<p><label class="bold">$i18n.getString( "allow_select_incident_date_in_future" ):</label><br><span id="selectIncidentDatesInFutureField"></span></p>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-09-10 13:28:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm	2013-09-16 09:47:59 +0000
@@ -127,6 +127,14 @@
 		</tr>
 		
 		<tr>
+			<td><label>$i18n.getString( "default_data_entry_method" ) </label></td>
+			<td>
+				<input type='checkbox' id='dataEntryMethod' name='dataEntryMethod' value='true' #if( $program.dataEntryMethod=='true' ) selected #end >
+			</td>
+			<td></td>
+		</tr>
+		
+		<tr>
 			<td><label>$i18n.getString( "version" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
 			<td><input type="text" id="version" name="version" value="$program.version" class="{validate:{required:true,integer:true}}"></td>
 			<td></td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-09-12 05:49:31 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm	2013-09-16 09:47:59 +0000
@@ -130,7 +130,6 @@
 					<select id="allowProvidedElsewhere" name='allowProvidedElsewhere' multiple="multiple" class="hidden"></select>
 					<select id="displayInReports" name='displayInReports' multiple="multiple" class="hidden"></select>
 					<select id="allowDateInFutures" name='allowDateInFutures' multiple="multiple" class="hidden"></select>     
-					<select id="displayAsRadioButtons" name='displayAsRadioButtons' multiple="multiple" class="hidden"></select>     
 				</th>
 			</tr>
 		</thead>
@@ -165,7 +164,6 @@
 								<th>$i18n.getString( "allow_provided_elsewhere" )</th>
 								<th>$i18n.getString( "display_in_reports" )</th>
 								<th>$i18n.getString( "date_in_future" )</th>
-								<th>$i18n.getString( "display_as_radio_button" )</th>
 							</tr>
 						</thead>
 						<tbody id="selectedList">
@@ -182,13 +180,6 @@
 										<input type="hidden" name="allowDateInFuture" />
 										#end
 									</td>
-									<td align="center">
-										#if($programStageDataElement.dataElement.optionSet)
-										<input type="checkbox" name="displayAsRadioButton" value="$programStageDataElement.dataElement.id" #if($programStageDataElement.displayAsRadioButton == 'true' ) checked #end />
-										#else
-										<input type="hidden" name="displayAsRadioButton" />
-										#end
-									</td>
 								</tr>
 							#end
 						</tbody>