← Back to branch summary

~dhis2-devs-core/dhis2/trunk

« back to all changes in this revision

Viewing changes to dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm

  • Committer: jimgrace at gmail
  • Date: 2014-05-18 00:49:40 UTC
  • Revision ID: jimgrace@gmail.com-20140518004940-wbw1bxjhfdmf33yl
Support attribute categories in validation

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm
84
84
                        <!-- Note: &nbsp; in the headers below keeps the jquery.tablesorter icons from overlapping the labels. -->
85
85
                        <th>$i18n.getString( "organisation_unit" )&nbsp;&nbsp;&nbsp;&nbsp;</th>
86
86
                        <th>$i18n.getString( "period" )&nbsp;&nbsp;&nbsp;&nbsp;</th>
 
87
            #if( $showAttributeCombos )
 
88
                <th>$i18n.getString( "attributes" )&nbsp;&nbsp;&nbsp;&nbsp;</th>
 
89
            #end
87
90
                        <!-- Note: column-level sortInitialOrder only works in tablesorter 2.0.8 and later (an earlier version in use as of this writing.) --->
88
91
                        <th class="{sorter: 'importanceSorter', sortInitialOrder: 'desc'}">$i18n.getString( "importance" )&nbsp;&nbsp;&nbsp;&nbsp;</th>
89
92
                        <th class="{sorter: false}">$i18n.getString( "validation_rule" )</th>
98
101
                <tr id="tr${result.id}">
99
102
                  <td>$encoder.htmlEncode( $!result.source.name )</td>
100
103
                  <td>$!format.formatPeriod( $result.period )</td>
 
104
          #if( $showAttributeCombos )
 
105
              <td>#if($result.attributeOptionCombo.isDefault()=='false') $encoder.htmlEncode( $!result.attributeOptionCombo.name ) #end</td>
 
106
          #end
101
107
                  <td>$encoder.htmlEncode( $i18n.getString( $!result.validationRule.importance ) )</td>
102
108
                  <td>$encoder.htmlEncode( $!result.validationRule.getInstructionFallback() )</td>
103
109
                  <td>$encoder.htmlEncode( $!result.leftsideValue )</td>