=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java	2013-10-08 08:47:47 +0000
@@ -28,8 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.List;
-
 import org.hisp.dhis.common.BaseIdentifiableObject;
 import org.hisp.dhis.dataentryform.DataEntryForm;
 import org.hisp.dhis.program.Program;
@@ -43,26 +41,29 @@
     private static final long serialVersionUID = -6000530171659755186L;
 
     public static String FIXED_ATTRIBUTE_FULLNAME = "fullName";
+
     public static String FIXED_ATTRIBUTE_GENDER = "gender";
+
     public static String FIXED_ATTRIBUTE_BIRTHDATE = "birthDate";
+
     public static String FIXED_ATTRIBUTE_AGE = "age";
+
     public static String FIXED_ATTRIBUTE_PHONE_NUMBER = "phoneNumber";
+
     public static String FIXED_ATTRIBUTE_DEATH_DATE = "deathDate";
+
     public static String FIXED_ATTRIBUTE_REGISTRATION_DATE = "registrationDate";
+
     public static String FIXED_ATTRIBUTE_IS_DEAD = "isDead";
+
     public static String FIXED_ATTRIBUTE_DOB_TYPE = "dobType";
+
     public static String FIXED_ATTRIBUTE_HEALTH_WORKER = "healthWorker";
 
     private Program program;
 
     private DataEntryForm dataEntryForm;
 
-    private List<String> fixedAttributes;
-
-    private List<PatientAttribute> dynamicAttributes;
-
-    private List<PatientIdentifierType> identifierTypes;
-
     // -------------------------------------------------------------------------
     // Constructors
     // -------------------------------------------------------------------------
@@ -77,8 +78,8 @@
         this.dataEntryForm = dataEntryForm;
     }
 
-    //TODO implement hashcode and equals
-    
+    // TODO implement hashcode and equals
+
     // -------------------------------------------------------------------------
     // Getters && Setters
     // -------------------------------------------------------------------------
@@ -103,34 +104,4 @@
         this.dataEntryForm = dataEntryForm;
     }
 
-    public List<String> getFixedAttributes()
-    {
-        return fixedAttributes;
-    }
-
-    public void setFixedAttributes( List<String> fixedAttributes )
-    {
-        this.fixedAttributes = fixedAttributes;
-    }
-
-    public List<PatientAttribute> getDynamicAttributes()
-    {
-        return dynamicAttributes;
-    }
-
-    public void setDynamicAttributes( List<PatientAttribute> dynamicAttributes )
-    {
-        this.dynamicAttributes = dynamicAttributes;
-    }
-
-    public List<PatientIdentifierType> getIdentifierTypes()
-    {
-        return identifierTypes;
-    }
-
-    public void setIdentifierTypes( List<PatientIdentifierType> identifierTypes )
-    {
-        this.identifierTypes = identifierTypes;
-    }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml	2013-08-29 18:09:46 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml	2013-10-08 08:47:47 +0000
@@ -21,26 +21,6 @@
 
     <many-to-one name="dataEntryForm" class="org.hisp.dhis.dataentryform.DataEntryForm"
       foreign-key="fk_patientregistrationform_dataentryformid" cascade="all" />
-      
-    <list name="fixedAttributes" table="patientregistrationform_fixedAttributes">
-      <key column="patientregistrationformid" foreign-key="fk_patientregistrationform_fixedAttributes_patientregistrationformid" />
-      <list-index column="sort_order" />
-      <element type="text" column="fixedattribute" />
-    </list>
-     
-    <list name="dynamicAttributes" table="patientregistrationform_attributes">
-      <key column="patientregistrationformid" foreign-key="fk_attributes_patientregistrationformid" />
-      <list-index column="sort_order" base="1" />
-      <many-to-many class="org.hisp.dhis.patient.PatientAttribute" column="patientattributeid" 
-      	foreign-key="fk_patientregistrationform_attributes_patientregistrationformid" />
-    </list>
-    
-    <list name="identifierTypes" table="patientregistrationform_identifierTypes">
-      <key column="patientregistrationformid" foreign-key="fk_identifierTypes_patientregistrationformid" />
-      <list-index column="sort_order" base="1" />
-      <many-to-many class="org.hisp.dhis.patient.PatientIdentifierType" column="patientidentifiertypeid"
-      	foreign-key="fk_patientregistrationform_identifiertype_patientregistrationformid" />
-    </list>
     
   </class>
 </hibernate-mapping>

=== 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-10-02 11:24:32 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm	2013-10-08 08:47:47 +0000
@@ -153,40 +153,42 @@
 	
 	#foreach ($attributeGroup in $attributeGroups )
 		#set($attributes = $attributesMap.get($attributeGroup.displayName))
