=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2012-09-07 09:18:04 +0000
@@ -67,6 +67,8 @@
private Integer standardInterval;
+ private String reportDateDescription;
+
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@@ -215,6 +217,16 @@
this.programStageDataElements = programStageDataElements;
}
+ public String getReportDateDescription()
+ {
+ return reportDateDescription;
+ }
+
+ public void setReportDateDescription( String reportDateDescription )
+ {
+ this.reportDateDescription = reportDateDescription;
+ }
+
public String getDataEntryType()
{
if ( dataEntryForm != null )
=== 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 2012-09-07 07:57:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java 2012-09-07 09:18:04 +0000
@@ -278,7 +278,11 @@
public Integer getEventStatus()
{
- if ( this.isCompleted() )
+ if ( this.status != null )
+ {
+ return status;
+ }
+ else if ( this.isCompleted() )
{
return ProgramStageInstance.COMPLETED_STATUS;
}
=== 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 2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java 2012-09-07 09:18:04 +0000
@@ -125,6 +125,9 @@
updateRelationshipIdentifiers();
updateRelationshipAttributes();
+
+ executeSql( "UPDATE programstage SET reportDateDescription='Report date' WHERE reportDateDescription is null" );
+
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml 2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml 2012-09-07 09:18:04 +0000
@@ -39,5 +39,7 @@
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-09-07 07:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties 2012-09-07 09:18:04 +0000
@@ -386,7 +386,7 @@
confirm_remove_empty_events = Are you sure you want to remove empty events?
please_select_relationship_type = Please select a relationship type
please_select_a_patient_for_setting_relationship = Please select a person for setting relationship
-report_date_from_to=Report date (from-to)
+from_to=(from-to)
enter_age_in_years = Enter age in years
add_and_continue = Add and continue
tracking = Tracking
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-08-29 11:43:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2012-09-07 09:18:04 +0000
@@ -36,7 +36,7 @@
@@ -76,7 +76,7 @@
- $i18n.getString('report_date_from_to') |
+ $i18n.getString('from_to') |
|
|
|
@@ -115,7 +115,7 @@
- |
+ $i18n.getString( "report_date" ) |
|
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-08-29 11:43:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/anonymousRegistration.js 2012-09-07 09:18:04 +0000
@@ -50,6 +50,8 @@
clearListById('searchObjectId');
programStageId = jQuery('#programId option:selected').attr('psid');
setFieldValue('programStageId', programStageId );
+ setInnerHTML('reportDateDescriptionField', jQuery('#programId option:selected').attr('reportDateDes'));
+ setInnerHTML('reportDateDescriptionField2', jQuery('#programId option:selected').attr('reportDateDes'));
if( programStageId == '')
{
@@ -378,4 +380,4 @@
}
});
}
-}
\ No newline at end of file
+}
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-09-07 07:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js 2012-09-07 09:18:04 +0000
@@ -843,4 +843,4 @@
element.style.backgroundColor = color;
}
-}
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js 2012-08-28 05:48:46 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js 2012-09-07 09:18:04 +0000
@@ -5,7 +5,6 @@
function loadDataEntry( programStageInstanceId )
{
setInnerHTML('dataEntryFormDiv', '');
- showById('executionDateTB');
showById('dataEntryFormDiv');
setFieldValue( 'dueDate', '' );
setFieldValue( 'executionDate', '' );
@@ -27,6 +26,9 @@
var executionDate = jQuery('#executionDate').val();
var completed = jQuery('#entryFormContainer input[id=completed]').val();
var irregular = jQuery('#entryFormContainer input[id=irregular]').val();
+ var reportDateDes = jQuery("#ps_" + programStageInstanceId).attr("reportDateDes");
+ setInnerHTML('reportDateDescriptionField',reportDateDes);
+ showById('executionDateTB');
showById('inputCriteriaDiv');
enable('validationBtn');
if( executionDate == '' )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm 2012-09-07 09:18:04 +0000
@@ -19,9 +19,9 @@
#parse( "/dhis-web-caseentry/programStageInstanceFlow.vm" )
-