diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index b372eb2c0..064061058 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -82,8 +82,8 @@ class SubjectsController < ApplicationController @is_creator = current_user.creator_of_subject?(@subject) # 合作团队 @members = @subject.subject_members.includes(:user) - shixun_ids = @subject.shixuns.published.pluck(:id) - challenge_ids = Challenge.where(shixun_id: shixun_ids).pluck(:id) + @shixuns = @subject.shixuns.published.pluck(:id) + challenge_ids = Challenge.where(shixun_id: @shixuns).pluck(:id) # 实训路径中的所有实训标签 @tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq # 用户获取的实训标签 diff --git a/app/helpers/subjects_helper.rb b/app/helpers/subjects_helper.rb index f0ecd1174..c464c7a7e 100644 --- a/app/helpers/subjects_helper.rb +++ b/app/helpers/subjects_helper.rb @@ -1,10 +1,10 @@ module SubjectsHelper # 实训路径的发布状态 - def publish_status subject, is_manager, user + def publish_status subject, is_manager, user, shixuns status = -1 if is_manager - status = 0 if subject.status == 0 && subject.shixuns_count > 0 + status = 0 if subject.status == 0 && shixuns.count > 0 status = 1 if subject.status == 1 status = 2 if subject.status == 2 && user.admin? end diff --git a/app/views/homework_commons/group_list.json.jbuilder b/app/views/homework_commons/group_list.json.jbuilder index b5fead17e..aa951bf7d 100644 --- a/app/views/homework_commons/group_list.json.jbuilder +++ b/app/views/homework_commons/group_list.json.jbuilder @@ -7,7 +7,7 @@ json.group_list do end end # 未分班展示情况放在最后 -if @course_groups.count != (@page -1)*@limit.to_i && @course_groups.count < @limit.to_i +if @course_groups.count != (@page.to_i - 1)*@limit.to_i && @course_groups.count < @limit.to_i ungroup_work_count = homework_ungroup_works_count(@homework, @ungroup_user_ids) if ungroup_work_count > 0 json.ungroup_list do diff --git a/app/views/subjects/show.json.jbuilder b/app/views/subjects/show.json.jbuilder index 14eb1942f..cafb08942 100644 --- a/app/views/subjects/show.json.jbuilder +++ b/app/views/subjects/show.json.jbuilder @@ -6,7 +6,7 @@ json.subject_score @subject.all_score json.member_count @subject.member_count json.allow_delete @is_creator && (@subject.status != 2 || @user.admin?) -json.publish_status publish_status(@subject, @is_creator, @user) +json.publish_status publish_status(@subject, @is_creator, @user, @shixuns) json.allow_statistics @user.manager_of_subject?(@subject) json.allow_send @user.logged? json.allow_visit @user.manager_of_subject?(@subject) || @user.admin? || @subject.status > 1 diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js index 0abd707af..7b9795e80 100644 --- a/public/react/config/webpack.config.prod.js +++ b/public/react/config/webpack.config.prod.js @@ -301,8 +301,8 @@ module.exports = { }, warnings: false, compress: { - drop_debugger: false, - drop_console: false + drop_debugger: true, + drop_console: true } } }), diff --git a/public/react/src/common/TextUtil.js b/public/react/src/common/TextUtil.js index c711143d2..bd524c4a9 100644 --- a/public/react/src/common/TextUtil.js +++ b/public/react/src/common/TextUtil.js @@ -6,6 +6,9 @@ export function isImageExtension(fileName) { export function markdownToHTML(oldContent, selector) { window.$('#md_div').html('') // markdown to html + try { + + var markdwonParser = window.editormd.markdownToHTML("md_div", { markdown: oldContent, emoji: true, @@ -15,6 +18,11 @@ export function markdownToHTML(oldContent, selector) { flowChart: true, // 默认不解析 sequenceDiagram: true // 默认不解析 }); + + } catch(e) { + console.error(e) + } + const content = window.$('#md_div').html() if (selector) { window.$(selector).html(content) diff --git a/public/react/src/modules/courses/Index.js b/public/react/src/modules/courses/Index.js index 27424821f..017a36765 100644 --- a/public/react/src/modules/courses/Index.js +++ b/public/react/src/modules/courses/Index.js @@ -18,7 +18,7 @@ const ListPageIndex = Loadable({ //课堂首页 const CoursesHome = Loadable({ - loader: () => import('./coursesHome/coursesHome'), + loader: () => import('./coursesHome/CoursesHome'), loading:Loading, }) diff --git a/public/react/src/modules/courses/coursesHome/coursesHome.js b/public/react/src/modules/courses/coursesHome/CoursesHome.js similarity index 97% rename from public/react/src/modules/courses/coursesHome/coursesHome.js rename to public/react/src/modules/courses/coursesHome/CoursesHome.js index 994e14eb9..3f4b4ad12 100644 --- a/public/react/src/modules/courses/coursesHome/coursesHome.js +++ b/public/react/src/modules/courses/coursesHome/CoursesHome.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import {getImageUrl} from 'educoder'; -import CoursesHomeCard from "./coursesHomeCard.js" +import CoursesHomeCard from "./CoursesHomeCard.js" import axios from 'axios'; import {Input,Tooltip} from 'antd'; import UpgradeModals from '../../modals/UpgradeModals'; @@ -10,7 +10,7 @@ import '@icedesign/base/lib/pagination/style.js'; const Search = Input.Search; -class coursesHome extends Component{ +class CoursesHome extends Component{ constructor(props) { super(props) this.state = { @@ -160,7 +160,7 @@ class coursesHome extends Component{ ) } } -export default coursesHome; +export default CoursesHome; // {/**/} \ No newline at end of file diff --git a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js similarity index 98% rename from public/react/src/modules/courses/coursesHome/coursesHomeCard.js rename to public/react/src/modules/courses/coursesHome/CoursesHomeCard.js index 2f65c622f..cd671cbe4 100644 --- a/public/react/src/modules/courses/coursesHome/coursesHomeCard.js +++ b/public/react/src/modules/courses/coursesHome/CoursesHomeCard.js @@ -4,7 +4,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom"; import {Tooltip,Spin,Alert} from 'antd'; import ShowSpin from '../../../common/ShowSpin'; -class coursesHomeCard extends Component{ +class CoursesHomeCard extends Component{ constructor(props) { super(props) } @@ -134,5 +134,5 @@ class coursesHomeCard extends Component{ ) } } -export default coursesHomeCard; +export default CoursesHomeCard; diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index afba47723..56cecc51b 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -29,11 +29,13 @@ class ShixunModal extends Component{ axios.get(url).then((result)=>{ if(result.status===200){ - this.setState({ - shixunmodallist:result.data, - hometypepvisible:false, - newshixunmodallist:result.data.shixun_list, - }) + if(result.data.message===undefined){ + this.setState({ + shixunmodallist:result.data, + hometypepvisible:false, + newshixunmodallist:result.data.shixun_list, + }) + } } }).catch((error)=>{ console.log(error); @@ -59,18 +61,18 @@ class ShixunModal extends Component{ } }).then((result)=>{ if(result.status===200){ + if(result.data.message===undefined){ + let shixun_list = result.data.shixun_list; + for (var i = 0; i < shixun_list.length; i++) { + newshixunmodallists.push(shixun_list[i]) + } + this.setState({ + shixunmodallist: result.data, + newshixunmodallist: newshixunmodallists, + hometypepvisible: false + }) - let shixun_list=result.data.shixun_list; - for(var i=0; i{ diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 99c190063..291095008 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -1203,14 +1203,14 @@ class GraduationTaskssettinglist extends Component{ {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length!=0?
  • 分班情况： - - this.groupgroup([])}>不限 - + this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{width: '1000px', paddingTop: '4px'}}> + + this.groupgroup([])}>不限 + - this.groupgroup(e,taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.length)} style={{ paddingTop: '4px'}}> {taskslistdata.search_assistants&&taskslistdata.search_assistants.course_group_info.map((item,key)=>{ return( - + {item.group_group_name} ({item.count}) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 1807d956c..3865ee153 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2490,7 +2490,7 @@ class Listofworksstudentone extends Component {
    -

    没有数据可以显示.！

    +

    没有数据可以显示！

    @@ -2702,7 +2702,7 @@ class Listofworksstudentone extends Component {
    -

    没有数据可以显示,,！

    +

    没有数据可以显示！

    @@ -2892,7 +2892,7 @@ class Listofworksstudentone extends Component {
    -

    没有数据可以显示..！

    +

    没有数据可以显示！

    diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index f15ec9f87..91edc45fe 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -59,15 +59,15 @@ class ShixunHomeworkPage extends Component { // console.log(teacherdata); this.setState({ - jobsettingsdatapage: jobsettingsdata, - teacherdatapage: teacherdata, - code_review: teacherdata.code_review, - view_report: teacherdata.view_report, + jobsettingsdatapage: jobsettingsdata.data.message!==undefined?undefined:jobsettingsdata, + teacherdatapage: teacherdata.message!==undefined?undefined:teacherdata, + code_review: teacherdata.code_review!==undefined?teacherdata.code_review :false, + view_report: teacherdata.view_report!==undefined? teacherdata.view_report:false, }) } componentDidMount() { - console.log("父组件加载框"); + // console.log("父组件加载框"); const query = this.props.location.search; const type = query.split('?tab='); // let sum = [] @@ -116,7 +116,9 @@ class ShixunHomeworkPage extends Component { let {tab, teacherdatapage, jobsettingsdatapage} = this.state; const isAdmin = this.props.isAdmin(); - + // console.log(119) + // console.log(jobsettingsdatapage); + // console.log(teacherdatapage); return (
    diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index b60cb8261..f1d1c43f3 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -1,6 +1,7 @@ import React,{ Component } from "react"; import { Modal,Checkbox,notification} from "antd"; import axios from 'axios'; +import {getImageUrl} from 'educoder'; class ShixunWorkModal extends Component{ constructor(props){ @@ -251,6 +252,18 @@ class ShixunWorkModal extends Component{ {course_groups===undefined?"": + group_list===undefined||JSON.stringify(group_list)==="[]" + ? +
    +
    +
    + +

    没有数据可以显示！

    +
    +
    + +
    + :
      @@ -258,7 +271,9 @@ class ShixunWorkModal extends Component{ { - group_list===undefined?"": + group_list===undefined||JSON.stringify(group_list)==="[]"? + "" + : group_list&&group_list.length===0?"":group_list.map((item,key)=>{ return(
      diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 3a401c7de..d587dc337 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -317,15 +317,18 @@ class LoginDialog extends Component { }); } handleDialogClose = () => { - if(this.props.match===undefined){ - window.location.href="/"; - }else if(this.props.match.path==="/"){ - this.setState({ - isRender: false - }) - }else{ - window.location.href="/"; - } + // if(this.props.match===undefined){ + // window.location.href="/"; + // }else if(this.props.match.path==="/"){ + // this.setState({ + // isRender: false + // }) + // }else{ + // window.location.href="/"; + // } + this.setState({ + isRender: false + }) } loginEDU=()=>{ diff --git a/public/react/src/modules/paths/PathDetail/sendPanel.js b/public/react/src/modules/paths/PathDetail/sendPanel.js index ff8bfc6c9..84c7d8e23 100644 --- a/public/react/src/modules/paths/PathDetail/sendPanel.js +++ b/public/react/src/modules/paths/PathDetail/sendPanel.js @@ -2,6 +2,7 @@ import React,{ Component } from "react"; import { Modal,Radio,Input,Tooltip,Checkbox,Select, Row,Col } from "antd"; import axios from 'axios'; import { SnackbarHOC } from 'educoder'; +import moment from 'moment'; import Modals from '../../modals/Modals'; const Option = Select.Option; const CheckboxGroup = Checkbox.Group; @@ -148,14 +149,16 @@ class sendPanel extends Component{ destroyOnClose={true} >
      -
      +
      diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 866ca3583..5efadc1d1 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -597,7 +597,7 @@ class TPMBanner extends Component {
    - +
    学员评分
    diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js index 184b6313a..956e652c8 100644 --- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js +++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js @@ -236,9 +236,7 @@ class Newshixuns extends Component { let newshixunUrl = `/shixuns/new.json`; axios.get(newshixunUrl).then((response) => { if (response.status === 200) { - if (response.data.status === 403 || response.data.status === 401 || response.data.status === 500) { - - } else { + if (response.data.message===undefined) { this.setState({ newshixunlist: response.data }); diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 1935f2053..85b0920e0 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -470,11 +470,10 @@ class Challenges extends Component {
    - {item.passed_count} 人完成挑战 + {item.passed_count} 人完成挑战 {item.playing_count} 人正在挑战 - 经验值 {item.score} + className="task-colspan">{item.playing_count} 人正在挑战 + 完成挑战可获得经验值 {item.score} {/*判断比较复杂 有排第一不能是灰色按钮*/} diff --git a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css index 2f68f2fbb..b3233f641 100644 --- a/public/react/src/modules/tpm/shixuns/css/TPMBanner.css +++ b/public/react/src/modules/tpm/shixuns/css/TPMBanner.css @@ -1,101 +1,103 @@ -.shixunsdiffcult{ - width: 40px; - height: 21px; - overflow: hidden; - margin-left: 8px; - } - - .rateYo{ - text-align: center; - cursor: default; - width: 90px; - } - - a:link, a:visited { - color: #05101a; -} - -a:link{text-decoration:none;} - -a:visited{text-decoration:none;} - -a:hover{text-decoration:none;} - -a:active{text-decoration:none;} - - -.next-rating-overlay .next-icon{ - color: #FFA800!important; -} - -.displayblock{ - display:block; - text-align: center; - margin-bottom: 20px; -} - -.totalScore{ - justify-content: center; - align-items: center; - display: -webkit-flex; - height: 100%; -} - -.next-progress-line{ - width: 210px !important; - margin-left: 10px; - margin-top: 4px; -} - -.next-progress-line-overlay-normal{ - background-color: #FFA800 !important; -} -.next-rating-base-disabled{ - cursor: default!important; -} -/*#challenge_begin {*/ -/*!*height: 40px !important;*!*/ -/*line-height: 30px;*/ -/*}*/ -.ant-modal-title{ - font-size: 16px; - font-weight: bold !important; - color: #333; -} - -.ml60{ - margin-left:20px; -} - -.marginauto{ - margin:0 auto; -} -.margin152{ - margin-left: 152px; -} - -.margin-tp26{ - margin-top: -26px; -} -.edu-h315{ - height:315px; -} - -.height39 { - height: 39px !important; -} -#commentsStar{ - margin-top:33px; -} -.startbtnModal .ant-modal-content{ - background: transparent; - box-shadow: 0 4px 12px transparent; -} - -.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{ - margin-left: 45%; -} - -.mr51{ - margin-right:51px; +.shixunsdiffcult{ + width: 40px; + height: 21px; + overflow: hidden; + margin-left: 8px; + } + + .rateYo{ + text-align: center; + cursor: default; + width: 90px; + } + + a:link, a:visited { + color: #05101a; +} + +a:link{text-decoration:none;} + +a:visited{text-decoration:none;} + +a:hover{text-decoration:none;} + +a:active{text-decoration:none;} + + +.next-rating-overlay .next-icon{ + color: #FFA800!important; +} + +.displayblock{ + display:block; + text-align: center; + margin-bottom: 20px; +} + +.totalScore{ + justify-content: center; + align-items: center; + display: -webkit-flex; + height: 100%; +} + +.next-progress-line{ + width: 210px !important; + margin-left: 10px; + margin-top: 4px; +} + +.next-progress-line-overlay-normal{ + background-color: #FFA800 !important; +} +.next-rating-base-disabled{ + cursor: default!important; +} +/*#challenge_begin {*/ +/*!*height: 40px !important;*!*/ +/*line-height: 30px;*/ +/*}*/ +.ant-modal-title{ + font-size: 16px; + font-weight: bold !important; + color: #333; +} + +.ml60{ + margin-left:20px; +} + +.marginauto{ + margin:0 auto; +} +.margin152{ + margin-left: 152px; +} + +.margin-tp26{ + margin-top: -26px; +} +.edu-h315{ + height:315px; +} + +.height39 { + height: 39px !important; +} +#commentsStar{ + margin-top: -7px; + width: 90px; + +} +.startbtnModal .ant-modal-content{ + background: transparent; + box-shadow: 0 4px 12px transparent; +} + +.startbtnModal .ant-modal-content .ant-modal-body .ant-spin-spinning{ + margin-left: 45%; +} + +.mr51{ + margin-right:51px; } \ No newline at end of file