From ec631691e35b17a79c7eba3c85130e8d811a15a5 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 31 Dec 2015 11:12:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=92=8C=E8=AF=BE=E7=A8=8B=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9D=9F=E5=AD=A6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/courses_service.rb | 2 + app/views/courses/new.html.erb | 120 ++++++++++-------- app/views/courses/settings.html.erb | 40 +++--- config/locales/courses/en.yml | 2 +- config/locales/courses/zh.yml | 2 +- .../20151231012634_add_last_term_to_course.rb | 17 +++ db/schema.rb | 9 +- public/javascripts/course.js | 42 +++++- 8 files changed, 159 insertions(+), 75 deletions(-) create mode 100644 db/migrate/20151231012634_add_last_term_to_course.rb diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 5d60238bf..aabe1a921 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -196,6 +196,8 @@ class CoursesService @course.tea_id = current_user.id @course.term = params[:term] @course.time = params[:time] + @course.end_term = params[:end_term] + @course.end_time = params[:end_time] #@course.school_id = params[:occupation] @course.school_id = current_user.user_extensions.school_id @course.setup_time = params[:setup_time] diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index f1b917816..9875ec9b7 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -4,64 +4,82 @@
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb index ae6416c9d..23d0a2a3f 100644 --- a/app/views/courses/settings.html.erb +++ b/app/views/courses/settings.html.erb @@ -2,11 +2,11 @@

<%= l(:label_course_modify_settings)%>