-		<tr><td>&nbsp;</td></tr>
-		<tr><th colspan="2" class="heading-column">$attributeGroup.displayName</th></tr>
-		#foreach($attribute in $attributes )
-			#if( $attribute )
-				#set($value = "")
-				#set($value = $patientAttributeValueMap.get($attribute.id))
-				<tr name='attributesFields'>
-					<td class='text-column'><label>$encoder.htmlEncode($attribute.displayName) #if($attribute.mandatory) <em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
-					<td class="input-column">
-						#if( $attribute.valueType == "bool" )
-							<select id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit"> 
-								<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
-								<option value="true" #if($value=='true') selected #end>$i18n.getString( "yes" )</option>
-								<option value="false" #if($value=='false') selected #end>$i18n.getString( "no" )</option>
-							</select>                
-						#elseif( $attribute.valueType == "trueOnly" )
-							<input type='checkbox' value="true" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" #if($value=='true') checked #end> 
-						#elseif( $attribute.valueType == "date" )
-							<input type="text" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" value='$value' class=' #validate( "default"  $attribute.mandatory )'/>
-							<script type="text/javascript">
-								datePickerValid( 'attr$attribute.id', false, false );
-							</script>                    
-						#elseif( $attribute.valueType == "combo" )  
-							<select  id="attr$attribute.id"  name="attr$attribute.id" inherit="$!attribute.inherit" class='#validate( "default"  $attribute.mandatory )'>
-								<option value="">[$i18n.getString( "please_select" )]</option>
-								#foreach ($option in $attribute.attributeOptions )
-									<option value="$option.id" #if("$value"=="$option.name") selected #end>$option.name</option>
-								#end
-							</select>
-						#else
-							<input type="text" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" value='$value' class="{validate:{required:$attribute.mandatory #if($attribute.valueType=='NUMBER'),number:true #end }}" />
-						#end
-					</td>		
-				</tr>
+		#if( $attributes && $attributes.size() == 0 )
+			<tr><td>&nbsp;</td></tr>
+			<tr><th colspan="2" class="heading-column">$attributeGroup.displayName</th></tr>
+			#foreach($attribute in $attributes )
+				#if( $attribute )
+					#set($value = "")
+					#set($value = $patientAttributeValueMap.get($attribute.id))
+					<tr name='attributesFields'>
+						<td class='text-column'><label>$encoder.htmlEncode($attribute.displayName) #if($attribute.mandatory) <em title="$i18n.getString( 'required' )" class="required">*</em> #end</label></td>
+						<td class="input-column">
+							#if( $attribute.valueType == "bool" )
+								<select id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit"> 
+									<option value="" selected="selected">[$i18n.getString( "please_select" )]</option>
+									<option value="true" #if($value=='true') selected #end>$i18n.getString( "yes" )</option>
+									<option value="false" #if($value=='false') selected #end>$i18n.getString( "no" )</option>
+								</select>                
+							#elseif( $attribute.valueType == "trueOnly" )
+								<input type='checkbox' value="true" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" #if($value=='true') checked #end> 
+							#elseif( $attribute.valueType == "date" )
+								<input type="text" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" value='$value' class=' #validate( "default"  $attribute.mandatory )'/>
+								<script type="text/javascript">
+									datePickerValid( 'attr$attribute.id', false, false );
+								</script>                    
+							#elseif( $attribute.valueType == "combo" )  
+								<select  id="attr$attribute.id"  name="attr$attribute.id" inherit="$!attribute.inherit" class='#validate( "default"  $attribute.mandatory )'>
+									<option value="">[$i18n.getString( "please_select" )]</option>
+									#foreach ($option in $attribute.attributeOptions )
+										<option value="$option.id" #if("$value"=="$option.name") selected #end>$option.name</option>
+									#end
+								</select>
+							#else
+								<input type="text" id="attr$attribute.id" name="attr$attribute.id" inherit="$!attribute.inherit" value='$value' class="{validate:{required:$attribute.mandatory #if($attribute.valueType=='NUMBER'),number:true #end }}" />
+							#end
+						</td>		
+					</tr>
+				#end
 			#end
 		#end
 	#end

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDefaultPatientRegistrationFormAcion.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDefaultPatientRegistrationFormAcion.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/SaveDefaultPatientRegistrationFormAcion.java	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-package org.hisp.dhis.patient.action.dataentryform;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeService;
-import org.hisp.dhis.patient.PatientIdentifierType;
-import org.hisp.dhis.patient.PatientIdentifierTypeService;
-import org.hisp.dhis.patient.PatientRegistrationForm;
-import org.hisp.dhis.patient.PatientRegistrationFormService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * 
- * @version $ SaveDefaultPatientRegistrationFormAcion.java Jul 3, 2013 11:05:02
- *          AM $
- */
-public class SaveDefaultPatientRegistrationFormAcion
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ProgramService programService;
-
-    public void setProgramService( ProgramService programService )
-    {
-        this.programService = programService;
-    }
-
-    private PatientRegistrationFormService patientRegistrationFormService;
-
-    public void setPatientRegistrationFormService( PatientRegistrationFormService patientRegistrationFormService )
-    {
-        this.patientRegistrationFormService = patientRegistrationFormService;
-    }
-
-    private PatientAttributeService patientAttributeService;
-
-    public void setPatientAttributeService( PatientAttributeService patientAttributeService )
-    {
-        this.patientAttributeService = patientAttributeService;
-    }
-
-    private PatientIdentifierTypeService identifierTypeService;
-
-    public void setIdentifierTypeService( PatientIdentifierTypeService identifierTypeService )
-    {
-        this.identifierTypeService = identifierTypeService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Getters && Setters
-    // -------------------------------------------------------------------------
-    
-    private String name;
-
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-
-    private List<String> fixedAttributes;
-
-    public void setFixedAttributes( List<String> fixedAttributes )
-    {
-        this.fixedAttributes = fixedAttributes;
-    }
-
-    private List<Integer> dynamicAttributeIds;
-
-    public void setDynamicAttributeIds( List<Integer> dynamicAttributeIds )
-    {
-        this.dynamicAttributeIds = dynamicAttributeIds;
-    }
-
-    private List<Integer> identifierTypeIds;
-
-    public void setIdentifierTypeIds( List<Integer> identifierTypeIds )
-    {
-        this.identifierTypeIds = identifierTypeIds;
-    }
-
-    private Integer programId;
-
-    public void setProgramId( Integer programId )
-    {
-        this.programId = programId;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        List<PatientAttribute> dynamicAttributes = new ArrayList<PatientAttribute>();
-
-        for ( Integer dynamicAttributeId : dynamicAttributeIds )
-        {
-            dynamicAttributes.add( patientAttributeService.getPatientAttribute( dynamicAttributeId ) );
-        }
-
-        List<PatientIdentifierType> identifierTypes = new ArrayList<PatientIdentifierType>();
-
-        for ( Integer identifierTypeId : identifierTypeIds )
-        {
-            identifierTypes.add( identifierTypeService.getPatientIdentifierType( identifierTypeId ) );
-        }
-
-        PatientRegistrationForm registrationForm = null;
-
-        Program program = null;
-
-        if ( programId == null )
-        {
-            registrationForm = patientRegistrationFormService.getCommonPatientRegistrationForm();
-        }
-        else
-        {
-            program = programService.getProgram( programId );
-            registrationForm = patientRegistrationFormService.getPatientRegistrationForm( program );
-        }
-
-        // ---------------------------------------------------------------------
-        // Save data-entry-form
-        // ---------------------------------------------------------------------
-
-        if ( registrationForm == null )
-        {
-            registrationForm = new PatientRegistrationForm();
-            registrationForm.setName( name );
-            registrationForm.setFixedAttributes( fixedAttributes );
-            registrationForm.setDynamicAttributes( dynamicAttributes );
-            registrationForm.setIdentifierTypes( identifierTypes );
-            registrationForm.setProgram( program );
-            patientRegistrationFormService.savePatientRegistrationForm( registrationForm );
-        }
-        else
-        {
-            registrationForm.setName( name );
-            registrationForm.setFixedAttributes( fixedAttributes );
-            registrationForm.setDynamicAttributes( dynamicAttributes );
-            registrationForm.setIdentifierTypes( identifierTypes );
-            patientRegistrationFormService.updatePatientRegistrationForm( registrationForm );
-        }
-
-        return SUCCESS;
-    }
-}

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDefaultPatientRegistrationFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDefaultPatientRegistrationFormAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ShowDefaultPatientRegistrationFormAction.java	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-package org.hisp.dhis.patient.action.dataentryform;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hisp.dhis.patient.PatientAttribute;
-import org.hisp.dhis.patient.PatientAttributeService;
-import org.hisp.dhis.patient.PatientIdentifierType;
-import org.hisp.dhis.patient.PatientIdentifierTypeService;
-import org.hisp.dhis.patient.PatientRegistrationForm;
-import org.hisp.dhis.patient.PatientRegistrationFormService;
-import org.hisp.dhis.program.Program;
-import org.hisp.dhis.program.ProgramService;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Chau Thu Tran
- * 
- * @version $ ShowDefaultPatientRegistrationFormAction.java Jul 3, 2013 4:47:15
- *          PM $
- */
-public class ShowDefaultPatientRegistrationFormAction
-    implements Action
-{
-    // -------------------------------------------------------------------------
-    // Dependencies
-    // -------------------------------------------------------------------------
-
-    private ProgramService programService;
-
-    public void setProgramService( ProgramService programService )
-    {
-        this.programService = programService;
-    }
-
-    private PatientRegistrationFormService patientRegistrationFormService;
-
-    public void setPatientRegistrationFormService( PatientRegistrationFormService patientRegistrationFormService )
-    {
-        this.patientRegistrationFormService = patientRegistrationFormService;
-    }
-
-    private PatientAttributeService patientAttributeService;
-
-    public void setPatientAttributeService( PatientAttributeService patientAttributeService )
-    {
-        this.patientAttributeService = patientAttributeService;
-    }
-
-    private PatientIdentifierTypeService identifierTypeService;
-
-    public void setIdentifierTypeService( PatientIdentifierTypeService identifierTypeService )
-    {
-        this.identifierTypeService = identifierTypeService;
-    }
-
-    // -------------------------------------------------------------------------
-    // Getters && Setters
-    // -------------------------------------------------------------------------
-
-    private List<PatientAttribute> attributes;
-
-    public List<PatientAttribute> getAttributes()
-    {
-        return attributes;
-    }
-
-    private List<PatientIdentifierType> identifierTypes;
-
-    public List<PatientIdentifierType> getIdentifierTypes()
-    {
-        return identifierTypes;
-    }
-
-    private Integer programId;
-
-    public void setProgramId( Integer programId )
-    {
-        this.programId = programId;
-    }
-
-    private Program program;
-
-    public Program getProgram()
-    {
-        return program;
-    }
-
-    private PatientRegistrationForm registrationForm;
-
-    public PatientRegistrationForm getRegistrationForm()
-    {
-        return registrationForm;
-    }
-
-    // -------------------------------------------------------------------------
-    // Action implementation
-    // -------------------------------------------------------------------------
-
-    @Override
-    public String execute()
-        throws Exception
-    {
-        attributes = new ArrayList<PatientAttribute>( patientAttributeService.getAllPatientAttributes() );
-        identifierTypes = new ArrayList<PatientIdentifierType>( identifierTypeService.getAllPatientIdentifierTypes() );
-        
-        if ( programId != null )
-        {
-            program = programService.getProgram( programId );
-            registrationForm = patientRegistrationFormService.getPatientRegistrationForm( program );
-        }
-        else
-        {
-            registrationForm = patientRegistrationFormService.getCommonPatientRegistrationForm();
-        }
-        
-        if ( attributes != null && registrationForm != null )
-        {
-            attributes.removeAll( registrationForm.getDynamicAttributes() );
-        }
-
-        if ( identifierTypes != null && registrationForm != null )
-        {
-            identifierTypes.removeAll( registrationForm.getIdentifierTypes() );
-        }
-
-        return SUCCESS;
-    }
-
-}

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2013-09-27 11:13:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml	2013-10-08 08:47:47 +0000
@@ -572,42 +572,6 @@
 	</bean>
 
 	<bean
-		id="org.hisp.dhis.patient.action.dataentryform.ShowDefaultPatientRegistrationFormAction"
-		class="org.hisp.dhis.patient.action.dataentryform.ShowDefaultPatientRegistrationFormAction"
-		scope="prototype">
-		<property name="programService">
-			<ref bean="org.hisp.dhis.program.ProgramService" />
-		</property>
-		<property name="patientRegistrationFormService">
-			<ref bean="org.hisp.dhis.patient.PatientRegistrationFormService" />
-		</property>
-		<property name="patientAttributeService">
-			<ref bean="org.hisp.dhis.patient.PatientAttributeService" />
-		</property>
-		<property name="identifierTypeService">
-			<ref bean="org.hisp.dhis.patient.PatientIdentifierTypeService" />
-		</property>
-	</bean>
-
-	<bean
-		id="org.hisp.dhis.patient.action.dataentryform.SaveDefaultPatientRegistrationFormAcion"
-		class="org.hisp.dhis.patient.action.dataentryform.SaveDefaultPatientRegistrationFormAcion"
-		scope="prototype">
-		<property name="programService">
-			<ref bean="org.hisp.dhis.program.ProgramService" />
-		</property>
-		<property name="patientRegistrationFormService">
-			<ref bean="org.hisp.dhis.patient.PatientRegistrationFormService" />
-		</property>
-		<property name="patientAttributeService">
-			<ref bean="org.hisp.dhis.patient.PatientAttributeService" />
-		</property>
-		<property name="identifierTypeService">
-			<ref bean="org.hisp.dhis.patient.PatientIdentifierTypeService" />
-		</property>
-	</bean>
-
-	<bean
 		id="org.hisp.dhis.patient.action.dataentryform.ShowPatientRegistrationFormAction"
 		class="org.hisp.dhis.patient.action.dataentryform.ShowPatientRegistrationFormAction"
 		scope="prototype">

=== 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-27 11:13:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties	2013-10-08 08:47:47 +0000
@@ -482,4 +482,7 @@
 the_properties_to_open_data_entry_form_after_enrolment_is_active_in_the_stage = The properties to open data entry form after enrolment is active in the stage
 add_relative = Add relative
 who_is_the_new_relative_to_the_existing_person = Who is the new relative to the existing person?
-program_for_new_relative_to_be_enrolled_in = Program for new relative to be enrolled in
\ No newline at end of file
+program_for_new_relative_to_be_enrolled_in = Program for new relative to be enrolled in
+health_worker = Health worker
+is_hidden = Is hidden ?
+default_value = Default value
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-09-17 06:08:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-10-08 08:47:47 +0000
@@ -623,24 +623,6 @@
 				../dhis-web-commons/ajax/jsonResponseSuccess.vm
 			</result>
 		</action>
-
-		<action name="showDefaultPatientRegistrationForm"
-			class="org.hisp.dhis.patient.action.dataentryform.ShowDefaultPatientRegistrationFormAction">
-			<result name="success" type="velocity">/main.vm</result>
-			<param name="page">/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm</param>
-			<param name="javascripts">
-				../dhis-web-commons/ckeditor/ckeditor.js,
-				../dhis-web-commons/ckeditor/adapters/jquery.js,
-				javascript/patientRegistationForm.js
-			</param>
-			<param name="stylesheets">style/basic.css</param>
-		</action>
-		
-		<action name="saveDefaultPatientRegistrationForm"
-			class="org.hisp.dhis.patient.action.dataentryform.SaveDefaultPatientRegistrationFormAcion">
-			<result name="success" type="redirect">patientRegistrationForm.action
-			</result>
-		</action>
 		
 		<!-- Patient Attribute Group -->
 

=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm	2013-07-10 02:51:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/defaultPatientRegistationForm.vm	1970-01-01 00:00:00 +0000
@@ -1,225 +0,0 @@
-<script>
-jQuery(document).ready(	function(){
-	validation( 'defaultPatientRegistrationForm', function(form){
-		form.submit();
-	});
-	
-	byId('name').focus();
-});
-</script>
-
-<h3>$i18n.getString( "create_default_registration_form" )</h3>
-																			
-<form id="defaultPatientRegistrationForm" name="defaultPatientRegistrationForm" action="saveDefaultPatientRegistrationForm.action" method="post" onsubmit="selectAllById('fixedAttributes');selectAllById('dynamicAttributeIds');selectAllById('identifierTypeIds');">
-<input type='hidden' id='programId' name='programId' value='$!program.id'/>
-<table>
-	<tr>
-		<th colspan="2">$i18n.getString( "default_registration_form" )</th>
-	</tr>
-	<tr>
-		<td>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></td>
-		<td><input type="text" id="name" name="name" class="{validate:{required:true}}" value='$!registrationForm.name'/></td>
-	</tr> 
-	<tr>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-</table>
-
-<table>
-	<colgroup>
-		<col style='width:300px'/>
-		<col/>
-		<col style='width:300px'/>
-	</colgroup>
-	<tr>
-		<th>$i18n.getString( "available_fixed_attributes" )</th>
-		<th>$i18n.getString( "filter" )</th>
-		<th>$i18n.getString( "selected_fixed_attributes" )
-		</th>
-	</tr>
-	<tr>
-		<td>
-			<select id="availableFixedAttributes" name='availableFixedAttributes' multiple="multiple" ondblclick="moveSelectedById( 'availableFixedAttributes', 'fixedAttributes' )" style="width:450px;height:270px">
-				#set($hasRegistrationDate = false)
-				#set($hasFullName = false)
-				#set($hasGender = false)
-				#set($hasDobType = false)
-				#set($hasBirthDate = false)
-				#set($hasAge = false)
-				#set($hasPhoneNumber = false)
-				#set($hasDeathDate = false)
-				#set($hasIsDead = false)
-				#set($hasHealthWorker = false)
-				#foreach( $fixedAttribute in $registrationForm.fixedAttributes )
-					#if($fixedAttribute=='registrationDate')
-						#set($hasRegistrationDate = true)
-					#end
-					#if($fixedAttribute=='fullName')
-						#set($hasFullName = true)
-					#end
-					#if($fixedAttribute=='gender')
-						#set($hasGender = true)
-					#end
-					#if($fixedAttribute=='dobType')
-						#set($hasDobType = true)
-					#end
-					#if($fixedAttribute=='birthDate')
-						#set($hasBirthDate = true)
-					#end
-					#if($fixedAttribute=='age')
-						#set($hasAge = true)
-					#end
-					#if($fixedAttribute=='phoneNumber')
-						#set($hasPhoneNumber = true)
-					#end
-					#if($fixedAttribute=='deathDate')
-						#set($hasDeathDate = true)
-					#end
-					#if($fixedAttribute=='isDead')
-						#set($hasIsDead = true)
-					#end
-					#if($fixedAttribute=='healthWorker')
-						#set($hasHealthWorker = true)
-					#end
-				#end
-				
-				#if($hasRegistrationDate==false)
-					<option value="registrationDate">$i18n.getString('registration_date')</option>
-				#end
-				#if($hasFullName==false)
-					<option value="fullName">$i18n.getString('full_name')</option>
-				#end
-				#if($hasGender==false)
-					<option value="gender">$i18n.getString('gender')</option>
-				#end
-				#if($hasDobType==false)
-					<option value="dobType">$i18n.getString('dob_type')</option>
-				#end
-				#if($hasBirthDate==false)
-					<option value="birthDate">$i18n.getString('birth_date')</option>
-				#end
-				#if($hasAge==false)
-					<option value="age">$i18n.getString('age_years')</option>
-				#end
-				#if($hasPhoneNumber==false)
-					<option value="phoneNumber">$i18n.getString('phone_number')</option>
-				#end
-				#if($hasDeathDate==false)
-					<option value="deathDate">$i18n.getString('death_date')</option>
-				#end
-				#if($hasIsDead==false)
-					<option value="isDead">$i18n.getString('is_dead')</option>
-				#end
-				#if($hasHealthWorker==false)
-					<option value="healthWorker">$i18n.getString('health_worker')</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableFixedAttributes', 'fixedAttributes' )" class='filterButton'/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'fixedAttributes', 'availableFixedAttributes' )" class='filterButton'/><br/>
-			<input type="button" value="&gt;&gt;" onclick="moveAllById( 'availableFixedAttributes', 'fixedAttributes' )" class='filterButton' /><br/>
-			<input type="button" value="&lt;&lt;" onclick="moveAllById( 'fixedAttributes', 'availableFixedAttributes' )" class='filterButton' />
-		</td>
-		<td>	
-			<select style='width:100%' multiple="multiple" id="fixedAttributes" name="fixedAttributes" ondblclick="moveSelectedById( 'fixedAttributes', 'availableFixedAttributes' )" size="15" >
-				#foreach( $fixedAttribute in $registrationForm.fixedAttributes )
-				<option value='$fixedAttribute'>$i18n.getString($fixedAttribute)</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<a href="javascript:moveUpSelectedOption( 'fixedAttributes')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
-			<a href="javascript:moveDownSelectedOption( 'fixedAttributes' )" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" alt="$i18n.getString( 'move_up' )"/></a>
-		</td>
-	</tr>  
-</table>
-
-<table>
-	<colgroup>
-		<col style='width:300px'/>
-		<col/>
-		<col style='width:300px'/>
-	</colgroup>
-	<tr>
-		<th>$i18n.getString( "available_identifier_types" )</th>
-		<th>$i18n.getString( "filter" )</th>
-		<th>$i18n.getString( "selected_identifier_types" )<th>
-	</tr>
-	<tr>
-		<td>
-			<select id="availableIdentifierTypes" name='availableIdentifierTypes' multiple="multiple" ondblclick="moveSelectedById( 'availableIdentifierTypes', 'identifierTypeIds' )" style="width:450px;height:270px">
-				#foreach($identifierType in $identifierTypes)
-				<option value='$identifierType.id'>$identifierType.displayName</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableIdentifierTypes', 'identifierTypeIds' )" class='filterButton'/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'identifierTypeIds', 'availableIdentifierTypes' )" class='filterButton'/><br/>
-			<input type="button" value="&gt;&gt;" onclick="moveAllById( 'availableIdentifierTypes', 'identifierTypeIds' )" class='filterButton' /><br/>
-			<input type="button" value="&lt;&lt;" onclick="moveAllById( 'identifierTypeIds', 'availableIdentifierTypes' )" class='filterButton' />
-		</td>
-		<td>
-			<select style='width:100%' multiple="multiple" id="identifierTypeIds" name="identifierTypeIds" ondblclick="moveSelectedById( 'identifierTypeIds', 'availableIdentifierTypes' )"  size="15" >
-				#foreach( $identifierType in $registrationForm.identifierTypes )
-				<option value='$identifierType.id'>$identifierType.displayName</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<a href="javascript:moveUpSelectedOption( 'identifierTypeIds')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
-			<a href="javascript:moveDownSelectedOption( 'identifierTypeIds' )" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" alt="$i18n.getString( 'move_up' )"/></a>
-		</td>
-	</tr>  
-</table>
-
-<table>
-	<colgroup>
-		<col style='width:300px'/>
-		<col/>
-		<col style='width:300px'/>
-	</colgroup>
-	<tr>
-		<th>$i18n.getString( "available_dynamic_attributes" )</th>
-		<th>$i18n.getString( "filter" )</th>
-		<th>$i18n.getString( "selected_dynamic_attributes" )</th>
-	</tr>
-	<tr>
-		<td>
-			<select id="availableAttributes" name='availableAttributes' multiple="multiple" ondblclick="moveSelectedById( 'availableAttributes', 'dynamicAttributeIds' )" style="width:450px;height:270px">
-				#foreach($attribute in $attributes)
-				<option value='$attribute.id'>$attribute.displayName</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<input type="button" value="&gt;" title="$i18n.getString('move_selected')" onclick="moveSelectedById( 'availableAttributes', 'dynamicAttributeIds' )" class='filterButton'/><br/>
-			<input type="button" value="&lt;" title="$i18n.getString('remove_selected')" onclick="moveSelectedById( 'dynamicAttributeIds', 'availableAttributes' )" class='filterButton'/><br/>
-			<input type="button" value="&gt;&gt;" onclick="moveAllById( 'availableAttributes', 'dynamicAttributeIds' )" class='filterButton' /><br/>
-			<input type="button" value="&lt;&lt;" onclick="moveAllById( 'dynamicAttributeIds', 'availableAttributes' )" class='filterButton' />
-		</td>
-		<td>
-			<select style='width:100%' multiple="multiple" id="dynamicAttributeIds" name="dynamicAttributeIds" size="15" ondblclick="moveSelectedById( 'dynamicAttributeIds', 'availableAttributes' )">
-				#foreach( $dynamicAttribute in $registrationForm.dynamicAttributes )
-				<option value='$dynamicAttribute.id'>$dynamicAttribute.displayName</option>
-				#end
-			</select>
-		</td>
-		<td>
-			<a href="javascript:moveUpSelectedOption( 'dynamicAttributeIds')" title="$i18n.getString( 'move_up' )"><img src="../images/move_up.png" alt="$i18n.getString( 'move_up' )"/></a><br/><br/>
-			<a href="javascript:moveDownSelectedOption( 'dynamicAttributeIds' )" title="$i18n.getString( 'move_down' )"><img src="../images/move_down.png" alt="$i18n.getString( 'move_up' )"/></a>
-		</td>
-	</tr>  
-</table>
-
-<p>
-	<input type="submit" value="$i18n.getString( 'add' )" />
-	<input type="button" value="$i18n.getString( 'cancel' )" onclick="window.location.href='patientRegistrationForm.action'"/>
-</p>
-
-</form>
-
-<script>
-	var i18n_remove_option = '$encoder.jsEscape( $i18n.getString( "remove_option" ) , "'") ';
-</script>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientRegistrationForm.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientRegistrationForm.js	2013-07-03 15:40:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientRegistrationForm.js	2013-10-08 08:47:47 +0000
@@ -22,8 +22,3 @@
 		});
 	}
 }
