dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18855
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8016: Report Date improvements.
------------------------------------------------------------
revno: 8016
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-09-07 16:18:04 +0700
message:
Report Date improvements.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.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/ProgramStage.hbm.xml
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/webapp/dhis-web-caseentry/anonymousRegistration.vm
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/commons.js
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/programEnrollmentForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.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/programstage/AddProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/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/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.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/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 @@
<one-to-many class="org.hisp.dhis.program.ProgramStageSection" />
</set>
+ <property name="reportDateDescription" />
+
</class>
</hibernate-mapping>
=== 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 @@
<select type="text" id="programId" name="programId" onchange='getDataElements();' class='stage-object-selected'>
#foreach( $program in $programs )
#foreach( $programStage in $program.programStages )
- <option value='$program.id' psid='$programStage.id'>$program.name</option>
+ <option value='$program.id' psid='$programStage.id' reportDateDes="$programStage.reportDateDescription">$program.name</option>
#end
#end
</select>
@@ -76,7 +76,7 @@
</td>
</tr>
<tr>
- <td>$i18n.getString('report_date_from_to')</td>
+ <td><span id="reportDateDescriptionField"></span>$i18n.getString('from_to')</td>
<td><input type="text" id='startDate' name='startDate' style='width:240px'></td>
<td><input type="text" id='endDate' name='endDate' style='width:240px'></td>
<td><input type="button" id='searchBtn' value='$i18n.getString( "search" )' onclick='validateSearchEvents( false )'></td>
@@ -115,7 +115,7 @@
</p>
<table>
<tr>
- <th><label for="executionDate">$i18n.getString( "report_date" ) </label></th>
+ <th><span id="reportDateDescriptionField2">$i18n.getString( "report_date" ) </label></th>
<th><input type="text" id="executionDate" name="executionDate" onchange="addNewEvent();"></th>
<script type="text/javascript">
datePickerValid( 'executionDate', false );
@@ -163,4 +163,6 @@
contentDiv = '';
var unSave = false;
var searchTextBox = '<input type="text" id="searchText" name="searchText">';
+ setInnerHTML('reportDateDescriptionField', jQuery('#programId option:selected').attr('reportDateDes'));
+ setInnerHTML('reportDateDescriptionField2', jQuery('#programId option:selected').attr('reportDateDes'));
</script>
\ 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 @@
<div id='programInstanceDiv'>
#parse( "/dhis-web-caseentry/programStageInstanceFlow.vm" )
<br>
- <table id='executionDateTB' class='hidden'>
+ <table id='executionDateTB' name="executionDateTB" class='hidden'>
<tr>
- <th class='text-column'><label for="executionDate">$i18n.getString( "report_date" ) </label></th>
+ <th class='text-column'><span id="reportDateDescriptionField">$i18n.getString( "report_date" ) </span></th>
<th><input type="text" id="executionDate" name="executionDate" class='criteria' value="$!format.formatDate( $programStageInstance.executionDate )" >
<script type="text/javascript">
datePickerValid( 'executionDate', false );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2012-09-06 03:50:03 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageDataEntryForm.vm 2012-09-07 09:18:04 +0000
@@ -41,7 +41,7 @@
#if( $programStageInstance )
<tr>
- <th><label for="executionDate">$i18n.getString( "report_date" ) </label></th>
+ <th><label for="executionDate">$programStageInstance.programStage.reportDateDescription </label></th>
<th><input type="text" id="executionDate" name="executionDate" value="$!format.formatDate( $programStageInstance.executionDate )" onchange="saveExecutionDate( $programStageInstance.id, getFieldValue('executionDate') )" ></th>
<script type="text/javascript">
datePickerValid( 'executionDate', false );
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2012-09-06 09:44:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2012-09-07 09:18:04 +0000
@@ -17,6 +17,7 @@
orgunit="$!programStageInstance.organisationUnit.name"
programType='$programInstance.program.type'
reportDate="$!format.formatDate( $!programStageInstance.executionDate )"
+ reportDateDes="$programStageInstance.programStage.reportDateDescription"
dueDate="$format.formatDate( $programStageInstance.dueDate )"
class="stage-object"
value="$programStageInstance.programStage.name $format.formatDate( $programStageInstance.dueDate )"
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2012-05-30 03:52:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2012-09-07 09:18:04 +0000
@@ -7,6 +7,7 @@
"minDaysFromStart": "${programStage.minDaysFromStart}",
"dataElementCount": "${programStageDataElements.size()}",
"standardInterval": "$!programStage.standardInterval",
+ "reportDateDescription": "$!programStage.reportDateDescription",
#set( $size = ${programStageDataElements.size()} )
"dataElement": [
=== 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 2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/AddProgramAction.java 2012-09-07 09:18:04 +0000
@@ -55,6 +55,7 @@
implements Action
{
private static String SINGLE_EVENT = "Single-Event";
+ private static String REPORT_DATE_DESCRIPTION = "Report date";
// -------------------------------------------------------------------------
// Dependency
@@ -233,6 +234,7 @@
programStage.setStageInProgram( program.getProgramStages().size() + 1 );
programStage.setProgram( program );
programStage.setMinDaysFromStart( 0 );
+ programStage.setReportDateDescription( REPORT_DATE_DESCRIPTION );
programStageService.saveProgramStage( programStage );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java 2012-07-27 15:13:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/AddProgramStageAction.java 2012-09-07 09:18:04 +0000
@@ -153,6 +153,13 @@
this.standardInterval = standardInterval;
}
+ private String reportDateDescription;
+
+ public void setReportDateDescription( String reportDateDescription )
+ {
+ this.reportDateDescription = reportDateDescription;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -170,6 +177,7 @@
programStage.setStageInProgram( program.getProgramStages().size() + 1 );
programStage.setProgram( program );
programStage.setStandardInterval( standardInterval );
+ programStage.setReportDateDescription( reportDateDescription );
irregular = (irregular == null) ? false : irregular;
programStage.setIrregular( irregular );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java 2012-07-30 06:35:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/UpdateProgramStageAction.java 2012-09-07 09:18:04 +0000
@@ -119,12 +119,14 @@
{
this.compulsories = compulsories;
}
- private List<Boolean> allowProvidedElsewhere = new ArrayList<Boolean>();
-
+
+ private List<Boolean> allowProvidedElsewhere = new ArrayList<Boolean>();
+
public void setAllowProvidedElsewhere( List<Boolean> allowProvidedElsewhere )
{
this.allowProvidedElsewhere = allowProvidedElsewhere;
}
+
private int programId;
public int getProgramId()
@@ -146,6 +148,13 @@
this.standardInterval = standardInterval;
}
+ private String reportDateDescription;
+
+ public void setReportDateDescription( String reportDateDescription )
+ {
+ this.reportDateDescription = reportDateDescription;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -158,6 +167,7 @@
programStage.setName( name );
programStage.setDescription( description );
programStage.setStandardInterval( standardInterval );
+ programStage.setReportDateDescription( reportDateDescription );
minDaysFromStart = (minDaysFromStart == null) ? 0 : minDaysFromStart;
programStage.setMinDaysFromStart( minDaysFromStart );
@@ -167,21 +177,21 @@
programStageService.updateProgramStage( programStage );
- Set<ProgramStageDataElement> programStageDataElements = new HashSet<ProgramStageDataElement>( programStage
- .getProgramStageDataElements() );
+ Set<ProgramStageDataElement> programStageDataElements = new HashSet<ProgramStageDataElement>(
+ programStage.getProgramStageDataElements() );
for ( int i = 0; i < this.selectedDataElementsValidator.size(); i++ )
{
DataElement dataElement = dataElementService.getDataElement( selectedDataElementsValidator.get( i ) );
Boolean allowed = allowProvidedElsewhere.get( i ) == null ? false : allowProvidedElsewhere.get( i );
-
+
ProgramStageDataElement programStageDataElement = programStageDataElementService.get( programStage,
dataElement );
if ( programStageDataElement == null )
{
- programStageDataElement = new ProgramStageDataElement( programStage, dataElement, this.compulsories
- .get( i ), new Integer( i ) );
+ programStageDataElement = new ProgramStageDataElement( programStage, dataElement,
+ this.compulsories.get( i ), new Integer( i ) );
programStageDataElement.setAllowProvidedElsewhere( allowed );
programStageDataElementService.addProgramStageDataElement( programStageDataElement );
}
@@ -192,7 +202,7 @@
programStageDataElement.setSortOrder( new Integer( i ) );
programStageDataElement.setAllowProvidedElsewhere( allowed );
-
+
programStageDataElementService.updateProgramStageDataElement( programStageDataElement );
programStageDataElements.remove( programStageDataElement );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-09-05 14:30:23 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-09-07 09:18:04 +0000
@@ -267,4 +267,5 @@
available_identifiers_and_attributes = Available identifiers / attributes
select_identifiers_and_attributes = Select identifiers / attributes
identifiers_and_attributes = Identifiers / Attributes
-displayed_in_list = Displayed in list
\ No newline at end of file
+displayed_in_list = Displayed in list
+report_date_description = Description of report 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/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2012-06-05 06:46:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2012-09-07 09:18:04 +0000
@@ -35,6 +35,11 @@
<td><label>$i18n.getString( "standard_interval_days" )</label></td>
<td><input type="text" id="standardInterval" name="standardInterval" class="{validate:{required:true,number:true}}" disabled /></td>
</tr>
+
+ <tr>
+ <td><label>$i18n.getString( "report_date_description" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="reportDateDescription" name="reportDateDescription" class="{validate:{required:true}}" /></td>
+ </tr>
<tr><td> </td><td> </td></tr>
</thead>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2012-08-14 08:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/programStage.js 2012-09-07 09:18:04 +0000
@@ -60,7 +60,7 @@
var irregular = (json.programStage.irregular=='true') ? i18n_yes : i18n_no;
setInnerHTML( 'irregularField', irregular );
setInnerHTML( 'standardIntervalField', json.programStage.standardInterval );
-
+ setInnerHTML( 'reportDateDescriptionField', json.programStage.reportDateDescription );
setInnerHTML( 'dataElementCountField', json.programStage.dataElementCount );
showDetails();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2012-08-24 10:09:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2012-09-07 09:18:04 +0000
@@ -47,6 +47,7 @@
<p><label class="bold">$i18n.getString( "scheduled_days_from_start" ):</label><br><span id="scheduledDaysFromStartField"></span></p>
<p><label class="bold">$i18n.getString( "irregular" ):</label><br><span id="irregularField"></span></p>
<p><label class="bold">$i18n.getString( "standard_interval_days" ):</label><br><span id="standardIntervalField"></span></p>
+ <p><label class="bold">$i18n.getString( "report_date_description" ):</label><br><span id="reportDateDescriptionField">reportDateDescription</span></p>
<p><label class="bold">$i18n.getString( "no_of_dataelements" ):</label><br><span id="dataElementCountField"></span></p>
</div>
</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 2012-08-14 08:46:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2012-09-07 09:18:04 +0000
@@ -36,6 +36,12 @@
<td><label>$i18n.getString( "standard_interval_days" )</label></td>
<td><input type="text" id="standardInterval" name="standardInterval" value='$!programStage.standardInterval' class="{validate:{required:true,number:true}}" #if($programStage.irregular!='true' ) disabled #end /></td>
</tr>
+
+ <tr>
+ <td><label>$i18n.getString( "report_date_description" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
+ <td><input type="text" id="reportDateDescription" name="reportDateDescription" value='$!programStage.reportDateDescription' class="{validate:{required:true}}" /></td>
+ </tr>
+
<tr><td> </td></tr>
</tbody>
