=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java	2013-09-11 15:26:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java	2013-09-18 02:45:29 +0000
@@ -28,18 +28,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.message.MessageConversation;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patientcomment.PatientComment;
 import org.hisp.dhis.sms.outbound.OutboundSms;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
 /**
  * @author Abyot Asalefew
  */
@@ -87,8 +85,6 @@
 
     private Date completedDate;
 
-    private Set<Patient> patients;
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -125,8 +121,9 @@
             return false;
         }
 
-        // TODO include due date and execution date to make consistent with hashcode
-        
+        // TODO include due date and execution date to make consistent with
+        // hashcode
+
         final ProgramStageInstance other = (ProgramStageInstance) object;
 
         return programInstance.equals( other.getProgramInstance() ) && programStage.equals( other.getProgramStage() );
@@ -301,16 +298,6 @@
         this.coordinates = coordinates;
     }
 
-    public Set<Patient> getPatients()
-    {
-        return patients;
-    }
-
-    public void setPatients( Set<Patient> patients )
-    {
-        this.patients = patients;
-    }
-
     public List<MessageConversation> getMessageConversations()
     {
         return messageConversations;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java	2013-09-14 18:27:14 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java	2013-09-18 02:45:29 +0000
@@ -57,7 +57,6 @@
     final String AUTO_SAVE_CASE_ENTRY_FORM = "autoSaveCaseEntryForm";
     final String AUTO_SAVE_PATIENT_REGISTRATION_ENTRY_FORM = "autoSavePatientRegistration";
     final String DEFAULT_ANALYSIS_DISPLAY_PROPERTY = "name";
-    final String KEY_DISPLAY_OPTION_SET_AS_RADIO_BUTTON = "displayOptionSetAsRadioButton";
     
     final List<Integer> DASHBOARD_CHARTS_TO_DISPLAY = Arrays.asList( 4, 6, 8 );
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml	2013-09-10 04:51:49 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml	2013-09-18 02:45:29 +0000
@@ -55,12 +55,6 @@
 		<property name="completedUser" />
 
 		<property name="completedDate" />
-
-		<set name="patients" table="programstageinstance_patients">
-			<key column="programstageinstanceid" />
-			<many-to-many class="org.hisp.dhis.patient.Patient"
-				column="patientid" />
-		</set>
-
+		
 	</class>
 </hibernate-mapping>

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java	2013-09-06 15:53:07 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java	2013-09-18 02:45:29 +0000
@@ -56,7 +56,6 @@
 import org.hisp.dhis.program.comparator.ProgramStageDataElementSortOrderComparator;
 import org.hisp.dhis.program.comparator.ProgramStageSectionSortOrderComparator;
 import org.hisp.dhis.system.util.ValidationUtils;
-import org.hisp.dhis.user.UserSettingService;
 
 import com.opensymphony.xwork2.Action;
 
@@ -120,13 +119,6 @@
         this.organisationUnitService = organisationUnitService;
     }
 
-    private UserSettingService userSettingService;
-
-    public void setUserSettingService( UserSettingService userSettingService )
-    {
-        this.userSettingService = userSettingService;
-    }
-
     private String displayOptionSetAsRadioButton;
 
     public String getDisplayOptionSetAsRadioButton()
@@ -370,10 +362,7 @@
             longitude = ValidationUtils.getLongitude( programStageInstance.getCoordinates() );
             latitude = ValidationUtils.getLatitude( programStageInstance.getCoordinates() );
         }
-
-        displayOptionSetAsRadioButton = (String) userSettingService.getUserSetting(
-            UserSettingService.KEY_DISPLAY_OPTION_SET_AS_RADIO_BUTTON, "" );
-
+        
         return SUCCESS;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java	2013-09-12 07:33:02 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java	2013-09-18 02:45:29 +0000
@@ -30,8 +30,6 @@
 
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -54,8 +52,6 @@
 import org.hisp.dhis.patient.util.PatientIdentifierGenerator;
 import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
 import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
-import org.hisp.dhis.program.ProgramStageInstance;
-import org.hisp.dhis.program.ProgramStageInstanceService;
 import org.hisp.dhis.relationship.Relationship;
 import org.hisp.dhis.relationship.RelationshipService;
 import org.hisp.dhis.relationship.RelationshipType;
@@ -96,10 +92,8 @@
 
     private RelationshipTypeService relationshipTypeService;
 
-    private ProgramStageInstanceService programStageInstanceService;
-
     private SystemSettingManager systemSettingManager;
-    
+
     private UserService userService;
 
     // -------------------------------------------------------------------------
@@ -138,17 +132,10 @@
 
     private boolean relationshipFromA;
 
-    private Integer programStageInstanceId;
-
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------
 
