dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19465
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8497: Minor fix for data entry form.
------------------------------------------------------------
revno: 8497
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-10-12 09:52:00 +0700
message:
Minor fix for data entry form.
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.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-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm 2012-10-06 13:46:23 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/defaultDataEntryForm.vm 2012-10-12 02:52:00 +0000
@@ -10,7 +10,7 @@
<tr>
<th>$i18n.getString( "data_element" )</th>
<th>$i18n.getString( "entry" )</th>
- #if( $!programStageInstance.programStage.program.displayProvidedOtherFacility=='true')
+ #if( $programStage.program.displayProvidedOtherFacility=='true')
<th>$i18n.getString( "provided_elsewhere" )</th>
#end
</tr>
@@ -59,38 +59,16 @@
datePicker($programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false);
</script>
#elseif($hasOptionSet=='true')
- <input name="entryfield" options='$hasOptionSet' #if($hasOptionSet == 'true') #end dataElementId='$programStageDataElement.dataElement.id' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"
- #set( $type=$programStageDataElement.dataElement.getDetailedNumberType())
- #if( $type=='number' )
- class="{validate:{number:true}}"
- #elseif( $type=='positiveNumber' )
- class="{validate:{positive_integer:true}}"
- #elseif( $type=='negativeNumber' )
- class="{validate:{negative_integer:true}}"
- #elseif( $type=='int' )
- class="{validate:{integer:true}}"
- #end />
+ <input name="entryfield" options='$hasOptionSet' #if($hasOptionSet == 'true') #end dataElementId='$programStageDataElement.dataElement.id' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex" />
#else
<input name="entryfield" dataElementId='$programStageDataElement.dataElement.id'
data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"
id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )"
onchange="saveVal( $programStageDataElement.dataElement.id )"
- onkeypress="return keyPress(event, this)" tabindex="$tabIndex"
-
- #set( $type=$programStageDataElement.dataElement.getDetailedNumberType())
- #if( $type=='number' )
- class="{validate:{number:true}}"
- #elseif( $type=='positiveNumber' )
- class="{validate:{positive_integer:true}}"
- #elseif( $type=='negativeNumber' )
- class="{validate:{negative_integer:true}}"
- #elseif( $type=='int' )
- class="{validate:{integer:true}}"
- #end
- />
+ onkeypress="return keyPress(event, this)" tabindex="$tabIndex"/>
#end
</td>
- #if( $!programStageInstance.programStage.program.displayProvidedOtherFacility=='true' )
+ #if( $programStage.program.displayProvidedOtherFacility=='true' )
<td style='width:20px;' align='center'>
#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
#if( $programStageDataElement.allowProvidedElsewhere == 'true')
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm 2012-08-28 15:46:56 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm 2012-10-12 02:52:00 +0000
@@ -12,7 +12,7 @@
<colgroup>
<col id="deCol">
<col id="entryCol">
- #if( $!programStageInstance.programStage.program.isRegistration() == 'true')
+ #if( $programStage.program.isRegistration() == 'true')
<col width="18%" />
#end
</colgroup>
@@ -20,7 +20,7 @@
<tr>
<th>$i18n.getString( "data_element" )</th>
<th>$i18n.getString( "entry" )</th>
- #if( $!programStageInstance.programStage.program.isRegistration() == 'true')
+ #if( $programStage.program.isRegistration() == 'true')
<th>$i18n.getString( "provided_elsewhere" )</th>
#end
</tr>
@@ -69,38 +69,16 @@
datePicker($programStageDataElement.programStage.id + '-' + $programStageDataElement.dataElement.id + '-val', false);
</script>
#elseif($hasOptionSet=='true')
- <input name="entryfield" options='$hasOptionSet' #if($hasOptionSet == 'true') #end dataElementId='$programStageDataElement.dataElement.id' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"
- #set( $type=$programStageDataElement.dataElement.getDetailedNumberType())
- #if( $type=='number' )
- class="{validate:{number:true}}"
- #elseif( $type=='positiveNumber' )
- class="{validate:{positive_integer:true}}"
- #elseif( $type=='negativeNumber' )
- class="{validate:{negative_integer:true}}"
- #elseif( $type=='int' )
- class="{validate:{integer:true}}"
- #end />
+ <input name="entryfield" options='$hasOptionSet' #if($hasOptionSet == 'true') #end dataElementId='$programStageDataElement.dataElement.id' data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"/>
#else
<input name="entryfield" dataElementId='$programStageDataElement.dataElement.id'
data="{compulsory: $programStageDataElement.compulsory, deName:'$programStageDataElement.dataElement.name', deType:'$programStageDataElement.dataElement.getDetailedNumberType()' }" onkeypress="return keyPress(event, this)" tabindex="$tabIndex"
id="$id" type="text" value="$!encoder.htmlEncode( $patientDataValue.value )"
onchange="saveVal( $programStageDataElement.dataElement.id )"
- onkeypress="return keyPress(event, this)" tabindex="$tabIndex"
-
- #set( $type=$programStageDataElement.dataElement.getDetailedNumberType())
- #if( $type=='number' )
- class="{validate:{number:true}}"
- #elseif( $type=='positiveNumber' )
- class="{validate:{positive_integer:true}}"
- #elseif( $type=='negativeNumber' )
- class="{validate:{negative_integer:true}}"
- #elseif( $type=='int' )
- class="{validate:{integer:true}}"
- #end
- />
+ onkeypress="return keyPress(event, this)" tabindex="$tabIndex"/>
#end
</td>
- #if( $!programStageInstance.programStage.program.isRegistration() == 'true' )
+ #if( $programStage.program.isRegistration() == 'true' )
<td style='width:20px;' align='center'>
#set( $id = $programStageDataElement.programStage.id + '_' + $programStageDataElement.dataElement.id + '_facility' )
#if( $programStageDataElement.allowProvidedElsewhere == 'true')