-
-function showDefaultRegistrationForm( programId )
-{
-	window.location.href='showDefaultPatientRegistrationForm.action?programId=' + programId;
-}
\ 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/patientRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm	2013-09-05 18:46:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm	2013-10-08 08:47:47 +0000
@@ -10,17 +10,12 @@
 	#end
   <tr>
     <td style="vertical-align:top" colspan='2'>
-		
 		<table class="listTable" id='formList'>
 			  <col>   
-			  <col> 
-			  <col>
 			  <col width="100">
 			<thead>			  
 			  <tr>  
 				<th>$i18n.getString( "program" )</th>
-				<th>$i18n.getString( "default_form_name" )</th>
-				<th>$i18n.getString( "custom_form_name" )</th>
 				<th class="{sorter: false}">$i18n.getString( "operations" )</th>
 			  </tr>
 			</thead>
@@ -35,31 +30,12 @@
 							$i18n.getString('no_program')
 							#set($hasCommonForm = 'true')
 						#end	
-					</td>  
-					<td>
-						#if($!registrationForm.name)
-							$!encoder.htmlEncode( $registrationForm.name )
-						#else
-							[$i18n.getString('none')]
-						#end
-					</td> 
-					<td>
-						#if($!registrationForm.dataEntryForm)
-							$!encoder.htmlEncode( $registrationForm.dataEntryForm.name )
-						#else
-							[$i18n.getString('none')]
-						#end
-					</td>   					
+					</td>					
 					<td style="text-align:center">
 					  <a href="javascript:showDefaultRegistrationForm('$!registrationForm.program.id');" title="$i18n.getString( 'edit' )"><img src='../images/edit.png' alt="$i18n.getString( 'edit' )"></a>
