dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #20687
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9588: Add translation button for program and programstage object.
------------------------------------------------------------
revno: 9588
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-01-23 17:27:28 +0700
message:
Add translation button for program and programstage object.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm
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/caseAggregationResultDetails.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramEnrollment.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramInstances.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStages.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonSingleEventPrograms.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularInitialize.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm
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/programTrackingList.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageListAction.java
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/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm
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/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.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/jsonCalPatientAttributeParams.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonParamsByProgram.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm
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/programStage.vm
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/programStageSection.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseProgramStages.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.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/updateProgramStageSectionForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.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/ProgramStageService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageService.java 2010-11-21 15:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageService.java 2013-01-23 10:27:28 +0000
@@ -51,4 +51,6 @@
ProgramStage getProgramStageByName( String name );
Collection<ProgramStage> getAllProgramStages();
+
+ Collection<ProgramStage> getProgramStages( Program program );
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2013-01-07 09:11:47 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2013-01-23 10:27:28 +0000
@@ -351,7 +351,7 @@
return INVALID_CONDITION;
}
- matcher.appendReplacement( description, "[" + program.getName() + SEPARATOR_ID + programStage
+ matcher.appendReplacement( description, "[" + program.getDisplayName() + SEPARATOR_ID + programStage
+ SEPARATOR_ID + dataElement.getName() + "]" );
}
else
@@ -388,7 +388,7 @@
return INVALID_CONDITION;
}
- matcher.appendReplacement( description, "[" + OBJECT_PROGRAM + SEPARATOR_OBJECT + program.getName()
+ matcher.appendReplacement( description, "[" + OBJECT_PROGRAM + SEPARATOR_OBJECT + program.getDisplayName()
+ "]" );
}
else if ( info[0].equalsIgnoreCase( OBJECT_PROGRAM_STAGE ) )
@@ -403,7 +403,7 @@
String count = (ids.length == 2) ? SEPARATOR_ID + ids[1] : "";
matcher.appendReplacement( description, "[" + OBJECT_PROGRAM_STAGE + SEPARATOR_OBJECT
- + programStage.getName() + count + "]" );
+ + programStage.getDisplayName() + count + "]" );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2012-11-01 08:32:54 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java 2013-01-23 10:27:28 +0000
@@ -152,14 +152,14 @@
DataElement dataElement = null;
- String programStageName = programStage.getName();
+ String programStageName = programStage.getDisplayName();
if ( programStageId != programStage.getId() )
{
dataElement = dataElementService.getDataElement( dataElementId );
ProgramStage otherProgramStage = programStageService.getProgramStage( programStageId );
- programStageName = otherProgramStage != null ? otherProgramStage.getName() : "N/A";
+ programStageName = otherProgramStage != null ? otherProgramStage.getDisplayName() : "N/A";
}
else
{
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java 2012-12-07 13:55:41 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java 2013-01-23 10:27:28 +0000
@@ -189,7 +189,7 @@
return INVALID_CONDITION;
}
- matcher.appendReplacement( description, programStage.getName() + SEPARATOR_ID + dataElement.getName() );
+ matcher.appendReplacement( description, programStage.getDisplayName() + SEPARATOR_ID + dataElement.getName() );
}
matcher.appendTail( description );
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java 2012-06-20 08:57:27 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java 2013-01-23 10:27:28 +0000
@@ -27,10 +27,13 @@
package org.hisp.dhis.program;
+import static org.hisp.dhis.i18n.I18nUtils.i18n;
+
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.hisp.dhis.i18n.I18nService;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.validation.ValidationCriteria;
import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +57,13 @@
this.programStore = programStore;
}
+ private I18nService i18nService;
+
+ public void setI18nService( I18nService service )
+ {
+ i18nService = service;
+ }
+
// -------------------------------------------------------------------------
// Implementation methods
// -------------------------------------------------------------------------
@@ -75,17 +85,17 @@
public Collection<Program> getAllPrograms()
{
- return programStore.getAll();
+ return i18n( i18nService, programStore.getAll() );
}
public Program getProgram( int id )
{
- return programStore.get( id );
+ return i18n( i18nService, programStore.get( id ) );
}
public Program getProgramByName( String name )
{
- return programStore.getByName( name );
+ return i18n( i18nService, programStore.getByName( name ) );
}
public Collection<Program> getPrograms( OrganisationUnit organisationUnit )
@@ -117,15 +127,15 @@
return programs;
}
-
+
public Collection<Program> getPrograms( int type )
{
- return programStore.getByType( type );
+ return i18n( i18nService, programStore.getByType( type ) );
}
-
+
public Collection<Program> getPrograms( int type, OrganisationUnit orgunit )
{
- return programStore.get( type, orgunit );
+ return i18n( i18nService, programStore.get( type, orgunit ) );
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-01-22 06:42:20 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2013-01-23 10:27:28 +0000
@@ -288,7 +288,7 @@
{
Grid grid = new ListGrid();
- grid.setTitle( program.getName() + " ( " + format.formatDate( startDate ) + " - " + format.formatDate( endDate )
+ grid.setTitle( program.getDisplayName() + " ( " + format.formatDate( startDate ) + " - " + format.formatDate( endDate )
+ " )" );
int total = programInstanceService.countProgramInstances( program, orgunitIds, startDate, endDate );
@@ -311,7 +311,7 @@
{
grid.addRow();
grid.addValue( programStage.getId() );
- grid.addValue( programStage.getName() );
+ grid.addValue( programStage.getDisplayName() );
int completed = programStageInstanceStore.getStatisticalProgramStageReport( programStage, orgunitIds,
startDate, endDate, ProgramStageInstance.COMPLETED_STATUS );
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageService.java 2010-11-21 15:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageService.java 2013-01-23 10:27:28 +0000
@@ -26,9 +26,12 @@
*/
package org.hisp.dhis.program;
+import static org.hisp.dhis.i18n.I18nUtils.i18n;
+
import java.util.Collection;
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+import org.hisp.dhis.i18n.I18nService;
import org.hisp.dhis.program.ProgramStage;
import org.hisp.dhis.program.ProgramStageService;
import org.springframework.transaction.annotation.Transactional;
@@ -52,6 +55,13 @@
this.programStageStore = programStageStore;
}
+ private I18nService i18nService;
+
+ public void setI18nService( I18nService service )
+ {
+ i18nService = service;
+ }
+
// -------------------------------------------------------------------------
// ProgramStage implementation
// -------------------------------------------------------------------------
@@ -68,12 +78,12 @@
public ProgramStage getProgramStage( int id )
{
- return programStageStore.get( id );
+ return i18n( i18nService, programStageStore.get( id ));
}
public ProgramStage getProgramStageByName( String name )
{
- return programStageStore.getByName( name );
+ return i18n( i18nService, programStageStore.getByName( name ));
}
public void updateProgramStage( ProgramStage programStage )
@@ -83,7 +93,11 @@
public Collection<ProgramStage> getAllProgramStages()
{
- return programStageStore.getAll();
+ return i18n( i18nService, programStageStore.getAll());
}
+ public Collection<ProgramStage> getProgramStages( Program program )
+ {
+ return i18n( i18nService, program.getProgramStages() );
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2013-01-22 06:42:20 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java 2013-01-23 10:27:28 +0000
@@ -399,8 +399,8 @@
String filterSQL = filterSQLStatement( deFilters );
Grid grid = new ListGrid();
- grid.setTitle( programStage.getProgram().getName() );
- grid.setSubtitle( programStage.getName() );
+ grid.setTitle( programStage.getProgram().getDisplayName() );
+ grid.setSubtitle( programStage.getDisplayName() );
// Type = 1
if ( position == PatientAggregateReport.POSITION_ROW_ORGUNIT_COLUMN_PERIOD )
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2013-01-21 06:18:31 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2013-01-23 10:27:28 +0000
@@ -216,6 +216,7 @@
<bean id="org.hisp.dhis.program.ProgramStageService" class="org.hisp.dhis.program.DefaultProgramStageService">
<property name="programStageStore" ref="org.hisp.dhis.program.ProgramStageStore" />
+ <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
<bean id="org.hisp.dhis.program.ProgramStageSectionService" class="org.hisp.dhis.program.DefaultProgramStageSectionService">
@@ -225,6 +226,7 @@
<bean id="org.hisp.dhis.program.ProgramService" class="org.hisp.dhis.program.DefaultProgramService">
<property name="programStore" ref="org.hisp.dhis.program.ProgramStore" />
+ <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
</bean>
<bean id="org.hisp.dhis.program.ProgramValidationService" class="org.hisp.dhis.program.DefaultProgramValidationService">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm 2013-01-23 10:27:28 +0000
@@ -67,7 +67,7 @@
<input type="button" name="programStageBtn"
id="ps_$!programStageInstance.id"
psid="$programStageInstance.programStage.id"
- psname="$encoder.htmlEncode($programStageInstance.programStage.name)"
+ psname="$encoder.htmlEncode($programStageInstance.programStage.displayName)"
orgunit="$encoder.htmlEncode($!programStageInstance.organisationUnit.name)"
programType='$programInstance.program.type'
reportDate="$!format.formatDate( $!programStageInstance.executionDate )"
@@ -77,7 +77,7 @@
index="$idx"
class="stage-object"
title="$title"
- value="$encoder.htmlEncode($programStageInstance.programStage.name) $valueDate"
+ value="$encoder.htmlEncode($programStageInstance.programStage.displayName) $valueDate"
onclick="javascript:loadDataEntry( $programStageInstance.id );">
<script>
var status = $programStageInstance.getEventStatus();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm 2013-01-23 10:27:28 +0000
@@ -43,7 +43,7 @@
<option value="">[$i18n.getString("please_select")]</option>
#foreach($program in $programs)
#if($program.type=='1')
- <option value="$program.id" type='$program.type'>$program.name</option>
+ <option value="$program.id" type='$program.type'>$program.displayName</option>
#end
#end
</select>
=== 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-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/anonymousRegistration.vm 2013-01-23 10:27:28 +0000
@@ -31,7 +31,7 @@
<option value="" psid="" reportDateDes="$i18n.getString('report_date')">[$i18n.getString("please_select")]</option>
#foreach( $program in $programs )
#foreach( $programStage in $program.programStages )
- <option value='$program.id' psid='$programStage.id' reportDateDes="$programStage.reportDateDescription">$program.name</option>
+ <option value='$program.id' psid='$programStage.id' reportDateDes="$programStage.reportDateDescription">$program.displayName</option>
#end
#end
</select>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm 2013-01-23 10:27:28 +0000
@@ -35,7 +35,7 @@
#set( $mark = false )
#foreach( $dataValue in $dataValues )
<tr #alternate( $mark )>
- <td>$dataValue.programStageInstance.programStage.name</td>
+ <td>$dataValue.programStageInstance.programStage.displayName</td>
<td>$dataValue.dataElement.name</td>
<td>$dataValue.value</td>
<td>$format.formatDate($dataValue.timestamp)</td>
@@ -69,7 +69,7 @@
#set( $mark = false )
#foreach( $dataValue in $dataValues )
<tr #alternate( $mark )>
- <td>$encoder.htmlEncode($dataValue.programStageInstance.programStage.name)</td>
+ <td>$encoder.htmlEncode($dataValue.programStageInstance.programStage.displayName)</td>
<td>$encoder.htmlEncode($dataValue.dataElement.name)</td>
<td>$dataValue.value</td>
<td>$format.formatDate($dataValue.timestamp)</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm 2013-01-23 10:27:28 +0000
@@ -60,7 +60,7 @@
<td><label class="bold">$i18n.getString( "enrolled_in_program" )</label></td>
<td>:
#foreach( $program in $partner.programs )
- $encoder.htmlEncode($program.name)
+ $encoder.htmlEncode($program.displayName)
#end
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm 2013-01-03 09:50:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm 2013-01-23 10:27:28 +0000
@@ -20,7 +20,7 @@
#foreach( $comment in $programStageInstance.patientComments )
<tr id="comment_$comment.id" #alternate( $mark )>
<td>$format.formatDateTime($comment.createdDate)</td>
- <td>$programStageInstance.programStage.name</td>
+ <td>$programStageInstance.programStage.displayName</td>
<td>$comment.creator</td>
<td>$comment.commentText</td>
</tr>
@@ -31,7 +31,7 @@
#foreach( $sms in $programStageInstance.outboundSms )
<tr id="tr${sms.id}" #alternate( $mark )>
<td>$format.formatDateTime($!sms.date)</td>
- <td>$programStageInstance.programStage.name</td>
+ <td>$programStageInstance.programStage.displayName</td>
<td>$sms.sender</td>
<td>$sms.message</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramEnrollment.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramEnrollment.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramEnrollment.vm 2013-01-23 10:27:28 +0000
@@ -2,6 +2,6 @@
"programInstanceId": "${programInstance.id}",
"activeProgramStageInstanceId": "$!activeProgramStageInstance.id",
"programStageId": "$!activeProgramStageInstance.programStage.id",
- "activeProgramStageName": "$!encoder.jsonEncode( ${activeProgramStageInstance.programStage.name} )",
+ "activeProgramStageName": "$!encoder.jsonEncode( ${activeProgramStageInstance.programStage.displayName} )",
"dueDate": "$!format.formatDate( ${activeProgramStageInstance.dueDate} )"
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramInstances.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramInstances.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramInstances.vm 2013-01-23 10:27:28 +0000
@@ -4,7 +4,7 @@
#foreach( $programInstance in $programInstances )
{
"id": ${programInstance.program.id} ,
- "name": "$!encoder.jsonEncode( ${programInstance.program.name} )",
+ "name": "$!encoder.jsonEncode( ${programInstance.program.displayName} )",
"programInstanceId": ${programInstance.id}
}#if( $velocityCount < $size ),#end
#end]
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm 2013-01-23 10:27:28 +0000
@@ -5,7 +5,7 @@
{
"id": "$programStageInstance.id",
"programStageId": "$programStageInstance.programStage.id",
- "programStageName": "$programStageInstance.programStage.name",
+ "programStageName": "$programStageInstance.programStage.displayName",
"dueDate": "$format.formatDate( $programStageInstance.dueDate )",
"status": "$programStageInstance.getEventStatus()"
}#if( $velocityCount < $size ),#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStages.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStages.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStages.vm 2013-01-23 10:27:28 +0000
@@ -3,7 +3,7 @@
#foreach( ${programStage} in $!{programStages} )
{
"id": "${programStage.id}",
- "name": "$!encoder.jsonEncode( ${programStage.name} )"
+ "name": "$!encoder.jsonEncode( ${programStage.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonSingleEventPrograms.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonSingleEventPrograms.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonSingleEventPrograms.vm 2013-01-23 10:27:28 +0000
@@ -4,7 +4,7 @@
#foreach( $program in $programs )
{
"id": ${program.id} ,
- "name": "$!encoder.jsonEncode( ${program.name} )",
+ "name": "$!encoder.jsonEncode( ${program.displayName} )",
"type": "$program.type",
#foreach( $programStage in $program.programStages )
"reportDateDescription": "$programStage.reportDateDescription",
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm 2013-01-21 09:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm 2013-01-23 10:27:28 +0000
@@ -12,7 +12,7 @@
#end
"type": "${programStage.program.type}",
"programStageId": "${programStage.id}",
- "programStageName": "${programStage.name}",
+ "programStageName": "${programStage.displayName}",
"startDates": [
#set( $size = ${aggregateReport.startDates.size()} )
#foreach( $startDate in $!aggregateReport.startDates )
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularInitialize.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularInitialize.vm 2013-01-21 06:18:31 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularInitialize.vm 2013-01-23 10:27:28 +0000
@@ -18,7 +18,7 @@
#foreach( $program in $programs )
{
"id": "${program.id}" ,
- "name": "$!encoder.jsonEncode( ${program.name} )",
+ "name": "$!encoder.jsonEncode( ${program.displayName} )",
"type": "$program.type"
}#if( $velocityCount < $programs.size() ),#end
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm 2013-01-21 09:52:11 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm 2013-01-23 10:27:28 +0000
@@ -11,7 +11,7 @@
#end
"type": "${programStage.program.type}",
"programStageId": "${programStage.id}",
- "programStageName": "${programStage.name}",
+ "programStageName": "${programStage.displayName}",
"startDate": "$!format.formatDate( $tabularReport.startDate )",
"endDate": "$!format.formatDate( ${tabularReport.endDate} )",
"level": "${tabularReport.level}",
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-01-08 04:25:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm 2013-01-23 10:27:28 +0000
@@ -112,13 +112,13 @@
programStageInstanceId='$programStageInstanceId' style='cursor:pointer;'
onclick='javascript:loadActiveProgramStageRecords("$programInstance.id", "$programStageInstance.id")' >
<td id='td_$programInstance.id'>
- <a><span id='infor_$programInstance.id'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</span></a>
+ <a><span id='infor_$programInstance.id'>$programInstance.program.displayName ($format.formatDate($programInstance.enrollmentDate))</span></a>
</td>
</tr>
#if($programInstance.program.type==1)
<tr>
<td id='tr2_$programInstance.id' onclick='javascript:loadActiveProgramStageRecords("$programInstance.id", "$programStageInstance.id")' style='cursor:pointer;'>
- <a>• $programStageInstance.programStage.name ($format.formatDate($programStageInstance.dueDate))</a>
+ <a>• $programStageInstance.programStage.displayName ($format.formatDate($programStageInstance.dueDate))</a>
</td>
</tr>
#end
@@ -130,7 +130,7 @@
programStageInstanceId='$programStageInstanceId' style='cursor:pointer;'
onclick='javascript:loadActiveProgramStageRecords("$programInstance.id", false)' >
<td id='td_$programInstance.id'>
- <a><span id='infor_$programInstance.id'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</span></a>
+ <a><span id='infor_$programInstance.id'>$programInstance.program.displayName ($format.formatDate($programInstance.enrollmentDate))</span></a>
</td>
</tr>
#end
@@ -156,7 +156,7 @@
#end
<tr onclick='javascript:loadActiveProgramStageRecords($programInstance.id);' >
<td>
- <a><span id='infor_$programInstance.id'>$programInstance.program.name ($format.formatDate($programInstance.enrollmentDate))</span></a>
+ <a><span id='infor_$programInstance.id'>$programInstance.program.displayName ($format.formatDate($programInstance.enrollmentDate))</span></a>
</td>
</tr>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm 2013-01-23 10:27:28 +0000
@@ -28,7 +28,7 @@
<option value="$program.id" programType='$program.type'
displayIncidentDate='$!program.displayIncidentDate'
dateOfEnrollmentDescription='$!program.dateOfEnrollmentDescription'
- dateOfIncidentDescription='$!program.dateOfIncidentDescription'>$encoder.htmlEncode( $program.name )</option>
+ dateOfIncidentDescription='$!program.dateOfIncidentDescription'>$encoder.htmlEncode( $program.displayName )</option>
#end
</select>
</td>
=== 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-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm 2013-01-23 10:27:28 +0000
@@ -20,14 +20,14 @@
name="ps_$!programStageInstance.id"
pi="$programInstance.id"
psid="$programStageInstance.programStage.id"
- psname="$programStageInstance.programStage.name"
+ psname="$programStageInstance.programStage.displayName"
status="$programStageInstance.getEventStatus()"
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 $valueDate"
+ value="$programStageInstance.programStage.displayName $valueDate"
onclick="javascript:loadDataEntry( $programStageInstance.id );">
<script>
var status = $programStageInstance.getEventStatus();
@@ -57,7 +57,7 @@
<select id='repeatableProgramStage_$!programInstance.id' name='repeatableProgramStageId_$!programInstance.id' onchange="setSuggestedDueDate('$programInstance.id')">
#foreach( $programStage in $programInstance.program.programStages )
#if( $programStage.irregular=='true')
- <option value="$programStage.id" standardInterval='$programStage.standardInterval' repeatable="true">$!programStage.name</option>
+ <option value="$programStage.id" standardInterval='$programStage.standardInterval' repeatable="true">$!programStage.displayName</option>
#elseif( $programStage.autoGenerateEvent=='false')
#set($hasEvent="false")
#foreach( $programStageInstance in $programInstance.programStageInstances )
@@ -66,7 +66,7 @@
#end
#end
#if($hasEvent=="false")
- <option value="$programStage.id" standardInterval='$programStage.minDaysFromStart' repeatable="false">$!programStage.name</option>
+ <option value="$programStage.id" standardInterval='$programStage.minDaysFromStart' repeatable="false">$!programStage.displayName</option>
#end
#end
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2012-12-18 05:41:39 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm 2013-01-23 10:27:28 +0000
@@ -1,7 +1,7 @@
<h3>
<a href="javascript:onClickBackBtn();">$i18n.getString( 'program_tracking' )</a>
• <a href="javascript:showPatientDashboardForm( $programStageInstance.programInstance.patient.id );">$i18n.getString( 'patient_dashboard' )</a>
- » $encoder.htmlEncode($programStageInstance.programStage.name)
+ » $encoder.htmlEncode($programStageInstance.programStage.displayName)
</h3>
<input type='hidden' id='currentUsername' name='currentUsername' value='$currentUsername'>
@@ -58,7 +58,7 @@
<td>$i18n.getString( "due_date" )</td>
#set( $duedateId = "value_" + $programStageInstance.id + "_date" )
<td>
- <input type="text" id="$duedateId" value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" />
+ <input type="text" id="$duedateId" value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.displayName )' )" />
<input type="hidden" name="enrollmentDate" id="enrollmentDate" value="$!format.formatDate( $programInstance.enrollmentDate )">
<input type="hidden" name="dateOfIncident" id="dateOfIncident" value="$!format.formatDate( $programInstance.dateOfIncident )">
<script type="text/javascript">
@@ -134,7 +134,7 @@
#foreach( $comment in $comments )
<tr id="comment_$comment.id">
<td>$format.formatDateTime($comment.createdDate)</td>
- <td>$encoder.htmlEncode($programStageInstance.programStage.name)</td>
+ <td>$encoder.htmlEncode($programStageInstance.programStage.displayName)</td>
<td>$encoder.htmlEncode($comment.creator)</td>
<td>$encoder.htmlEncode($comment.commentText)</td>
</tr>
@@ -143,7 +143,7 @@
#foreach( $sms in $outboundSms )
<tr id="tr${sms.id}" >
<td>$format.formatDateTime($!sms.date)</td>
- <td>$encoder.htmlEncode($programStageInstance.programStage.name)</td>
+ <td>$encoder.htmlEncode($programStageInstance.programStage.displayName)</td>
<td>$encoder.htmlEncode($sms.sender)</td>
<td>$encoder.htmlEncode($sms.message)</td>
</tr>
@@ -158,7 +158,7 @@
<script type="text/javascript">
jQuery(document).ready( function(){
- setFieldValue('programStageName', "$programStageInstance.programStage.name");
+ setFieldValue('programStageName', "$programStageInstance.programStage.displayName");
setFieldValue( "programStageInstanceId", "$!programStageInstance.id" );
commentDivToggle(true);
});
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm 2013-01-23 10:27:28 +0000
@@ -80,14 +80,14 @@
<input type='button' id='ps_$programStageInstance.id' name='programStageBtn'
programStageInstanceId='$programStageInstance.id'
- programStageName='$encoder.htmlEncode($programStageInstance.programStage.name)'
+ programStageName='$encoder.htmlEncode($programStageInstance.programStage.displayName)'
programStageId='$programStageInstance.programStage.id'
programInstanceId='$programInstance.id'
dueDate='$format.formatDate( $programStageInstance.dueDate )'
status='$programStageInstance.getEventStatus()'
index="$idx"
class='stage-object'
- value='$programStageInstance.programStage.name $valueDate'
+ value='$programStageInstance.programStage.displayName $valueDate'
title="$title" onclick='javascript:programTrackingList( $programStageInstance.id, false );'>
<script>
var status = $programStageInstance.getEventStatus();
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm 2013-01-23 10:27:28 +0000
@@ -17,7 +17,7 @@
</tr>
</table>
-<h4>$i18n.getString( "records_for" ) $encoder.htmlEncode( $programStageInstance.programStage.name ) </h4>
+<h4>$i18n.getString( "records_for" ) $encoder.htmlEncode( $programStageInstance.programStage.displayName ) </h4>
<table class="mainPageTable">
<col id="noCol">
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2012-12-26 03:02:05 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm 2013-01-23 10:27:28 +0000
@@ -1,5 +1,5 @@
<div id='reportTitle' name='reportTitle' style="display:none;">
- <h3>$i18n.getString('records_of') $encoder.htmlEncode( $patient.getFullName() ) $i18n.getString('at') $programStage.name $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
+ <h3>$i18n.getString('records_of') $encoder.htmlEncode( $patient.getFullName() ) $i18n.getString('at') $programStage.displayName $i18n.getString('in') $organisationUnit.name $i18n.getString('on_value') $format.formatDate($programStageInstance.executionDate)</h3>
<hr/>
</div>
@@ -14,7 +14,7 @@
$encoder.htmlEncode( $patient.getFullName() ) ( $i18n.getString( "$patient.gender" ) )
</td>
<td class='bold text-column' style="vertical-align:top">$i18n.getString('program'): </td>
- <td style="vertical-align:right">$program.name</td>
+ <td style="vertical-align:right">$program.displayName</td>
</tr>
<tr>
<td>
@@ -24,7 +24,7 @@
$format.formatDate( $patient.birthDate ) ( $encoder.htmlEncode( $patient.getAge() ) )
</td>
<td class='bold text-column' style="vertical-align:top">$i18n.getString('program_stage'): </td>
- <td style="vertical-align:right">$programStageInstance.programStage.name</td>
+ <td style="vertical-align:right">$programStageInstance.programStage.displayName</td>
</tr>
#foreach( $attributeName in $calAttributeValueMap.keySet() )
<tr>
@@ -49,7 +49,7 @@
</table>
</div>
-<input type='hidden' id="programId" name="programId" type="text" readonly="readonly" value="$encoder.htmlEncode( $program.name )" style="min-width:350px">
+<input type='hidden' id="programId" name="programId" type="text" readonly="readonly" value="$encoder.htmlEncode( $program.displayName )" style="min-width:350px">
<input id="programStageId" name="programStageId" type="hidden" value="$programStage.id" style="min-width:350px">
<p></p>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm 2013-01-23 10:27:28 +0000
@@ -24,7 +24,7 @@
<select id="programId" name="programId" #if($!programs) #else disabled #end class="{validate:{required:true}}" >
<option value=''>[$i18n.getString('please_select_a_program')]</option>
#foreach( $program in $programs )
- <option value='$program.id'>$program.name</option>
+ <option value='$program.id'>$program.displayName</option>
#end
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm 2013-01-23 10:27:28 +0000
@@ -30,7 +30,7 @@
#end
#foreach( $program in $patient.programs )
<program>
- <name>$encoder.xmlEncode( $program.name )</name>
+ <name>$encoder.xmlEncode( $program.displayName )</name>
</program>
#end
</patient>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm 2013-01-23 10:27:28 +0000
@@ -22,7 +22,7 @@
#foreach( $programStage in $programStages )
{
"id": ${programStage.id} ,
- "name": "$!encoder.jsonEncode( ${programStage.name} )",
+ "name": "$!encoder.jsonEncode( ${programStage.displayName} )",
"irregular":${programStage.irregular}
}#if( $velocityCount < $size ),#end
#end]
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm 2013-01-23 10:27:28 +0000
@@ -22,7 +22,7 @@
#end
#foreach( $program in $!patient.programs )
<program>
- <name>$!encoder.xmlEncode( $program.name )</name>
+ <name>$!encoder.xmlEncode( $program.displayName )</name>
</program>
#end
</patient>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm 2013-01-23 10:27:28 +0000
@@ -21,7 +21,7 @@
#end
#foreach( $program in $!patient.programs )
<program>
- <name>$!encoder.xmlEncode( $program.name )</name>
+ <name>$!encoder.xmlEncode( $program.displayName )</name>
</program>
#end
</patient>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm 2013-01-23 10:27:28 +0000
@@ -31,7 +31,7 @@
#end
#foreach( $program in $patient.programs )
<program>
- <name>$!encoder.xmlEncode( $program.name )</name>
+ <name>$!encoder.xmlEncode( $program.displayName )</name>
</program>
#end
</patient>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm 2013-01-23 10:27:28 +0000
@@ -24,7 +24,7 @@
<select id='programIdAddPatient' name='programIdAddPatient' onchange='enableBtn();'>
<option value='' type='2'>[$i18n.getString("please_select")]</option>
#foreach($program in $programs)
- <option value="$program.id" type='$program.type'>$program.name</option>
+ <option value="$program.id" type='$program.type'>$program.displayName</option>
#end
</select>
</td>
@@ -135,7 +135,7 @@
var searchTextBox = '<input type="text" id="searchText" name="searchText" onkeyup="searchPatientsOnKeyUp( event );">';
var programComboBox = '<select class="search-field" id="searchText" name="searchText" >';
#foreach ( $program in $programs )
- programComboBox += '<option value="$program.id">$program.name</option>';
+ programComboBox += '<option value="$program.id">$program.displayName</option>';
#end
programComboBox += '</select>';
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<tbody id="entryForm">
<tr>
- <th colspan='2'>$programStage.program.name</th>
+ <th colspan='2'>$programStage.program.displayName</th>
</tr>
<!-- Identifiers/Attributes belong to the selected single program -->
#set($program = $programStage.program)
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm 2012-12-17 08:43:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramDetailsReport.vm 2013-01-23 10:27:28 +0000
@@ -1,4 +1,4 @@
-<input type="hidden" id="programStageName" name="programStageName" value="$!encoder.jsEncode($programStage.name)">
+<input type="hidden" id="programStageName" name="programStageName" value="$!encoder.jsEncode($programStage.displayName)">
<table width="100%">
<tr>
<td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm 2013-01-08 04:25:40 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm 2013-01-23 10:27:28 +0000
@@ -24,7 +24,7 @@
<select id="programId" name="programId" #if($!programs) #else disabled #end class="{validate:{required:true}}" >
<option value=''>[$i18n.getString('please_select_a_program')]</option>
#foreach( $program in $programs )
- <option value='$program.id'>$program.name</option>
+ <option value='$program.id'>$program.displayName</option>
#end
</select>
</td>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm 2013-01-23 10:27:28 +0000
@@ -119,7 +119,7 @@
<td class="bold text-column">$i18n.getString("enrolled_in_program"):</td>
<td>
#foreach( $program in $representative.programs )
- $encoder.htmlEncode($program.name)
+ $encoder.htmlEncode($program.displayName)
#if( $velocityCount > 1 )
<br>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2012-12-10 12:54:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm 2013-01-23 10:27:28 +0000
@@ -12,7 +12,7 @@
<tr>
<td></td>
<td>
- <input type="button" class='button' value="$i18n.getString( 'update' )" onclick='updateEnrollment($programInstance.patient.id, $programInstance.program.id, $programInstance.id, "$programInstance.program.name")'/>
+ <input type="button" class='button' value="$i18n.getString( 'update' )" onclick='updateEnrollment($programInstance.patient.id, $programInstance.program.id, $programInstance.id, "$programInstance.program.displayName")'/>
<input type="button" class='button' value="$i18n.getString( 'complete' )" onclick='unenrollmentForm($programInstance.id)'/>
</td>
</tr>
@@ -51,12 +51,12 @@
<td>$rowCount</td>
##stage name
<td>
- $encoder.htmlEncode( $programStageInstance.programStage.name )
+ $encoder.htmlEncode( $programStageInstance.programStage.displayName )
</td>
#set( $duedateId = "value_" + $programStageInstance.id + "_date" )
#set($status = $programStageInstance.getEventStatus())
<td>
- <input type="text" id="$duedateId" style='width:80%;' value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.name )' )" />
+ <input type="text" id="$duedateId" style='width:80%;' value="$!format.formatDate( $programStageInstance.dueDate )" onchange="saveDueDate( $programInstance.id, $programStageInstance.id, '$encoder.jsEncode( $programStageInstance.programStage.displayName )' )" />
<script type="text/javascript">
#if($status==1 || $status==2 || $status==5 )
disable('$duedateId');
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageListAction.java 2012-10-01 04:09:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageListAction.java 2013-01-23 10:27:28 +0000
@@ -33,6 +33,7 @@
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramService;
import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageService;
import com.opensymphony.xwork2.Action;
@@ -54,6 +55,13 @@
this.programService = programService;
}
+ private ProgramStageService programStageService;
+
+ public void setProgramStageService( ProgramStageService programStageService )
+ {
+ this.programStageService = programStageService;
+ }
+
// -------------------------------------------------------------------------
// Input/Output
// -------------------------------------------------------------------------
@@ -98,7 +106,7 @@
{
program = programService.getProgram( id );
- associations = new ArrayList<ProgramStage>( program.getProgramStages() );
+ associations = new ArrayList<ProgramStage>( programStageService.getProgramStages( program ) );
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 2012-12-21 09:23:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2013-01-23 10:27:28 +0000
@@ -267,6 +267,7 @@
class="org.hisp.dhis.patient.action.programstage.GetProgramStageListAction"
scope="prototype">
<property name="programService" ref="org.hisp.dhis.program.ProgramService" />
+ <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
</bean>
<bean id="org.hisp.dhis.patient.action.programstage.GetProgramStageAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2012-10-26 13:10:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addCaseAggregation.vm 2013-01-23 10:27:28 +0000
@@ -64,7 +64,7 @@
<select id="programId" name="programId" onChange="getParams();">
<option value="">[$i18n.getString('please_select')]</option>
#foreach( $program in $programs )
- <option value="$program.id" title='$program.name' programType='$program.type'>$encoder.htmlEncode( $program.name )</option>
+ <option value="$program.id" title='$program.displayName' programType='$program.type'>$encoder.htmlEncode( $program.displayName )</option>
#end
</select>
</td>
=== 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 2012-12-14 08:30:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramForm.vm 2013-01-23 10:27:28 +0000
@@ -47,6 +47,12 @@
</tr>
<tr>
+ <td><label>$i18n.getString( "block_entry_form_after_completed" )</label></td>
+ <td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true'></td>
+ <td></td>
+ </tr>
+
+ <tr>
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
</tr>
=== 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-12-12 04:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageForm.vm 2013-01-23 10:27:28 +0000
@@ -2,7 +2,7 @@
<h3>$i18n.getString( "create_new_program_stage" )</h3>
-<h4>$program.name</h4>
+<h4>$program.displayName</h4>
<form id="addProgramStageForm" name="addProgramStageForm" action="addProgramStage.action" method="post">
<input type="hidden" id="id" name="id" value="$program.id"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm 2012-10-30 04:06:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addProgramStageSectionForm.vm 2013-01-23 10:27:28 +0000
@@ -16,7 +16,7 @@
<h3>$i18n.getString( "create_new_program_stage_section" )</h3>
-<h4>$programStage.name</h4>
+<h4>$programStage.displayName</h4>
<form id="programStageSectionForm" name="programStageSectionForm" action="addProgramStageSection.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2012-11-12 07:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addSingleProgramValidationForm.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "create_new_program_validation_rule" )</h3>
-<h4>$program.name</h4>
+<h4>$program.displayName</h4>
<form id='programValidationForm' name='programValidationForm' method='post' action='addProgramValidation.action'>
=== 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 2012-12-10 04:03:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/program.js 2013-01-23 10:27:28 +0000
@@ -20,6 +20,9 @@
var displayProvidedOtherFacility = ( json.program.displayProvidedOtherFacility == 'true') ? i18n_yes : i18n_no;
setInnerHTML( 'displayProvidedOtherFacilityField', displayProvidedOtherFacility );
+ var blockEntryForm = ( json.program.blockEntryForm == 'true') ? i18n_yes : i18n_no;
+ setInnerHTML( 'blockEntryFormField', blockEntryForm );
+
var displayIncidentDate = ( json.program.displayIncidentDate == 'true') ? i18n_yes : i18n_no;
setInnerHTML( 'displayIncidentDateField', displayIncidentDate );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm 2012-12-21 09:23:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonCalPatientAttributeParams.vm 2013-01-23 10:27:28 +0000
@@ -12,7 +12,7 @@
#foreach( $program in $programs )
{
"id": "$program.id",
- "name": "$!encoder.jsonEncode( ${program.name} )"
+ "name": "$!encoder.jsonEncode( ${program.displayName} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonParamsByProgram.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonParamsByProgram.vm 2012-06-04 04:06:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/jsonParamsByProgram.vm 2013-01-23 10:27:28 +0000
@@ -3,7 +3,7 @@
#foreach( ${programStage} in $!{programStages} )
{
"id": "${programStage.id}",
- "name": "$!encoder.jsonEncode( ${programStage.name} )"
+ "name": "$!encoder.jsonEncode( ${programStage.displayName} )"
}#if( $velocityCount < $size ),#end
#end
],
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm 2012-05-23 16:19:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programAssociations.vm 2013-01-23 10:27:28 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "assign_program_to_orgunits_for_registering" )</h3>
-<h4>$encoder.htmlEncode( $program.name )</h4>
+<h4>$encoder.htmlEncode( $program.displayName )</h4>
<form id="defineProgramAssociationsForm" action="defineProgramAssociations.action" method="post">
<div style="display:inline">
=== 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 2012-12-14 08:30:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programList.vm 2013-01-23 10:27:28 +0000
@@ -20,14 +20,15 @@
#foreach( $program in $programs )
<tr id="tr${program.id}">
- <td onclick="showProgramDetails( $program.id )">$encoder.htmlEncode( $program.name )</td>
+ <td onclick="showProgramDetails( $program.id )">$encoder.htmlEncode( $program.displayName )</td>
<td style="text-align:center">
<a href="defineProgramAssociationsForm.action?id=$program.id" title="$i18n.getString( 'assign_program_to_orgunits' )"><img src="../images/assign.png" alt="$i18n.getString( 'assign_program_to_orgunits' )"></a>
<a href="programValidation.action?programId=$program.id" title="$i18n.getString( 'program_validation_rule_management' )"><img src="../images/assign_b.png" alt="$i18n.getString( 'program_validation_rule_management' )"></a>
<a href="showUpdateProgramForm.action?id=$program.id" title="$i18n.getString( 'edit' )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
+ <a href="javascript:translate( 'Program', '$program.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>
<a href="programStage.action?id=$program.id" title="$i18n.getString( 'view_program_stages' )"><img src="../images/add_section.png" alt="$i18n.getString( 'view_stage_management' )"></a>
- <a href="javascript:removeProgram( '$program.id', '$encoder.jsEncode( $program.name )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
+ <a href="javascript:removeProgram( '$program.id', '$encoder.jsEncode( $program.displayName )' )" title="$i18n.getString( "remove" )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
<a href="javascript:showProgramDetails( $program.id )" title="$i18n.getString( 'show_details' )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
</td>
@@ -47,6 +48,7 @@
<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
<p><label class="bold">$i18n.getString( "type" ):</label><br><span id="typeField"></span></p>
<p><label class="bold">$i18n.getString( "display_provided_other_facility_column" ):</label><br><span id="displayProvidedOtherFacilityField"></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( "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( "ignore_to_generate_overdue_events" ):</label><br><span id="ignoreOverdueEventsField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm 2012-10-26 03:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStage.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "program_stage_management" )</h3>
-<h4>$program.name</h4>
+<h4>$program.displayName</h4>
<input type='hidden' id='id' name='id' value='$program.id'>
=== 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-12-12 04:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageList.vm 2013-01-23 10:27:28 +0000
@@ -4,7 +4,7 @@
<table class="listTable" id="listTable">
<col>
<col>
- <col width="150">
+ <col width="180">
<thead>
<tr>
<th>$i18n.getString( "name" )</th>
@@ -17,12 +17,12 @@
#set( $mark = false )
#foreach( $association in $associations )
<tr id="tr${association.id}" #alternate( $mark )>
- <td onclick="showProgramStageDetails( $association.id )">$encoder.htmlEncode( $association.name )</td>
+ <td onclick="showProgramStageDetails( $association.id )">$encoder.htmlEncode( $association.displayName )</td>
<td onclick="showProgramStageDetails( $association.id )">$encoder.htmlEncode( $association.description )</td>
<td style="text-align:center"#alternate( $mark )>
<a href="showUpdateProgramStageForm.action?id=$association.id" title="$i18n.getString( "edit" )"><img src="../images/edit.png" alt="$i18n.getString( 'edit' )"></a>
- #if( $program.type=='1' )
+ <a href="javascript:translate( 'ProgramStage', '$association.id' )" title="$i18n.getString( 'translation_translate' )"><img src="../images/i18n.png" alt="$i18n.getString( 'translation_translate' )"/></a>#if( $program.type=='1' )
<a href="javascript:removeItem( '$association.id', '$encoder.jsEncode( $association.name )', i18n_confirm_delete , 'removeProgramStage.action' )" title="$i18n.getString( 'remove' )"><img src="../images/delete.png" alt="$i18n.getString( 'remove' )"></a>
#end
<a href="javascript:showProgramStageDetails( $association.id )" title="$i18n.getString( "show_details" )"><img src="../images/information.png" alt="$i18n.getString( 'show_details' )"></a>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm 2012-10-26 03:26:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSection.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "program_stage_section" )</h3>
-<h4>$programStage.name</h4>
+<h4>$programStage.displayName</h4>
<input type='hidden' id='id' name='id' value='$programStage.id'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm 2012-10-26 04:16:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programStageSectionSortOder.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "program_stage_section_sort_order" )</h3>
-<h4>$programStage.name</h4>
+<h4>$programStage.displayName</h4>
<form id="programStageSectionSortOrderForm" name="programStageSectionSortOrderForm" onsubmit="selectAllById('sectionIds');" action="saveProgramStageSectionSortOrder.action" method="post">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-01-07 05:07:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programValidationList.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "program_validation_rule_management" )</h3>
-<h4>$program.name</h4>
+<h4>$program.displayName</h4>
<table class="mainPageTable">
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseProgramStages.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseProgramStages.vm 2010-11-25 22:22:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/responseProgramStages.vm 2013-01-23 10:27:28 +0000
@@ -4,7 +4,7 @@
#foreach( $programStage in $programStages )
<programstage>
<id>$programStage.id</id>
- <name>$encoder.xmlEncode( $programStage.name )</name>
+ <name>$encoder.xmlEncode( $programStage.displayName )</name>
</programstage>
#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2012-11-12 04:55:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateCaseAggregation.vm 2013-01-23 10:27:28 +0000
@@ -61,7 +61,7 @@
<select id="programId" name="programId" onChange="getParams();">
<option value="">[$i18n.getString('please_select')]</option>
#foreach( $program in $programs )
- <option value="$program.id" title='$program.name' programType='$program.type'>$encoder.htmlEncode( $program.name )</option>
+ <option value="$program.id" title='$program.displayName' programType='$program.type'>$encoder.htmlEncode( $program.displayName )</option>
#end
</select>
</td>
=== 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 2012-12-14 08:30:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramForm.vm 2013-01-23 10:27:28 +0000
@@ -13,7 +13,7 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( "required" )" class="required">*</em></label></td>
- <td><input style="width: 330px;" type="text" id="name" name="name" value="$encoder.htmlEncode( $program.name )" class="{validate:{required:true,minlength:4}}"></td>
+ <td><input style="width: 330px;" type="text" id="name" name="name" value="$encoder.htmlEncode( $program.displayName )" class="{validate:{required:true,minlength:4}}"></td>
<td></td>
</tr>
@@ -50,6 +50,12 @@
<td><input type="checkbox" id="displayProvidedOtherFacility" name="displayProvidedOtherFacility" value='true' #if( $program.displayProvidedOtherFacility=='true' ) checked #end ></td>
<td></td>
</tr>
+
+ <tr>
+ <td><label>$i18n.getString( "block_entry_form_after_completed" )</label></td>
+ <td><input type="checkbox" id="blockEntryForm" name="blockEntryForm" value='true' #if( $program.blockEntryForm=='true' ) checked #end ></td>
+ <td></td>
+ </tr>
<tr>
<th colspan="2">$i18n.getString( "enrollment_details" )</th>
=== 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-12-12 04:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageForm.vm 2013-01-23 10:27:28 +0000
@@ -2,7 +2,7 @@
<h3>$i18n.getString( "edit_program_stage" )</h3>
-<h4>$programStage.program.name</h4>
+<h4>$programStage.program.displayName</h4>
<form id="updateProgramStageForm" name="updateProgramStageForm" action="updateProgramStage.action" method="post">
<input type="hidden" id="id" name="id" value="$programStage.id"/>
@@ -16,7 +16,7 @@
<tbody>
<tr>
<td><label>$i18n.getString( "name" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.name )" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
+ <td><input type="text" id="name" name="name" value="$encoder.htmlEncode( $programStage.displayName )" class="{validate:{required:true,rangelength:[4,160]}}"/></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm 2012-10-30 04:06:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateProgramStageSectionForm.vm 2013-01-23 10:27:28 +0000
@@ -17,7 +17,7 @@
<h3>$i18n.getString( "update_program_stage_section" )</h3>
-<h4>$programStage.name</h4>
+<h4>$programStage.displayName</h4>
<form id="programStageSectionForm" name="programStageSectionForm" action="updateProgramStageSection.action" method="post">
<input type="hidden" id="programStageId" name="programStageId" value="$programStage.id"/>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2012-11-12 07:04:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updateSingleProgramValidationForm.vm 2013-01-23 10:27:28 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "update_program_validation_rule" )</h3>
-<h4>$validation.program.name</h4>
+<h4>$validation.program.displayName</h4>
<form id='programValidationForm' name='programValidationForm' method='post' action='updateProgramValidation.action'>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2013-01-18 01:23:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/viewDataEntryForm.vm 2013-01-23 10:27:28 +0000
@@ -68,7 +68,7 @@
<form id="saveDataEntryForm" name="saveDataEntryForm" action="saveDataEntryForm.action" method="post">
<input type="hidden" name="programStageId" id="programStageId" value="$!programStage.id"/>
<input type="hidden" name="dataEntryFormId" id="dataEntryFormId" value="$!programStage.dataEntryForm.id"/>
-<h3>$i18n.getString( "dataentryform_management_for_program_stage" ): $programStage.name </h3>
+<h3>$i18n.getString( "dataentryform_management_for_program_stage" ): $programStage.displayName </h3>
<div class="container" >
<table id="detailsList" width="100%">
<col/>
