Author: chathura
Date: Fri Dec 7 00:11:23 2007
New Revision: 10680
Log:
Added ratings display in the collection view.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
Fri Dec 7 00:11:23 2007
@@ -148,6 +148,7 @@
resourceData.setDescription(child.getDescription());
resourceData.setAverageRating(registry.getAverageRating(child.getPath()));
resourceData.setCreatedOn(child.getCreatedTime());
+ calculateAverageStars(resourceData);
} catch (AuthorizationFailedException e) {
@@ -214,4 +215,48 @@
public void setNavigatablePaths(List navigatablePaths) {
this.navigatablePaths = navigatablePaths;
}
+
+ private void calculateAverageStars(ResourceData resourceData) {
+
+ float tempRating = resourceData.getAverageRating() * 1000;
+ tempRating = Math.round(tempRating);
+ tempRating = tempRating / 1000;
+ resourceData.setAverageRating(tempRating);
+
+ float averageRating = resourceData.getAverageRating();
+ String[] averageStars = new String[5];
+
+ for (int i = 0; i < 5; i++) {
+
+ if (averageRating >= i + 1) {
+ averageStars[i] = "04";
+
+ } else if (averageRating <= i) {
+ averageStars[i] = "00";
+
+ } else {
+
+ float fraction = averageRating - i;
+
+ if (fraction <= 0.125) {
+ averageStars[i] = "00";
+
+ } else if (fraction > 0.125 && fraction <= 0.375) {
+ averageStars[i] = "01";
+
+ } else if (fraction > 0.375 && fraction <= 0.625) {
+ averageStars[i] = "02";
+
+ } else if (fraction > 0.625 && fraction <= 0.875) {
+ averageStars[i] = "03";
+
+ } else {
+ averageStars[i] = "04";
+
+ }
+ }
+ }
+
+ resourceData.setAverageStars(averageStars);
+ }
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
Fri Dec 7 00:11:23 2007
@@ -39,6 +39,7 @@
private String authorUserName;
private String description;
private float averageRating;
+ private String[] averageStars = new String[5];
private Date createdOn;
public String getName() {
@@ -105,6 +106,14 @@
this.averageRating = averageRating;
}
+ public String[] getAverageStars() {
+ return averageStars;
+ }
+
+ public void setAverageStars(String[] averageStars) {
+ this.averageStars = averageStars;
+ }
+
public Date getCreatedOn() {
return createdOn;
}
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Fri Dec 7 00:11:23 2007
@@ -46,7 +46,7 @@
while (iNavPaths.hasNext()) {
ResourcePath resourcePath = (ResourcePath) iNavPaths.next();
%>
- / <a
href="/wso2registry/web<%=resourcePath.getNavigatePath()%>"><%=resourcePath.getNavigateName()%></a>
+ / <a
href="/wso2registry/web<%=resourcePath.getNavigatePath()%>"><%=resourcePath.getNavigateName()%></a>
<% } %>
</div>
<table cellpadding="0" cellspacing="0" border="0">
@@ -181,8 +181,15 @@
<tr id="1">
<td><a href="/wso2registry/web/<%=resourceData.getRelativePath()%>"
class="folder-small"><%=resourceData.getName()%></a></td>
<td><%=resourceData.getCreatedOn()%></td>
- <td>Admin</td>
- <td>Rating</td>
+ <td><%=resourceData.getAuthorUserName()%></td>
+ <td>
+ <img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[0]%>.gif" />
+ <img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[1]%>.gif" />
+ <img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[2]%>.gif" />
+ <img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[3]%>.gif" />
+ <img
src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[4]%>.gif" />
+ (<%=resourceData.getAverageRating()%>)
+ </td>
<td><a href="#" onclick="showDescription('1-des')"><img border="0"
src="/wso2registry/admin/images/icon-show.gif" /></a></td>
<td>
<a href="#" title="Sub Items"><img
src="/wso2registry/admin/images/icon-subitems.gif" border="0" /></a>
@@ -216,8 +223,8 @@
<div class="comments-header">
<strong>Commented on
</strong><%=comment.getCommentedTime().toString()%><strong> by</strong> <a
href="#"><%=comment.getCommentedUser()%></a>
<div class="comments-bottom">
- <%=comment.getCommentText()%>
-</div>
+ <%=comment.getCommentText()%>
+ </div>
</div>
<% } %>
@@ -228,8 +235,8 @@
<!-- START add comment box -->
<div id="add-comment-div">
<form action="/wso2registry/system/addComment" method="post">
- <textarea name="comment" class="comment-textbox"></textarea>
- <div style="margin-top:10px;"><input type="submit" class="button"
value="Add" /> <input type="submit" class="button" value="Cancel" /></div>
+ <textarea name="comment" class="comment-textbox"></textarea>
+ <div style="margin-top:10px;"><input type="submit" class="button"
value="Add" /> <input type="submit" class="button" value="Cancel" /></div>
</form>
</div>
<!-- END add comment box -->
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
