dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2188
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-11-26 18:21:10 +0100
message:
  Compacted dataentryscreen markup
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.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-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm	2010-11-26 17:10:45 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/defaultForm.vm	2010-11-26 17:21:10 +0000
@@ -28,6 +28,9 @@
   #set( $dataElements = $orderedDataElements.get( $categoryCombo )  )
   #set( $optionCombos = $orderdCategoryOptionCombos.get( $categoryCombo.id )  )
   #set( $mark = 0 )
+  #foreach( $optionCombo in $optionCombos )
+  <span id="value[option${optionCombo.id}].name" class="hidden">${optionCombo.name}</span>
+  #end
   #foreach( $dataElement in $dataElements )
   #if( $mark == 1 )
   #set( $mark = 0 )
@@ -39,7 +42,7 @@
   #set( $calculatedValue = false )
   #set( $calculatedValue = $calculatedValueMap.get( $dataElement ) )                        
   #set( $calculated = false )
-  #set( $calculated = ($calculatedDataElementIds.contains($dataElement.id)) )
+  #set( $calculated = ($calculatedDataElementIds.contains($dataElement.id) ) )
   <tr>
     <td #if( $mark == 1 ) style="background-color:#dddddd" #end>
       <span id="value[$dataElement.id].name" title="$!encoder.htmlEncode( $dataElement.description )">$encoder.htmlEncode( $dataElement.name )</span><span id="value[$dataElement.id].type" class="hidden">$dataElement.getDetailedNumberType()</span>
@@ -56,7 +59,7 @@
       #set( $minMaxError = true )
       #end
     #end
-    <span id="value[option$optionCombo.id].name" class="hidden">$optionCombo.name</span><span id="value[$dataElement.id:$optionCombo.id].min" class="hidden">$!minMax.min</span><span id="value[$dataElement.id:$optionCombo.id].max" class="hidden">$!minMax.max</span>
+    <span id="value[${dataElement.id}:${optionCombo.id}].min" class="hidden">$!minMax.min</span><span id="value[${dataElement.id}:${optionCombo.id}].max" class="hidden">$!minMax.max</span>
     <td>
     #if( $dataElement.type == "bool" )
     <span id="value[option$optionCombo.id].name" style="display:none">$optionCombo.name</span>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2010-11-26 17:10:45 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm	2010-11-26 17:21:10 +0000
@@ -46,6 +46,9 @@
       #set( $count = 0 )
       #set( $mark = 0 )
       #set( $optionCombos = $orderdCategoryOptionCombos.get( $categoryComboId )  )
+      #foreach( $optionCombo in $optionCombos )
+      <span id="value[option${optionCombo.id}].name" class="hidden">${optionCombo.name}</span>
+      #end
       #foreach( $dataElement in $section.dataElements )
       #if( $mark == 1 )
       #set( $mark = 0 )
@@ -75,7 +78,7 @@
           #set( $minMaxError = true )
           #end
         #end
-        <span id="value[option$optionCombo.id].name" class="hidden">$optionCombo.name</span><span id="value[$dataElement.id:$optionCombo.id].min" class="hidden">$!minMax.min</span><span id="value[$dataElement.id:$optionCombo.id].max" class="hidden">$!minMax.max</span>
+        <span id="value[${dataElement.id}:${optionCombo.id}].min" class="hidden">$!minMax.min</span><span id="value[${dataElement.id}:${optionCombo.id}].max" class="hidden">$!minMax.max</span>
         <td>
         #if( $dataElement.type == "bool" )
         <span id="value[option$optionCombo.id].name" style="display:none">$optionCombo.name</span>