dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #17622
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7079: Impl first cut of data interpretations.
------------------------------------------------------------
revno: 7079
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-05-29 14:04:07 +0200
message:
Impl first cut of data interpretations.
added:
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java
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/javascript/interpretation.js
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/impl/DefaultInterpretationService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/interpretation/InterpretationServiceTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css
--
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/chart/ChartService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2012-01-25 05:35:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2012-05-29 12:04:07 +0000
@@ -28,6 +28,7 @@
*/
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -48,12 +49,12 @@
{
String ID = ChartService.class.getName();
- JFreeChart getJFreeChart( String uid, I18nFormat format );
-
JFreeChart getJFreeChart( int id, I18nFormat format );
JFreeChart getJFreeChart( Chart chart, I18nFormat format );
+ JFreeChart getJFreeChart( Chart chart, Date date, I18nFormat format );
+
JFreeChart getJFreePeriodChart( Indicator indicator, OrganisationUnit unit, boolean title, I18nFormat format );
JFreeChart getJFreeOrganisationUnitChart( Indicator indicator, OrganisationUnit parent, boolean title, I18nFormat format );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java 2012-05-28 22:32:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java 2012-05-29 12:04:07 +0000
@@ -27,8 +27,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.Date;
+
import org.hisp.dhis.chart.Chart;
import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.user.User;
/**
* @author Lars Helge Overland
@@ -40,14 +43,38 @@
private String text;
+ private User user;
+
+ private Date created;
+
+ // -------------------------------------------------------------------------
+ // Constructors
+ // -------------------------------------------------------------------------
+
public Interpretation()
{
+ this.created = new Date();
}
-
+
public Interpretation( Chart chart, String text )
{
- }
-
+ this.chart = chart;
+ this.text = text;
+ this.created = new Date();
+ }
+
+ public Interpretation( Chart chart, String text, User user )
+ {
+ this.chart = chart;
+ this.text = text;
+ this.user = user;
+ this.created = new Date();
+ }
+
+ // -------------------------------------------------------------------------
+ // Get and set methods
+ // -------------------------------------------------------------------------
+
public Chart getChart()
{
return chart;
@@ -67,4 +94,24 @@
{
this.text = text;
}
+
+ public User getUser()
+ {
+ return user;
+ }
+
+ public void setUser( User user )
+ {
+ this.user = user;
+ }
+
+ public Date getCreated()
+ {
+ return created;
+ }
+
+ public void setCreated( Date created )
+ {
+ this.created = created;
+ }
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2012-05-17 19:54:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2012-05-29 12:04:07 +0000
@@ -73,7 +73,7 @@
private String email;
private String phoneNumber;
-
+
private UserCredentials userCredentials;
/**
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2012-03-18 12:15:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2012-05-29 12:04:07 +0000
@@ -43,6 +43,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -173,13 +174,6 @@
// Logic
// -------------------------------------------------------------------------
- public JFreeChart getJFreeChart( String uid, I18nFormat format )
- {
- Chart chart = getChart( uid );
-
- return chart != null ? getJFreeChart( chart, format ) : null;
- }
-
public JFreeChart getJFreeChart( int id, I18nFormat format )
{
Chart chart = getChart( id );
@@ -189,10 +183,15 @@
public JFreeChart getJFreeChart( Chart chart, I18nFormat format )
{
+ return getJFreeChart( chart, null, format );
+ }
+
+ public JFreeChart getJFreeChart( Chart chart, Date date, I18nFormat format )
+ {
if ( chart.getRelatives() != null )
{
- chart.setRelativePeriods( periodService.reloadPeriods( chart.getRelatives().getRelativePeriods( format,
- true ) ) );
+ chart.setRelativePeriods( periodService.reloadPeriods( chart.getRelatives().getRelativePeriods(
+ date, format, true ) ) );
}
User user = currentUserService.getCurrentUser();
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/impl/DefaultInterpretationService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/impl/DefaultInterpretationService.java 2012-05-28 22:32:37 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/impl/DefaultInterpretationService.java 2012-05-29 12:04:07 +0000
@@ -32,6 +32,8 @@
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
import org.hisp.dhis.interpretation.Interpretation;
import org.hisp.dhis.interpretation.InterpretationService;
+import org.hisp.dhis.user.CurrentUserService;
+import org.hisp.dhis.user.User;
/**
* @author Lars Helge Overland
@@ -49,6 +51,13 @@
{
this.interpretationStore = interpretationStore;
}
+
+ private CurrentUserService currentUserService;
+
+ public void setCurrentUserService( CurrentUserService currentUserService )
+ {
+ this.currentUserService = currentUserService;
+ }
// -------------------------------------------------------------------------
// InterpretationService implementation
@@ -56,6 +65,13 @@
public int saveInterpretation( Interpretation interpretation )
{
+ User user = currentUserService.getCurrentUser();
+
+ if ( user != null )
+ {
+ interpretation.setUser( user );
+ }
+
return interpretationStore.save( interpretation );
}
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2012-05-28 22:32:37 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2012-05-29 12:04:07 +0000
@@ -251,7 +251,8 @@
<!-- Interpretation -->
<bean id="org.hisp.dhis.interpretation.InterpretationService" class="org.hisp.dhis.interpretation.impl.DefaultInterpretationService">
- <property name="interpretationStore" ref="org.hisp.dhis.interpretation.InterpretationStore" />
+ <property name="interpretationStore" ref="org.hisp.dhis.interpretation.InterpretationStore" />
+ <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
<bean id="org.hisp.dhis.interpretation.InterpretationStore" class="org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore">
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml 2012-05-28 22:32:37 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml 2012-05-29 12:04:07 +0000
@@ -18,7 +18,12 @@
<property name="text" column="interpretationtext" type="text" />
<many-to-one name="chart" class="org.hisp.dhis.chart.Chart" column="chartid"
- foreign-key="fk_interpretation_chartid" />
+ foreign-key="fk_interpretation_chartid" not-null="true" />
+
+ <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid"
+ foreign-key="fk_interpretation_userid" not-null="true" />
+
+ <property name="created" not-null="true" />
</class>
</hibernate-mapping>
\ No newline at end of file
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/interpretation/InterpretationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/interpretation/InterpretationServiceTest.java 2012-05-28 22:32:37 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/interpretation/InterpretationServiceTest.java 2012-05-29 12:04:07 +0000
@@ -37,6 +37,8 @@
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.chart.Chart;
import org.hisp.dhis.chart.ChartService;
+import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserService;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,11 +50,16 @@
extends DhisSpringTest
{
@Autowired
+ private UserService userService;
+
+ @Autowired
private ChartService chartService;
@Autowired
private InterpretationService interpretationService;
+ private User userA;
+
private Chart chartA;
private Interpretation interpretationA;
@@ -62,12 +69,15 @@
@Before
public void beforeTest()
{
+ userA = createUser( 'A' );
+ userService.addUser( userA );
+
chartA = new Chart( "ChartA" );
chartService.saveChart( chartA );
- interpretationA = new Interpretation( chartA, "Interpration of chart A" );
- interpretationB = new Interpretation( chartA, "Interpration of chart B" );
- interpretationC = new Interpretation( chartA, "Interpration of chart C" );
+ interpretationA = new Interpretation( chartA, "Interpration of chart A", userA );
+ interpretationB = new Interpretation( chartA, "Interpration of chart B", userA );
+ interpretationC = new Interpretation( chartA, "Interpration of chart C", userA );
}
@Test
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java 2012-05-28 14:25:12 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java 2012-05-29 12:04:07 +0000
@@ -40,6 +40,7 @@
import org.jfree.chart.ChartUtilities;
import org.jfree.chart.JFreeChart;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,6 +49,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.util.Date;
import static org.hisp.dhis.api.utils.ContextUtils.CacheStrategy;
@@ -79,14 +81,15 @@
@RequestMapping( value = { "/{uid}/data", "/{uid}/data.png" }, method = RequestMethod.GET )
public void getChart( @PathVariable( "uid" ) String uid,
+ @RequestParam( value = "date", required = false ) @DateTimeFormat( pattern = "yyyy-MM-dd" ) Date date,
@RequestParam( value = "width", defaultValue = "800", required = false ) int width,
@RequestParam( value = "height", defaultValue = "500", required = false ) int height,
HttpServletResponse response ) throws IOException, I18nManagerException
{
- JFreeChart jFreeChart = chartService.getJFreeChart( uid, i18nManager.getI18nFormat() );
-
Chart chart = chartService.getChart( uid );
+ JFreeChart jFreeChart = chartService.getJFreeChart( chart, date, i18nManager.getI18nFormat() );
+
String filename = CodecUtils.filenameEncode( chart.getName() ) + ".png";
contextUtils.configureResponse( response, ContextUtils.CONTENT_TYPE_PNG, CacheStrategy.RESPECT_SYSTEM_SETTING, filename, false );
=== added directory 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation'
=== added directory 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action'
=== added file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java 2012-05-29 12:04:07 +0000
@@ -0,0 +1,45 @@
+package org.hisp.dhis.dashboard.interpretation.action;
+
+import java.util.List;
+
+import org.hisp.dhis.interpretation.Interpretation;
+import org.hisp.dhis.interpretation.InterpretationService;
+
+import com.opensymphony.xwork2.Action;
+
+public class GetInterpretationsAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private InterpretationService interpretationService;
+
+ public void setInterpretationService( InterpretationService interpretationService )
+ {
+ this.interpretationService = interpretationService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private List<Interpretation> interpretations;
+
+ public List<Interpretation> getInterpretations()
+ {
+ return interpretations;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ interpretations = interpretationService.getInterpretations( 0, 10 );
+
+ return SUCCESS;
+ }
+}
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml 2012-03-09 17:36:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml 2012-05-29 12:04:07 +0000
@@ -97,5 +97,12 @@
<property name="messageService" ref="org.hisp.dhis.message.MessageService" />
<property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
</bean>
+
+ <!-- Interpretations -->
+
+ <bean id="org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction" class="org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction"
+ scope="prototype">
+ <property name="interpretationService" ref="org.hisp.dhis.interpretation.InterpretationService" />
+ </bean>
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-03-05 10:43:47 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-05-29 12:04:07 +0000
@@ -34,4 +34,5 @@
user_roles=User roles
meta_data=Meta data
sending_message=Sending message
-explore=Explore
\ No newline at end of file
+explore=Explore
+interpretations=Interpretations
\ No newline at end of file
=== 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-03-09 17:36:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml 2012-05-29 12:04:07 +0000
@@ -112,5 +112,15 @@
<param name="onExceptionReturn">plainTextError</param>
</action>
+ <!-- Interpretation -->
+
+ <action name="interpretation" class="org.hisp.dhis.dashboard.interpretation.action.GetInterpretationsAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-dashboard-integration/interpretation.vm</param>
+ <param name="menu">/dhis-web-dashboard-integration/menu.vm</param>
+ <param name="javascripts">javascript/interpretation.js</param>
+ <param name="stylesheets">style/dashboard.css</param>
+ </action>
+
</package>
</struts>
=== added 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 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm 2012-05-29 12:04:07 +0000
@@ -0,0 +1,20 @@
+
+<h3>$i18n.getString( "interpretations" )</h3>
+
+<div id="shareLink">Share your own interpretations from <a href="../dhis-web-visualizer/app/index.html">Data Visualizer</a></div>
+
+<div id="interpretationFeed">
+#foreach( $ip in $interpretations )
+<div class="interpretation">
+ <div class="interpretationName"><span class="bold" style="cursor:pointer" onclick="showUserInfo( '${ip.user.id}' )">${ip.user.name}</span> <span class="grey">${format.formatDate( $ip.created )}</span></div>
+ <div class="interpretationText">${ip.text}</div>
+ <div class="interpretationChart">
+ <img style="cursor:pointer"
+ src="../api/charts/${ip.chart.uid}/data?date=${format.formatDate( $ip.created )}&width=530&height=300"
+ onclick="javascript:window.location.href='../dhis-web-visualizer/app/index.html?id=${ip.chart.uid}&date=${format.formatDate( $ip.created )}'">
+ </div>
+</div>
+#end
+</div>
+
+<div id="userInfo" class="page"></div>
\ No newline at end of file
=== added 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 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-05-29 12:04:07 +0000
@@ -0,0 +1,11 @@
+
+function showUserInfo( id )
+{
+ $( "#userInfo" ).load( "../dhis-web-commons-ajax-html/getUser.action?id=" + id );
+ $( "#userInfo" ).dialog( {
+ modal : true,
+ width : 350,
+ height : 350,
+ title : "User"
+ } );
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 2011-09-30 13:18:24 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/menu.vm 2012-05-29 12:04:07 +0000
@@ -8,6 +8,7 @@
<ul>
<li><a href="index.action">$i18n.getString( "dashboard" ) </a></li>
<li><a href="message.action">$i18n.getString( "messages" ) </a></li>
+ <li><a href="interpretation.action">$i18n.getString( "interpretations" ) </a></li>
</ul>
<h2>$i18n.getString( "dhis2_online" ) </h2>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm 2012-04-16 14:54:22 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm 2012-05-29 12:04:07 +0000
@@ -1,6 +1,3 @@
-<script type="text/javascript">
- var i18n_confirm_delete_message = '$encoder.jsEscape( $i18n.getString( "confirm_delete_message" ) , "'" )';
-</script>
<h3>$i18n.getString( "messages" ) #openHelp( "dashboard_messages" )</h3>
@@ -35,3 +32,6 @@
<p></p>
#parse( "/dhis-web-commons/paging/paging.vm" )
+<script type="text/javascript">
+ var i18n_confirm_delete_message = '$encoder.jsEscape( $i18n.getString( "confirm_delete_message" ) , "'" )';
+</script>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm 2012-02-15 17:14:18 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm 2012-05-29 12:04:07 +0000
@@ -54,7 +54,7 @@
#foreach( $message in $conversation.messages )
<div class="messageDiv">
<span class="bold" style="cursor:pointer" onclick="showSenderInfo( ${message.id}, ${message.sender.id} )">$encoder.htmlEncode( $message.sender.name )</span>
-<span style="color:#606060">$format.formatDate( $message.lastUpdated )</span>
+<span class="grey">$format.formatDate( $message.lastUpdated )</span>
<p>$!dhisTextUtils.htmlLinks( $encoder.htmlEncode( $message.text ) )</p>
<span id="metaData${message.id}" style="display:none">$!encoder.htmlEncode( $message.metaData )</span>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-03-05 10:43:47 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css 2012-05-29 12:04:07 +0000
@@ -57,7 +57,7 @@
.labelText
{
- color:#808080;
+ color:#888;
padding:3px;
}
@@ -119,3 +119,46 @@
{
height:200px;
}
+
+.grey
+{
+ color: #555;
+}
+
+/*----------------------------------------------------------------------------*/
+/* Interpretation */
+/*----------------------------------------------------------------------------*/
+
+#interpretationFeed
+{
+ width: 550px;
+ border-top: 1px solid #ccc;
+}
+
+#shareLink
+{
+ color: #777;
+ font-size: 11pt;
+ margin-bottom: 9px;
+}
+
+.interpretation
+{
+ border-bottom: 1px solid #ccc;
+ padding: 22px;
+}
+
+.interpretationName
+{
+ margin-bottom: 8px;
+}
+
+.interpretationText
+{
+ margin-bottom: 18px;
+}
+
+.interpretationChart
+{
+}
+
