Merge branch 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun_beta

app/assets/javascripts/admins/identity_authentications/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-identity-authentications-index-page').length > 0) {
     var $searchFrom = $('.identity-authentication-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/assets/javascripts/admins/professional_authentications/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-professional-authentications-index-page').length > 0) {
     var $searchFrom = $('.professional-authentication-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/assets/javascripts/admins/shixun_authorizations/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-authorizations-index-page').length > 0) {
     var $searchFrom = $('.shixun-authorization-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/assets/javascripts/admins/subject_authorizations/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-subject-authorizations-index-page').length > 0) {
     var $searchFrom = $('.subject-authorization-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/controllers/games_controller.rb

@@ -13,8 +13,8 @@ class GamesController < ApplicationController
   def show
     uid_logger("--games show start")
     # 防止评测中途ajaxE被取消;3改成0是为了处理首次进入下一关的问题
-    @game.update_attribute(:status, 0) if @game.status == 1
-    @game.update_attributes(status: 0, open_time: Time.now) if @game.status == 3
+    update_game_parameter(@game)
+
     game_challenge = Challenge.base_attrs.find(@game.challenge_id)
 
     # 选择题类型的实训关卡总分
@@ -964,4 +964,13 @@ class GamesController < ApplicationController
       nil
     end
   end
+
+  # 更新关卡状态和一些学习进度
+  def update_game_parameter game
+    game.update_attribute(:status, 0) if game.status == 1
+    game.update_attributes(status: 0, open_time: Time.now) if game.status == 3
+    # 开启实训更新myshixuns的时间，方便跟踪用于的学习进度。
+    game.myshixun.update_column(:updated_at, Time.now)
+  end
+
 end

app/helpers/subjects_helper.rb

@@ -13,8 +13,13 @@ module SubjectsHelper
 
   # 实训路径的所有用户获得的标签
   def user_shixun_tags challenge_ids, user_id
+    logger.info("#####################")
     ChallengeTag.joins("join games on challenge_tags.challenge_id = games.challenge_id").
       where(challenge_id: challenge_ids, games: {status: 2, user_id: user_id}).pluck("challenge_tags.name").uniq
+    logger.info("#####################")
+    pass_challenge_ids = Game.where(status: 2, user_id: user_id, challenge_id: challenge_ids).pluck(:challenge_id)
+    ChallengeTag.where(challenge_id: pass_challenge_ids).pluck(:name).uniq
+    logger.info("#####################")
   end
 
   # 金课的课堂状态 0：未开课，1：进行中，2：已结束

app/models/subject.rb

@@ -82,9 +82,16 @@ class Subject < ApplicationRecord
   end
 
   def my_subject_progress
+    logger.info("#-----------")
     my_challenge_count = Game.joins(:challenge).where(user_id: User.current.id, status: 2, challenges: {shixun_id: shixuns.published_closed}).
       pluck(:challenge_id).uniq.size
-    count = self.subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / self.subject_challenge_count).round(2) * 100).to_i
+    logger.info("#-----------")
+    new_challenge_count = Challenge.left_joins(:games)
+                              .where(games: {user_id: User.current.id, status: 2}, shixun_id: shixuns.published_closed)
+                              .uniq.count
+    logger.info("#-----------")
+    subject_challenge_count = shixuns.sum(:challenges_count)
+    subject_challenge_count == 0 ? 0 : ((my_challenge_count.to_f / subject_challenge_count).round(2) * 100).to_i
   end
 
   def my_consume_time

config/environments/development.rb

@@ -50,11 +50,14 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  config.assets.debug = false
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
+  config.assets.compile = true
+  # config.assets.prefix = '/dev-assets'
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 

config/initializers/assets.rb

@@ -11,4 +11,4 @@ Rails.application.config.assets.paths << Rails.root.join('node_modules')
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
-Rails.application.config.assets.precompile += %w( admin.js admin.scss )
+Rails.application.config.assets.precompile += %w( admin.js admin.css )

public/assets/.sprockets-manifest-1c370772f16743f825981ab0e5c94237.json

