SAK-29425 bug fix for 0 posts total (sakaiproject#8716)

bot2012 · Oct 21, 2020 · a1de243 · a1de243
1 parent 6de4039
commit a1de243
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties b/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
@@ -100,8 +100,8 @@ stat_sort_by_date=Sort by Date
 stat_byUser=by User
 stat_byTopic=by Topic
 stat_totalMessages=Total Messages
-stat_percent_read=<span class="statsTally">Percent Read:</span> {0}%
-stat_num_authored=<span class="statsTally">Messages Authored:</span> {0}
+stat_percent_read_user=<span class="statsTally">Percent Read:</span> {0}%
+stat_num_authored_user=<span class="statsTally">Messages Authored:</span> {0}
 
 cdfm_labels=Labels
 cdfm_newflag=New!

diff --git a/...orums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumStatisticsBean.java b/...orums-app/src/java/org/sakaiproject/tool/messageforums/ui/MessageForumStatisticsBean.java
@@ -3113,16 +3113,20 @@ private boolean isUseAnonymousId(Topic topic)
 		return topic.getPostAnonymous() && (!topic.getRevealIDsToRoles() || !uiPermissionsManager.isIdentifyAnonAuthors((DiscussionTopic) topic));
 	}
 
-    public int getPercentRead()
-    {
-        int totalPosts = 0;
-        List<Object[]> studentAuthoredStats = messageManager.findAuthoredMessageCountForAllStudents();
-        for (Object[] pair : studentAuthoredStats)
-        {
-            totalPosts += ((Long) pair[1]).intValue();
-        }
-
-        int numRead = getUserReadStatistics().size();
-        return (numRead / totalPosts) * 100;
-    }
+	public int getPercentRead()
+	{
+		int totalPosts = 0;
+		List<Object[]> studentAuthoredStats = messageManager.findAuthoredMessageCountForAllStudents();
+		for (Object[] pair : studentAuthoredStats)
+		{
+			totalPosts += ((Long) pair[1]).intValue();
+		}
+
+		if (totalPosts == 0)
+		{
+			return 0;
+		}
+		int numRead = getUserReadStatistics().size();
+		return (numRead / totalPosts) * 100;
+	}
 }
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsUser.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsUser.jsp
@@ -189,12 +189,12 @@
 	  	<h:outputText rendered="#{ForumTool.anonymousEnabled && ForumTool.siteHasAnonymousTopics && !mfStatisticsBean.pureAnon}" value="#{msgs.stat_forum_anonymous_omitted}" styleClass="instruction" />
 
         <div>
-            <h:outputFormat value="#{msgs.stat_percent_read}" escape="false">
+            <h:outputFormat value="#{msgs.stat_percent_read_user}" escape="false">
                 <f:param value="#{mfStatisticsBean.getPercentRead()}" />
             </h:outputFormat>
         </div>
         <div>
-            <h:outputFormat value="#{msgs.stat_num_authored}" escape="false">
+            <h:outputFormat value="#{msgs.stat_num_authored_user}" escape="false">
                 <f:param value="#{mfStatisticsBean.userAuthoredStatistics.size()}" />
             </h:outputFormat>
         </div>