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

app/controllers/courses_controller.rb

@@ -552,7 +552,7 @@ class CoursesController < ApplicationController
   def change_member_role
     tip_exception("请至少选择一个角色") if params[:roles].blank?
     tip_exception("不能具有老师、助教两种角色") if params[:roles].include?("PROFESSOR") && params[:roles].include?("ASSISTANT_PROFESSOR")
-    tip_exception("管理员不能切换为助教或老师") if @user_course_identity == Course::CREATOR &&
+    tip_exception("管理员不能切换为助教或老师") if params[:user_id].to_i == @course.tea_id &&
       (params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR"))
 
     course_members = @course.course_members.where(user_id: params[:user_id])

app/controllers/exercises_controller.rb

@@ -694,6 +694,7 @@ class ExercisesController < ApplicationController
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
   def publish
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -701,7 +702,6 @@ class ExercisesController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/homework_commons_controller.rb

@@ -1044,6 +1044,7 @@ class HomeworkCommonsController < ApplicationController
 
   def publish_homework
     tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -1051,7 +1052,6 @@ class HomeworkCommonsController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/polls_controller.rb

@@ -254,6 +254,7 @@ class PollsController < ApplicationController
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
   def publish
+    group_ids = params[:group_ids]&.reject(&:blank?)
     if params[:detail].blank?
       tip_exception("缺少截止时间参数") if params[:end_time].blank?
       tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
@@ -261,7 +262,6 @@ class PollsController < ApplicationController
         @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
     else
       group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
-      group_ids = params[:group_ids].reject(&:blank?)
       tip_exception("缺少截止时间参数") if group_end_times.blank?
       tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
       group_end_times.each do |time|

app/controllers/question_banks_controller.rb

@@ -90,23 +90,25 @@ class QuestionBanksController < ApplicationController
   def send_to_course
     banks = @object_type.classify.constantize.where(id: params[:object_id])
     course = current_user.manage_courses.find_by!(id: params[:course_id])
+    task_ids = []
     banks.each do |bank|
       case @object_type
       when 'HomeworkBank' # 作业
-        quote_homework_bank bank, course
+        task = quote_homework_bank bank, course
       when 'ExerciseBank'
         if bank.container_type == 'Exercise' # 试卷
-          quote_exercise_bank bank, course
+          task = quote_exercise_bank bank, course
         else # 问卷
-          quote_poll_bank bank, course
+          task = quote_poll_bank bank, course
         end
       when 'GtaskBank'
-        quote_gtask_bank bank, course
+        task = quote_gtask_bank bank, course
       when 'GtopicBank'
-        quote_gtopic_bank bank, course
+        task = quote_gtopic_bank bank, course
       end
+      task_ids << task.id if task
     end
-    normal_status("发送成功")
+    render :json => {task_ids: task_ids, status: 0, message: "发送成功"}
   end
 
   def destroy

public/react/src/AppConfig.js

@@ -84,9 +84,9 @@ export function initAxiosInterceptors(props) {
                     }
                     config.url = `${proxy}${url}`;
                     if (config.url.indexOf('?') == -1) {
-                        config.url = `${config.url}?debug=${'student'}`;
+                        config.url = `${config.url}?debug=${debugType}`;
                     } else {
-                        config.url = `${config.url}&debug=${'student'}`;
+                        config.url = `${config.url}&debug=${debugType}`;
                     }
                 } else {
                     // 加api前缀

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

@@ -167,6 +167,11 @@ class CommonWorkSetting extends Component{
 
     }
     on('commonwork_fetch_all', this.fetchAllListener)
+
+
+		if(this.props.isAdmin()===true){
+			 this.setState({startEditFlag: true})
+		}
 	}
   componentWillUnmount() {
     off('commonwork_fetch_all', this.fetchAllListener)  

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

@@ -48,7 +48,7 @@ class HomeworkModal extends Component{
 		if(this.props.starttimes!=undefined&&this.props.starttimes!=""){
 
 			this.setState({
-				endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'months')).format("YYYY-MM-DD HH:mm")
+				endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
 			})
 		}
 	}
@@ -70,7 +70,7 @@ class HomeworkModal extends Component{
 
 			if(this.props.starttimes!=undefined&&this.props.starttimes!=""){
         this.setState({
-					endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'months')).format("YYYY-MM-DD HH:mm")
+					endtime:moment(moment(handleDateString(this.props.starttimes)).add(1, 'week')).format("YYYY-MM-DD HH:mm")
 				})
 			}
 		}

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

