dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #23439
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11402: Add functionality to allow use birthdate for incidentdate and enrollment date.
------------------------------------------------------------
revno: 11402
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-07-16 11:31:27 +0700
message:
Add functionality to allow use birthdate for incidentdate and enrollment date.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
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/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm
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/UpdateProgramAction.java
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/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/javascript/program.js
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/updateProgramForm.vm
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/viewPatientRegistationForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-07-09 03:26:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2013-07-16 04:31:27 +0000
@@ -130,6 +130,11 @@
* Allow enrolling person to all orgunit no matter what the program is assigned for the orgunit or not
*/
private Boolean displayOnAllOrgunit = true;
+
+
+ private Boolean useBirthDateAsIncidentDate;
+
+ private Boolean useBirthDateAsEnrollmentDate;
// -------------------------------------------------------------------------
// Constructors
@@ -545,4 +550,28 @@
this.displayOnAllOrgunit = displayOnAllOrgunit;
}
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public Boolean getUseBirthDateAsIncidentDate()
+ {
+ return useBirthDateAsIncidentDate;
+ }
+
+ public void setUseBirthDateAsIncidentDate( Boolean useBirthDateAsIncidentDate )
+ {
+ this.useBirthDateAsIncidentDate = useBirthDateAsIncidentDate;
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public Boolean getUseBirthDateAsEnrollmentDate()
+ {
+ return useBirthDateAsEnrollmentDate;
+ }
+
+ public void setUseBirthDateAsEnrollmentDate( Boolean useBirthDateAsEnrollmentDate )
+ {
+ this.useBirthDateAsEnrollmentDate = useBirthDateAsEnrollmentDate;
+ }
+
}
=== 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-07-09 03:26:26 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2013-07-16 04:31:27 +0000
@@ -219,6 +219,8 @@
executeSql( "UPDATE program SET useFormNameDataElement=true where useFormNameDataElement is null" );
executeSql( "ALTER TABLE caseaggregationcondition ALTER COLUMN aggregationexpression TYPE varchar(1000)");
executeSql( "update patientattribute set displayonvisitschedule = false where displayonvisitschedule is null");
+ executeSql( "update program set useBirthDateAsIncidentDate = false where useBirthDateAsIncidentDate is null");
+ executeSql( "update program set useBirthDateAsEnrollmentDate = false where useBirthDateAsEnrollmentDate 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-07-09 03:26:26 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml 2013-07-16 04:31:27 +0000
@@ -88,6 +88,10 @@
<property name="displayOnAllOrgunit" />
+ <property name="useBirthDateAsIncidentDate" />
+
+ <property name="useBirthDateAsEnrollmentDate" />
+
<!-- Access properties -->
<many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_program_userid" />
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java 2013-04-24 09:20:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java 2013-07-16 04:31:27 +0000
@@ -159,10 +159,27 @@
Program program = programService.getProgram( programId );
+ if ( enrollmentDate == null || enrollmentDate.isEmpty() )
+ {
+ if ( program.getUseBirthDateAsIncidentDate() )
+ {
+ enrollmentDate = format.formatDate( patient.getBirthDate() );
+ }
+ }
+
if ( dateOfIncident == null || dateOfIncident.isEmpty() )
{
- dateOfIncident = enrollmentDate;
+ if ( program.getUseBirthDateAsIncidentDate() )
+ {
+ dateOfIncident = format.formatDate( patient.getBirthDate() );
+ }
+ else
+ {
+ dateOfIncident = enrollmentDate;
+ }
}
+
+
Collection<ProgramInstance> programInstances = programInstanceService.getProgramInstances( patient, program,
ProgramInstance.STATUS_ACTIVE );
=== 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-07-09 03:26:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm 2013-07-16 04:31:27 +0000
@@ -16,6 +16,8 @@
"blockEntryForm": "$!program.blockEntryForm",
"onlyEnrollOnce": "$!program.onlyEnrollOnce",
"remindCompleted": "$!program.remindCompleted",
- "displayOnAllOrgunit": "$!program.displayOnAllOrgunit"
+ "displayOnAllOrgunit": "$!program.displayOnAllOrgunit",
+ "useBirthDateAsIncidentDate": "$!program.useBirthDateAsIncidentDate",
+ "useBirthDateAsEnrollmentDate": "$!program.useBirthDateAsEnrollmentDate"
}
}
\ No newline at end of file
=== 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-07-09 03:26:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2013-07-16 04:31:27 +0000
@@ -242,6 +242,20 @@
this.displayOnAllOrgunit = displayOnAllOrgunit;
}
+ private Boolean useBirthDateAsIncidentDate;
+
+ public void setUseBirthDateAsIncidentDate( Boolean useBirthDateAsIncidentDate )
+ {
+ this.useBirthDateAsIncidentDate = useBirthDateAsIncidentDate;
+ }
+
+ private Boolean useBirthDateAsEnrollmentDate;
+
+ public void setUseBirthDateAsEnrollmentDate( Boolean useBirthDateAsEnrollmentDate )
+ {
+ this.useBirthDateAsEnrollmentDate = useBirthDateAsEnrollmentDate;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -257,6 +271,8 @@
onlyEnrollOnce = (onlyEnrollOnce == null) ? false : onlyEnrollOnce;
remindCompleted = (remindCompleted == null) ? false : remindCompleted;
displayOnAllOrgunit = (displayOnAllOrgunit == null) ? false : displayOnAllOrgunit;
+ useBirthDateAsIncidentDate = (useBirthDateAsIncidentDate == null) ? false : useBirthDateAsIncidentDate;
+ useBirthDateAsEnrollmentDate = (useBirthDateAsEnrollmentDate == null) ? false : useBirthDateAsEnrollmentDate;
Program program = new Program();
@@ -272,6 +288,8 @@
program.setOnlyEnrollOnce( onlyEnrollOnce );
program.setRemindCompleted( remindCompleted );
program.setDisplayOnAllOrgunit( displayOnAllOrgunit );
+ program.setUseBirthDateAsIncidentDate( useBirthDateAsIncidentDate );
+ program.setUseBirthDateAsEnrollmentDate( useBirthDateAsEnrollmentDate );
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/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-07-09 03:26:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/UpdateProgramAction.java 2013-07-16 04:31:27 +0000
@@ -238,6 +238,20 @@
this.whenToSend = whenToSend;
}
+ private Boolean useBirthDateAsIncidentDate;
+
+ public void setUseBirthDateAsIncidentDate( Boolean useBirthDateAsIncidentDate )
+ {
+ this.useBirthDateAsIncidentDate = useBirthDateAsIncidentDate;
+ }
+
+ private Boolean useBirthDateAsEnrollmentDate;
+
+ public void setUseBirthDateAsEnrollmentDate( Boolean useBirthDateAsEnrollmentDate )
+ {
+ this.useBirthDateAsEnrollmentDate = useBirthDateAsEnrollmentDate;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -252,6 +266,8 @@
blockEntryForm = (blockEntryForm == null) ? false : blockEntryForm;
remindCompleted = (remindCompleted == null) ? false : remindCompleted;
displayOnAllOrgunit = (displayOnAllOrgunit == null) ? false : displayOnAllOrgunit;
+ useBirthDateAsIncidentDate = (useBirthDateAsIncidentDate == null) ? false : useBirthDateAsIncidentDate;
+ useBirthDateAsEnrollmentDate = (useBirthDateAsEnrollmentDate == null) ? false : useBirthDateAsEnrollmentDate;
Program program = programService.getProgram( id );
program.setName( name );
@@ -266,7 +282,9 @@
program.setOnlyEnrollOnce( onlyEnrollOnce );
program.setRemindCompleted( remindCompleted );
program.setDisplayOnAllOrgunit( displayOnAllOrgunit );
-
+ program.setUseBirthDateAsIncidentDate( useBirthDateAsIncidentDate );
+ program.setUseBirthDateAsEnrollmentDate( useBirthDateAsEnrollmentDate );
+
if ( type == Program.MULTIPLE_EVENTS_WITH_REGISTRATION )
{
program.setGeneratedByEnrollmentDate( generateBydEnrollmentDate );
=== 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-07-05 07:05:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2013-07-16 04:31:27 +0000
@@ -394,7 +394,7 @@
combine = Combine
completed = Completed
events = Events
-display_on_all_orgunits = Display on all organisation units
+used_by_all_orgunits = Used by all organisation units
other_program_stages = Other program stages
minus = Minus
minus_with_dateOfIncident = Incident Date Diff
@@ -441,4 +441,6 @@
isDead = Is dead
healthWorker = Health worker
create_default_registration_form = Create default registration form
-minus_with_dataelement = Data Element Date Diff
\ No newline at end of file
+minus_with_dataelement = Data Element Date Diff
+use_birth_date_as_incident_date = Use birthdate as incident date
+use_birth_date_as_enrollment_date = Use birthdate as enrollment date
\ 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-07-09 03:26:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-07-16 04:31:27 +0000
@@ -165,14 +165,20 @@
</tr>
<tr>
- <td><label>$i18n.getString( "display_on_all_orgunits" )</label></td>
+ <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
<td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true'></td>
<td></td>
</tr>
<tr name='nonAnonymous'>
- <td><label>$i18n.getString( "show_incident_date" )</label></td>
- <td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' checked onchange='programOnChange();'></td>
+ <td><label>$i18n.getString( "use_birth_date_as_incident_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsIncidentDate" name="useBirthDateAsIncidentDate" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_enrollment_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsEnrollmentDate" name="useBirthDateAsEnrollmentDate" value='true' ></td>
<td></td>
</tr>
=== 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-07-10 08:02:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-07-16 04:31:27 +0000
@@ -41,6 +41,12 @@
var remindCompleted = ( json.program.remindCompleted == 'true') ? i18n_yes : i18n_no;
setInnerHTML( 'remindCompletedField', remindCompleted );
+ var useBirthDateAsIncidentDate = ( json.program.useBirthDateAsIncidentDate == 'true') ? i18n_yes : i18n_no;
+ setInnerHTML( 'useBirthDateAsIncidentDateField', useBirthDateAsIncidentDate );
+
+ var useBirthDateAsEnrollmentDate = ( json.program.useBirthDateAsEnrollmentDate == 'true') ? i18n_yes : i18n_no;
+ setInnerHTML( 'useBirthDateAsEnrollmentDateField', useBirthDateAsEnrollmentDate );
+
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/programList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-07-09 03:26:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-07-16 04:31:27 +0000
@@ -91,11 +91,14 @@
<p><label class="bold">$i18n.getString( "display_date_of_incident" ):</label><br><span id="displayIncidentDateField"></span></p> <p><label class="bold">$i18n.getString( "generated_events_by_enrollment_date" ):</label><br><span id="generatedByEnrollmentDateField"></span></p>
<p><label class="bold">$i18n.getString( "skip_to_generate_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></span></p>
<p><label class="bold">$i18n.getString( "only_enroll_once" ):</label><br><span id="onlyEnrollOnceField"></span></p>
- <p><label class="bold">$i18n.getString( "display_on_all_orgunits" ):</label><br><span id="displayOnAllOrgunitField"></span></p>
+ <p><label class="bold">$i18n.getString( "used_by_all_orgunits" ):</label><br><span id="displayOnAllOrgunitField"></span></p>
<p><label class="bold">$i18n.getString( "block_entry_form_after_completed" ):</label><br><span id="blockEntryFormField"></span></p>
<p><label class="bold">$i18n.getString( "remind_completing_program_after_program_stage_completed" ):</label><br><span id="remindCompletedField"></span></p>
+ <p><label class="bold">$i18n.getString( "use_birth_date_as_incident_date" ):</label><br><span id="useBirthDateAsIncidentDate"></span></p>
+ <p><label class="bold">$i18n.getString( "show_incident_date" ):</label><br><span id="displayIncidentDate"></span></p>
+ <p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>
+ <p><label class="bold">$i18n.getString( "use_birth_date_as_enrollment_date" ):</label><br><span id="useBirthDateAsEnrollmentDate"></span></p>
<p><label class="bold">$i18n.getString( "date_of_enrollment_description" ):</label><br><span id="dateOfEnrollmentDescriptionField"></span></p>
- <p><label class="bold">$i18n.getString( "date_of_incident_description" ):</label><br><span id="dateOfIncidentDescriptionField"></span></p>
<p><label class="bold">$i18n.getString( "number_of_attributes" ):</label><br><span id="noAttributesField"></span></p>
<p><label class="bold">$i18n.getString( "number_of_identifier_types" ):</label><br><span id="noIdentifierTypesField"></span></p>
</div>
=== 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-07-10 08:02:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-07-16 04:31:27 +0000
@@ -169,12 +169,24 @@
</tr>
<tr>
- <td><label>$i18n.getString( "display_on_all_orgunits" )</label></td>
+ <td><label>$i18n.getString( "used_by_all_orgunits" )</label></td>
<td><input type="checkbox" id="displayOnAllOrgunit" name="displayOnAllOrgunit" value='true' #if($program.displayOnAllOrgunit) checked #end></td>
<td></td>
</tr>
<tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_incident_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsIncidentDate" name="useBirthDateAsIncidentDate" value='true' #if($program.useBirthDateAsIncidentDate=='true') checked #end /></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
+ <td><label>$i18n.getString( "use_birth_date_as_enrollment_date" )</label></td>
+ <td><input type="checkbox" id="useBirthDateAsEnrollmentDate" name="useBirthDateAsEnrollmentDate" value='true' #if($program.useBirthDateAsEnrollmentDate=='true') checked #end ></td>
+ <td></td>
+ </tr>
+
+ <tr name='nonAnonymous'>
<td><label>$i18n.getString( "show_incident_date" )</label></td>
<td><input type="checkbox" id="displayIncidentDate" name="displayIncidentDate" value='true' onchange='programOnChange();' #if( $program.type=='3' ) disabled #elseif($program.displayIncidentDate=='true') checked #end></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-07-10 08:02:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2013-07-16 04:31:27 +0000
@@ -4,7 +4,7 @@
<h4>$programStage.program.displayName</h4>
-<form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="get">
+<form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="post">
<input type="hidden" id="id" name="id" value="$programStage.id"/>
<input type="hidden" id="programId" name="programId" value="$programStage.program.id"/>
<select id='daysAllowedSendMessages' name="daysAllowedSendMessages" multiple="multiple" class="hidden"></select>
=== 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-09 06:32:58 +0000
+++ 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
@@ -200,9 +200,9 @@
<tr>
<td>
<select id="programAttrSelector" multiple="multiple" style="width:450px;height:270px" ondblclick="insertElement( 'prg' )">
- <option value="enrollmentDate" mandatory='true'>$encoder.htmlEncode($program.dateOfEnrollmentDescription) *</option>
+ <option value="enrollmentDate" #if($program.useBirthDateAsEnrollmentDate=='false') mandatory='true' #end >$encoder.htmlEncode($program.dateOfEnrollmentDescription) #if($program.useBirthDateAsEnrollmentDate=='false') * #end</option>
#if($program.displayIncidentDate=='true')
- <option value="dateOfIncident" mandatory='true'>$encoder.htmlEncode($program.dateOfIncidentDescription) *</option>
+ <option value="dateOfIncident" #if($program.useBirthDateAsIncidentDate=='false') mandatory='true' #end>$encoder.htmlEncode($program.dateOfIncidentDescription) #if($program.useBirthDateAsIncidentDate=='false') * #end</option>
#end
</select>
</td>
