diff --git a/app/assets/images/personal_experience/.keep b/app/assets/images/personal_conference/.keep similarity index 100% rename from app/assets/images/personal_experience/.keep rename to app/assets/images/personal_conference/.keep diff --git a/app/assets/javascripts/personal_experience/.keep b/app/assets/javascripts/personal_conference/.keep similarity index 100% rename from app/assets/javascripts/personal_experience/.keep rename to app/assets/javascripts/personal_conference/.keep diff --git a/app/assets/stylesheets/personal_experience/.keep b/app/assets/stylesheets/personal_conference/.keep similarity index 100% rename from app/assets/stylesheets/personal_experience/.keep rename to app/assets/stylesheets/personal_conference/.keep diff --git a/app/controllers/admin/experience_types_controller.rb b/app/controllers/admin/experience_types_controller.rb new file mode 100644 index 0000000..3b3c5c9 --- /dev/null +++ b/app/controllers/admin/experience_types_controller.rb @@ -0,0 +1,41 @@ +class Admin::ExperienceTypesController < OrbitAdminController + def new + @experience_type = ExperienceType.new + @url = admin_experience_types_path(@experience_type) + render :layout=>false + end + + def create + @experience_type = ExperienceType.new(experience_type_params) + @experience_type.save + @experience_types = ExperienceType.all + render :partial=>'list', :layout=>false + end + + def edit + @experience_type = ExperienceType.find(params[:id]) + @url = admin_experience_type_path(@experience_type) + render :layout=>false + end + + def update + @experience_type = ExperienceType.find(params[:id]) + @experience_type.update_attributes(experience_type_params) + @experience_type.save + @experience_types = ExperienceType.all + render :partial=>'list', :layout=>false + end + + def destroy + experience_type = ExperienceType.find(params[:id]) + experience_type.destroy + @experience_types = ExperienceType.all + render :partial=>'list', :layout=>false + end + + private + + def experience_type_params + params.require(:experience_type).permit! rescue nil + end +end \ No newline at end of file diff --git a/app/controllers/admin/experiences_controller.rb b/app/controllers/admin/experiences_controller.rb new file mode 100644 index 0000000..d50af6e --- /dev/null +++ b/app/controllers/admin/experiences_controller.rb @@ -0,0 +1,89 @@ +class Admin::ExperiencesController < OrbitMemberController + layout "member_plugin" + + before_action :set_plugin + before_action :get_settings,:only => [:new, :edit, :setting] + + def index + @experiences = Experience.all + end + + def new + @member = MemberProfile.find_by(:uid=>params['uid']) rescue nil + @experience = Experience.new + end + + def create + @member = MemberProfile.find(experience_params['member_profile_id']) rescue nil + @experience = Experience.new(experience_params) + @experience.save + redirect_to '/admin/members/'+@member.to_param+'/Experience' + end + + def edit + @member = MemberProfile.find_by(:uid=>params['uid']) rescue nil + @experience = Experience.find(params[:id]) + end + + def update + @member = MemberProfile.find(experience_params['member_profile_id']) rescue nil + @experience = Experience.find(params[:id]) + @experience.update_attributes(experience_params) + @experience.save + redirect_to '/admin/members/'+@member.to_param+'/Experience' + end + + def destroy + @experience = Experience.find(params[:id]) + @experience.destroy + end + + def toggle_hide + if params[:ids] + @experiences = Experience.any_in(_id: params[:ids]) + + @experiences.each do |experience| + experience.is_hidden = params[:disable] + experience.save + end + end + + render json: {"success"=>true} + end + + def setting + end + + def frontend_setting + @member = MemberProfile.find_by(:uid=>params['uid']) rescue nil + @intro = ExperienceIntro.find_by(:member_profile_id=>@member.id) rescue nil + @intro = @intro.nil? ? ExperienceIntro.new({:member_profile_id=>@member.id}) : @intro + end + + def update_frontend_setting + @member = MemberProfile.find(intro_params['member_profile_id']) rescue nil + @intro = ExperienceIntro.find_by(:member_profile_id=>@member.id) rescue nil + @intro = @intro.nil? ? ExperienceIntro.new({:member_profile_id=>@member.id}) : @intro + @intro.update_attributes(intro_params) + @intro.save + redirect_to '/admin/members/'+@member.to_param+'/Experience' + end + + def get_settings + @experience_types = ExperienceType.all + end + + def set_plugin + @plugin = OrbitApp::Plugin::Registration.all.select{|plugin| plugin.app_name.eql? 'Experience'}.first + end + + private + + def experience_params + params.require(:experience).permit! rescue nil + end + + def intro_params + params.require(:experience_intro).permit! rescue nil + end +end \ No newline at end of file diff --git a/app/models/experience.rb b/app/models/experience.rb new file mode 100644 index 0000000..0d805ca --- /dev/null +++ b/app/models/experience.rb @@ -0,0 +1,43 @@ +class Experience + include Mongoid::Document + include Mongoid::Timestamps + include OrbitModel::Status + include Slug + + field :organizationt_title, localize: true + field :department, localize: true + field :job_title, localize: true + + belongs_to :experience_type + belongs_to :member_profile + + field :language + field :start_date , :type => Date + field :end_date , :type => Date + field :keywords + field :url + field :note + field :create_user_id, :type => BSON::ObjectId + field :update_user_id, :type => BSON::ObjectId + + paginates_per 10 + + before_validation :add_http + + def duration + self.start_date.strftime('%Y.%m')+' ~ '+self.end_date.strftime('%Y.%m') + end + + def slug_title + self.organizationt_title+' '+self.department+' '+self.job_title + end + + protected + + def add_http + unless self.url.blank? || self.url[/^http:\/\//] || self.url[/^https:\/\//] + self.url = 'http://' + self.url + end + end + +end \ No newline at end of file diff --git a/app/models/experience_intro.rb b/app/models/experience_intro.rb new file mode 100644 index 0000000..802b1fd --- /dev/null +++ b/app/models/experience_intro.rb @@ -0,0 +1,4 @@ +class ExperienceIntro < PersonalPluginIntro + + +end diff --git a/app/models/experience_type.rb b/app/models/experience_type.rb new file mode 100644 index 0000000..b290b4e --- /dev/null +++ b/app/models/experience_type.rb @@ -0,0 +1,8 @@ +class ExperienceType + include Mongoid::Document + include Mongoid::Timestamps + + field :title, localize: true + + has_many :experiences +end \ No newline at end of file diff --git a/app/views/admin/experience_types/_form.html.erb b/app/views/admin/experience_types/_form.html.erb new file mode 100644 index 0000000..afd8ba5 --- /dev/null +++ b/app/views/admin/experience_types/_form.html.erb @@ -0,0 +1,24 @@ +<%= form_for(@experience_type, :html =>{:class=>"form-horizontal", :style=>"margin: 0;"}, :remote => true, :url => @url ) do |f| %> +
+ +

<%= t("personal_experience.experience_category") %>

+
+ +
+ <%= f.fields_for :title_translations do |f| %> + <% @site_in_use_locales.each do |locale| %> +
+ <%= label_tag t(locale), t(locale), :class => 'control-label' %> +
+ <%= f.text_field locale, :value => (@experience_type.title_translations[locale] rescue nil) %> +
+
+ <% end %> + <% end %> +
+ +
+ <%= f.submit t('submit'), :class=>'btn btn-primary' %> + <%= t('cancel')%> +
+<% end %> \ No newline at end of file diff --git a/app/views/admin/experience_types/_list.js.erb b/app/views/admin/experience_types/_list.js.erb new file mode 100644 index 0000000..4f39d48 --- /dev/null +++ b/app/views/admin/experience_types/_list.js.erb @@ -0,0 +1,2 @@ +$('#experience_types tbody').html("<%= j render :partial => '/admin/experiences/list_experience_type', :collection => @experience_types %>"); +$('#experience_type_modal').modal('hide'); \ No newline at end of file diff --git a/app/views/admin/experience_types/edit.js.erb b/app/views/admin/experience_types/edit.js.erb new file mode 100644 index 0000000..48eb7b4 --- /dev/null +++ b/app/views/admin/experience_types/edit.js.erb @@ -0,0 +1 @@ +$('#experience_type_modal').html("<%= j render 'form' %>"); \ No newline at end of file diff --git a/app/views/admin/experience_types/new.js.erb b/app/views/admin/experience_types/new.js.erb new file mode 100644 index 0000000..48eb7b4 --- /dev/null +++ b/app/views/admin/experience_types/new.js.erb @@ -0,0 +1 @@ +$('#experience_type_modal').html("<%= j render 'form' %>"); \ No newline at end of file diff --git a/app/views/admin/experiences/_experience.html.erb b/app/views/admin/experiences/_experience.html.erb new file mode 100644 index 0000000..506f920 --- /dev/null +++ b/app/views/admin/experiences/_experience.html.erb @@ -0,0 +1,16 @@ +<% @experiences.each do |experience| %> + "> + <%= experience.duration %> + + <%= link_to experience.organizationt_title, '', target: "blank"%> +
+ +
+ + <%= experience.department %> + <%= experience.job_title %> + +<% end %> \ No newline at end of file diff --git a/app/views/admin/experiences/_form.html.erb b/app/views/admin/experiences/_form.html.erb new file mode 100644 index 0000000..78722d1 --- /dev/null +++ b/app/views/admin/experiences/_form.html.erb @@ -0,0 +1,178 @@ +<% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-datetimepicker" %> + <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> + + +
+ + +
<%= t(:module) %>
+ + + +
+ + +
+ +
+ +
+ <%= @member.name rescue ''%> + <%= f.hidden_field :member_profile_id, :value => @member.id %> +
+
+ + +
+ +
+ <%= f.select :experience_type_id, @experience_types.collect {|t| [ t.title, t.id ]} %> +
+
+ + +
+ +
+ <%= f.datetime_picker :start_date, :no_label => true, :format=>"yyyy/MM", :placeholder=>"YYYY/MM" %> +
+
+ + +
+ +
+ <%= f.datetime_picker :end_date, :no_label => true, :format=>"yyyy/MM", :placeholder=>"YYYY/MM" %> +
+
+ + +
+ +
+ <%= f.text_field :keywords %> +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ <%= f.text_field :url , :class => "span5" %> +
+
+ + +
+ +
+ <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
+
+ +
+ + +
+
+ +
+ +
+
+
+ +
+ + +
<%= t(:language) %>
+ + + +
+ + <% @site_in_use_locales.each_with_index do |locale, i| %> + +
"> + + +
+ +
+ <%= f.fields_for :organizationt_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_experience.organizationt_title"), value: (@experience.organizationt_title_translations[locale] rescue nil) %> + <% end %> +
+
+ + +
+ +
+ <%= f.fields_for :department_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_experience.department"), value: (@experience.department_translations[locale] rescue nil) %> + <% end %> +
+
+ + +
+ +
+ <%= f.fields_for :job_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_experience.job_title"), value: (@experience.job_title_translations[locale] rescue nil) %> + <% end %> +
+
+ +
+ + <% end %> + +
+ +
+ + +
+ <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
\ No newline at end of file diff --git a/app/views/admin/experiences/_form_file.html.erb b/app/views/admin/experiences/_form_file.html.erb new file mode 100644 index 0000000..8628623 --- /dev/null +++ b/app/views/admin/experiences/_form_file.html.erb @@ -0,0 +1,55 @@ +<% if form_file.new_record? %> +
+<% else %> +
+ <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
+ + + + <% @site_in_use_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + + <% @site_in_use_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :description_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:description), :value => (form_file.description_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
+
\ No newline at end of file diff --git a/app/views/admin/experiences/_list_experience_type.html.erb b/app/views/admin/experiences/_list_experience_type.html.erb new file mode 100644 index 0000000..6ad1f3f --- /dev/null +++ b/app/views/admin/experiences/_list_experience_type.html.erb @@ -0,0 +1,8 @@ + + <%= list_experience_type.title %> + + + <%= t(:edit) %> + <%= link_to t(:delete_), admin_experience_type_path(list_experience_type), "data-confirm" => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %> + + \ No newline at end of file diff --git a/app/views/admin/experiences/destroy.js.erb b/app/views/admin/experiences/destroy.js.erb new file mode 100644 index 0000000..35ab849 --- /dev/null +++ b/app/views/admin/experiences/destroy.js.erb @@ -0,0 +1 @@ +$('#writing_conference_<%= @writing_conference.id.to_s%>').remove(); \ No newline at end of file diff --git a/app/views/admin/experiences/edit.html.erb b/app/views/admin/experiences/edit.html.erb new file mode 100644 index 0000000..154e5b7 --- /dev/null +++ b/app/views/admin/experiences/edit.html.erb @@ -0,0 +1,5 @@ +<%= form_for @experience, url:'/admin/experiences/'+@experience.id.to_s, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
+ <%= render partial: 'form', locals: {f: f} %> +
+<% end %> \ No newline at end of file diff --git a/app/views/admin/experiences/frontend_setting.html.erb b/app/views/admin/experiences/frontend_setting.html.erb new file mode 100644 index 0000000..93e3fe6 --- /dev/null +++ b/app/views/admin/experiences/frontend_setting.html.erb @@ -0,0 +1,93 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> + +<%= form_for(:experience_intro, :url => update_frontend_setting_admin_experiences_path, :method => "post", html: {class: "form-horizontal main-forms previewable"} ) do |f| %> +
+ +
+ + +
<%= t("module_name.personal_experience") %>
+ + + +
+ +
+ <% if !@member.blank? %> +
+ +
+ <%= @member.name rescue ''%> + <%= f.hidden_field :member_profile_id, :value => @member.id %> +
+
+ <% end %> + +
+ +
+ <%= f.check_box :brief_intro, :checked => @intro.brief_intro %> <%= t("personal_plugins.brief_intro") %> + <%= f.check_box :complete_list, :checked => @intro.complete_list %> <%= t("personal_plugins.complete_list") %> +
+
+
+
+ + +
<%= t(:language) %>
+
    + <% @site_in_use_locales.each_with_index do |locale, i| %> +
  • + <%= t(locale) %> +
    • + <% end %> +
+ + +
+ + <% @site_in_use_locales.each_with_index do |locale, i| %> + +
"> + + +
+ +
+
+ <%= f.fields_for :text_translations do |f| %> + <%= f.cktext_area locale, rows: 5, class: "input-block-level", :value => (@intro.text_translations[locale] rescue nil) %> + <% end %> +
+
+
+ + +
+ + <% end %> + + + +
+ + + +
+ + +
+ <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/admin/experiences/index.html.erb b/app/views/admin/experiences/index.html.erb new file mode 100644 index 0000000..c8179a8 --- /dev/null +++ b/app/views/admin/experiences/index.html.erb @@ -0,0 +1,21 @@ + + + + + + + + + + + <%= render :partial => 'experience', :collection => @experiences %> + +
<%= t('date_') %><%= t('personal_experience.organizationt_title') %><%= t('personal_experience.department') %><%= t('personal_experience.job_title') %>
+ +
+
+ <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), admin_experience_setting_path, :class => 'btn btn-primary pull-right' %> +
+ +
\ No newline at end of file diff --git a/app/views/admin/experiences/new.html.erb b/app/views/admin/experiences/new.html.erb new file mode 100644 index 0000000..741d4fd --- /dev/null +++ b/app/views/admin/experiences/new.html.erb @@ -0,0 +1,5 @@ +<%= form_for @experience, url: admin_experiences_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
+ <%= render partial: 'form', locals: {f: f} %> +
+<% end %> \ No newline at end of file diff --git a/app/views/admin/experiences/setting.html.erb b/app/views/admin/experiences/setting.html.erb new file mode 100644 index 0000000..f3e6fcc --- /dev/null +++ b/app/views/admin/experiences/setting.html.erb @@ -0,0 +1,52 @@ + + +
+
+
+

