← Back to branch summary

~registry/dhis2-academy/group3_messaging_support

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm

  • Committer: michaelgunnulfsen at gmail
  • Date: 2011-11-18 15:42:06 UTC
  • mfrom: (4968.1.62 Address_Book_group-4)
  • Revision ID: michaelgunnulfsen@gmail.com-20111118154206-akum3pg1i1jbk9iy
merged new searching functionality with addressbook

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntry.vm
1
1
 
2
2
#set( $Integer = 0 )
3
3
 
4
 
<h2>$encoder.htmlEncode( $dataSet.name )</h2>
 
4
#if( $dataSet.alternativeName )
 
5
        #set( $dataSetName = $dataSet.alternativeName )
 
6
#else
 
7
        #set( $dataSetName = $dataSet.name )
 
8
#end
 
9
 
 
10
<h2>$encoder.htmlEncode( $dataSetName )</h2>
5
11
 
6
12
#set( $validationRuleViolationsSize = $validationRuleViolations.size() )
7
13
#set( $validationViolationsSize = $validationViolations.size() )
47
53
        <h3 style="text-align: left;">$sectionName</h3>
48
54
        <p style="text-align: left;">
49
55
                #foreach( $dataElement in $dataElements)
 
56
                        #if( $dataElement.shortName )
 
57
                                #set( $dataElementName = $dataElement.shortName )
 
58
                        #else
 
59
                                #set( $dataElementName = $dataElement.name )
 
60
                        #end
 
61
 
50
62
                        #foreach( $optionCombo in $dataElement.categoryCombo.optionCombos )
51
63
                                #set( $key = "DE${dataElement.id}OC${optionCombo.id}" )
52
 
                                <label>$dataElement.name #if($optionCombo.name!="(default)")$optionCombo.name#end</label>
 
64
 
 
65
                                <label>$encoder.htmlEncode( $dataElementName ) #if( $optionCombo.name!="(default)")$encoder.htmlEncode( $optionCombo.name )#end</label>
53
66
 
54
67
                                #if( $validationViolations.get( $key ) )
55
68
                                        #set( $validationViolation = $validationViolations.get( $key ) )
56
69
 
57
 
                        #if( $sectionFormUtils.valueHigher( $validationViolation.value, $validationViolation.max ) )
 
70
                        #if( $formUtils.valueHigher( $validationViolation.value, $validationViolation.max ) )
58
71
                            <br /><span style="color: #990000;">Too high (max $validationViolation.max)</span>
59
 
                        #elseif( $sectionFormUtils.valueLower( $validationViolation.value, $validationViolation.min ) )
 
72
                        #elseif( $formUtils.valueLower( $validationViolation.value, $validationViolation.min ) )
60
73
                            <br /><span style="color: red;">Too low (min $validationViolation.min)</span>
61
74
                        #else
62
75
                            <br /><span style="color: red;">Not a number</span>