From 2a395a901d7990ec78555d8a4284004a2e60f410 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 23 Aug 2019 15:09:16 +0800 Subject: [PATCH 1/6] tiaozheng --- app/models/subject.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/subject.rb b/app/models/subject.rb index 3ec030f80..3c94ad870 100644 --- a/app/models/subject.rb +++ b/app/models/subject.rb @@ -41,7 +41,7 @@ class Subject < ApplicationRecord # 挑战过路径的成员数(金课统计去重后的报名人数) def member_count - excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length > 0 ? + excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length > shixuns.pluck(:myshixuns_count).sum ? CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).uniq.length : shixuns.pluck(:myshixuns_count).sum end From dd2e6f5565ab55f390eb8b1c6258757770602538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 23 Aug 2019 15:10:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesPublic/Addcourses.js | 14 ++-- .../react/src/modules/courses/poll/PollNew.js | 83 ++++++++++++++++--- .../courses/shixunHomework/shixunHomework.js | 4 +- 3 files changed, 82 insertions(+), 19 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js index a4599bffb..f03608c8b 100644 --- a/public/react/src/modules/courses/coursesPublic/Addcourses.js +++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js @@ -48,8 +48,8 @@ class Addcourses extends Component{ } componentDidUpdate = (prevProps) => { - console.log(prevProps); - console.log(this.props); + // console.log(prevProps); + // console.log(this.props); if(prevProps.occupation!==this.props.occupation){ this.setState({ Addcoursestype:false, @@ -222,8 +222,8 @@ class Addcourses extends Component{ student:student } ).then((response) => { - console.log("submittojoinclass"); - console.log(response); + // console.log("submittojoinclass"); + // console.log(response); if(response === undefined){ this.setState({ // Addcoursestype:false, @@ -302,7 +302,7 @@ class Addcourses extends Component{ isSpin:false }); }).catch((error) => { - console.log(error) + console.log(error); this.setState({ Addcoursestype:false, isSpin:false @@ -326,8 +326,8 @@ class Addcourses extends Component{ Addcoursestypes }=this.state; const antIcon = ; - console.log("Addcourses"); - console.log(Addcoursestypes) + // console.log("Addcourses"); + // console.log(Addcoursestypes) return(
{ + console.log("调用了changeTopicName"); let num = 60 - parseInt(e.target.value.length); this.setState({ addonAfter: num < 0 ? 0 : num @@ -124,8 +127,35 @@ class PollNew extends Component { console.log("问卷返回"); console.log(this.props); + try { + if(this.props.current_user!==undefined){ + this.setState({ + first_category_url :this.props.current_user.first_category_url, + }); + console.log("======================="); + console.log(this.props.current_user.first_category_url); + } + }catch (e) { + console.log("12312312312") + console.log(e); + } + }; + componentDidUpdate = (prevProps) => { + // console.log("componentDidUpdate"); + // console.log(prevProps); + // console.log(this.props); + if(prevProps.current_user!=this.props.current_user){ + if(this.props.current_user!==undefined){ + // console.log(this.props.current_user.login); + // console.log(prevProps.current_user.login); + this.setState({ + first_category_url :this.props.current_user.first_category_url, + }) + } + } } + //获取权限 // getPollInfo(){ // // console.log(this.props.match); @@ -144,12 +174,12 @@ class PollNew extends Component { // } //初始化请求网络 Initializatio_data = () => { - // console.log("Initializatio_data 582") + console.log("Initializatio_data 582") //课堂id let coursesId = this.props.match.params.coursesId; //时间id let pollid = this.props.match.params.pollid; - // console.log(pollid); + console.log(pollid); // let coursesId = 557; if (pollid === undefined) { // console.log("没有问卷新建问卷~~~") @@ -215,6 +245,19 @@ class PollNew extends Component { polls_nametest: result.data.poll.polls_name, polls_descriptiontest: result.data.poll.polls_description, }); + + if(result.data){ + if(result.data.poll){ + if(result.data.poll.polls_name){ + let num = 60 - parseInt(result.data.poll.polls_name.length); + this.setState({ + addonAfter: num < 0 ? 0 : num + }) + } + } + + } + this.setState({ projects: result.data, pollid: pollid, @@ -229,6 +272,7 @@ class PollNew extends Component { polls_nametest: result.data.poll.polls_name, polls_descriptiontest: result.data.poll.polls_description, questionnair: true, + left_banner_id:result.data.left_banner_id }) // console.log(this.state.polls_nametest) // console.log(this.state.polls_descriptiontest) @@ -2338,10 +2382,13 @@ class PollNew extends Component { } gotohome=()=>{ // const { current_user} = this.props + if(this.state.first_category_url){ + window.location.href=this.state.first_category_url; + }else{ + this.props.history.goBack(); + } - // this.props.history.push(current_user && current_user.first_category_url); // - this.props.history.goBack() // let courseId=this.props.match.params.coursesId; // if(courseId===undefined){ // this.props.history.push("/courses"); @@ -2360,6 +2407,7 @@ class PollNew extends Component { readOnlys, newoption, cancellation, + left_banner_id } = this.state //获取老师权限 // console.log("[`${maps[polls_status && polls_status]}`]]"); @@ -2404,16 +2452,30 @@ class PollNew extends Component {

this.gotohome()}>{this.props.coursedata.name} > - 问卷 + { + this.props.match.params.news === "new"? + 问卷 + : + 问卷 + } + > {this.props.match.params.news === undefined ? "新建" : this.props.match.params.news === "new" ? "新建" : "编辑"}

{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}

- this.gotohome()} - className=" fr font-16">返回 + { + this.props.match.params.news === "new" ? + 返回 + : + 返回 + } +
{/*
*/} @@ -2461,12 +2523,13 @@ class PollNew extends Component { }
- + {/*addonAfter={String(addonAfter)}*/} diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 71fd8744e..74d142129 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -1019,8 +1019,8 @@ class ShixunHomework extends Component{

- {/*{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}*/} - 实训作业 + {datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"} + {/* 实训作业*/}

  • {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null? From bbe1c4a5eb24e00b65c1dbbc9ec47e1c400f4bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 23 Aug 2019 15:26:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/gradinforms/Eduinforms.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/gradinforms/Eduinforms.js b/public/react/src/modules/courses/gradinforms/Eduinforms.js index aef54ab13..777f04bc6 100644 --- a/public/react/src/modules/courses/gradinforms/Eduinforms.js +++ b/public/react/src/modules/courses/gradinforms/Eduinforms.js @@ -149,7 +149,7 @@ class Eduinforms extends Component{
    • :
    -
    +
    From 6c19c8d213fd85992941c0899506763066ba9dfc Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Fri, 23 Aug 2019 15:27:12 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/exercise/ExerciseReviewAndAnswer.js | 8 +++++++- .../src/modules/courses/exercise/question/shixunAnswer.js | 2 +- public/react/src/modules/courses/poll/PollDetailIndex.js | 2 +- public/react/src/modules/courses/poll/PollInfo.js | 2 +- public/react/src/modules/courses/poll/PollNew.js | 6 ++++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js index 91ca19e7d..cdbc7218b 100644 --- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js +++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js @@ -479,6 +479,12 @@ class ExerciseReviewAndAnswer extends Component{ }) } + // 返回 + returnBtn = () =>{ + let coursesId=this.props.match.params.coursesId; + let eId=this.props.match.params.Id; + this.props.history.push(`/courses/${coursesId}/exercises/${eId}/student_exercise_list?tab=0`) + } render(){ let coursesId=this.props.match.params.coursesId; @@ -561,7 +567,7 @@ class ExerciseReviewAndAnswer extends Component{ { (isAdmin || ( isStudent && exercise && user_exercise_status == 1)) ? - this.props.history.goBack()}>返回 + 返回 : time && time != 0 ?
    diff --git a/public/react/src/modules/courses/exercise/question/shixunAnswer.js b/public/react/src/modules/courses/exercise/question/shixunAnswer.js index 64e4214fa..cdffe08b8 100644 --- a/public/react/src/modules/courses/exercise/question/shixunAnswer.js +++ b/public/react/src/modules/courses/exercise/question/shixunAnswer.js @@ -316,7 +316,7 @@ class shixunAnswer extends Component{ 第{item[0].position}关 - + {item[0].name} diff --git a/public/react/src/modules/courses/poll/PollDetailIndex.js b/public/react/src/modules/courses/poll/PollDetailIndex.js index a141db961..e92a0e352 100644 --- a/public/react/src/modules/courses/poll/PollDetailIndex.js +++ b/public/react/src/modules/courses/poll/PollDetailIndex.js @@ -136,7 +136,7 @@ class PollDetailIndex extends Component{ - this.props.history.goBack()}>返回 + 返回

    diff --git a/public/react/src/modules/courses/poll/PollInfo.js b/public/react/src/modules/courses/poll/PollInfo.js index bce3d2753..2476e0bc3 100644 --- a/public/react/src/modules/courses/poll/PollInfo.js +++ b/public/react/src/modules/courses/poll/PollInfo.js @@ -327,7 +327,7 @@ class PollInfo extends Component{ {poll && poll.polls_name} { - isAdmin || (poll && poll.user_poll_status == 1) ? this.props.history.goBack()}>返回 :'' + isAdmin || (poll && poll.user_poll_status == 1) ? 返回 :'' }

    diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index ce602afc3..f8163b6a4 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -1,6 +1,9 @@ import React, {Component} from "react"; import {Form, Input, Tooltip, Checkbox, Radio, Select, message, Modal, Button} from 'antd' import {WordsBtn, ActionBtn} from 'educoder' + +import {Link} from 'react-router-dom' + import '../css/members.css' import "../common/formCommon.css" @@ -2412,8 +2415,7 @@ class PollNew extends Component {

    {this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}

    - this.gotohome()} - className=" fr font-16">返回 + 返回
    {/**/} From f80ed2fb2f54a2dce94c429b97b94bcd97efc63e Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 23 Aug 2019 15:28:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E7=9B=AE=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/homework_common.rb | 5 +++++ .../_homework_public_navigation.json.jbuilder | 1 + 2 files changed, 6 insertions(+) diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index 332aff045..790a9b7ab 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -80,6 +80,11 @@ class HomeworkCommon < ApplicationRecord end end + # 实训作业的主目录信息 + def main_category_info + {category_id: course.shixun_course_modules.take.try(:id), category_name: course.shixun_course_modules.take.try(:module_name)} + end + # 根据是否统一发布获取作业的作品列表 def all_works student_works = self.unified_setting ? self.student_works : diff --git a/app/views/homework_commons/_homework_public_navigation.json.jbuilder b/app/views/homework_commons/_homework_public_navigation.json.jbuilder index 243c6aecd..b5067e3c7 100644 --- a/app/views/homework_commons/_homework_public_navigation.json.jbuilder +++ b/app/views/homework_commons/_homework_public_navigation.json.jbuilder @@ -2,6 +2,7 @@ json.course_id course.id json.course_name course.name json.is_end course.is_end json.category homework.category_info +json.main_category homework.main_category_info if homework.homework_type == "practice" member = course.course_members.find_by(user_id: user.id, is_active: 1) curr_status = homework_curr_status(homework, user.course_identity(course), course, member, member&.teacher_course_groups) json.homework_status curr_status[:status] From 2e5f34decc53679a491437491991fe35dfd16800 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Fri, 23 Aug 2019 15:37:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?addonafter=E6=9B=BF=E6=8D=A2=E4=B8=BAsuffix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/boards/BoardsNew.js | 2 +- public/react/src/modules/courses/busyWork/NewWork.js | 2 +- public/react/src/modules/courses/exercise/ExerciseNew.js | 2 +- .../modules/courses/graduation/tasks/GraduationTasksedit.js | 2 +- .../modules/courses/graduation/tasks/GraduationTasksnew.js | 2 +- .../src/modules/courses/graduation/topics/GraduateTopicNew.js | 2 +- public/react/src/modules/courses/poll/PollNew.js | 4 ++-- .../react/src/modules/user/usersInfo/video/EditVideoModal.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index d2b218f3d..b02f6a73f 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -350,7 +350,7 @@ class BoardsNew extends Component{ }], })( + onInput={this.changeTitle} suffix={`${title_num}/${MAX_TITLE_LENGTH}`} /> )} diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js index 83e792d68..ca79e8ac5 100644 --- a/public/react/src/modules/courses/busyWork/NewWork.js +++ b/public/react/src/modules/courses/busyWork/NewWork.js @@ -399,7 +399,7 @@ class NewWork extends Component{ required: true, message: '请输入标题' }], })( - + )}