Merge remote-tracking branch 'origin/master'

public/react/src/common/Const.js

@@ -1,7 +1,19 @@
+/** 
+EDU_ADMIN = 1       # 超级管理员
+EDU_BUSINESS = 2    # 运营人员
+EDU_SHIXUN_MANAGER = 3 # 实训管理员
+EDU_SHIXUN_MEMBER = 4  # 实训成员
+EDU_CERTIFICATION_TEACHER = 5 # 平台认证的老师
+EDU_GAME_MANAGER = 6     # TPI的创建者
+EDU_TEACHER = 7 # 平台老师,但是未认证
+EDU_NORMAL = 8  # 普通用户
+*/ 
+
 export const EDU_ADMIN = 1       // 超级管理员
-export const EDU_SHIXUN_MANAGER = 2 // 实训管理员
+export const EDU_BUSINESS = 2    // # 运营人员
-export const EDU_SHIXUN_MEMBER = 3  // 实训成员
+export const EDU_SHIXUN_MANAGER = 3 // 实训管理员
-export const EDU_CERTIFICATION_TEACHER = 4 // 平台认证的老师
+export const EDU_SHIXUN_MEMBER = 4  // 实训成员
-export const EDU_GAME_MANAGER = 5     // TPI的创建者
+export const EDU_CERTIFICATION_TEACHER = 5 // 平台认证的老师
-export const EDU_TEACHER = 6 // 平台老师,但是未认证
+export const EDU_GAME_MANAGER = 6     // TPI的创建者
-export const EDU_NORMAL = 7  // 普通用户
+export const EDU_TEACHER = 7 // 平台老师,但是未认证
+export const EDU_NORMAL = 8  // 普通用户

public/react/src/common/educoder.js

@@ -24,7 +24,7 @@ export { toStore as toStore, fromStore as fromStore } from 	'./Store'
 
 export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info_c, warn_c, error_c } from 	'./LogUtil'
 
