=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-09-25 13:56:20 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-09-30 17:45:22 +0000 @@ -125,7 +125,7 @@ - + /main.vm /dhis-web-dashboard-integration/interpretation.vm /dhis-web-dashboard-integration/menu.vm @@ -133,5 +133,9 @@ style/dashboard.css + + /dhis-web-dashboard-integration/interpretationFeed.vm + + === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2012-09-05 07:20:37 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2012-09-30 17:45:22 +0000 @@ -7,61 +7,6 @@
-#foreach( $ip in $interpretations ) -
- -
- ${ip.user.name}  - ${format.formatDate( $ip.created )} -
-
- ${ip.text} -
-
- #if( $ip.chartInterpretation ) - - #elseif( $ip.mapViewInterpretation ) - $encoder.htmlEncode( $ip.mapView.name ) - #elseif( $ip.reportTableInterpretation ) - #if( $ip.organisationUnit )#set( $ou = "&ou=" + $ip.organisationUnit.uid )#else#set( $ou = "" )#end - - $encoder.htmlEncode( $ip.reportTable.name ) - #elseif( $ip.dataSetReportInterpretation ) - - $encoder.htmlEncode( $ip.dataSet.name ) - #end -
- - #set( $comments = $ip.comments ) -
-
- #foreach( $comment in $comments ) -
-
- ${comment.user.name}  - ${format.formatDate( $comment.created )} -
-
-
- ${comment.text} -
- #end -
- - -
- -
-#end
=== added file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm 2012-09-30 17:45:22 +0000 @@ -0,0 +1,55 @@ +#foreach( $ip in $interpretations ) +
+ +
+ ${ip.user.name}  + ${format.formatDate( $ip.created )} +
+
+ ${ip.text} +
+
+ #if( $ip.chartInterpretation ) + + #elseif( $ip.mapViewInterpretation ) + $encoder.htmlEncode( $ip.mapView.name ) + #elseif( $ip.reportTableInterpretation ) + #if( $ip.organisationUnit )#set( $ou = "&ou=" + $ip.organisationUnit.uid )#else#set( $ou = "" )#end + + $encoder.htmlEncode( $ip.reportTable.name ) + #elseif( $ip.dataSetReportInterpretation ) + + $encoder.htmlEncode( $ip.dataSet.name ) + #end +
+ + #set( $comments = $ip.comments ) +
+
+ #foreach( $comment in $comments ) +
+
+ ${comment.user.name}  + ${format.formatDate( $comment.created )} +
+
+
+ ${comment.text} +
+ #end +
+ + +
+ +
+#end \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-09-20 12:00:28 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-09-30 17:45:22 +0000 @@ -1,6 +1,7 @@ $( document ).ready( function() { - $( '.commentArea' ).autogrow(); + $( ".commentArea" ).autogrow(); + $( "#interpretationFeed" ).load( "getInterpretations.action" ); } ); function showUserInfo( id )