@@ -0,0 +1 @@
+{"files":{"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js":{"logical_path":"admin.js","mtime":"2019-08-26T15:21:11+08:00","size":907839,"digest":"6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d","integrity":"sha256-ZXXxOZlT+xk1wDenuL0oxK/we3C+2bQfr2iZqJr0tX0="},"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css":{"logical_path":"admin.css","mtime":"2019-08-26T15:21:47+08:00","size":655571,"digest":"8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5","integrity":"sha256-iisDy4oFXcY/RUQ7MEyudzgjMb66VbFXCz08iqQkQtU="},"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot":{"logical_path":"font-awesome/fontawesome-webfont.eot","mtime":"2019-08-14T17:22:43+08:00","size":165742,"digest":"7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979","integrity":"sha256-e/yrbbmdXPvxcFygU23ceFhUMsxfpBu9etDwCQM7KXk="},"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2":{"logical_path":"font-awesome/fontawesome-webfont.woff2","mtime":"2019-08-14T17:22:43+08:00","size":77160,"digest":"2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe","integrity":"sha256-Kt78vAQefRj88tQXh53FoJmXqmTWdbejxLbOM9oT8/4="},"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff":{"logical_path":"font-awesome/fontawesome-webfont.woff","mtime":"2019-08-14T17:22:43+08:00","size":98024,"digest":"ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07","integrity":"sha256-ugxZ3rVFD1y0Gz+TYJ7i0NmVQVh33foiPoqKdTNHTwc="},"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf":{"logical_path":"font-awesome/fontawesome-webfont.ttf","mtime":"2019-08-14T17:22:43+08:00","size":165548,"digest":"aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8","integrity":"sha256-qljzPyOaD7AvXHpsRcBD16msmgkzNYBmlOzW1O3A1qg="},"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg":{"logical_path":"font-awesome/fontawesome-webfont.svg","mtime":"2019-08-14T17:22:43+08:00","size":444379,"digest":"ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4","integrity":"sha256-rWFXkmwWIrpOHQPUePFUE2hSS/xG9R5C/g2UX37zI+Q="},"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png":{"logical_path":"logo.png","mtime":"2019-08-21T15:10:12+08:00","size":2816,"digest":"7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423","integrity":"sha256-f/ESVocJv5f5iY/ockm3qPIA/x9I1TfYWvhyFfGHBCM="},"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js":{"logical_path":"application.js","mtime":"2019-08-26T15:21:11+08:00","size":1042232,"digest":"a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533","integrity":"sha256-o6TzVJ1oZwVyuwdwDIWprBHlNu3HP+9udIlyO/U15TM="},"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css":{"logical_path":"application.css","mtime":"2019-08-26T15:21:47+08:00","size":1182859,"digest":"a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46","integrity":"sha256-p1CLiOtqaaWzAWAr3cFHRc7AmFPqfZHG+uhWuW54j0Y="}},"assets":{"admin.js":"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js","admin.css":"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css","font-awesome/fontawesome-webfont.eot":"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot","font-awesome/fontawesome-webfont.woff2":"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2","font-awesome/fontawesome-webfont.woff":"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff","font-awesome/fontawesome-webfont.ttf":"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf","font-awesome/fontawesome-webfont.svg":"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg","logo.png":"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png","application.js":"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js","application.css":"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css"}}

public/react/public/css/edu-all.css

@@ -119,7 +119,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
     background: rgba(000,000,000,0.56);
-    border: 1px solid #fff;
+    border: 1px solid rgba(255,255,255,0.56);
     border-radius: 3px;
     font-size: 12px;
     /*opacity: 0.56;*/
@@ -446,8 +446,8 @@ table.text-file{}
 
 /*-------------------------------实训路径-------------------------------*/
 .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #081C4B;
-    background-size: cover;
+    background-color: #131b39;
+    /*background-size: cover;*/
     background-position: center;
     background-repeat: no-repeat;
 }

public/react/scripts/build.js

@@ -203,12 +203,12 @@ function generateNewIndexJsp() {
       <script>
          (function() {
             var _host = '/react/build/'
-            /*
+            /**/
             if (window.location.host == 'pre-newweb.educoder.net') {
                 _host = 'https://testali-cdn.educoder.net/react/build/'
             } else if (window.location.host == 'www.educoder.net') {
                 _host = 'https://ali-newweb.educoder.net/react/build/'
-            }*/
+            }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
             document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
          })()

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