+ <%= t('add')%> + <%= t("personal_experience.experience_category") %> +

+
+
+
+
+
+
+
+
+
+
+ + + <%= render :partial => 'list_experience_type', :collection => @experience_types %> + +
+
+
+
+
+
+
+ +
+ +
\ No newline at end of file diff --git a/app/views/plugin/personal_experience/_profile.html.erb b/app/views/plugin/personal_experience/_profile.html.erb new file mode 100644 index 0000000..c7a16f3 --- /dev/null +++ b/app/views/plugin/personal_experience/_profile.html.erb @@ -0,0 +1,86 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + +<% + is_autorized_user = (current_user==@member.user || current_user.is_admin?) + if is_autorized_user + @experiences = Experience.where(member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) + else + @experiences = Experience.where(is_hidden: false, member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) + end +%> + +<% if is_autorized_user %> +
+
+ <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => toggle_hide_admin_experiences_path(member_profile_id: params[:id], disable: 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => toggle_hide_admin_experiences_path(member_profile_id: params[:id], disable: 'false') ) %> +
+
+<% end -%> + + + + + <% if is_autorized_user %> + + <% end -%> + + + + + + + + <% @experiences.each do |experience| %> + "> + <% if is_autorized_user %> + + <% end %> + + + + + + <% end %> + +
<%= t('date_') %><%= t('personal_experience.organizationt_title') %><%= t('personal_experience.department') %><%= t('personal_experience.job_title') %>
+ <%= check_box_tag 'to_change[]', experience.id.to_s, false, :class => "list-check" %> + <%= experience.duration %> + <%= link_to experience.organizationt_title, '', target: "blank"%> +
+
    +
  • <%= link_to t('edit'), '/admin/members/'+@member.to_param+'/experiences/'+experience.id+'/edit' %>
    • +
  • <%= link_to t(:delete_), admin_experience_path(id: experience.id, member_profile_id: @member.id), method: :delete, remote: true, data: { confirm: t('sure?') } %>
    • +