@@ -6,7 +6,7 @@ import axios from 'axios'
 /** 
     角色数组, CREATOR: 创建者, PROFESSOR: 教师, ASSISTANT_PROFESSOR: 助教, STUDENT: 学生
 */
-function ChangeRolePop({ member_roles = [], record, courseId, onChangeRoleSuccess, showNotification }) {
+function ChangeRolePop({ member_roles = [], record, courseId, onChangeRoleSuccess, showNotification, getUserId, fetchUser }) {
     const [checkBoxRoles, setCheckBoxRoles] = useState(member_roles)
     useEffect(() => {
         setCheckBoxRoles(member_roles)
@@ -41,7 +41,14 @@ function ChangeRolePop({ member_roles = [], record, courseId, onChangeRoleSucces
             user_id: record.user_id
         })
         if (response.data.status == 0) {
+            showNotification('保存成功')
             onChangeRoleSuccess()
+
+            trigger('updatabanner')
+            if (fetchUser && record.user_id == getUserId) {
+                fetchUser()
+            }
+            
         }
         console.log(response)
     }

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

@@ -155,6 +155,8 @@ const buildColumns = (that,isParent) => {
               member_roles={record.member_roles}
               onChangeRoleSuccess={that.onChangeRoleSuccess}
               showNotification={that.props.showNotification}
+              getUserId={that.props.isUserid}
+              fetchUser={that.props.fetchUser}
             ></ChangeRolePop>
           </React.Fragment>
         )
@@ -545,6 +547,19 @@ class studentsList extends Component{
   addDir = () => {
     trigger('groupAdd', this.props.coursesids)
   }
+  addToDir = async () => {
+    const courseId = this.props.match.params.coursesId    
+    const url = `/courses/${courseId}/join_course_group.json`
+    const course_group_id = this.props.match.params.course_group_id
+
+    const response = await axios.post(url, {
+      course_group_id
+    })
+    if (response && response.data.status == 0) {
+      this.props.showNotification('加入成功')
+      this.fetchAll()
+    }
+  }
   renameDir = () => {
     const course_group_id = this.props.match.params.course_group_id
     trigger('groupRename', { id: parseInt(course_group_id), name: this.state.course_group_name})
@@ -591,6 +606,7 @@ class studentsList extends Component{
 
   render(){
     const isAdmin = this.props.isAdmin()
+    const isStudent = this.props.isStudent()
     const isSuperAdmin = this.props.isSuperAdmin()
     const isCourseEnd = this.props.isCourseEnd()
     let {
@@ -702,6 +718,8 @@ class studentsList extends Component{
               { 
                 // pageType !== TYPE_STUDENTS && 
                   !isCourseEnd && isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>添加分班</WordsBtn> }
+              { 
+                  isStudent && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.addToDir()}>加入分班</WordsBtn> }
               { 
                   isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { 

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

@@ -165,6 +165,9 @@ function buildColumns(that) {
                 member_roles={record.member_roles}
                 onChangeRoleSuccess={that.onChangeRoleSuccess}
                 showNotification={that.props.showNotification}
+                getUserId={that.props.isUserid}
+                fetchUser={that.props.fetchUser}
+
               ></ChangeRolePop>
               {/* <Popconfirm 
                 placement="bottom"
@@ -646,6 +649,7 @@ class studentsList extends Component{
       combineArray = this.state.application_list
     }
     const isAdminOrTeacher = this.props.isAdminOrTeacher()
+    const isAdminOrCreator = this.props.isAdminOrCreator()
     const isSuperAdmin = this.props.isSuperAdmin()
     const hasGraduationModule = this.hasGraduationModule()
     const coursesId = this.props.match.params.coursesId
@@ -682,7 +686,7 @@ class studentsList extends Component{
               {/* { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>添加教师</WordsBtn> }
               { isAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addStudent()}>添加学生</WordsBtn> } */}
               
-              { isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
+              { isAdminOrCreator && <WordsBtn style="blue" className="fr" onClick={()=>this.showChangeAdminModal()}>更换管理员</WordsBtn>}
             
             </React.Fragment>
           }