Modified: branches/dashboard/app/views/dashboard/index.rhtml (2500 => 2501)
--- branches/dashboard/app/views/dashboard/index.rhtml 2010-08-19 15:35:28 UTC (rev 2500)
+++ branches/dashboard/app/views/dashboard/index.rhtml 2010-08-19 15:36:44 UTC (rev 2501)
@@ -1,40 +1,134 @@
-<h1>Statistics Dashboard</h1>
-<p>This is the current statistics report for <%= Conf.sitename %> from <%= @stats_start_date %> to <%= @stats_end_date %>.</p>
-<div id="user-stats">
- <h2>Users & Networks</h2>
- <div class="stats-area stats-area-left">
- <p>This is a breakdown of the registered users in your system.</p>
- <table>
- <tbody>
- <tr>
- <td>Activated Users</td>
- <td><%= @activated_users %></td>
- </tr>
- <tr>
- <td>Unactivated Users</td>
- <td><%= @unactivated_users %></td>
- </tr>
- <tr>
- <th>Registered Users</th>
- <td><%= @total_users %></td>
- </tr>
- </tbody>
- </table>
- </div>
- <div class="stats-area">
- <img src="" @user_chart_url %>"/>
- </div>
- <div class="stats-clear"></div>
- <div class="stats-area stats-area-left">
- <p>These are the top 10 biggest networks;</p>
- <ol>
- <% @top_ten_networks.each do |n| %>
- <li><%= link_to n.title, group_path(n) %> (<%= n.memberships.length %>)</li>
- <% end %>
- </ol>
- </div>
- <div class="stats-area">
- <img src="" @top_ten_networks_chart_url %>"/>
- </div>
- <div class="stats-clear"></div>
-</div>
+ <h1>Statistics Dashboard</h1>
+ <p>This is the current statistics report for <%= Conf.sitename %> from <%= @stats_start_date %> to <%= @stats_end_date %>.</p>
+ <div id="user-stats">
+ <h2>Users & Networks</h2>
+ <div class="stats-area stats-area-left">
+ <p>This is a breakdown of the registered users in your system.</p>
+ <table>
+ <tbody>
+ <tr>
+ <td>Activated Users</td>
+ <td><%= @activated_users %></td>
+ </tr>
+ <tr>
+ <td>Unactivated Users</td>
+ <td><%= @unactivated_users %></td>
+ </tr>
+ <tr>
+ <th>Registered Users</th>
+ <td><%= @total_users %></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div class="stats-area">
+ <img src="" @user_chart_url %>"/>
+ </div>
+
+ <div class="stats-clear"></div>
+ <div class="stats-area stats-area-left">
+ <p>Breakdown of the registered users in your system.</p>
+ <ol>
+ <% @user_login_stats.each do |key, value| %>
+ <li>
+ <%= key %>
+ : <%= value%>
+ </li>
+ <%end%>
+ </ol>
+ </div>
+ <div class="stats-area">
+ <img src="" @user_login_stats_url %>"/>
+ </div>
+
+
+ <div class="stats-clear"></div>
+
+ <div class="stats-area stats-area-left">
+ <p>Workflows</p>
+ <table>
+ <tbody>
+ <tr>
+ <td>Number of Workflows</td>
+ <td><%= @workflow_count %></td>
+ </tr>
+ <tr>
+ <td>Number of publically downloadable workflows: </td>
+ <td> <%= @workflow_pub %></td>
+ </tr>
+ <tr>
+ <td>Number of publically viewable workflows:</td>
+ <td> <%= @workflow_pubview %></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="stats-area">
+ <img src="" @workflow_chart_url %>"/>
+ </div>
+
+ <div class="stats-clear"></div>
+ <div class="stats-area stats-area-left">
+ <p>Workflow versions distribution</p>
+ <ol>
+ <% @workflow_version_distrib.each do |n| %>
+ <li> Version <%= n.current_version%> : (<%=n.count %>) </li>
+ <%end%>
+ </ol>
+ </div>
+ <div class="stats-area">
+ <img src="" @workflow_distrib_version_chart_url %>"/>
+ </div>
+
+ <div class="stats-clear"></div>
+ <div class="stats-area stats-area-left">
+ <p>These are the top 10 biggest networks;</p>
+ <ol>
+ <% @top_ten_networks.each do |n| %>
+ <li><%= link_to n.title, group_path(n) %> (<%= n.memberships.length %>)</li>
+ <% end %>
+ </ol>
+ </div>
+ <div class="stats-area">
+ <img src="" @top_ten_networks_chart_url %>"/>
+ </div>
+ <div class="stats-clear"></div>
+
+
+ <div class="stats-clear"></div>
+ <div class="stats-area stats-area-left">
+ <p>User Account Creation</p>
+ <br/>
+ Maximum Users in a month for a year
+ <ol>
+ <% @user_history.each do |n| %>
+ <li> <%= n.maximum_users%> (<%=n.year_created %>) </li>
+ <%end%>
+ </ol>
+ <br/> <br/> <br/>
+ </div>
+
+ <div class="stats-area">
+ <img src="" @user_history_stats_url %>"/>
+ </div>
+
+ <div class="stats-clear"></div>
+
+ <div class="stats-area stats-area-left">
+ <p>Contributions</p>
+ <br/>
+ Average Contributions per month in a year
+ <ol>
+ <% @contribution_charts_avg.each do |n| %>
+ <li> <%= n.contributions_num%> (<%=n.year_created %>) </li>
+ <%end%>
+ </ol>
+ <br/> <br/> <br/>
+ </div>
+
+ <div class="stats-area">
+ <img src="" @contribution_charts_stats_url %>"/>
+ </div>
+
+ </div>