-export { EDU_ADMIN, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
+export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
     , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 	'./Const'
 
 export { ModalHOC } from 	'./components/ModalHOC'

public/react/src/context/TPIContextProvider.js

@@ -32,7 +32,7 @@ import _ from 'lodash'
 
 import TPIContext from './TPIContext'
 import { EDU_ADMIN, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
-    , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 'educoder'
+    , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL, EDU_BUSINESS} from 'educoder'
 import { MuiThemeProvider, createMuiTheme, withStyles } from 'material-ui/styles';
 import MUIDialogStyleUtil from '../modules/page/component/MUIDialogStyleUtil'
 
@@ -447,6 +447,18 @@ pop_box_new(htmlvalue, 480, 182);
 		// const EDU_TEACHER = 6 // 平台老师,但是未认证
 		// const EDU_NORMAL = 7  // 普通用户
 
+
+		/** 
+		    EDU_ADMIN = 1       # 超级管理员
+			EDU_BUSINESS = 2    # 运营人员
+			EDU_SHIXUN_MANAGER = 3 # 实训管理员
+			EDU_SHIXUN_MEMBER = 4  # 实训成员
+			EDU_CERTIFICATION_TEACHER = 5 # 平台认证的老师
+			EDU_GAME_MANAGER = 6     # TPI的创建者
+			EDU_TEACHER = 7 # 平台老师,但是未认证
+			EDU_NORMAL = 8  # 普通用户
+		*/ 
+
 		// myshixun_manager power is_teacher
 		resData.power = 0
 		resData.myshixun_manager = false
@@ -455,6 +467,9 @@ pop_box_new(htmlvalue, 480, 182);
 		if (resData.user.identity === EDU_ADMIN) {
 			resData.power = 1
 			resData.myshixun_manager = true
+		} else if (resData.user.identity === EDU_BUSINESS) {
+			resData.power = 1
+			resData.myshixun_manager = true
 		} else if (resData.user.identity === EDU_SHIXUN_MANAGER) {
 			resData.power = 1
 			resData.myshixun_manager = true

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -209,7 +209,7 @@ class CommonWorkAppraise extends Component{
               { update_time &&
               <React.Fragment>
                 <span className={"color9B9B fr"}>更新</span>
-                <span className={"fr font-13 mr10 ml10"}>{update_user_name}</span>
+                <span className={"fr font-14 mr10 ml10"}>{update_user_name}</span>
                 <span className={"color9B9B fr"}>
                   {moment(update_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(update_time).format('YYYY-MM-DD HH:mm')}
                 </span>
@@ -218,7 +218,7 @@ class CommonWorkAppraise extends Component{
               { commit_time &&
               <React.Fragment>
                 <span className={"color9B9B fr mr30"}>提交</span>
-                <span className={"fr font-13 mr10 ml10"}>{author_name}</span>
+                <span className={"fr font-14 mr10 ml10"}>{author_name}</span>
                 <span className={" color9B9B fr"}>
                   {moment(commit_time).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(commit_time).format('YYYY-MM-DD HH:mm')}
                 </span>

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -31,7 +31,9 @@ function renderScore(score, content) {
   } else if (score >= 60) {
     color = '#FF6800'
   }
-  return <a href="javascript:;"  style={{ color, minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>{score == '--' ? '--': (content || score)}</a>
+  return <a href="javascript:;"  style={{ color, minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
+      {score == null || score == undefined || score == '--' ? '--': (content || score)}
+    </a>
 }
 function getScoreTip(score, dom) {
   return score == '--' ? '未评分' : score == '**' ? '未公开' : dom
@@ -51,7 +53,7 @@ function buildColumns(that, student_works) {
   const isAdmin = that.props.isAdmin()
   const isAdminOrStudent = that.props.isAdminOrStudent()
   const isStudent = that.props.isStudent()
-  const isNiPing = homework_status.indexOf('匿评中') != -1
+  const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1
   // https://www.trustie.net/issues/21450   分组作业作品列表 学时视角，匿评阶段的列表显示信息不正确
   const niPingAndIsStudent = isStudent && isNiPing
 
@@ -84,7 +86,7 @@ function buildColumns(that, student_works) {
   }]
   if (!niPingAndIsStudent) {
     columns.push({
-      width: 180,
+      width: 88,
       title: '学号',
       dataIndex: 'student_id',
       key: 'student_id',
@@ -152,7 +154,7 @@ function buildColumns(that, student_works) {
       </span>
     )},
   }, {
-    width: 133,
+    width: 150,
     title: '更新时间',
     dataIndex: 'update_time',
     key: 'update_time',
@@ -250,9 +252,10 @@ function buildColumns(that, student_works) {
           { !!appeal_all_count && 
             <Tooltip placement="bottom" title={`共有${appeal_all_count}条匿评申诉，${record.appeal_deal_count}条待处理`}>
               <span style={{ minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
-                {`${appeal_all_count}/${record.appeal_deal_count}`}
+                {`${record.appeal_deal_count}/${appeal_all_count}`}
               </span>
             </Tooltip> }
+          { !appeal_all_count && '-/-'}
       </span>
       ),
     })

public/react/src/modules/courses/busyWork/Index.js

@@ -75,12 +75,6 @@ class CoursesWorkIndex extends Component{
                 (props) => (<CommonWorkDetailIndex {...this.props} {...props} {...this.state} />)
               }
             ></Route>
-            <Route exact path="/courses/:coursesId/common_homeworks/new"
-              render={
-                (props) => (<NewWork {...this.props} {...props} {...this.state} />)
-              }
-            ></Route>
-
             {/* 作业问答 */}
             <Route exact path="/courses/:coursesId/common_homeworks/:workId/question"
               render={
@@ -120,7 +114,7 @@ class CoursesWorkIndex extends Component{
                 (props) => (<NewWork {...this.props} {...props} {...this.state} />)
               }
             ></Route>
-            <Route exact path="/courses/:coursesId/common_homeworks/new"
+            <Route exact path="/courses/:coursesId/common_homeworks/:categroy_id/new"
               render={
                 (props) => (<NewWork {...this.props} {...props} {...this.state} />)
               }

public/react/src/modules/courses/busyWork/IndexGroup.js

@@ -117,7 +117,7 @@ class CoursesWorkIndex extends Component{
                 (props) => (<NewWork {...this.props} {...props} {...this.state} />)
               }
             ></Route>
-            <Route exact path="/courses/:coursesId/group_homeworks/new"
+            <Route exact path="/courses/:coursesId/group_homeworks/:categroy_id/new"
               render={
                 (props) => (<NewWork {...this.props} {...props} {...this.state} />)
               }

public/react/src/modules/courses/busyWork/PublishRightnow.js

@@ -52,9 +52,9 @@ class PublishRightnow extends Component{
       modalname: isPublish ? "立即发布" : "立即截止",
       modaltype:1,
       visible:true,
-      Topval: isPublish ? "本操作只对“未发布”的对象生效" : "本操作只对“提交中”的对象生效",
+      Topval: isPublish ? "学生将立即收到作业" : "学生将不能再提交作品",
-      Botvalleft: isPublish ? "暂不发布" : "暂不截止",
+      // Botvalleft: isPublish ? "暂不发布" : "暂不截止",
-      Botval: isPublish ? "则通过后续手动设置，定时发布" : "则将根据已设置的截止时间，定时截止",
+      Botval: this.props.fromListPage ? (isPublish ? "本操作只对“未发布”的分班有效" : "本操作只对“提交中”的分班有效") : '',
       starttime: isPublish ? `发布时间：${startMoment.format(dateFormat)}` : '',
 			starttimes:isPublish ? `${startMoment.format(dateFormat)}` : '',
       endtime: isPublish ? `截止时间：${startMoment.add(1, 'months').add(1, 'hours').minutes(0).format(dateFormat)}` : '',

public/react/src/modules/courses/busyWork/common.js

@@ -67,9 +67,9 @@ export function RouteHOC(options = {}) {
           this.props.history.push(`/courses/${_courseId}/${secondName}/${_workId}/${_studentWorkId}/appraise`)
         }
       }
-      toNewPage = (courseId, workId) => {
+      toNewPage = (courseId) => {
         const secondName = this.getModuleName()
-        this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/new`)
+        this.props.history.push(`/courses/${courseId.coursesId}/${secondName}/${courseId.category_id}/new`)
       }
       toListPage = (_courseId, _workId) => {
         const secondName = this.getModuleName()

public/react/src/modules/courses/busyWork/commonWork.js

@@ -75,7 +75,6 @@ class commonWork extends Component{
 
   }
   componentDidUpdate(prevProps, prevState) {
-    debugger;
     if (prevProps.match.path != this.props.match.path) {
       this.componentDidMount()
     }
@@ -198,6 +197,7 @@ class commonWork extends Component{
             this.clearSelection()
             let {search,order}=this.state;
             this.getList(1,search,order);
+            this.props.updataleftNavfun()
           }
           console.log(response)
         }).catch((error) => {
@@ -395,11 +395,11 @@ class commonWork extends Component{
                 </li>
                 <li className="li_line">
                   <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
-                      isPublish={true} doWhenSuccess={this.doWhenSuccess}></PublishRightnow>
+                      isPublish={true} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
                 </li>
                 <li className="li_line">
                   <PublishRightnow showActionButton={true} {...this.props} checkBoxValues={checkBoxValues} 
-                     isPublish={false} doWhenSuccess={this.doWhenSuccess}></PublishRightnow>
+                     isPublish={false} doWhenSuccess={this.doWhenSuccess} fromListPage={true}></PublishRightnow>
                 </li>
                 
                 { !!course_public && <li className="li_line"><a href="javascript:void(0)" onClick={this.onSetPublic} className="color-grey-9">设为公开</a></li>}