dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6414
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-03-28 11:59:27 +0200
message:
  minor fixes to xsl rendering
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl


--
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/report/Report.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java	2012-03-28 09:59:27 +0000
@@ -142,7 +142,7 @@
     }
 
     @JsonProperty
-    @JsonSerialize( contentAs = BaseIdentifiableObject.class )
+    @JsonSerialize( as = BaseIdentifiableObject.class )
     @JsonView( {DetailedView.class, ExportView.class} )
     @JacksonXmlProperty( namespace = Dxf2Namespace.NAMESPACE )
     public ReportTable getReportTable()

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl	2012-03-27 20:10:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl	2012-03-28 09:59:27 +0000
@@ -23,7 +23,7 @@
         </tr>
       </table>
 
-      <xsl:apply-templates select="d:indicators|d:indicatorGroupSet" mode="short"/>
+      <xsl:apply-templates select="d:indicatorGroupSet|d:indicators" mode="short"/>
     </div>
   </xsl:template>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl	2012-03-28 09:59:27 +0000
@@ -23,7 +23,7 @@
         </tr>
       </table>
 
-      <xsl:apply-templates select="d:organisationUnits" mode="short"/>
+      <xsl:apply-templates select="d:organisationUnitGroupSet|d:organisationUnits" mode="short"/>
     </div>
   </xsl:template>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl	2012-03-28 09:59:27 +0000
@@ -26,5 +26,13 @@
       <xsl:apply-templates select="d:organisationUnitGroups" mode="short"/>
     </div>
   </xsl:template>
-  
+
+  <xsl:template match="d:organisationUnitGroupSet" mode="short">
+    <h3>OrganisationUnit Group Set</h3>
+    <table class="organisationUnitGroupSet">
+      <xsl:apply-templates select="." mode="row"/>
+    </table>
+  </xsl:template>
+
+
 </xsl:stylesheet>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2012-03-27 17:38:48 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl	2012-03-28 09:59:27 +0000
@@ -37,6 +37,10 @@
         <td>Code</td>
         <td> <xsl:value-of select="@d:code" /> </td>
       </tr>
+      <tr>
+        <td>UsingOrgUnitGroupSets</td>
+        <td> <xsl:value-of select="d:usingOrgUnitGroupSets" /> </td>
+      </tr>
     </table>
 
     <xsl:apply-templates select="d:reportTable" mode="short"/>