dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40944
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20856: rename PS.irregular to PS.repeatable in classes and DB (already done before in JSON/XML)
------------------------------------------------------------
revno: 20856
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-23 10:41:44 +0700
message:
rename PS.irregular to PS.repeatable in classes and DB (already done before in JSON/XML)
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
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-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/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 2015-10-14 07:57:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2015-10-23 03:41:44 +0000
@@ -68,7 +68,7 @@
private int minDaysFromStart;
- private Boolean irregular = false;
+ private boolean repeatable;
private Program program;
@@ -282,14 +282,14 @@
@JsonProperty( "repeatable" )
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( localName = "repeatable", namespace = DxfNamespaces.DXF_2_0 )
- public Boolean getIrregular()
+ public boolean getRepeatable()
{
- return irregular;
+ return repeatable;
}
- public void setIrregular( Boolean irregular )
+ public void setRepeatable( boolean repeatable )
{
- this.irregular = irregular;
+ this.repeatable = repeatable;
}
@JsonProperty
@@ -513,11 +513,12 @@
minDaysFromStart = programStage.getMinDaysFromStart();
autoGenerateEvent = programStage.isAutoGenerated();
+ repeatable = programStage.getRepeatable();
if ( strategy.isReplace() )
{
description = programStage.getDescription();
- irregular = programStage.getIrregular();
+ repeatable = programStage.getRepeatable();
program = programStage.getProgram();
dataEntryForm = programStage.getDataEntryForm();
standardInterval = programStage.getStandardInterval();
@@ -536,7 +537,6 @@
else if ( strategy.isMerge() )
{
description = programStage.getDescription() == null ? description : programStage.getDescription();
- irregular = programStage.getIrregular() == null ? irregular : programStage.getIrregular();
program = programStage.getProgram() == null ? program : programStage.getProgram();
dataEntryForm = programStage.getDataEntryForm() == null ? dataEntryForm : programStage
.getDataEntryForm();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2015-10-20 07:00:38 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java 2015-10-23 03:41:44 +0000
@@ -521,7 +521,7 @@
for ( ProgramStageInstance stageInstance : stageInstances )
{
if ( (!stageInstance.isCompleted() && stageInstance.getStatus() != EventStatus.SKIPPED)
- || stageInstance.getProgramStage().getIrregular() )
+ || stageInstance.getProgramStage().getRepeatable() )
{
return false;
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java 2015-10-19 14:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java 2015-10-23 03:41:44 +0000
@@ -49,7 +49,7 @@
@Autowired
private StatementBuilder statementBuilder;
-
+
// -------------------------------------------------------------------------
// Execute
// -------------------------------------------------------------------------
@@ -79,6 +79,9 @@
executeSql( "ALTER TABLE program ALTER COLUMN \"type\" TYPE varchar(255);" );
executeSql( "update program set \"type\"='WITH_REGISTRATION' where type='1' or type='2'" );
executeSql( "update program set \"type\"='WITHOUT_REGISTRATION' where type='3'" );
+
+ executeSql( "alter table programstage rename column irregular to repeatable" );
+ executeSql( "update programstage set repeatable=false where repeatable is null" );
}
// -------------------------------------------------------------------------
@@ -186,7 +189,7 @@
executeSql( "update trackedentityattribute set valuetype='TRACKER_ASSOCIATE' where valuetype='trackerAssociate'" );
executeSql( "update trackedentityattribute set valuetype='USERNAME' where valuetype='users'" );
executeSql( "update trackedentityattribute set valuetype='TEXT' where valuetype is null" );
-
+
executeSql( "update optionset set valuetype='TEXT' where valuetype is null" );
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2015-10-08 13:50:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java 2015-10-23 03:41:44 +0000
@@ -106,8 +106,6 @@
executeSql( "ALTER TABLE program DROP COLUMN anonymous" );
executeSql( "UPDATE program SET type=1 where type is null" );
- executeSql( "UPDATE programstage SET irregular=false WHERE irregular is null" );
-
executeSql( "DROP TABLE programattributevalue" );
executeSql( "DROP TABLE programinstance_attributes" );
executeSql( "DROP TABLE programattributeoption" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml 2015-10-07 05:15:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml 2015-10-23 03:41:44 +0000
@@ -24,7 +24,7 @@
<many-to-one name="program" class="org.hisp.dhis.program.Program" column="programid"
foreign-key="fk_programstage_program" />
- <property name="irregular" column="irregular" />
+ <property name="repeatable" column="repeatable" />
<set name="programStageDataElements" order-by="sort_order" cascade="save-update">
<key column="programstageid" />
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java 2015-09-10 10:49:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java 2015-10-23 03:41:44 +0000
@@ -250,7 +250,7 @@
stageD = new ProgramStage( "D", programB );
stageB.setSortOrder( 2 );
- stageC.setIrregular( true );
+ stageC.setRepeatable( true );
programStageService.saveProgramStage( stageD );
programStages = new HashSet<>();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java 2015-10-20 06:28:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java 2015-10-23 03:41:44 +0000
@@ -214,7 +214,7 @@
programStageService.saveProgramStage( stageC );
stageD = new ProgramStage( "D", programB );
- stageC.setIrregular( true );
+ stageC.setRepeatable( true );
programStageService.saveProgramStage( stageD );
programStages = new HashSet<>();
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-10-22 03:52:17 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-10-23 03:41:44 +0000
@@ -332,7 +332,7 @@
}
else
{
- if ( !programStage.getIrregular() )
+ if ( !programStage.getRepeatable() )
{
programStageInstance = programStageInstanceService.getProgramStageInstance( programInstance,
programStage );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2015-10-22 03:05:41 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java 2015-10-23 03:41:44 +0000
@@ -158,7 +158,7 @@
programStageA = createProgramStage( 'A', 0 );
programStageB = createProgramStage( 'B', 0 );
- programStageB.setIrregular( true );
+ programStageB.setRepeatable( true );
identifiableObjectManager.save( programStageA );
identifiableObjectManager.save( programStageB );
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2015-10-02 11:32:31 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2015-10-23 03:41:44 +0000
@@ -975,7 +975,7 @@
}
// is repeatable
- mobileProgramStage.setRepeatable( programStage.getIrregular() );
+ mobileProgramStage.setRepeatable( programStage.getRepeatable() );
if ( programStage.getStandardInterval() == null )
{
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java 2015-10-19 14:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java 2015-10-23 03:41:44 +0000
@@ -226,7 +226,7 @@
prStg.setName( programStage.getName() );
- prStg.setRepeatable( programStage.getIrregular() );
+ prStg.setRepeatable( programStage.getRepeatable() );
if ( programStage.getStandardInterval() == null )
{
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2015-10-05 17:23:54 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2015-10-23 03:41:44 +0000
@@ -1223,14 +1223,14 @@
return createProgramStage( uniqueCharacter, minDays, false );
}
- public static ProgramStage createProgramStage( char uniqueCharacter, int minDays, boolean irregular )
+ public static ProgramStage createProgramStage( char uniqueCharacter, int minDays, boolean repeatable )
{
ProgramStage programStage = new ProgramStage();
programStage.setName( "ProgramStage" + uniqueCharacter );
programStage.setDescription( "description" + uniqueCharacter );
programStage.setMinDaysFromStart( minDays );
- programStage.setIrregular( irregular );
+ programStage.setRepeatable( repeatable );
return programStage;
}
=== 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 2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm 2015-10-23 03:41:44 +0000
@@ -23,7 +23,7 @@
}#if( $velocityCount < $programStage.reminders.size() ),#end
#end
],
- "irregular": "$!programStage.irregular",
+ "repeatable": "$!programStage.repeatable",
"autoGenerateEvent": "$!programStage.autoGenerateEvent",
"validCompleteOnly": "$!programStage.validCompleteOnly",
"displayGenerateEventBox": "$!programStage.displayGenerateEventBox",
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java 2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java 2015-10-23 03:41:44 +0000
@@ -167,11 +167,11 @@
this.allowProvidedElsewhere = allowProvidedElsewhere;
}
- private Boolean irregular;
+ private Boolean repeatable;
- public void setIrregular( Boolean irregular )
+ public void setRepeatable( Boolean repeatable )
{
- this.irregular = irregular;
+ this.repeatable = repeatable;
}
private Integer standardInterval;
@@ -351,7 +351,7 @@
throws Exception
{
minDaysFromStart = (minDaysFromStart == null) ? 0 : minDaysFromStart;
- irregular = (irregular == null) ? false : irregular;
+ repeatable = (repeatable == null) ? false : repeatable;
autoGenerateEvent = (autoGenerateEvent == null) ? false : autoGenerateEvent;
validCompleteOnly = (validCompleteOnly == null) ? false : validCompleteOnly;
displayGenerateEventBox = (displayGenerateEventBox == null) ? false : displayGenerateEventBox;
@@ -372,7 +372,7 @@
programStage.setProgram( program );
programStage.setStandardInterval( standardInterval );
programStage.setExcecutionDateLabel( StringUtils.trimToNull( excecutionDateLabel ) );
- programStage.setIrregular( irregular );
+ programStage.setRepeatable( repeatable );
programStage.setMinDaysFromStart( minDaysFromStart );
programStage.setDisplayGenerateEventBox( displayGenerateEventBox );
programStage.setValidCompleteOnly( validCompleteOnly );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java 2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java 2015-10-23 03:41:44 +0000
@@ -158,11 +158,11 @@
return programId;
}
- private Boolean irregular;
+ private Boolean repeatable;
- public void setIrregular( Boolean irregular )
+ public void setRepeatable( Boolean repeatable )
{
- this.irregular = irregular;
+ this.repeatable = repeatable;
}
private Integer standardInterval;
@@ -342,7 +342,7 @@
throws Exception
{
minDaysFromStart = (minDaysFromStart == null) ? 0 : minDaysFromStart;
- irregular = (irregular == null) ? false : irregular;
+ repeatable = (repeatable == null) ? false : repeatable;
autoGenerateEvent = (autoGenerateEvent == null) ? false : autoGenerateEvent;
validCompleteOnly = (validCompleteOnly == null) ? false : validCompleteOnly;
displayGenerateEventBox = (displayGenerateEventBox == null) ? false : displayGenerateEventBox;
@@ -362,7 +362,7 @@
programStage.setStandardInterval( standardInterval );
programStage.setExcecutionDateLabel( StringUtils.trimToNull( excecutionDateLabel ) );
programStage.setMinDaysFromStart( minDaysFromStart );
- programStage.setIrregular( irregular );
+ programStage.setRepeatable( repeatable );
programStage.setMinDaysFromStart( minDaysFromStart );
programStage.setDisplayGenerateEventBox( displayGenerateEventBox );
programStage.setBlockEntryForm( blockEntryForm );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm 2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm 2015-10-23 03:41:44 +0000
@@ -124,8 +124,8 @@
<tr><th colspan="2">$i18n.getString( "repeatable_program_stage_details" )</th></tr>
<tr>
- <td><label for="irregular">$i18n.getString( "repeatable" )</label></td>
- <td><input type="checkbox" id="irregular" name="irregular" value='true' onchange='repeatableOnChange();' /></td>
+ <td><label for="repeatable">$i18n.getString( "repeatable" )</label></td>
+ <td><input type="checkbox" id="repeatable" name="repeatable" value='true' onchange='repeatableOnChange();' /></td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js 2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js 2015-10-23 03:41:44 +0000
@@ -56,8 +56,8 @@
setInnerHTML( 'scheduledDaysFromStartField', json.programStage.minDaysFromStart );
setInnerHTML( 'idField', json.programStage.uid );
- var irregular = (json.programStage.irregular=='true') ? i18n_yes : i18n_no;
- setInnerHTML( 'irregularField', irregular );
+ var repeatable = (json.programStage.repeatable=='true') ? i18n_yes : i18n_no;
+ setInnerHTML( 'repeatableField', repeatable );
var autoGenerateEvent = (json.programStage.autoGenerateEvent=='true') ? i18n_yes : i18n_no;
setInnerHTML( 'autoGenerateEventField', autoGenerateEvent );
@@ -262,7 +262,7 @@
function repeatableOnChange()
{
- var checked = byId('irregular').checked;
+ var checked = byId('repeatable').checked;
if( checked )
{
enable('standardInterval');
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm 2015-10-01 18:17:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm 2015-10-23 03:41:44 +0000
@@ -61,7 +61,7 @@
<p><label class="bold">$i18n.getString( "description" ):</label><br><span id="descriptionField"></span></p>
<p><label class="bold">$i18n.getString( "scheduled_days_from_start" ):</label><br><span id="scheduledDaysFromStartField"></span></p>
<p><label class="bold">$i18n.getString( "auto_generate_event" ):</label><br><span id="autoGenerateEventField"></span></p>
- <p><label class="bold">$i18n.getString( "irregular" ):</label><br><span id="irregularField"></span></p>
+ <p><label class="bold">$i18n.getString( "repeatable" ):</label><br><span id="repeatableField"></span></p>
<p><label class="bold">$i18n.getString( "display_generate_event_box_after_completed" ):</label><br><span id="displayGenerateEventBoxField"></span></p>
<p><label class="bold">$i18n.getString( "standard_interval_days" ):</label><br><span id="standardIntervalField"></span></p>
<p><label class="bold">$i18n.getString( "block_entry_form_after_completed" ):</label><br><span id="blockEntryFormField"></span></p>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm 2015-10-22 04:10:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm 2015-10-23 03:41:44 +0000
@@ -151,19 +151,19 @@
<tr><th colspan="2">$i18n.getString( "repeatable_program_stage_details" )</th></tr>
<tr>
- <td><label for="irregular">$i18n.getString( "repeatable" )</label></td>
- #if( $programStage.irregular && $programStage.irregular == 'true' )
+ <td><label for="repeatable">$i18n.getString( "repeatable" )</label></td>
+ #if( $programStage.repeatable && $programStage.repeatable == 'true' )
<td><input type="checkbox" value='true' checked disabled/></td>
- <td><input type="hidden" id="irregular" name="irregular" value='true' checked/></td>
+ <td><input type="hidden" id="repeatable" name="repeatable" value='true' checked/></td>
#else
- <td><input type="checkbox" id="irregular" name="irregular" value='true' onchange='repeatableOnChange();' /></td>
+ <td><input type="checkbox" id="repeatable" name="repeatable" value='true' onchange='repeatableOnChange();' /></td>
#end
</tr>
<tr>
<td><label for="periodTypeName">$i18n.getString( "period_type" )</label></td>
<td>
- <select id="periodTypeName" name="periodTypeName" #if( $programStage.irregular !='true' ) disabled #end onchange='periodTypeOnChange();'>
+ <select id="periodTypeName" name="periodTypeName" #if( $programStage.repeatable !='true' ) disabled #end onchange='periodTypeOnChange();'>
<option value=''>[$i18n.getString('please_select')]</option>
#foreach( $periodType in $periodTypes )
<option value="$periodType.name" #if($programStage.periodType.name == "$periodType.name") selected #end>$i18n.getString( $periodType.name )</option>
@@ -174,12 +174,12 @@
<tr>
<td><label for="displayGenerateEventBox">$i18n.getString( "display_generate_event_box_after_completed" )</label></td>
- <td><input type="checkbox" id="displayGenerateEventBox" name="displayGenerateEventBox" value='true' #if( $programStage.displayGenerateEventBox && $programStage.displayGenerateEventBox=='true' ) checked #end #if($programStage.irregular!='true' ) disabled checked #end /></td>
+ <td><input type="checkbox" id="displayGenerateEventBox" name="displayGenerateEventBox" value='true' #if( $programStage.displayGenerateEventBox && $programStage.displayGenerateEventBox=='true' ) checked #end #if($programStage.repeatable!='true' ) disabled checked #end /></td>
</tr>
<tr>
<td><label for="standardInterval">$i18n.getString( "standard_interval_days" )</label></td>
- <td><input type="text" id="standardInterval" name="standardInterval" value='$!programStage.standardInterval' #if( $programStage.irregular != 'true' || $programStage.periodType && $programStage.periodType.name != '' ) disabled #end /></td>
+ <td><input type="text" id="standardInterval" name="standardInterval" value='$!programStage.standardInterval' #if( $programStage.repeatable != 'true' || $programStage.periodType && $programStage.periodType.name != '' ) disabled #end /></td>
</tr>
#end
