=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2012-09-30 14:58:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2012-10-08 13:44:41 +0000 @@ -78,6 +78,8 @@ private transient String lastSenderFirstname; + private transient int messageCount; + public MessageConversation() { } @@ -378,6 +380,16 @@ this.lastSenderFirstname = lastSenderFirstname; } + public int getMessageCount() + { + return messageCount; + } + + public void setMessageCount( int messageCount ) + { + this.messageCount = messageCount; + } + @Override public void mergeWith( IdentifiableObject other ) { === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/GetMessagesAction.java' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/GetMessagesAction.java 2012-02-14 19:19:27 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/GetMessagesAction.java 2012-10-08 13:44:41 +0000 @@ -51,6 +51,24 @@ } // ------------------------------------------------------------------------- + // Input + // ------------------------------------------------------------------------- + + private boolean followUp; + + public void setFollowUp( boolean followUp ) + { + this.followUp = followUp; + } + + private boolean unread; + + public void setUnread( boolean unread ) + { + this.unread = unread; + } + + // ------------------------------------------------------------------------- // Output // ------------------------------------------------------------------------- @@ -69,7 +87,7 @@ { this.paging = createPaging( messageService.getMessageConversationCount() ); - conversations = messageService.getMessageConversations( paging.getStartPos(), paging.getPageSize() ); + conversations = messageService.getMessageConversations( followUp, unread, paging.getStartPos(), paging.getPageSize() ); return SUCCESS; } === 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-10-07 20:10:20 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties 2012-10-08 13:44:41 +0000 @@ -78,4 +78,7 @@ email=Email phone_number=Phone number org_units=Org units -edit_profile=Edit profile \ No newline at end of file +edit_profile=Edit profile +inbox=Inbox +follow_up=Follow up +unread=Unread \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-10-08 07:13:57 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm 2012-10-08 13:29:11 +0000 @@ -14,9 +14,9 @@