From d5bb84050da566a7e2f080f42f5c66bd93b32bc5 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 7 Nov 2019 13:39:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/inform.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/inform.rb b/app/models/inform.rb index a6f40fe6d..93b7d5337 100644 --- a/app/models/inform.rb +++ b/app/models/inform.rb @@ -7,11 +7,11 @@ class Inform < ApplicationRecord has_many :attachments, as: :container, dependent: :destroy def next_inform - Inform.where(position: self.position+1, container_id: self.course_id, container_type: 'Course') + Inform.where(position: self.position+1, container_id: self.container_id, container_type: self.container_type) end def last_inform - Inform.where(position: self.position-1, container_id: self.course_id, container_type: 'Course') + Inform.where(position: self.position-1, container_id: self.container_id, container_type: self.container_type) end end From 37c34aac698ace32cd14c7946a06aa4c3b72953d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 7 Nov 2019 13:44:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=B0=83=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworksstudentone.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 5253eb94f..ad3d28167 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1175,8 +1175,9 @@ class Listofworksstudentone extends Component { className: 'font-14', render: (text, record) => ( record.submitstate === "未提交" ? - this.Adjustment(record)}>调分 : + this.Viewstudenttraininginformationtysl2(e, record)} + onClick={() => this.Viewstudenttraininginformationt(record)}>查看 : this.Viewstudenttraininginformationtysl2(e, record)} @@ -1508,8 +1509,9 @@ class Listofworksstudentone extends Component { className: 'font-14', render: (text, record) => ( record.submitstate === "未提交" ? - this.Adjustment(record)}>调分 : + this.Viewstudenttraininginformationtysl2(e, record)} + onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating} : this.Viewstudenttraininginformationtysl2(e, record)} From 7281cf877ec9ceba8ff7a0befc38b3716ebf1dd2 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 7 Nov 2019 13:46:47 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 488289815..5e72eb514 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -288,7 +288,7 @@ class CoursesController < ApplicationController inform = @course.informs.find_by(id: params[:inform_id]) next_inform = inform.next_inform ActiveRecord::Base.transaction do - if next_inform + if next_inform.blank? render_error('已经到达最顶部') else inform.update_attribute(:position, (position + 1)) @@ -302,7 +302,7 @@ class CoursesController < ApplicationController inform = @course.informs.find_by(id: params[:inform_id]) last_inform = inform.last_inform ActiveRecord::Base.transaction do - if last_inform + if last_inform.blank? render_error('已经到达最底部') else inform.update_attribute(:position, (position - 1)) From 48c7c1cb314ac7c2fe0faa1cd11d638aef95de4b Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 7 Nov 2019 13:48:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 5e72eb514..b21eaa933 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -291,8 +291,8 @@ class CoursesController < ApplicationController if next_inform.blank? render_error('已经到达最顶部') else - inform.update_attribute(:position, (position + 1)) - next_inform.update_attribute(:position, last_inform.position - 1) + inform.update_attribute(:position, (inform.position + 1)) + next_inform.update_attribute(:position, inform.position - 1) render_ok end end @@ -305,8 +305,8 @@ class CoursesController < ApplicationController if last_inform.blank? render_error('已经到达最底部') else - inform.update_attribute(:position, (position - 1)) - last_inform.update_attribute(:position, last_inform.position + 1) + inform.update_attribute(:position, (inform.position - 1)) + last_inform.update_attribute(:position, inform.position + 1) render_ok end end From c1dac659a29f40872cbe84ecb69f579c4edc7534 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 7 Nov 2019 13:54:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=A0=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index b21eaa933..5dd001f5a 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -317,7 +317,7 @@ class CoursesController < ApplicationController inform = Inform.new(container: @course) inform.name = params[:name] inform.description = params[:description] - inform.position = @course.informs.maximum(:position) + 1 + inform.position = @course.informs.maximum(:position).to_i + 1 inform.save! normal_status("创建成功") end