@@ -430,7 +430,7 @@ class CommonWorkList extends Component{
   }
   
   _getRequestParams() {
-    const { search, arg_work_status, arg_teacher_comment, arg_course_group, order, page } = this.state
+    const { search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work } = this.state
     return {
       page,
       search,
@@ -441,6 +441,7 @@ class CommonWorkList extends Component{
       limit: PAGE_SIZE,
       b_order: orderMap[order],
       group_id:arg_course_group,
+      member_work: arg_member_work
     }
   }
   fetchData = () => {
@@ -488,6 +489,11 @@ class CommonWorkList extends Component{
       this.fetchList()
     })
   }
+  memberWorkChange = (values, isAllChecked) => {
+    this.setState({arg_member_work: isAllChecked ? '' : values[0], page: 1}, () => {
+      this.fetchList()
+    })
+  }
   funorder = (order) => {
     this.setState({ order }, () => {
       this.fetchList()
@@ -581,10 +587,21 @@ class CommonWorkList extends Component{
       return { label: `${item.name}(${item.count})`, value: item.id }
     })
 
+    // 1:组长， 0:组员，“” 不限
+    const member_works = [{
+      name: '组长', id: 1
+    }, {
+      name: '组员', id: 0
+    }]
+    const options_member_work = member_works.map((item) => {
+      return { label: `${item.name}`, value: item.id }
+    })
+
 
     const isAdmin = this.props.isAdmin()
     const isStudent = this.props.isStudent()
     const isAdminOrStudent = this.props.isAdminOrStudent()
+    const isGroup = this.props.isGroup();
     // work_group
     let StudentData;
 
@@ -679,6 +696,7 @@ class CommonWorkList extends Component{
               <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
               <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
               {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
+              {isGroup && <CheckAllGroup options={options_member_work} label={'组内角色：'} onChange={this.memberWorkChange}></CheckAllGroup>}
 
 
               {/*   value={search} */}

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

@@ -1,12 +1,14 @@
 import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
-import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
-import { WordsBtn, getUploadActionUrl, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder';
 import axios from 'axios';
-import Modals from '../../modals/Modals';
 import _ from 'lodash'
 
+import { WordsBtn, getUploadActionUrl, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder';
+import Modals from '../../modals/Modals';
+import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
+import LeaderIcon from './common/LeaderIcon'
+
 const Search = Input.Search;
 const CheckboxGroup = Checkbox.Group;
 
@@ -753,6 +755,8 @@ render(){
                     text-overflow:ellipsis;
                     white-space:nowrap
                 }
+              .members .leaderIcon {
+              }
               `}</style>
             <div className={"members fl"}>
 
@@ -764,11 +768,14 @@ render(){
                     display:item.user_name===undefined?"none":""
                   }}>
                     <Tooltip placement="bottom" title={item.user_nam}>
-                      <div className={"fl ml5 fonthidden"} style={{width: '50px'}}>{item.user_name}</div>
+                      <div className={"fl ml5 fonthidden"} style={{width: '68px'}}>{item.user_name}{item.is_leader && <LeaderIcon className="leaderIcon" small={true}></LeaderIcon>}</div>
                     </Tooltip>
                     <div className={"fl ml40 color-grey-9"}>{item.group_name}</div>
                     <div className={"fl ml40 color-grey-9"}>{item.student_id}</div>
-                    {item.user_id != this.props.current_user.user_id ?<div className={"fr"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
+                    {item.user_id != this.props.current_user.user_id ?
+                      <div className={"fr"}><i className={"iconfont icon-shanchudiao fl "} 
+                        style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
+                    
                   </div>
                 )
               })}

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

@@ -128,7 +128,7 @@ class UseBank extends Component{
     })
   }
   onSave = () => {
-    
+    debugger
     const { checkBoxValues } = this.state;
     const { object_type } = this.props
     if(checkBoxValues.length==0){

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

@@ -2,8 +2,10 @@ import React,{Component} from "React";
 
 export default function LeaderIcon(props = {}) {
     let icon = null;
+    const { className, style } = props;
+    const _className = `font-8 blueFull Actionbtn ${className}`
     if (props.small) {
-        icon = <div className="font-8 blueFull Actionbtn" style={{ 
+        icon = <div className={_className} style={{ 
             height: '14px',
             'line-height': '14px',
             width: '24px',
@@ -12,7 +14,7 @@ export default function LeaderIcon(props = {}) {
             'margin-left': '2px',
             'vertical-align': 'middle', }}>组长</div>
     } else {
-        icon = <div className="font-8 blueFull Actionbtn" style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
+        icon = <div className={_className} style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
     
     }
     return icon

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -750,7 +750,8 @@ class Coursesleftnav extends Component{
       {/*分班*/}
       {item.type==="course_group"?<div onClick={e=>this.Navmodalnames(e,2,"course_group",item.id)}>添加分班</div>:""}
       {/*分班*/}
-      {item.type==="course_group"? <div onClick={e=>this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名</div>:""}
+      {/*{item.type==="course_group"? :""}*/}
+      <div onClick={e=>this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名</div>
 
       <div onClick={e=>this.edithidden(e,item.id)}>隐藏</div>
       <div onClick={e=>this.editSetup(e,item.id)}>置顶</div>

public/react/src/modules/courses/coursesPublic/ShixunModal.js

@@ -186,7 +186,8 @@ class ShixunModal extends Component{
         // this.props.showNotification(response.data.message)
 
       }else{
-        this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+        // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+				this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
         this.props.hidecouseShixunModal()
       }
       this.setState({

public/react/src/modules/courses/gradinforms/Bullsubdirectory.js

@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form,Row, Col } from "antd";
 import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
 import './myysleduinforms.css'
 import axios from 'axios';
@@ -165,18 +165,25 @@ class Bullsubdirectory extends Component{
 											{
 												whethertoeditysl === false?
 													<div>
-														<div  className="" >
-															<div className="fudonyingxiangysl"><div className="ysltitbt fl"><span >{myname}</span></div>
-																{
-																	this.props.isAdmin() === true ?
-																		(this.props.yslbool===false?
-																				<i className="iconfont icon-bianji1 newbianji1 fr pr25  yslbianji" onClick={()=>this.bianji(true)}></i>
-																				:
-																				""
-																		)
-
-																		:""
-																}
+														<div>
+															<div className="fudonyingxiangysl">
+																<div style={{marginRight:"59px"}}>
+																	<span className="ysltitbt">{myname}</span>
+																</div>
+																<div>
+																	<span className="fr pr25  yslbianji">
+																	{
+																		this.props.isAdmin() === true ?
+																			(this.props.yslbool===false?
+																					<i className="iconfont icon-bianji1 newbianji1" onClick={()=>this.bianji(true)}></i>
+																					:
+																					""
+																			)
+																			:""
+																	}
+																</span>
+																</div>
+																<div className="yslclear"></div>
 															</div>
 															<div id="MakedownHTML"className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"}   dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/>
 														</div>

public/react/src/modules/courses/gradinforms/myysleduinforms.css

@@ -68,7 +68,6 @@
 }
 .fudonyingxiangysl{
     width: 100%;
-    height: 66px;
 }
 .yslbianji{
     padding-top: 31px;
@@ -79,3 +78,5 @@
 .ysldashed{
     border:1px dashed #EEE;
 }
+.yslclear{ clear: both;
+}

public/react/src/modules/courses/graduation/tasks/index.js

@@ -564,6 +564,7 @@ class GraduationTasks extends Component{
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
 
+
   }
   getcourse_groupslist=(id)=>{
     this.setState({
@@ -775,7 +776,7 @@ class GraduationTasks extends Component{
 
 
 						{
-								all_count===undefined?'' :all_count===0? <NoneData></NoneData>:""
+							tasks===undefined?'' :tasks.length===0? <NoneData></NoneData>:""
 						}
         <div>
 

public/react/src/modules/courses/members/studentsList.js

@@ -35,6 +35,7 @@ const buildColumns = (that) => {
     dataIndex: 'login',
     key: 'login',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (login, record) => {
       return <span className="color-dark overflowHidden1" style={{maxWidth: '160px'}}
@@ -57,9 +58,10 @@ const buildColumns = (that) => {
     dataIndex: 'student_id',
     key: 'student_id',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (student_id, record) => {
-      return <span className="color-dark overflowHidden1 "title={student_id && student_id.length > 10 ? student_id : ''}
+      return <span className="color-dark overflowHidden1 " title={student_id && student_id.length > 10 ? student_id : ''}
           style={{maxWidth: '160px'}} >{student_id}</span>
     }
   }];
@@ -69,7 +71,7 @@ const buildColumns = (that) => {
       dataIndex: 'course_group_name',
       key: 'course_group_name',
       align:'center',
-      width:"50%",
+      width:"40%",
       className:"color-grey-6"
     })
   }

public/react/src/modules/courses/new/CoursesNew.js

@@ -81,22 +81,19 @@ class CoursesNew extends Component {
                         is_public: data.is_public === 1 ? true : false,
                         Realnamecertification: data.authentication,
                         Professionalcertification:data.professional_certification,
-                        checkbofrups:data.course_modules,
+                        // checkbofrups:data.course_modules,
                     });
-                    try {
-                        if(data.course_modules===undefined||data.course_modules.length===0){
-                            this.setState({
-                                checkbofrups:this.state.checkbofrup,
-                            });
-                        }
-                    }catch (e) {
-                        this.setState({
-                            checkbofrups:this.state.checkbofrup,
-                        });
-                    }
-
-
-
+                    // try {
+                    //     if(data.course_modules===undefined||data.course_modules.length===0){
+                    //         this.setState({
+                    //             checkbofrups:this.state.checkbofrup,
+                    //         });
+                    //     }
+                    // }catch (e) {
+                    //     this.setState({
+                    //         checkbofrups:this.state.checkbofrup,
+                    //     });
+                    // }
                    this.handleSearchschool(data.school);
             }).catch((error) => {
                 console.log(error);
@@ -464,7 +461,7 @@ class CoursesNew extends Component {
 			this.applyForAddOrgForm.setVisible(true)
 		}
     render() {
-        let {datatime,school,searchlistscholl,checkbofrups} = this.state;
+        let {datatime,school,searchlistscholl} = this.state;
         const {getFieldDecorator} = this.props.form;
 				const propsWithoutForm = Object.assign({}, this.props)
 				delete propsWithoutForm.form
@@ -705,23 +702,6 @@ class CoursesNew extends Component {
                                                 "shixun_homework", "common_homework", "group_homework", "exercise", "attachment", "course_group",
                                             ],
                                         })(
-                                          this.props.match.params.coursesId != undefined?
-                                            <Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
-                                                {
-                                                    checkbofrups===undefined?"":checkbofrups.length===0?"":checkbofrups.map((item,key)=>{
-                                                         return(
-                                                           item.module_type==="announcement"?
-                                                          ""
-                                                             :
-                                                             item.module_type==="online_learning"?
-                                                               ""
-                                                               :
-                                                             <Checkbox key={key} value={item.module_type} className="fl">{item.module_name}</Checkbox>
-                                                        )
-                                                    })
-                                                }
-                                            </Checkbox.Group>
-                                            :
                                             <Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
                                             <Checkbox value={"shixun_homework"} className="fl">实训作业</Checkbox>
                                             <Checkbox value={"common_homework"} className="fl">普通作业</Checkbox>

public/react/src/modules/courses/new/Goldsubject.js

@@ -144,20 +144,18 @@ class Goldsubject extends Component {
 					course_module_types: data.course_module_types,
 					school:data.school,
 					Whethertocreateanewclassroom:false,
-					checkbofrups:data.course_modules,
 				});
-
-				try {
-					if(data.course_modules===undefined||data.course_modules.length===0){
-						this.setState({
-							checkbofrups:this.state.checkbofrup,
-						});
-					}
-				}catch (e) {
-					this.setState({
-						checkbofrups:this.state.checkbofrup,
-					});
-				}
+				// try {
+				// 	if(data.course_modules===undefined||data.course_modules.length===0){
+				// 		this.setState({
+				// 			checkbofrups:this.state.checkbofrup,
+				// 		});
+				// 	}
+				// }catch (e) {
+				// 	this.setState({
+				// 		checkbofrups:this.state.checkbofrup,
+				// 	});
+				// }
 				this.handleSearchschool(data.school);
 			}).catch((error) => {
 				console.log(error);
@@ -609,7 +607,7 @@ class Goldsubject extends Component {
 		this.applyForAddOrgForm.setVisible(true)
 	}
 	render() {
-		let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom,checkbofrups} = this.state;
+		let {datatime,datatimetwo,school,searchlistscholl,Whethertocreateanewclassroom} = this.state;
 		const {getFieldDecorator} = this.props.form;
 		const propsWithoutForm = Object.assign({}, this.props)
 		delete propsWithoutForm.form
@@ -884,25 +882,6 @@ class Goldsubject extends Component {
 												"announcement","online_learning","shixun_homework","common_homework",
 											],
 										})(
-											this.props.match.params.coursesId != undefined?
-												<Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
-													{
-														checkbofrups===undefined?"":checkbofrups.length===0?"":checkbofrups.map((item,key)=>{
-															return(
-																item.module_type==="announcement"?
-																	<Checkbox value={"announcement"} className="fl" defaultChecked disabled>公告栏</Checkbox>
-																	:
-																	item.module_type==="online_learning"?
-																		<Checkbox value={"online_learning"} className="fl" defaultChecked disabled>在线学习</Checkbox>
-																		:
-																		item.module_type==="graduation"?"":
-																			item.module_type==="group_homework"?"":
-																<Checkbox key={key} value={item.module_type} className="fl">{item.module_name}</Checkbox>
-															)
-														})
-													}
-												</Checkbox.Group>
-												:
 											<Checkbox.Group style={{width: "800px", marginTop: "10px"}}>
 												<Checkbox value={"announcement"} className="fl" defaultChecked disabled>公告栏</Checkbox>
 												<Checkbox value={"online_learning"} className="fl" defaultChecked disabled>在线学习</Checkbox>

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -969,7 +969,7 @@ class ShixunHomework extends Component{
           category_id={this.props.match.params.category_id}
           visible={shixunmodal}
           shixunmodallist={shixunmodallist}
-          // funshixunmodallist={(search,type,loading,page)=>this.funshixunmodallist(search,type,loading,page)}
+					homeworkupdatalists={(Coursename,page,order)=>this.homeworkupdatalist(Coursename,page,order)}
           hometypepvisible={hometypepvisible}
           hidecouseShixunModal={this.hidecouseShixunModal}
           newshixunmodallist={newshixunmodallist}
@@ -1066,7 +1066,7 @@ class ShixunHomework extends Component{
         </div>
         <Spin size="large" spinning={this.state.isSpin}>
         {this.props.isAdmin()===true?
-					datas===undefined?'' :datas.task_count===0?"":
+					datas===undefined?'' :datas.homeworks.length===0?"":
 					<div className="mt20 edu-back-white padding20-30">
 
           <div className="clearfix">
@@ -1210,7 +1210,7 @@ class ShixunHomework extends Component{
           </div>
 
 					{
-						datas===undefined?'' :datas.task_count===0? <NoneData></NoneData>:""
+						datas===undefined?'' :datas.homeworks.length===0? <NoneData></NoneData>:""
 					}
 
       </Spin>

public/react/src/public-path.js

@@ -1,6 +1,6 @@
 /*global __webpack_public_path__ */
-if (window._enableCDN && window.location.host == 'pre-newweb.educoder.net') {
-    __webpack_public_path__ = 'http://testali-cdn.educoder.net/react/build/'
-} else if (window._enableCDN && window.location.host == 'www.educoder.net') {
+if ( window.location.host == 'pre-newweb.educoder.net') {
+    __webpack_public_path__ = 'https://testali-cdn.educoder.net/react/build/'
+} else if ( window.location.host == 'www.educoder.net') {
     __webpack_public_path__ = 'https://ali-newweb.educoder.net/react/build/'
 }

public/stylesheets/educoder/edu-all.css

@@ -121,7 +121,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
     background: rgba(000,000,000,0.56);
-    border: 1px solid #fff;
+    border: 1px solid rgba(255,255,255,0.56);
     border-radius: 3px;
     font-size: 12px;
     /*opacity: 0.56;*/
@@ -448,8 +448,8 @@ table.text-file{}
 
 /*-------------------------------实训路径-------------------------------*/
 .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #081C4B;
-    background-size: cover;
+    background-color: #131b39;
+    /*background-size: cover;*/
     background-position: center;
     background-repeat: no-repeat;
 }