From 180cc3f05180c65b0b13007cd0ae043d0f179dfe Mon Sep 17 00:00:00 2001
From: spen <spen@rulingcom.com>
Date: Sun, 20 Apr 2014 14:53:03 +0800
Subject: [PATCH] nctu_bst

---
 .../front_end/member_lists/index.html.erb     | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/app/views/panel/member/front_end/member_lists/index.html.erb b/app/views/panel/member/front_end/member_lists/index.html.erb
index 80fa140..43f4c9b 100644
--- a/app/views/panel/member/front_end/member_lists/index.html.erb
+++ b/app/views/panel/member/front_end/member_lists/index.html.erb
@@ -2,7 +2,11 @@
 
 <% if !@member_lists.blank? %>	
 
-	<% @job_title_field = @member_lists.get_member_list_attribute_field("teacher","job_title") %>
+	<% 
+	  @job_title_field = @member_lists.get_member_list_attribute_field("teacher","job_title") 
+	  @job_edu_field = @member_lists.get_member_list_attribute_field("teacher","educational") 
+	  @job_exp_field = @member_lists.get_member_list_attribute_field("teacher","expertise") 
+	%>
 
 			<section> 
 
@@ -44,6 +48,22 @@
 										<%= @job_title %>
 									</li>
 									<% end %>
+									<% @job_edu = @member_lists.get_member_list_attribute_value(member.id,@job_edu_field.id).get_value_by_locale(I18n.locale)
+									   if @job_edu != 'NoData' and !@job_edu.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @job_edu_field.title %></b>
+										<%= @job_edu %>
+									</li>
+									<% end %>
+									<% @job_exp = @member_lists.get_member_list_attribute_value(member.id,@job_exp_field.id).get_value_by_locale(I18n.locale)
+									   if @job_exp != 'NoData' and !@job_exp.blank?
+									%>
+									<li><b class="o-members-label">
+										<%= @job_exp_field.title %></b>
+										<%= nl2br(@job_exp) %>
+									</li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.email")%></b><%= member.email %></li>
 									<% if !member.office_tel.blank? %>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>
@@ -85,6 +105,16 @@
 									%>
 									<li><b class="o-members-label"><%= @job_title_field.title %></b><%= @job_title %></li>
 									<% end %>
+									<% @job_edu = @member_lists.get_member_list_attribute_value(member.id,@job_edu_field.id).get_value_by_locale(I18n.locale)
+									   if @job_edu != 'NoData' and !@job_edu.blank?
+									%>
+									<li><b class="o-members-label"><%= @job_edu_field.title %></b><%= @job_edu %></li>
+									<% end %>
+									<% @job_exp = @member_lists.get_member_list_attribute_value(member.id,@job_exp_field.id).get_value_by_locale(I18n.locale)
+									   if @job_exp != 'NoData' and !@job_exp.blank?
+									%>
+									<li><b class="o-members-label"><%= @job_exp_field.title %></b><%= nl2br(@job_exp) %></li>
+									<% end %>
 									<li><b class="o-members-label"><%= t("users.email")%></b> <%= member.email %></li>
 									<% if !member.office_tel.blank? %>
 									<li><b class="o-members-label"><%= t("users.office_tel")%></b><%= member.office_tel %></li>