-    public void setProgramStageInstanceId( Integer programStageInstanceId )
-    {
-        this.programStageInstanceId = programStageInstanceId;
-    }
-
     public void setUserService( UserService userService )
     {
         this.userService = userService;
@@ -393,34 +380,13 @@
             }
         }
 
-        // Save relationship with event
-        
-        if ( programStageInstanceId != null )
-        {
-            ProgramStageInstance programStageInstance = programStageInstanceService
-                .getProgramStageInstance( programStageInstanceId );
-            Set<Patient> patients = programStageInstance.getPatients();
-            if ( patients == null )
-            {
-                patients = new HashSet<Patient>();
-            }
-            patients.add(patient);
-            programStageInstance.setPatients( patients );
-            programStageInstanceService.updateProgramStageInstance( programStageInstance );
-        }
-
         return SUCCESS;
     }
 
     // -----------------------------------------------------------------------------
     // Getter/Setter
     // -----------------------------------------------------------------------------
-
-    public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService )
-    {
-        this.programStageInstanceService = programStageInstanceService;
-    }
-
+    
     public void setPatientIdentifierTypeService( PatientIdentifierTypeService patientIdentifierTypeService )
     {
         this.patientIdentifierTypeService = patientIdentifierTypeService;

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2013-09-17 09:47:21 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2013-09-18 02:45:29 +0000
@@ -111,8 +111,6 @@
 			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
 		<property name="programIndicatorService"
 			ref="org.hisp.dhis.program.ProgramIndicatorService" />
-		<property name="userSettingService"
-			ref="org.hisp.dhis.user.UserSettingService" />
 	</bean>
 
 	<bean
@@ -737,8 +735,6 @@
 			ref="org.hisp.dhis.relationship.RelationshipService" />
 		<property name="relationshipTypeService"
 			ref="org.hisp.dhis.relationship.RelationshipTypeService" />
-		<property name="programStageInstanceService"
-			ref="org.hisp.dhis.program.ProgramStageInstanceService" />
 		<property name="systemSettingManager" ref="org.hisp.dhis.setting.SystemSettingManager" />
 		<property name="userService" ref="org.hisp.dhis.user.UserService" />
 	</bean>

=== 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-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm	2013-09-18 02:45:29 +0000
@@ -70,12 +70,9 @@
 					#end
 				</script> 
 			#elseif($hasOptionSet=='true')
-				#if( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && (($displayOptionSetAsRadioButton=='dropdown') 
-					|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='false' ) ) )
+				#if( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && $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( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && 
-					(($displayOptionSetAsRadioButton=='radio' && $program.dataEntryMethod =='true' ) 
-					|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='true' ) ) )
+				#elseif( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && $program.dataEntryMethod =='true' )
 					<table style='width:100%'>
 						<tr>
 							<td>

=== 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-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm	2013-09-18 02:45:29 +0000
@@ -81,12 +81,9 @@
 										#end
 									</script> 
 								#elseif($hasOptionSet=='true')
-									#if( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && (($displayOptionSetAsRadioButton=='dropdown') 
-										|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='false' ) ) )
+									#if( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && $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( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && 
-										(($displayOptionSetAsRadioButton=='radio' && $program.dataEntryMethod =='true' ) 
-										|| ( $displayOptionSetAsRadioButton=='' && $program.dataEntryMethod =='true' ) ) )
+									#elseif( $programStageDataElement.dataElement.optionSet.options.size() <= 7 && $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/settings/userGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm	2013-09-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm	2013-09-18 02:45:29 +0000
@@ -7,8 +7,7 @@
 				currentStyle: getFieldValue( 'currentStyle' ),
 				analysisDisplayProperty: getFieldValue( 'analysisDisplayProperty' ),
                 messageEmailNotification: jQuery( '#messageEmailNotification' ).is(':checked' ),
