<% sub_role.attribute_fields.each do |af|%>
- <%= af.block_helper(@user,@form_index,sub_role_disable)%>
+ <%= af.block_helper(@user,@form_index)%>
<% @form_index = @form_index +1 %>
<% end %>
diff --git a/app/views/admin/users_new_interface/_show_roles.html.erb b/app/views/admin/users_new_interface/_show_roles.html.erb
new file mode 100644
index 000000000..fa4775df2
--- /dev/null
+++ b/app/views/admin/users_new_interface/_show_roles.html.erb
@@ -0,0 +1,10 @@
+
diff --git a/app/views/admin/users_new_interface/_show_sub_role.html.erb b/app/views/admin/users_new_interface/_show_sub_role.html.erb
new file mode 100644
index 000000000..12c5d8973
--- /dev/null
+++ b/app/views/admin/users_new_interface/_show_sub_role.html.erb
@@ -0,0 +1,7 @@
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb
index b92197dd4..b064986b5 100644
--- a/app/views/admin/users_new_interface/show.html.erb
+++ b/app/views/admin/users_new_interface/show.html.erb
@@ -51,6 +51,9 @@
<%= render :partial=> "user_role",:locals=>{:role_class=>"basic",:i18n=>"admin.new_admin.users.profile",:items=>@profile_data} %>
+ <%= render :partial=> "show_roles",:collection=>@user.roles %>
+ <%# @user.sub_roles.each{|sr| render :partial=> "user_role",:locals=>{:role_class=>sr.key.to_s,:i18n=>"admin.new_admin.users.roles.#{sr.key.to_s}",:items=>sr} }%>
+
<%#= render :partial=> "user_role",:locals=>{:role_class=>"teacher",:i18n=>"admin.new_admin.users.roles.teacher",:items=>@teacher_data} %>
<%#= render :partial=> "user_role",:locals=>{:role_class=>"student",:i18n=>"admin.new_admin.users.roles.student",:items=>@student_data}%>
<%#= render :partial=> "user_role",:locals=>{:role_class=>"staff",:i18n=>"admin.new_admin.users.roles.staff",:items=>@staff_data} %>
diff --git a/lib/tasks/build_new_member.rake b/lib/tasks/build_new_member.rake
index 4e4a6bcc9..5810f4fe0 100644
--- a/lib/tasks/build_new_member.rake
+++ b/lib/tasks/build_new_member.rake
@@ -268,4 +268,66 @@ namespace :build_new_member do
# p "==Finished building status for Students"
# end
+ task :build_sub_role_for_staff_1023 => :environment do
+ role = Role.first(conditions: {key: 'staff'})
+ staff_sub_roles ={
+ :secretary => {"en"=>"Secretary", "zh_tw"=>"秘書"},
+ :assistant => {"en"=>"Assistant", "zh_tw"=>"行政助理"},
+ :research_assistant => {"en"=>"Research Assistant", "zh_tw"=>"研究助理"},
+ :ta => {"en"=>"TA", "zh_tw"=>"助教"},
+ :technical_specialist => {"en"=>"Technical Specialist", "zh_tw"=>"技士"}
+ }
+ staff_sub_roles.each do |key,item|
+ role.sub_roles.build(:key=>key,:title_translations=> item)
+ end
+ role.save
+ end
+
+ task :build_staff_attribute_field_1023 => :environment do
+ sub_role_attribute_fields_template = [
+ {key: 'status', markup: "select", locale: true, list_options: nil, built_in: true, disabled: false, locale_title_translations: {"zh_tw"=>"狀態", "en"=>"Status"}, neutral_title: nil },
+ {key: 'responsibilities', markup: "text_field", locale: true, list_options: nil, built_in: true, disabled: false, locale_title_translations: {"zh_tw"=>"負責業務", "en"=>"Responsibilities"}, neutral_title: nil }
+ ]
+ role = Role.first({conditions:{key: 'staff'}})
+ role.sub_roles.each{|sb|
+ sb.attribute_fields.destroy_all
+ sub_role_attribute_fields_template.each{|att_f|
+ sb.attribute_fields.build att_f
+ }
+ sb.save
+ }
+ role.save
+ end
+
+ task :build_status_1023 => :environment do
+ student_status ={
+ :studying => {"en"=>"Studying", "zh_tw"=>"在學"},
+ :drop_out => {"en"=>"Drop-out", "zh_tw"=>"休學"},
+ :alumi => {"en"=>"Alumi", "zh_tw"=>"校友"},
+ :suspended => {"en"=>"Suspended", "zh_tw"=>"未完成"}
+ }
+
+ role = Role.first(conditions: {key: 'student'})
+ student_status.each do |key,item|
+ role.statuses.build(:key=>key.to_s,:title_translations=>item)
+ end
+ role.save
+
+ teacher_status ={
+ :fulltime => {"en"=>"Full Time", "zh_tw"=>"全職"},
+ :adjunct => {"en"=>"Adjunct", "zh_tw"=>"兼職"},
+ :co_hiring => {"en"=>"Co Hiring", "zh_tw"=>"合聘"},
+ :distinguished => {"en"=>"Distinguished", "zh_tw"=>"特聘"}
+ }
+ role = Role.first(conditions: {key: 'teacher'})
+ teacher_status.each do |key,item|
+ role.statuses.build(:key=>key.to_s,:title_translations=>item)
+ end
+ role.save
+
+ end
+
+ task :clean_up_attribute_value_for_deleted_fields => :environment do
+ AttributeValue.all.reject{|t| !AttributeField.find(t.attribute_field_id).nil? rescue false }.each{|t| t.delete}
+ end
end