From 7eb1f03034a6bb8c7412e2478da2d1b3dc2c687c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 20 Mar 2020 17:57:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/subjects_controller.rb | 2 +- app/controllers/weapps/subjects_controller.rb | 2 +- app/queries/weapps/subject_query.rb | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index c5cae99c4..b6fdf8ea9 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -17,7 +17,7 @@ class SubjectsController < ApplicationController include CustomSortable def index - subjects = Weapps::SubjectQuery.call(current_laboratory, params) + subjects = Weapps::SubjectQuery.call(current_laboratory, params, "web") @subject_count = subjects.map(&:id).size @subjects = paginate subjects.includes(:shixuns, :repertoire) end diff --git a/app/controllers/weapps/subjects_controller.rb b/app/controllers/weapps/subjects_controller.rb index e5c3eb316..e1e50cc40 100644 --- a/app/controllers/weapps/subjects_controller.rb +++ b/app/controllers/weapps/subjects_controller.rb @@ -4,7 +4,7 @@ class Weapps::SubjectsController < Weapps::BaseController # 首页 def index - subjects = Weapps::SubjectQuery.call(current_laboratory, params) + subjects = Weapps::SubjectQuery.call(current_laboratory, params, "wechat") @subject_count = subjects.map(&:id).size @subjects = paginate subjects end diff --git a/app/queries/weapps/subject_query.rb b/app/queries/weapps/subject_query.rb index 180176ce2..c0fbbf653 100644 --- a/app/queries/weapps/subject_query.rb +++ b/app/queries/weapps/subject_query.rb @@ -2,13 +2,20 @@ class Weapps::SubjectQuery < ApplicationQuery include CustomSortable attr_reader :params - def initialize(current_laboratory, params) + def initialize(current_laboratory, params, device) @current_laboratory = current_laboratory @params = params + @device = device end def call - subjects = @current_laboratory.subjects.unhidden.publiced.show_moblied + Rails.logger.info("##### @device: #{@device}") + subjects = + if @device == "wechat" + @current_laboratory.subjects.unhidden.publiced + else + @current_laboratory.subjects.unhidden.publiced.show_moblied + end # 课程体系的过滤 if params[:sub_discipline_id].present? From 6936f05778f712eef6674f64008f3b07682e304f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 20 Mar 2020 18:00:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=92=8Cweb=E7=AB=AF?= =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/queries/weapps/subject_query.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/queries/weapps/subject_query.rb b/app/queries/weapps/subject_query.rb index c0fbbf653..ca0c437a9 100644 --- a/app/queries/weapps/subject_query.rb +++ b/app/queries/weapps/subject_query.rb @@ -12,9 +12,9 @@ class Weapps::SubjectQuery < ApplicationQuery Rails.logger.info("##### @device: #{@device}") subjects = if @device == "wechat" - @current_laboratory.subjects.unhidden.publiced - else @current_laboratory.subjects.unhidden.publiced.show_moblied + else + @current_laboratory.subjects.unhidden.publiced end # 课程体系的过滤 From 071d2df64523229d29678ab1ab11edfc9e54d525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 20 Mar 2020 20:11:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exercise/Studentshavecompletedthelist.js | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 070ceeed2..b8880c6f2 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -1244,19 +1244,19 @@ class Studentshavecompletedthelist extends Component { (//助教是否有权限 this.props.assistant_auth&&this.props.assistant_auth===true? this.Adjustment(record.user_id)}>评阅 + target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} : (//是否截止 this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3? this.Adjustment(record.user_id)}>评阅 + target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} : -- ) ) : this.Adjustment(record.user_id)}>评阅 + target="_blank" onClick={() => this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} ) :record.submitstate === "已提交"? (//是否助教 @@ -1581,8 +1581,9 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - operating: "评阅", + operating:exercise_users[i].has_comment===true?"已评阅":"评阅", commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) } else { datalist.push({ @@ -1599,8 +1600,9 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - operating: "--", - commit_method:exercise_users[i].commit_method + operating:exercise_users[i].has_comment===true?"已评阅":"--", + commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) } @@ -1670,8 +1672,9 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - operating: "查看", + operating:exercise_users[i].has_comment===true?"已评阅":"查看", commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) noclassroom = exercise_users[i].user_group_name; } @@ -1817,9 +1820,10 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - finalscore: "评阅", + finalscore:exercise_users[i].has_comment===true?"已评阅":"评阅", user_id: exercise_users[i].user_id, - commit_method:exercise_users[i].commit_method + commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) } else { datalist.push({ @@ -1836,9 +1840,10 @@ class Studentshavecompletedthelist extends Component { efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - finalscore: "--", + finalscore:exercise_users[i].has_comment===true?"已评阅":"--", user_id: exercise_users[i].user_id, - commit_method:exercise_users[i].commit_method + commit_method:exercise_users[i].commit_method, + has_comment:exercise_users[i].has_comment }) indexi++; }