-                messageSmsNotification: jQuery( '#messageSmsNotification' ).is(':checked' ),
-				displayOptionSetAsRadioButton: getFieldValue( 'displayOptionSetAsRadioButton' )
+                messageSmsNotification: jQuery( '#messageSmsNotification' ).is(':checked' )
 			}, function ( json ) {
 				if ( json.response == "success" )
 				{	
@@ -67,16 +66,6 @@
 </select>
 </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( "dropdown_box" )</option>
-		<option value="radio" #if( "radio" == $displayOptionSetAsRadioButton ) selected="selected" #end>$i18n.getString( "radio_button" )</option>
-	</select>
-</div>
-
 <div class="setting">
 	<input type="checkbox" id="messageEmailNotification" name="messageEmailNotification" #if( $messageEmailNotification ) checked="checked"#end/>
 	<label for="messageEmailNotification">$i18n.getString( "enable_message_email_notifications" )</label>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java	2013-09-14 18:27:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java	2013-09-18 02:45:29 +0000
@@ -30,7 +30,6 @@
 
 import static org.hisp.dhis.user.UserSettingService.DEFAULT_ANALYSIS_DISPLAY_PROPERTY;
 import static org.hisp.dhis.user.UserSettingService.KEY_ANALYSIS_DISPLAY_PROPERTY;
-import static org.hisp.dhis.user.UserSettingService.KEY_DISPLAY_OPTION_SET_AS_RADIO_BUTTON;
 import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_EMAIL_NOTIFICATION;
 import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_SMS_NOTIFICATION;
 
@@ -150,13 +149,6 @@
         return messageSmsNotification;
     }
 
-    private String displayOptionSetAsRadioButton;
-
-    public String getDisplayOptionSetAsRadioButton()
-    {
-        return displayOptionSetAsRadioButton;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------
@@ -171,7 +163,7 @@
         availableLocales = localeManager.getAvailableLocales();
 
         currentLocale = localeManager.getCurrentLocale();
-                
+
         // ---------------------------------------------------------------------
         // Get available DB locales
         // ---------------------------------------------------------------------
@@ -195,9 +187,6 @@
 
         messageSmsNotification = (Boolean) userSettingService.getUserSetting( KEY_MESSAGE_SMS_NOTIFICATION, false );
 
-        displayOptionSetAsRadioButton = (String) userSettingService.getUserSetting(
-            KEY_DISPLAY_OPTION_SET_AS_RADIO_BUTTON, "" );
-
         return SUCCESS;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java	2013-09-14 19:05:29 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java	2013-09-18 02:45:29 +0000
@@ -30,7 +30,6 @@
 
 import static org.hisp.dhis.user.UserSettingService.KEY_ANALYSIS_DISPLAY_PROPERTY;
 import static org.hisp.dhis.user.UserSettingService.KEY_DB_LOCALE;
-import static org.hisp.dhis.user.UserSettingService.KEY_DISPLAY_OPTION_SET_AS_RADIO_BUTTON;
 import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_EMAIL_NOTIFICATION;
 import static org.hisp.dhis.user.UserSettingService.KEY_MESSAGE_SMS_NOTIFICATION;
 
@@ -120,13 +119,6 @@
         this.messageSmsNotification = messageSmsNotification;
     }
 
-    private String displayOptionSetAsRadioButton;
-
-    public void setDisplayOptionSetAsRadioButton( String displayOptionSetAsRadioButton )
-    {
-        this.displayOptionSetAsRadioButton = displayOptionSetAsRadioButton;
-    }
-
     private String message;
 
     public String getMessage()
@@ -160,8 +152,6 @@
 
         userSettingService.saveUserSetting( KEY_MESSAGE_SMS_NOTIFICATION, messageSmsNotification );
 
-        userSettingService.saveUserSetting( KEY_DISPLAY_OPTION_SET_AS_RADIO_BUTTON, displayOptionSetAsRadioButton );
-
         message = i18n.getString( "settings_updated" );
 
         return SUCCESS;

=== 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-16 09:47:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-09-18 02:45:29 +0000
@@ -402,10 +402,6 @@
 server_memory=Server memory
 cpu_cores=CPU cores
 user_groups=User groups
-preferred_mode_of_data_entry = Preferred mode of data entry
-dropdown_box = Dropdown box
-radio_button = Radio button
-please_select = Please select
 
 #-- Change Log------------------------------------------------------------------#
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-09-11 16:02:06 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-09-18 02:45:29 +0000
@@ -122,9 +122,9 @@
 F_ORGANISATION_REGISTRATION=Organisation Unit Registration
 F_PATIENT_REMOVE_EMPTY_EVENTS=Remove Empty Person Events
 F_ACCESS_PATIENT_ATTRIBUTES = View and Search Person identifiers
-F_ALLOW_EDIT_PATIENT_ATTRIBUTES = Add and Edit Patient Attributes
-F_ALLOW_EDIT_PATIENT_PROPERTIES = Add and Edit Patient Properties
-F_ALLOW_EDIT_PATIENT_IDENTIFIERS = Add and Edit Patient Identifiers
+F_ALLOW_EDIT_PATIENT_ATTRIBUTES = Add and Edit Person Attributes
+F_ALLOW_EDIT_PATIENT_PROPERTIES = Add and Edit Person Properties
+F_ALLOW_EDIT_PATIENT_IDENTIFIERS = Add and Edit Person Identifiers
 F_PATIENTATTRIBUTE_ADD=Add/Update Person Attribute
 F_PATIENTATTRIBUTE_DELETE=Delete Person Attribute
 F_PATIENTATTRIBUTEVALUE_ADD=Add Person Attribute Value