From f03a7cfb309734c8be1a67963c3fb01ef1095a4c Mon Sep 17 00:00:00 2001
From: Manson Wang <manson@rulingcom.com>
Date: Mon, 10 Feb 2014 18:29:08 +0800
Subject: [PATCH] ntu_mb

---
 .../member_lists/_show_office_field.html.erb  | 30 +++++++++++++++++++
 .../_show_research_field.html.erb             | 30 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 app/views/panel/member/front_end/member_lists/_show_office_field.html.erb
 create mode 100644 app/views/panel/member/front_end/member_lists/_show_research_field.html.erb

diff --git a/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb b/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb
new file mode 100644
index 0000000..bd70d5c
--- /dev/null
+++ b/app/views/panel/member/front_end/member_lists/_show_office_field.html.erb
@@ -0,0 +1,30 @@
+   <% show_office_field.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %>
+
+                  <% 
+                    if !@member.get_attribute_value(rf).blank?
+                      if !@member.get_attribute_value(rf)['val'].blank?
+                        @rodata = @member.get_attribute_value(rf)['val']
+                      elsif !@member.get_attribute_value(rf)[I18n.locale].blank?
+                        @rodata = @member.get_attribute_value(rf)[I18n.locale]
+                      else
+                        @rodata = nil
+                      end
+
+                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank?
+                  %>
+
+                    <tr>
+                    <% if (rf.title == "Office" || rf.title == "研究室")%>
+                      <td><%= rf.title %></td>
+                      <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
+                      </tr>
+                     <%end%>
+
+                    </tr>
+
+                    <% end -%>
+
+                  <% end -%>
+                  
+                <% end -%>
+
diff --git a/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb b/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb
new file mode 100644
index 0000000..bc93c75
--- /dev/null
+++ b/app/views/panel/member/front_end/member_lists/_show_research_field.html.erb
@@ -0,0 +1,30 @@
+   <% show_research_field.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %>
+
+                  <% 
+                    if !@member.get_attribute_value(rf).blank?
+                      if !@member.get_attribute_value(rf)['val'].blank?
+                        @rodata = @member.get_attribute_value(rf)['val']
+                      elsif !@member.get_attribute_value(rf)[I18n.locale].blank?
+                        @rodata = @member.get_attribute_value(rf)[I18n.locale]
+                      else
+                        @rodata = nil
+                      end
+
+                    if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank?
+                  %>
+
+                    <tr>
+                    <% if (rf.title == "Research Field"|| rf.title == "研究領域")%>
+                      <td><%= rf.title %></td>
+                      <td><%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
+                      </tr>
+                     <%end%>
+
+                    </tr>
+
+                    <% end -%>
+
+                  <% end -%>
+                  
+                <% end -%>
+