@@ -50,6 +50,12 @@ <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"} %>
+
  • + + <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time_selected"} %> + <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term_selected"} %> +
    • +
  • @@ -123,15 +129,17 @@
    • diff --git a/config/locales/courses/en.yml b/config/locales/courses/en.yml index fd8ba2366..20d9d112c 100644 --- a/config/locales/courses/en.yml +++ b/config/locales/courses/en.yml @@ -15,7 +15,7 @@ en: label_homework: Task label_course_news: 课程通知 label_main_teacher: 主讲教师 - label_course_term: 开课学期 + label_course_term: 开始学期 label_join_course: 加入 label_exit_course: exit course diff --git a/config/locales/courses/zh.yml b/config/locales/courses/zh.yml index 16d49ea1f..19b979d97 100644 --- a/config/locales/courses/zh.yml +++ b/config/locales/courses/zh.yml @@ -19,7 +19,7 @@ zh: label_course_news: 课程通知 label_course_mail_news_reply: 课程通知回复 label_main_teacher: 主讲教师 - label_course_term: 开课学期 + label_course_term: 开始学期 label_isuue_mail_status: 更新了issue状态！ label_join_course: 加入 diff --git a/db/migrate/20151231012634_add_last_term_to_course.rb b/db/migrate/20151231012634_add_last_term_to_course.rb new file mode 100644 index 000000000..1b342eaaf --- /dev/null +++ b/db/migrate/20151231012634_add_last_term_to_course.rb @@ -0,0 +1,17 @@ +class AddLastTermToCourse < ActiveRecord::Migration + def change + add_column :courses, :end_time, :integer + add_column :courses, :end_term, :string + + count = Course.all.count / 30 + 2 + transaction do + for i in 1 ... count do + Course.page(i).per(30).each do |course| + course.end_time = course.time + course.end_term = course.term + course.save + end + end + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 72ca3c649..ec783d251 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20151229022049) do +ActiveRecord::Schema.define(:version => 20151231012634) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -198,6 +198,7 @@ ActiveRecord::Schema.define(:version => 20151229022049) do t.integer "last_message_id" t.integer "parent_id" t.integer "course_id" + t.integer "org_subfield_id" end add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id" @@ -474,6 +475,8 @@ ActiveRecord::Schema.define(:version => 20151229022049) do t.integer "outline", :default => 0 t.integer "publish_resource", :default => 0 t.integer "is_delete", :default => 0 + t.integer "end_time" + t.string "end_term" end create_table "custom_fields", :force => true do |t| @@ -1643,10 +1646,6 @@ ActiveRecord::Schema.define(:version => 20151229022049) do t.string "extra" end - create_table "temp", :id => false, :force => true do |t| - t.integer "id", :default => 0, :null => false - end - create_table "time_entries", :force => true do |t| t.integer "project_id", :null => false t.integer "user_id", :null => false diff --git a/public/javascripts/course.js b/public/javascripts/course.js index a0bce3099..df04d857b 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -119,6 +119,46 @@ function regex_course_class_period() return false; } } +//验证开始学期和结束学期 +function regex_time_term(){ + var obj_time = document.getElementById("time"); + var obj_end_time = document.getElementById("end_time"); + var obj_term = document.getElementById("term"); + var obj_end_term = document.getElementById("end_term"); + var time = obj_time.options[obj_time.selectedIndex]; + var end_time = obj_end_time.options[obj_end_time.selectedIndex]; + var term = obj_term.options[obj_term.selectedIndex]; + var end_term = obj_end_term.options[obj_end_term.selectedIndex]; + if(time.value == end_time.value) { + if(set_term_val(term.value) > set_term_val(end_term.value)) { + $("#course_time_term_notice").html("开始学期不能晚于结束学期"); + $("#course_time_term_notice").show(); + return false; + } else { + $("#course_time_term_notice").html(""); + $("#course_time_term_notice").hide(); + return true; + } + } else if(time.value < end_time.value) { + $("#course_time_term_notice").html(""); + $("#course_time_term_notice").hide(); + return true; + } else { + $("#course_time_term_notice").html("开始学期不能晚于结束学期"); + $("#course_time_term_notice").show(); + return false; + } +} +//学期转换为数字 +function set_term_val(val) { + if(val == "春季学期"){ + return 1; + } else if(val == "夏季学期"){ + return 2; + } else if(val == "秋季学期"){ + return 3; + } +} //验证密码 function regex_course_password() { @@ -145,7 +185,7 @@ function regex_course_password() //提交新建课程 function submit_new_course() { - if(regex_course_name()&®ex_course_class_period()&®ex_course_password()) + if(regex_course_name()&®ex_course_class_period()&®ex_time_term()&®ex_course_password()) { $("#new_course").submit(); } From 2c5a4f8a13573ba4a40d9df9f56c72323727df01 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 31 Dec 2015 11:36:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BD=9C=E4=B8=9A=E6=97=B6=E7=9A=84=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E5=8C=BF=E8=AF=84=E6=94=B9=E4=B8=BA=E7=A6=81=E7=94=A8=E5=8C=BF?= =?UTF-8?q?=E8=AF=84=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=8D=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/views/users/_user_homework_form.html.erb | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 46362c2d3..d345fba5f 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -63,7 +63,7 @@ class HomeworkCommonController < ApplicationController end @homework.end_time = params[:homework_common][:end_time] || Time.now @homework.course_id = params[:course_id] - @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1 + @homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0 homework_detail_manual = @homework.homework_detail_manual || HomeworkDetailManual.new if @homework.publish_time <= Date.today && homework_detail_manual.comment_status == 0 diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 78d8e2b46..85d42e189 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -522,7 +522,7 @@ class UsersController < ApplicationController else homework.publish_time = params[:homework_common][:publish_time] end - homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 1 + homework.anonymous_comment = params[:homework_common][:anonymous_comment] ? params[:homework_common][:anonymous_comment] : 0 homework.homework_type = params[:homework_type].to_i || 1 homework.late_penalty = 10 homework.teacher_priority = 1 diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 29be69a23..d145dab90 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -5,9 +5,9 @@ @@ -53,8 +53,8 @@
    <% if !edit_mode || edit_mode && homework.homework_detail_manual.comment_status < 2 %>
    - - 启用匿评 + + 禁用匿评
    <% end %> From 7e76a32480ddd8f50bb6d0be27d1af37e5b7fd99 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 31 Dec 2015 15:36:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE/=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=9A=84=E5=8A=A8=E6=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E7=BD=AE=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 39 ++++++++++++++++------- app/views/users/_project_message.html.erb | 29 ++++++++++++++++- config/routes.rb | 4 +-- 3 files changed, 58 insertions(+), 14 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 4996f7730..3633b2134 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %> @@ -43,17 +43,34 @@
    - +
    + <% end %>
    diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index b9ebc2135..c31e4ac2e 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> @@ -44,6 +44,33 @@
    + <% if activity.author.id == User.current.id%> + + <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index 9326ac61e..e64670ff2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -413,12 +413,12 @@ RedmineApp::Application.routes.draw do match 'boards/:id/join_to_org_subfields', :to => 'boards#join_to_org_subfields' get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message' match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post] - get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit' + get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit',:as=>'edit_board_message' post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message' post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply' post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit' - post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy' + post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy',:as=>'delete_board_message' match 'messages/join_org_subfield', :to => 'messages#join_org_subfield' match 'messages/get_subfield_on_click_org', :to => 'messages#get_subfield_on_click_org' match 'messages/join_org_subfields', :to => 'messages#join_org_subfields'