From 5977370c985d0221ee3e8dc5c27853d555bd82fa Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Mon, 1 Jun 2015 16:17:45 +0800
Subject: [PATCH] groups member now available

---
 app/controllers/admin/groups_controller.rb |  14 ++
 app/views/admin/groups/_post.html.erb      |   3 +-
 app/views/admin/groups/members.html.erb    | 154 ++++++++-------------
 app/views/admin/groups/showpost.html.erb   |   2 +-
 4 files changed, 77 insertions(+), 96 deletions(-)

diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 8d7dfdd..9f7fd6a 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -76,6 +76,20 @@ class Admin::GroupsController < OrbitGroupController
 
 	def members
 		render_401 and return if !user_can_read?
+		@group_members = []
+		@group.users.each do |user|
+			mp = user.member_profile rescue nil
+			if !mp.nil?
+				avatar = (mp.avatar.thumb.url == "thumb_person.png" ? "/assets/thumb_person.png" : mp.avatar.thumb.url rescue "/assets/thumb_person.png")		
+				@group_members << {
+					"id" => user.id.to_s,
+					"user_name" => (user.user_name rescue ""),
+					"avatar" => avatar,
+					"name" => (mp.name_translations rescue {"en" => "","zh_tw" => ""}),
+					"admin" => @group.admins.include?(user.id.to_s)
+				}
+			end
+		end
 	end
 
 	def create_category
diff --git a/app/views/admin/groups/_post.html.erb b/app/views/admin/groups/_post.html.erb
index 7d77c0f..e04f562 100644
--- a/app/views/admin/groups/_post.html.erb
+++ b/app/views/admin/groups/_post.html.erb
@@ -1,5 +1,4 @@
 <div class="group-post-item card clearfix wow bounceInUp" data-post-id="<%= post.id.to_s %>">
-<a href="/admin/posts/<%= post.to_param %>" class="group-post-link"></a>
   <div class="group-post-actions tool-tip-parent action">
         <button class="group-post-dropdown-toggle toggle">
             <span class="caret"></span>
@@ -31,11 +30,13 @@
         </ul>
   </div>
   <div class="group-post-image-wrap">
+    <a href="/admin/posts/<%= post.to_param %>" class="group-post-link">
     <% if !post.group_post_images.blank? %>
       <img class="group-post-image" src="<%= post.group_post_images.first.image.thumb.url %>" alt="<%= post.title %>">
     <% else %>
       <img class="group-post-image" src="/assets/no-image.jpg" alt="Post image">
       <% end %>
+    </a>
   </div>
   <div class="group-post-content-wrap">
 	<h3 class="group-post-title">
diff --git a/app/views/admin/groups/members.html.erb b/app/views/admin/groups/members.html.erb
index da5c27f..01ae269 100644
--- a/app/views/admin/groups/members.html.erb
+++ b/app/views/admin/groups/members.html.erb
@@ -25,107 +25,73 @@
       </ul>
     </div>
     <div class="group-member-dropdown btn-group">
-      <button class="btn">All members <span class="badge">20</span></button>
+      <button class="btn" id="currennt-selected-option">All members <span class="badge"><%= @group_members.count.to_s %></span></button>
       <button class="btn dropdown-toggle" data-toggle="dropdown">
         <span class="caret"></span>
       </button>
-      <ul class="dropdown-menu">
-        <li><a href="#">All members <span class="badge">20</span></a></li>
-        <li><a href="#">Admins <span class="badge">8</span></a></li>
-        <li><a href="#">members <span class="badge">12</span></a></li>
+      <ul class="dropdown-menu" id="member-type-selection">
+        <li><a href="#" data-member-type="all">All members <span class="badge"><%= @group_members.count.to_s %></span></a></li>
+        <li><a href="#" data-member-type="admin">Admins <span class="badge"><%= @group.admins.count.to_s %></span></a></li>
+        <li><a href="#" data-member-type="members">Members <span class="badge"><%= (@group_members.count - @group.admins.count).to_s %></span></a></li>
       </ul>
     </div>
-      <ul class="group-member-list clearfix">
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
+      <ul class="group-member-list clearfix" id="group-member-list">
+      <% @group_members.each do |gm| %>
+          <li class="group-member-item card" data-admin="<%= gm["admin"] %>">
+            <div class="group-member-photo-wrap">
+              <img class="group-member-photo" src="<%= gm["avatar"] %>" alt="Member Photo">
             </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
+            <div class="group-member-meta-wrap">
+              <div class="group-member-name">
+                <a href="#"><%= gm["name"][I18n.locale.to_s] %></a><br />
+                 <%= gm["user_name"] %><br />
+                 <% if gm["admin"] %>
+                    <span class="label label-danger">Admin</span>
+                 <% end %>
+              </div>
             </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
-        <li class="group-member-item card">
-          <div class="group-member-photo-wrap">
-            <img class="group-member-photo" src="http://lorempixel.com/100/100" alt="Member Photo">
-          </div>
-          <div class="group-member-meta-wrap">
-            <div class="group-member-name">
-              <a href="#">Joshua Lin</a>
-            </div>
-          </div>
-        </li>
+          </li>
+        <% end %>
       </ul>
   </div>
 </div>
+<script type="text/javascript">
+  $("#member-type-selection li a").on("click",function(){
+    var el = $(this),
+        members = $("#group-member-list li");
+    $("#currennt-selected-option").html(el.html());
+    switch(el.data("member-type")){
+      case "all":
+        members.show();
+        break;
+      case "admin":
+        members.filter("[data-admin=false]").hide();
+        members.filter("[data-admin=true]").show();
+        break;
+      case "members":
+        members.filter("[data-admin=true]").hide();
+        members.filter("[data-admin=false]").show();
+        break;
+    }
+
+  })
+</script>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/admin/groups/showpost.html.erb b/app/views/admin/groups/showpost.html.erb
index 37c64e3..1d93b23 100644
--- a/app/views/admin/groups/showpost.html.erb
+++ b/app/views/admin/groups/showpost.html.erb
@@ -115,7 +115,7 @@
         <div class="group-show-post-respond-wrap clearfix">
           <label for="comment" class="screen-reader">Comment</label>
           <div class="group-show-post-avatar">
-            <img src="http://lorempixel.com/60/60" alt="User Avatar">
+            <img src="<%= avatar %>" alt="User Avatar">
           </div>
           <input type="text" name="group_post_comment[comment]" id="group_post_comment" class="group-show-post-respond-comment" placeholder="Your comment here.">
           <input type="hidden" name="group_post_comment[group_post_id]" value="<%= @post.id.to_s %>" />