From f214e741b7977ce9e663706b4195cd9a024a52a1 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Mon, 12 Aug 2019 18:31:50 +0800 Subject: [PATCH 01/20] del --- public/react/src/modules/courses/exercise/new/NullEditor.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/react/src/modules/courses/exercise/new/NullEditor.js b/public/react/src/modules/courses/exercise/new/NullEditor.js index 8cfb21a5f..9a99a067d 100644 --- a/public/react/src/modules/courses/exercise/new/NullEditor.js +++ b/public/react/src/modules/courses/exercise/new/NullEditor.js @@ -196,12 +196,14 @@ class NullEditor extends Component{ } onAnswerChange = (index, itemIndex, val) => { + if (this.state.standard_answers[index]) { this.setState( (prevState) => ({ standard_answers : update(prevState.standard_answers , {[index]: {$splice: [[itemIndex, 1, val]]}}), }) ) + } } addChildAnswer = (index) => { this.setState( From 2b211412b383477ca527e7147ea42fa74f155deb Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 18:44:55 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E4=BC=98=E5=8C=96Model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/challenge.rb | 1 - app/models/shixun.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/challenge.rb b/app/models/challenge.rb index 8e4d2ae42..adb54fae9 100644 --- a/app/models/challenge.rb +++ b/app/models/challenge.rb @@ -1,7 +1,6 @@ class Challenge < ApplicationRecord # difficulty: 关卡难度: 1.简单 2.中等 3.困难 # show_type: 效果展示：-1.无效果 1.图片 2.apk/exe 3.txt 4.html 5.mp3 6.mp4 - default_scope { order("challenges.position asc") } belongs_to :shixun, :touch => true, counter_cache: true belongs_to :user diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 1839edf93..81b444c0a 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -5,7 +5,7 @@ class Shixun < ApplicationRecord # hide_code： 隐藏代码窗口 # code_hidden: 隐藏代码目录 # task_pass: 跳关 - has_many :challenges, dependent: :destroy + has_many :challenges, -> {order("challenges.position asc")}, dependent: :destroy has_many :challenge_tags, through: :challenges has_many :myshixuns, :dependent => :destroy has_many :shixun_members, dependent: :destroy From 11fb99285a2d4b45effef799addfd7a89d60bbdf Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 18:55:15 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/challenges_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index ebce98b62..9e87d3799 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -151,7 +151,7 @@ class ChallengesController < ApplicationController def index uid_logger("identifier: #{params}") - @challenges = Challenge.fields_for_list.where(shixun_id: @shixun.id) + @challenges = @shixun.challenges.fields_for_list @editable = @shixun.status == 0 # before_action：有判断权限，如果没发布，则肯定是管理人员 @user = current_user From 2804dc2580e0fe58b7ae8ceaa4d2ef217a243140 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 20:34:03 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 7f2519b99..cad3806bf 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1459,6 +1459,7 @@ class HomeworkCommonsController < ApplicationController if game_codes.count > 0 code_rate += game_codes.map(&:rate).sum / challenge.path.split("；").length end + logger.info("#####game_codes: #{game_codes}") target = game_codes.count > 0 ? game_codes[0].target_user_id : nil # 作品完成时间 game = challenge.games.find_by(user_id: @user.id) From 9be7563fa267f9ebca43e472858ed9829b259f94 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 20:35:51 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E9=87=8D?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index cad3806bf..3e414726c 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1460,7 +1460,7 @@ class HomeworkCommonsController < ApplicationController code_rate += game_codes.map(&:rate).sum / challenge.path.split("；").length end logger.info("#####game_codes: #{game_codes}") - target = game_codes.count > 0 ? game_codes[0].target_user_id : nil + #target = game_codes.count > 0 ? game_codes[0].target_user_id : nil # 作品完成时间 game = challenge.games.find_by(user_id: @user.id) end_time = game.end_time @@ -1468,7 +1468,7 @@ class HomeworkCommonsController < ApplicationController all_score = homework_challenge_settings.find_by(challenge_id: challenge.id).try(:score).to_f final_score = @student_work.work_challenge_score game, all_score # 抄袭用户 - copy_user = User.find_by_id(game_codes[0].target_user_id) + copy_user = User.find_by_id(game_codes[0].try(:target_user_id)) copy_end_time = copy_user.games.find_by(challenge_id: challenge.id).try(:end_time) if copy_user.present? # 代码部分 code_list = [] From ee70a023bd48fe0f1814eb92b399e5fa244c3b4b Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 20:49:41 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E6=9F=A5=E9=87=8D=E7=8E=87=E7=9A=84?= =?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/homework_commons_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 3e414726c..0f2bf2f9e 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1478,9 +1478,11 @@ class HomeworkCommonsController < ApplicationController code_list << {path: path, origin_content: info.origin_content, target_content: info.target_content} end end + copy_user_id = copy_user ? copy_user.id : "--" + copy_username = copy_user ? copy_user.full_name : "--" - {code_rate: code_rate, copy_user_id: copy_user.try(:id), end_time: end_time, final_score: final_score, - all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_user.try(:full_name), + {code_rate: code_rate, copy_user_id: copy_user_id, end_time: end_time, final_score: final_score, + all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_username, username: game.user.full_name, code_list: code_list, subject: challenge.subject, position: challenge.position, id: challenge.id} end From 846be14bc054a873a05ce5b4080e8a76fd8923ad Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 20:52:09 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 0f2bf2f9e..2dc23dc4e 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1478,9 +1478,10 @@ class HomeworkCommonsController < ApplicationController code_list << {path: path, origin_content: info.origin_content, target_content: info.target_content} end end + # TODO: 这里本来应该前端做的，但是现在页面已经刷不开了。 copy_user_id = copy_user ? copy_user.id : "--" copy_username = copy_user ? copy_user.full_name : "--" - + copy_end_time = copy_end_time ? copy_end_time : "--" {code_rate: code_rate, copy_user_id: copy_user_id, end_time: end_time, final_score: final_score, all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_username, username: game.user.full_name, code_list: code_list, subject: challenge.subject, position: challenge.position, From 3df693cdf6c461a81d367bffa7158fdac4681afd Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 21:10:21 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E6=8A=84=E8=A2=AD=E8=80=85=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 2dc23dc4e..99921b126 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1478,10 +1478,6 @@ class HomeworkCommonsController < ApplicationController code_list << {path: path, origin_content: info.origin_content, target_content: info.target_content} end end - # TODO: 这里本来应该前端做的，但是现在页面已经刷不开了。 - copy_user_id = copy_user ? copy_user.id : "--" - copy_username = copy_user ? copy_user.full_name : "--" - copy_end_time = copy_end_time ? copy_end_time : "--" {code_rate: code_rate, copy_user_id: copy_user_id, end_time: end_time, final_score: final_score, all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_username, username: game.user.full_name, code_list: code_list, subject: challenge.subject, position: challenge.position, From 3d019e07275b8b9c7722339f8e2d08b8516404d7 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 12 Aug 2019 21:12:16 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E6=8A=84=E8=A2=AD=E8=80=85=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index 99921b126..c8cf36824 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -1478,8 +1478,9 @@ class HomeworkCommonsController < ApplicationController code_list << {path: path, origin_content: info.origin_content, target_content: info.target_content} end end - {code_rate: code_rate, copy_user_id: copy_user_id, end_time: end_time, final_score: final_score, - all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_username, + # TODO: 这里本来应该前端做的，但是现在页面已经刷不开了。 + {code_rate: code_rate, copy_user_id: copy_user.try(:id), end_time: end_time, final_score: final_score, + all_score: all_score, copy_end_time: copy_end_time, copy_username: copy_user.try(:full_name), username: game.user.full_name, code_list: code_list, subject: challenge.subject, position: challenge.position, id: challenge.id} end From d778481f9d9ab3d1e414020c6df5381aa83c5e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 12 Aug 2019 22:05:22 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/boards/TopicDetail.css | 25 +++--- .../src/modules/courses/boards/TopicDetail.js | 2 +- .../Shixunworkdetails/ShixunCustomsPass.js | 77 ++++++++++--------- 3 files changed, 55 insertions(+), 49 deletions(-) diff --git a/public/react/src/modules/courses/boards/TopicDetail.css b/public/react/src/modules/courses/boards/TopicDetail.css index de3aeb69b..7500268bf 100644 --- a/public/react/src/modules/courses/boards/TopicDetail.css +++ b/public/react/src/modules/courses/boards/TopicDetail.css @@ -1,12 +1,15 @@ -.edu-class-container { - width: 1200px; - margin: 10px auto 20px; -} -#forum_index_list { - margin-top: 90px; - margin-bottom: 320px; -} - -.uploadBtn { - margin-left: 0px; +.edu-class-container { + width: 1200px; + margin: 10px auto 20px; +} +#forum_index_list { + margin-top: 90px; + margin-bottom: 320px; +} +#yslforum_index_list { + margin-top: 20px; + margin-bottom: 320px; +} +.uploadBtn { + margin-left: 0px; } \ No newline at end of file diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js index d60c34461..7d0e6d37d 100644 --- a/public/react/src/modules/courses/boards/TopicDetail.js +++ b/public/react/src/modules/courses/boards/TopicDetail.js @@ -526,7 +526,7 @@ class TopicDetail extends Component { const courseId=this.props.match.params.coursesId; const boardId = this.props.match.params.boardId return ( -
{/* fl with100 */} +
{/* fl with100 */} { data&&data.challenge_list.map((item,key)=>{ + console.log("203challenge_list下面的数据"); + console.log(item); + console.log(JSON.stringify(item)); return(
@@ -213,46 +216,46 @@ class ShixunCustomsPass extends Component { {item.subject} - 代码文件：{item.code_list[0].path} + 代码文件：{item.code_list.length===0?"无":item.code_list[0].path===undefined?"无":item.code_list[0].path}

- {item.code_list.map((ite,k)=>{ + {item.code_list.length===0?"":item.code_list.map((ite,k)=>{ return( -
-
-

- - {item.username} - 的代码文件 - - - {item.copy_username} - 的代码文件 - -

- -
-
  • - -
    • -
    -
    -
    +
    +
    +

    + + {item.username} + 的代码文件 + + + {item.copy_username} + 的代码文件 + +

    + +
    +
  • + +
    • +
    +
    +
    ) })}
    @@ -267,4 +270,4 @@ class ShixunCustomsPass extends Component { } } -export default ShixunCustomsPass; \ No newline at end of file +export default ShixunCustomsPass; From 885e6e1b334fc7365956e642a3a23cbaa198a7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 12 Aug 2019 22:52:02 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/ShixunWorkDetails.js | 6 +++--- .../shixunHomework/Shixunworkdetails/ShixunCustomsPass.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js index 508fc285e..d37aea5a7 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js @@ -71,13 +71,13 @@ class ShixunWorkDetails extends Component {

    this.goback(1)} + href={`/courses/${data&&data.course_id}/shixun_homeworks/${data&&data.homework_common_id}`} > - {data&&data.course_name}123 + {data&&data.course_name} > 实训作业 diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js index 3fc2d516a..8ffa8a1dd 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js @@ -200,9 +200,9 @@ class ShixunCustomsPass extends Component { { data&&data.challenge_list.map((item,key)=>{ - console.log("203challenge_list下面的数据"); - console.log(item); - console.log(JSON.stringify(item)); + // console.log("203challenge_list下面的数据"); + // console.log(item); + // console.log(JSON.stringify(item)); return(

    From ca3edc22db6177574fb22eae469cbd8376149552 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 13 Aug 2019 09:18:17 +0800 Subject: [PATCH 12/20] d --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 60383988b..7f4020590 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -278,7 +278,7 @@ class CommonWorkPost extends Component{ } // 附件相关 START handleChange = (info) => { - if (info.file.status === 'uploading') { + if (info.file.status === 'uploading' || info.file.status === 'done') { let fileList = info.fileList; this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) }); From 2e53af0f4fbfb150efd549c98b30840eed06d23d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 13 Aug 2019 09:19:36 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise_questions/_exercise_questions.json.jbuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/exercise_questions/_exercise_questions.json.jbuilder b/app/views/exercise_questions/_exercise_questions.json.jbuilder index 51c30ad92..61bf919ea 100644 --- a/app/views/exercise_questions/_exercise_questions.json.jbuilder +++ b/app/views/exercise_questions/_exercise_questions.json.jbuilder @@ -17,7 +17,8 @@ if question.question_type <= 2 #当为选择题或判断题时，只显示选 end json.question_choices do json.array! exercise_choices.each_with_index.to_a do |a,index| - standard_answer_b = standard_answers_array.include?(a.choice_position) + #TODO: 旧版本来答案都是存在exercise_choice_id里面的，但是新版做成了一对多的关系，exercise_choice_id只存了一个答案，导致了问题 + standard_answer_b = standard_answers_array.join("").include?(a.choice_position.to_s) user_answer_b = user_answer.include?(a.id) json.c_position (index+1) if ex_choice_random_boolean #当选项随机时，选项位置以此为准，否则不出现 json.choice_id a.id From db5e58a911db6961966decde404d0eb129d1f5fc Mon Sep 17 00:00:00 2001 From: p31729568 Date: Tue, 13 Aug 2019 09:22:15 +0800 Subject: [PATCH 14/20] modify video batch publish apu --- app/controllers/users/videos_controller.rb | 2 ++ app/services/videos/batch_publish_service.rb | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/controllers/users/videos_controller.rb b/app/controllers/users/videos_controller.rb index 03acd76cc..e4dffec23 100644 --- a/app/controllers/users/videos_controller.rb +++ b/app/controllers/users/videos_controller.rb @@ -40,6 +40,8 @@ class Users::VideosController < Users::BaseController def batch_publish Videos::BatchPublishService.call(observed_user, batch_publish_params) render_ok + rescue Videos::BatchPublishService::Error => ex + render_error(ex.message) end private diff --git a/app/services/videos/batch_publish_service.rb b/app/services/videos/batch_publish_service.rb index 3ff16dc57..e435b9508 100644 --- a/app/services/videos/batch_publish_service.rb +++ b/app/services/videos/batch_publish_service.rb @@ -1,4 +1,6 @@ class Videos::BatchPublishService < ApplicationService + Error = Class.new(StandardError) + attr_reader :user, :params def initialize(user, params) @@ -16,6 +18,8 @@ class Videos::BatchPublishService < ApplicationService video = user.videos.find_by(uuid: param[:video_id]) next if video.blank? || video.processing_video_apply.present? + raise Error, '视频还未上传完成' if video.vod_uploading? + video.title = param[:title].to_s.strip.presence || video.title video.apply_publish video.save! From cbff39697f381ed0df64f778269d697d48fcf8c5 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Tue, 13 Aug 2019 10:36:36 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E5=88=86=E7=8F=AD=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9=E6=88=9060=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course_group.rb | 2 +- app/views/exercise_questions/_exercise_questions.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/course_group.rb b/app/models/course_group.rb index 33e40ee52..d57edf497 100644 --- a/app/models/course_group.rb +++ b/app/models/course_group.rb @@ -8,7 +8,7 @@ class CourseGroup < ApplicationRecord has_many :homework_group_reviews, :dependent => :destroy scope :by_group_ids, lambda { |ids| where(id: ids)} - validates :name, length: { maximum: 20 } + validates :name, length: { maximum: 60 } after_create :generate_invite_code diff --git a/app/views/exercise_questions/_exercise_questions.json.jbuilder b/app/views/exercise_questions/_exercise_questions.json.jbuilder index 61bf919ea..bbdf45440 100644 --- a/app/views/exercise_questions/_exercise_questions.json.jbuilder +++ b/app/views/exercise_questions/_exercise_questions.json.jbuilder @@ -17,7 +17,7 @@ if question.question_type <= 2 #当为选择题或判断题时，只显示选 end json.question_choices do json.array! exercise_choices.each_with_index.to_a do |a,index| - #TODO: 旧版本来答案都是存在exercise_choice_id里面的，但是新版做成了一对多的关系，exercise_choice_id只存了一个答案，导致了问题 + #TODO: 旧版本来一个题只有一个标准答案的，新版又做成了一个题有多个标准答案（exercise_choice_id存放的是标准答案的位置..） standard_answer_b = standard_answers_array.join("").include?(a.choice_position.to_s) user_answer_b = user_answer.include?(a.id) json.c_position (index+1) if ex_choice_random_boolean #当选项随机时，选项位置以此为准，否则不出现 From bf3dcdabc7ba30740604b9f93804a08c1dfe1322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 13 Aug 2019 10:47:43 +0800 Subject: [PATCH 16/20] b --- .../src/modules/courses/ListPageIndex.js | 37 +++++++++++-------- .../src/modules/courses/new/CoursesNew.js | 12 ++++-- .../modules/courses/shixunHomework/Guide.js | 3 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 8c87c8731..39eeaf115 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -68,7 +68,7 @@ class ListPageIndex extends Component{ constructor(props) { super(props); this.state={ - yslGuideone:null, + yslGuideone:undefined, } } @@ -88,7 +88,11 @@ class ListPageIndex extends Component{ // navttype:newselectnavid // }) // } - setwindowlocal=(bool)=>{ + componentWillUnmount(){ + window.localStorage.setItem('yslGuideone', false); + + } + setwindowlocal=(bool)=>{ window.localStorage.setItem('yslGuideone', bool); this.setState({ yslGuideone:bool, @@ -96,26 +100,27 @@ class ListPageIndex extends Component{ } render() { let {yslGuideone} =this.state; - // console.log("98"); - // console.log(yslGuideone); + console.log("98"); + console.log(yslGuideone); + console.log(this.props.isAdmin()); + var yslGuideones = window.localStorage.getItem('yslGuideone'); return (
    {/*头部banner*/} - {/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/} - {/* (*/} - {/* this.props.isAdmin()===true?*/} - {/* this.setwindowlocal(b)}*/} - {/* >*/} - {/* */} - {/* :""*/} - {/* )*/} - {/* :""*/} - {/*}*/} - + {yslGuideones!==undefined? + ( + yslGuideones===true? + this.setwindowlocal(b)} + > + + :"" + ) + :"" + }
    diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 86789b8a2..beb3c74a9 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -76,7 +76,7 @@ class CoursesNew extends Component { Realnamecertification: data.authentication, Professionalcertification:data.professional_certification, }) - + this.handleSearchschool(data.school); }).catch((error) => { console.log(error); }) @@ -93,7 +93,9 @@ class CoursesNew extends Component { }); this.setState({ school:user_school, - }) + }); + this.handleSearchschool(user_school); + } @@ -204,6 +206,7 @@ class CoursesNew extends Component { if (response.data.status === 0) { // this.goback() window.location.href=first_category_url; + window.localStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -248,6 +251,7 @@ class CoursesNew extends Component { if (response.status === 200) { // this.goback window.location.href=response.data.first_category_url; + window.localStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -403,7 +407,9 @@ class CoursesNew extends Component { const optionschool = this.state.searchlistscholl&&this.state.searchlistscholl.map(z => ); // console.log(this.props.current_user.user_school) // form合并了 - + console.log(this.state); + console.log(this.props); + console.log(this.props.current_user); return ( diff --git a/public/react/src/modules/courses/shixunHomework/Guide.js b/public/react/src/modules/courses/shixunHomework/Guide.js index d501b2ab5..d93961518 100644 --- a/public/react/src/modules/courses/shixunHomework/Guide.js +++ b/public/react/src/modules/courses/shixunHomework/Guide.js @@ -21,6 +21,7 @@ class Guide extends Component { } componentDidMount() { + console.log("GuideGuideGuideGuide加载了") // 1366x768 // var mywidthone=7; @@ -59,7 +60,7 @@ class Guide extends Component { page:i, }) if(i===7){ - this.props.setwindowlocal(true); + this.props.setwindowlocal(false); } } render() { From 10a889388edc31395fd5c5d289d3db962d3d25b5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 13 Aug 2019 11:05:24 +0800 Subject: [PATCH 17/20] console --- public/react/src/common/UrlTool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js index f224526e6..1a910f224 100644 --- a/public/react/src/common/UrlTool.js +++ b/public/react/src/common/UrlTool.js @@ -13,7 +13,7 @@ export function getImageUrl(path) { export function setImagesUrl(path){ const local = 'http://47.96.87.25:48080' let firstStr=path.substr(0,1); - console.log(firstStr); + // console.log(firstStr); if(firstStr=="/"){ return isDev?`${local}${path}`:`${path}`; }else{ From e8a06972566b723db26d8c361121bdb09b660a8d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 13 Aug 2019 11:07:37 +0800 Subject: [PATCH 18/20] error --- public/react/src/App.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/react/src/App.js b/public/react/src/App.js index e71ce4a9a..8004e05f8 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -274,6 +274,11 @@ class App extends Component { // }, (error) => { // //TODO 这里如果样式变了会出现css不加载的情况 // }); + + window.addEventListener('error', (event) => { + const msg = `${event.type}: ${event.message}`; + console.log(msg) + }); } //修改登录方法 Modifyloginvalue=()=>{ From 746cfef99323d17d03eef50e1ad412a23c53e143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 13 Aug 2019 11:44:09 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/ListPageIndex.js | 37 ++++++++++++------- .../src/modules/courses/new/CoursesNew.js | 9 +++-- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/public/react/src/modules/courses/ListPageIndex.js b/public/react/src/modules/courses/ListPageIndex.js index 39eeaf115..9c1923452 100644 --- a/public/react/src/modules/courses/ListPageIndex.js +++ b/public/react/src/modules/courses/ListPageIndex.js @@ -69,16 +69,20 @@ class ListPageIndex extends Component{ super(props); this.state={ yslGuideone:undefined, + mysearch:undefined, } } componentDidMount(){ - var yslGuideone = window.localStorage.getItem('yslGuideone'); + var yslGuideone = window.sessionStorage.getItem('yslGuideone'); console.log("77"); console.log(yslGuideone); + var mysearchs= this.props.location.search===""?undefined:this.props.location.search===undefined?undefined:this.props.location.search==="?exhibition=true"?true:undefined; this.setState({ yslGuideone:yslGuideone, + mysearch:mysearchs, }) + } // // getleftNavid=(navid,newselectnavid)=>{ @@ -89,37 +93,42 @@ class ListPageIndex extends Component{ // }) // } componentWillUnmount(){ - window.localStorage.setItem('yslGuideone', false); - + window.sessionStorage.setItem('yslGuideone', false); } setwindowlocal=(bool)=>{ - window.localStorage.setItem('yslGuideone', bool); + window.sessionStorage.setItem('yslGuideone', bool); this.setState({ yslGuideone:bool, - }) + mysearch:undefined, + }); + var currenturl = this.props.location.pathname; + var newUrl = (currenturl.split("?"))[0]; + window.history.pushState('','',newUrl); } render() { - let {yslGuideone} =this.state; - console.log("98"); - console.log(yslGuideone); - console.log(this.props.isAdmin()); - var yslGuideones = window.localStorage.getItem('yslGuideone'); + let {yslGuideone,mysearch} =this.state; + // console.log("98"); + // console.log(yslGuideone); + // console.log(this.props.isAdmin()); + // // var yslGuideones = window.sessionStorage.getItem('yslGuideone'); + // console.log(this.props); + // console.log(this.props.location.search); return (
    {/*头部banner*/} - {yslGuideones!==undefined? + {mysearch!==undefined? ( - yslGuideones===true? + mysearch===true? this.setwindowlocal(b)} > :"" - ) - :"" + ) + :"" }
    diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index beb3c74a9..7dcc9bce7 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -205,8 +205,9 @@ class CoursesNew extends Component { // debugger if (response.data.status === 0) { // this.goback() - window.location.href=first_category_url; - window.localStorage.setItem('yslGuideone', true); + + window.location.href=first_category_url+"?exhibition=true"; + window.sessionStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) @@ -250,8 +251,8 @@ class CoursesNew extends Component { ).then((response) => { if (response.status === 200) { // this.goback - window.location.href=response.data.first_category_url; - window.localStorage.setItem('yslGuideone', true); + window.location.href=response.data.first_category_url+"?exhibition=true"; + window.sessionStorage.setItem('yslGuideone', true); } }).catch((error) => { console.log(error) From 3ccb0a5e266fe8904f61e1887718077b0f784bb2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 13 Aug 2019 12:22:42 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E8=B0=83=E8=AF=95?= 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 75d515186..223871968 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -598,7 +598,7 @@ class CoursesController < ApplicationController normal_status(0, "操作成功") rescue => e uid_logger_error(e.message) - tip_exception("操作失败") + tip_exception(e.message) raise ActiveRecord::Rollback end end