+
+ 		<%= experience.department %><%= experience.job_title %>
+ + +
+ <% if is_autorized_user %> +
+ <%= link_to content_tag(:i, nil, :class => 'icon-edit') +' '+ t('setting'),'/admin/members/'+@member.to_param+'/experiences/frontend_setting', :class => 'btn btn-primary' %> + <%= link_to content_tag(:i, nil, :class => 'icon-plus') +' '+ t('new_'), + '/admin/members/'+@member.to_param+'/experiences/new', :class => 'btn btn-primary' %> +
+ <% end %> + +
+ + \ No newline at end of file diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 0c88318..f08aa8c 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -2,7 +2,7 @@ zh_tw: module_name: personal_experience: 經歷 personal_experience: - department : "系所" + department : "單位" experience_category : 經歷類別 end_date : "結束日期" start_date : "開始日期" diff --git a/config/routes.rb b/config/routes.rb index d96d9d4..f4799f7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,28 @@ Rails.application.routes.draw do locales = Site.find_by(site_active: true).in_use_locales rescue I18n.available_locales scope "(:locale)", locale: Regexp.new(locales.join("|")) do namespace :admin do + get 'experience_setting' => "experiences#setting" + + resources :experiences do + collection do + get 'toggle_hide' => 'experiences#toggle_hide' + end + end + + resources :members do + collection do + scope '(:name-:uid)' do + resources :experiences do + collection do + get 'frontend_setting' => 'experiences#frontend_setting' + post 'update_frontend_setting' => 'experiences#update_frontend_setting' + end + end + end + end + end + + resources :experience_types end end end diff --git a/lib/personal_experience/engine.rb b/lib/personal_experience/engine.rb index 749a14e..1975567 100644 --- a/lib/personal_experience/engine.rb +++ b/lib/personal_experience/engine.rb @@ -4,7 +4,7 @@ module PersonalExperience OrbitApp.registration "PersonalExperience",:type=> 'ModuleApp' do module_label 'module_name.personal_experience' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true, :sort_number => '45', :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"/plugin/profile",:front_path=>"/profile",:admin_path=>"/admin/experiences",:i18n=>'module_name.personal_experience' + personal_plugin :enable => true, :sort_number => '45', :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"/plugin/personal_experience/profile",:front_path=>"/profile",:admin_path=>"/admin/experiences",:i18n=>'module_name.personal_experience' version "0.1" organization "Rulingcom" author "RD dep"