-					  
-					  <a id='update_$registrationForm.program.id' href="javascript:updateNewForm($registrationForm.id, '$!registrationForm.program.id')" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
-					  <a id='add_$registrationForm.program.id' href="javascript:addNewForm($registrationForm.program.id)" title="$i18n.getString( 'design_data_entry_form' )" style='display:none;'><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )" ></a>
-					 
 					  <a href="javascript:removeRegistrationForm( '$!registrationForm.program.id', '$!encoder.jsEncode( $registrationForm.program.name )')" title="$i18n.getString( "remove" )"><img id='active_$registrationForm.program.id' src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
 					  <img id='define_$registrationForm.program.id' style='display:none;' src='../images/delete-denied.png' title='$i18n.getString("remove")'>
 					</td>
-					
 				  </tr>
 				#end
 				
@@ -73,11 +49,8 @@
 					
 					#if($hasForm == false)
 						<tr id="tr${registrationForm.id}">
-							<td>$encoder.htmlEncode( $program.name )</td>  
-							<td>[$i18n.getString('none')]</td>   
-							<td>[$i18n.getString('none')]</td> 					
+							<td>$encoder.htmlEncode( $program.name )</td> 	
 							<td style="text-align:center">
-								<a href="javascript:showDefaultRegistrationForm($program.id);" title="$i18n.getString( 'edit' )"><img src='../images/edit.png' alt="$i18n.getString( 'edit' )"></a>
 								<a href="javascript:addNewForm($program.id)" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
 								<img src='../images/delete-denied.png' title='$i18n.getString("remove")'>
 							</td>
