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

app/models/searchable/dependents/user.rb

@@ -17,6 +17,7 @@ module Searchable::Dependents::User
 
       # reindex subject
       created_subjects.each(&:reindex)
+      subjects.each(&:reindex)
     end
   end
 end

app/models/searchable/subject.rb

@@ -27,6 +27,7 @@ module Searchable::Subject
     {
       author_name: user.real_name,
       author_school_name: user.school_name,
+      member_user_names: users.map(&:real_name).join(' ')
     }
   end
 

app/services/concerns/elasticsearch_able.rb

@@ -29,6 +29,7 @@ module ElasticsearchAble
         subject_stages: { type: 'plain' },
         content: { type: 'plain' },
         descendants_contents: { type: 'plain' },
+        member_user_names: { type: 'plain' }
       }
     }
   end

app/views/homework_commons/group_list.json.jbuilder

@@ -7,7 +7,8 @@ json.group_list do
   end
 end
 # 未分班展示情况放在最后
-if @course_groups.count != (@page.to_i - 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) ||
+    (@page.to_i == 1 && @course_groups.count == 0)
   ungroup_work_count = homework_ungroup_works_count(@homework, @ungroup_user_ids)
   if ungroup_work_count > 0
     json.ungroup_list do

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
         }
       }
     }),

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

@@ -136,7 +136,7 @@ function buildColumns(that, student_works) {
 
       render: (text, record) => (
         <span>
-          <a href="javascript:;"  style={{color:'#4CACFF'}}>{record.work_group}</a>
+          <a href="javascript:void(0);"  style={{color:'#4CACFF'}}>{record.work_group}</a>
         </span>
       ),
     })
@@ -150,7 +150,8 @@ function buildColumns(that, student_works) {
 
       render: (project_info, record) => (
         <span>
-          {project_info && project_info.name && <a href={`/projects/${project_info.id}`} target="_blank"  
+          {project_info && project_info.name && <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`} 
+              target={ project_info.id == -1 ? '' : "_blank" }
               className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto', display: 'block'}} title={project_info.name}
           >{project_info.name}</a>}
         </span>
@@ -249,7 +250,8 @@ function buildColumns(that, student_works) {
   */
     columns.push({
       width: 84,
-      title: <div style={{color: 'rgba(0,0,0,.85)'}}><div  style={{color: 'rgba(0,0,0,.85)'}}>匿评</div>评分</div>,
+      // title: <div style={{color: 'rgba(0,0,0,.85)'}}><div  style={{color: 'rgba(0,0,0,.85)'}}>匿评</div>评分</div>,
+      title: <div style={{color: 'rgba(0,0,0,.85)'}}>匿评评分</div>,
       key: 'student_score',
       dataIndex: 'student_score',
   
@@ -614,6 +616,7 @@ class CommonWorkList extends Component{
           ref="checkCodeModal"
           {...this.props}
         ></CheckCodeModal>
+        
         <AccessoryModal
             {...this.props}
             modalname={"补交附件"}
@@ -649,6 +652,10 @@ class CommonWorkList extends Component{
               position: absolute;
               right: 18px;
             }
+
+            .workListContent .ant-table-thead > tr > th, .workListContent .ant-table-tbody > tr > td {
+              padding: 10px 2px;
+            }
           `}</style>
           <div style={{ background: '#fff'}} className="workListContent">
              { isAdmin && <ul className="clearfix" style={{padding: "20px 40px 10px", position: 'relative', paddingLeft: '24px'}}>

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

@@ -132,13 +132,14 @@ class ShixunWorkModal extends Component{
 
 	onChange=(e)=>{
 		let{group_list}=this.state;
-
 		let {data}=this.props;
 		if(e.target.checked===true){
 			if(data&&data.length===0){
 				let id=[]
 				group_list.forEach((item,key)=>{
-					id.push(item.id)
+					if(item.works_count!=0){
+						id.push(item.id)
+					}
 				})
 				this.setState({
 					group_ids:id,
@@ -147,7 +148,9 @@ class ShixunWorkModal extends Component{
 			}else{
 				let id=[]
 				group_list.forEach((item,key)=>{
-					id.push(item.id)
+					if(item.works_count!=0){
+						id.push(item.id)
+					}
 				})
 				this.setState({
 					group_ids:id,
@@ -161,6 +164,9 @@ class ShixunWorkModal extends Component{
 			})
 		}
 
+
+
+
 	}