@@ -86,11 +59,8 @@
 				#end
 				#if($hasCommonForm=='false')
 				 <tr id="tr${registrationForm.id}">
-					<td>$i18n.getString('no_program')</td>  
-					<td>[$i18n.getString('none')]</td>  
-					<td>[$i18n.getString('none')]</td> 					
+					<td>$i18n.getString('no_program')</td> 			
 					<td style="text-align:center">
-					  <a href="javascript:showDefaultRegistrationForm('');" title="$i18n.getString( 'edit' )"><img src='../images/edit.png' alt="$i18n.getString( 'edit' )"></a>
 					  <a href="javascript:addNewForm('')" title="$i18n.getString( 'design_data_entry_form' )"><img src="../images/edit_layout.png" alt="$i18n.getString( 'design_data_entry_form' )"></a>
 					  <img src='../images/delete-denied.png' title='$i18n.getString("remove")'>
 					</td>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewPatientRegistationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewPatientRegistationForm.vm	2013-07-16 04:31:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewPatientRegistationForm.vm	2013-10-08 08:47:47 +0000
@@ -3,6 +3,7 @@
 <link href="../dhis-web-commons/css/print.css" media="print" rel="stylesheet" type="text/css">
 <link href="../favicon.ico" rel="shortcut icon">
 <link rel="stylesheet" type="text/css" href="../dhis-web-commons/ckeditor/skins/kama/editor.css?t=B8DJ5M3"/>
+<script type="text/javascript" src="javascript/plugin.js"></script>
 
 <script type="text/javascript">
   
@@ -135,14 +136,15 @@
 		</tr>
 		<tr>
 			<td>
-				<input type='text' id='suggestedField' style='width:350px;'>
-				<select style='width:350px;display:none;' id='genderSelector'>
+				$i18n.getString("default_value")
+				<input type='text' id='suggestedField' style='width:295px;'>
+				<select style='width:300px;display:none;' id='genderSelector'>
 					<option value="">[$i18n.getString( "please_select" )]</option>
 					<option value="M">$i18n.getString( "male" )</option>
 					<option value="F">$i18n.getString( "female" )</option>
 					<option value="T">$i18n.getString( "transgender" )</option>
 				</select>
-				<select style='width:350px;display:none;' id='dobTypeSelector'>
+				<select style='width:300px;display:none;' id='dobTypeSelector'>
 					<option value="">[$i18n.getString( "please_select" )]</option>
 					<option value="V">$i18n.getString( "verified" )</option>
 					<option value="D">$i18n.getString( "declared" )</option>