Merge branch 'dev_aliyun' into dev_aliyun_beta

app/controllers/courses_controller.rb

@@ -890,7 +890,7 @@ class CoursesController < ApplicationController
               name = worksheet.cell(row, 1).to_s
 
               if @course.course_groups.where(:name => name).blank?
-                @course.course_groups << CourseGroup.new(:name => name)
+                @course.course_groups << CourseGroup.new(:name => name, :position => @course.course_groups_count + 1)
                 group_count += 1
               end
             end

app/controllers/question_banks_controller.rb

@@ -1,6 +1,7 @@
 class QuestionBanksController < ApplicationController
   before_action :require_login, :check_auth
   before_action :params_filter, except: [:my_courses]
+  before_action :teacher_or_admin, except: [:bank_list]
 
   # 题库选用列表
   # object_type: #  normal 普通作业题库； group 分组作业题库； poll问卷题库； exercise试卷题库; gtask 毕设选题题库；gtopic 毕设任务
@@ -81,24 +82,29 @@ class QuestionBanksController < ApplicationController
 
   def my_courses
     @courses = current_user.manage_courses.where(is_delete: 0, is_end: 0)
+    unless params[:search].blank?
+      @courses = @courses.where("name like ?", "%#{params[:search].strip}%")
+    end
   end
 
   def send_to_course
-    bank = current_bank
+    banks = object_banks
-    course = current_user.manage_courses.find_by(id: params[:course_id])
+    course = current_user.manage_courses.find_by!(id: params[:course_id])
-    case @object_type
+    banks.each do |bank|
-    when 'HomeworkBank' # 作业
+      case @object_type
-      quote_homework_bank bank, course
+      when 'HomeworkBank' # 作业
-    when 'ExerciseBank'
+        quote_homework_bank bank, course
-      if bank.container_type == 'Exercise' # 试卷
+      when 'ExerciseBank'
-        quote_exercise_bank bank, course
+        if bank.container_type == 'Exercise' # 试卷
-      else # 问卷
+          quote_exercise_bank bank, course
-        quote_poll_bank bank, course
+        else # 问卷
+          quote_poll_bank bank, course
+        end
+      when 'GtaskBank'
+        quote_gtask_bank bank, course
+      when 'GtopicBank'
+        quote_gtopic_bank bank, course
       end
-    when 'GtaskBank'
-      quote_gtask_bank bank, course
-    when 'GtopicBank'
-      quote_gtopic_bank bank, course
     end
     normal_status("发送成功")
   end
@@ -106,7 +112,7 @@ class QuestionBanksController < ApplicationController
   def destroy
     bank = current_bank
 
-    unless user.admin? || bank.user_id == user.id
+    unless current_user.admin? || bank.user_id == current_user.id
       render_forbidden
       return
     end
@@ -121,11 +127,32 @@ class QuestionBanksController < ApplicationController
     render_ok
   end
 
+  def multi_delete
+    @objects = object_banks
+    @objects.destroy_all
+    normal_status("删除成功")
+  end
+
+  def multi_public
+    @objects = object_banks
+    @objects.update_all(is_public: true)
+    normal_status("更新成功")
+  end
+
   private
 
+  def object_banks
+    banks ||= @object_type.classify.constantize.where(@object_filter).where(id: params[:object_id])
+    unless current_user.admin?
+      banks = banks.where(user_id: current_user.id)
+    end
+    banks
+  end
+
   def current_bank
     @_current_bank ||= @object_type.classify.constantize.where(@object_filter).find(params[:id])
   end
+
   def params_filter
     type = ["normal", "group", "poll", "exercise", "gtask", "gtopic"]
     tip_exception("object_type类型不正确") unless type.include?(params[:object_type])
@@ -152,6 +179,10 @@ class QuestionBanksController < ApplicationController
     end
   end
 
+  def teacher_or_admin
+    tip_exception(403, "无权限操作") unless current_user.is_certification_teacher || current_user.admin?
+  end
+
   def quote_homework_bank homework, course
     ActiveRecord::Base.transaction do
       # 复制作业的基本信息

app/controllers/users/question_banks_controller.rb

@@ -18,8 +18,8 @@ class Users::QuestionBanksController < Users::BaseController
   def load_question_banks_solve_count
     question_bank_ids = @question_banks.map(&:id)
     @solve_count_map =
-      case params[:category]
+      case params[:object_type]
-      when 'common', 'group' then
+      when 'normal', 'group' then
         StudentWork.where(is_delete: false, work_status: [1, 2, 3]).joins(:homework_common)
           .where(homework_commons: { homework_bank_id: question_bank_ids })
           .group('homework_commons.homework_bank_id').count
@@ -42,14 +42,14 @@ class Users::QuestionBanksController < Users::BaseController
   end
 
   def query_params
-    params.permit(:type, :category, :course_list_id, :sort_by, :sort_direction)
+    params.permit(:type, :object_type, :course_list_id, :sort_by, :sort_direction)
   end
 
   def check_query_params!
     params[:type] = 'personal' if params[:type].blank? || !%w(personal publicly).include?(params[:type])
 
-    if params[:category].blank? || !%w(common group exercise poll gtask gtopic).include?(params[:category])
+    if params[:object_type].blank? || !%w(normal group exercise poll gtask gtopic).include?(params[:object_type])
-      params[:category] = 'common'
+      params[:object_type] = 'normal'
     end
 
     if params[:sort_by].blank? || !%w(updated_at name contributor).include?(params[:sort_by])

app/services/users/question_bank_service.rb

@@ -22,8 +22,8 @@ class Users::QuestionBankService
     course_lists = CourseList.joins(relation_name).where.not(relation_name => { id: nil })
 
     category_condition =
-      case params[:category]
+      case params[:object_type]
-      when 'common' then { homework_type: 1 }
+      when 'normal' then { homework_type: 1 }
       when 'group' then { homework_type: 3 }
       when 'exercise' then { container_type: 'Exercise' }
       when 'poll' then { container_type: 'Poll' }
@@ -47,8 +47,8 @@ class Users::QuestionBankService
 
   def class_name
     @_class_name ||= begin
-      case params[:category]
+      case params[:object_type]
-      when 'common', 'group'  then 'HomeworkBank'
+      when 'normal', 'group'  then 'HomeworkBank'
       when 'exercise', 'poll' then 'ExerciseBank'
       when 'gtask'            then 'GtaskBank'
       when 'gtopic'           then 'GtopicBank'
@@ -58,8 +58,8 @@ class Users::QuestionBankService
   end
 
   def category_filter(relations)
-    case params[:category]
+    case params[:object_type]
-    when 'common' then
+    when 'normal' then
       relations.where(homework_type: 1)
     when 'group' then
       relations.where(homework_type: 3)

app/views/admins/shixun_settings/shared/_td.html.erb

@@ -17,15 +17,16 @@
 </td>
 <td>
   <!-- 图片上传，稍后添加-->
+  --
 
-  <a href="javascript:void(0);" id="object_upload_img_<%= shixun.id %>" onclick="$('#upload_img_<%= shixun.id %>').click();">
+<!--  <a href="javascript:void(0);" id="object_upload_img_<%#= shixun.id %>" onclick="$('#upload_img_<%= shixun.id %>').click();">-->
-    <%= File.exist?(disk_filename("Shixun",shixun.id)) ? "重新上传" : "上传图片" %>
+    <%#= File.exist?(disk_filename("Shixun",shixun.id)) ? "重新上传" : "上传图片" %>
-  </a>
+<!--  </a>-->
-  <% if File.exist?(disk_filename("Shixun",shixun.id)) %>
+  <%# if File.exist?(disk_filename("Shixun",shixun.id)) %>
-    <%= image_tag(url_to_avatar(shixun), :class => "w80 h80 fl ml5 shixun_image_show", :id => "shixun_image_show_#{shixun.id}") %>
+    <%#= image_tag(url_to_avatar(shixun), :class => "w80 h80 fl ml5 shixun_image_show", :id => "shixun_image_show_#{shixun.id}") %>
-  <% else %>
+  <%# else %>
-    <img src="" class="w80 h80 fl ml5 shixun_image_show none" id="shixun_image_show_<%= shixun.id %>"/>
+<!--    <img src="" class="w80 h80 fl ml5 shixun_image_show none" id="shixun_image_show_<%#= shixun.id %>"/>-->
-  <% end %>
+  <%# end %>
 
 </td>
 <td><%= link_to shixun.owner.try(:show_real_name),"/users/#{shixun.owner.login}",target:'_blank' %></td>

app/views/exercises/start_answer.json.jbuilder

@@ -31,6 +31,11 @@ else
   json.question_status @question_status
 end
 
+exercise_type = 3
+if @t_user_exercise_status == 3 && @exercise.answer_open
+  exercise_type = 4
+end
+
 json.partial! "exercises/exercise_scores"
 
 json.exercise_questions do
@@ -57,7 +62,7 @@ json.exercise_questions do
                   shixun_challenges: question.exercise_shixun_challenges,
                   user_answer: question_info[:answered_content],
                   choices:question.exercise_choices,
-                  exercise_type:3,
+                  exercise_type:exercise_type,
                   shixun_type:question_info[:shixun_type],
                   ques_position: q[:ques_number],
                   edit_type:nil

config/routes.rb

@@ -632,6 +632,8 @@ Rails.application.routes.draw do
         post :save_banks
         get :my_courses
         post :send_to_course
+        delete :multi_delete
+        post :multi_public
       end
     end
 

db/migrate/20190829084147_migrate_course_group_position.rb

@@ -0,0 +1,11 @@
+class MigrateCourseGroupPosition < ActiveRecord::Migration[5.2]
+  def change
+    Course.all.each do |course|
+      if course.course_groups.exists?(position: 0)
+        course.course_groups.each_with_index do |group, index|
+          group.update_attributes(position: index+1)
+        end
+      end
+    end
+  end
+end

public/assets/admin-692c392528c56090d88fec92e6ff3b6a3442c6a691d9467c3b51e82625417c53.js

@@ -38362,46 +38362,37 @@ $(document).on('turbolinks:load', function() {
 ;
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
+    $(".shixun-settings-select").on("change", function () {
+      var s_value = $(this).val();
+      var s_name = $(this).attr("name");
+      var json = {};
+      json[s_name] = s_value;
+      $.ajax({
+        url: "/admins/shixun_settings",
+        type: "GET",
+        dataType:'script',
+        data: json
+      })
+    });
 
+   $(".shixun-setting-form").on("change",function () {
+     var s_id = $(this).attr("data-id");
+     var s_value = $(this).val();
+     var s_name = $(this).attr("name");
+     var json = {};
+     var s_index = $(this).parent("td").siblings(".shixun-line-no").text();
+     json[s_name] = s_value;
+     json["page_no"] = s_index;
+     $.ajax({
+       url: "/admins/shixun_settings/" + s_id,
+       type: "PUT",
+       dataType:'script',
+       data: json
+     })
+   })
   }
 });
 
-function update_change(target) {
-    var s_id = $(target).attr("data-id");
-    var s_value = $(target).val();
-    var s_name = $(target).attr("name");
-    var json = {};
-    var s_index = $(target).parent("td").siblings(".shixun-line-no").text();
-    json[s_name] = s_value;
-    json["page_no"] = s_index;
-    $.ajax({
-        url: "/admins/shixun_settings/" + s_id,
-        type: "PUT",
-        dataType:'script',
-        data: json,
-        success: function (data) {
-
-        }
-    })
-}
-
-
-function select_change(target) {
-    var s_value = $(target).val();
-    var s_name = $(target).attr("name");
-    var json = {};
-    json[s_name] = s_value;
-    $.ajax({
-        url: "/admins/shixun_settings/",
-        type: "GET",
-        dataType:'script',
-        data: json,
-        success: function (data) {
-
-        }
-    })
-}
-;
 $(document).on('turbolinks:load', function() {
     $('select#tag-choosed').select2({
         placeholder: "请选择分类",

public/assets/admin-94f6ba0b0c1720d61b4dbf60d7c939f8023f170e36099597cc002f546f90a051.css

@@ -18726,6 +18726,13 @@ input[type="checkbox"] {
   border: 1px solid #eee !important;
 }
 
+/* line 10, app/assets/stylesheets/admins/shixun_settings.scss */
+.setting-chosen {
+  font-weight: 400;
+  font-size: 10px;
+  color: #333;
+}
+
 /* line 1, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar {
   min-width: 200px;

public/assets/application-8ba6bce5955b760cd5bb9229d2440d3ef53fcbc4b071d9d0e9206176a0337957.js

@@ -38362,46 +38362,37 @@ $(document).on('turbolinks:load', function() {
 ;
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
+    $(".shixun-settings-select").on("change", function () {
+      var s_value = $(this).val();
+      var s_name = $(this).attr("name");
+      var json = {};
+      json[s_name] = s_value;
+      $.ajax({
+        url: "/admins/shixun_settings",
+        type: "GET",
+        dataType:'script',
+        data: json
+      })
+    });
 
+   $(".shixun-setting-form").on("change",function () {
+     var s_id = $(this).attr("data-id");
+     var s_value = $(this).val();
+     var s_name = $(this).attr("name");
+     var json = {};
+     var s_index = $(this).parent("td").siblings(".shixun-line-no").text();
+     json[s_name] = s_value;
+     json["page_no"] = s_index;
+     $.ajax({
+       url: "/admins/shixun_settings/" + s_id,
+       type: "PUT",
+       dataType:'script',
+       data: json
+     })
+   })
   }
 });
 
-function update_change(target) {
-    var s_id = $(target).attr("data-id");
-    var s_value = $(target).val();
-    var s_name = $(target).attr("name");
-    var json = {};
-    var s_index = $(target).parent("td").siblings(".shixun-line-no").text();
-    json[s_name] = s_value;
-    json["page_no"] = s_index;
-    $.ajax({
-        url: "/admins/shixun_settings/" + s_id,
-        type: "PUT",
-        dataType:'script',
-        data: json,
-        success: function (data) {
-
-        }
-    })
-}
-
-
-function select_change(target) {
-    var s_value = $(target).val();
-    var s_name = $(target).attr("name");
-    var json = {};
-    json[s_name] = s_value;
-    $.ajax({
-        url: "/admins/shixun_settings/",
-        type: "GET",
-        dataType:'script',
-        data: json,
-        success: function (data) {
-
-        }
-    })
-}
-;
 $(document).on('turbolinks:load', function() {
     $('select#tag-choosed').select2({
         placeholder: "请选择分类",

public/assets/application-d85c0ab2b3ec2cef4cbc8c4efce6d5bfa77c8568a0cbfd4ac74e0cb206b6f3eb.css

@@ -18726,6 +18726,13 @@ input[type="checkbox"] {
   border: 1px solid #eee !important;
 }
 
+/* line 10, app/assets/stylesheets/admins/shixun_settings.scss */
+.setting-chosen {
+  font-weight: 400;
+  font-size: 10px;
+  color: #333;
+}
+
 /* line 1, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar {
   min-width: 200px;
@@ -19421,6 +19428,13 @@ input[type="checkbox"] {
 .select2 .select2-selection__choice {
   border: 1px solid #eee !important;
 }
+
+/* line 10, app/assets/stylesheets/admins/shixun_settings.scss */
+.setting-chosen {
+  font-weight: 400;
+  font-size: 10px;
+  color: #333;
+}
 /* line 1, app/assets/stylesheets/admins/sidebar.scss */
 #sidebar {
   min-width: 200px;

public/react/src/modules/courses/css/Courses.css

@@ -1566,7 +1566,7 @@ samp {
     padding-left: 5px;
 }
 .padding10200{
-    padding: 10px 20px 0px;
+    padding: 10px 20px;
 }
 .padding1020{
     padding: 10px 20px 10px;

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

@@ -125,6 +125,7 @@ class studentsList extends Component{
       isSpin:false,
       DownloadType:false,
       DownloadMessageval:undefined,
+      donwloading:false,
     }
   }
 /// 确认是否下载
@@ -153,13 +154,18 @@ class studentsList extends Component{
       }else {
         this.props.showNotification(`正在下载中`);
         // window.open("/api"+url, '_blank');
+        this.setState({ donwloading: true })
         downloadFile({
           url: url,
           successCallback: (url) => {
             console.log('successCallback')
+            this.setState({ donwloading: false })
+
           },
           failCallback: (responseHtml, url) => {
             console.log('failCallback')
+            this.setState({ donwloading: false })
+
           }
         })
       }
@@ -603,8 +609,9 @@ class studentsList extends Component{
                        
                         `}</style>
               { isAdmin &&
+
               <li className="li_line drop_down fr color-blue font-16">
-                导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                <Spin spinning={this.state.donwloading} >导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                 <ul className="drop_down_menu" style={{"right": "-20px", "left": "unset", "height": "auto"}}>
                   <li onClick={(i) => this.confirmysl(exportUrltwo)}><a
                   	onClick={(i) => this.confirmysl(exportUrltwo)}>课堂信息</a>
@@ -616,7 +623,9 @@ class studentsList extends Component{
                     onClick={(i) => this.confirmysl(exportUrl)}>总成绩</a>
                   </li>
                 </ul>
+                </Spin>
               </li>
+
               }
               {/*<WordsBtn style="blue" className=""  onClick={(url)=>this.confirmysl(exportUrl)} >导出成绩</WordsBtn>*/}
               {/*  */}

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

@@ -606,7 +606,7 @@ class CoursesNew extends Component {
                                     `}
                                 </style>
 
-                                <div className="stud-class-set bor-bottom-greyE padding10200 ">
+                                <div className="stud-class-set bor-bottom-greyE padding1020 ">
                                     <div className={"TabsWarpcourse"}>
                                         <style>{
                                             `
@@ -624,21 +624,7 @@ class CoursesNew extends Component {
 																		  background-color: #fafafa!important;
 																		 }
 																		 
-																	 .yslzxueshis .ant-select-dropdown{
+																		
-																	    width: 655px !important;
-																		  height:160px !important;
-																		}
-																		.yslzxueshisy .ant-select-dropdown{
-																	    width: 655px !important;
-																		  height:160px !important;
-																		}
-																	 .yslzxueshis	.ant-select-dropdown-menu{
-																 width: 655px !important;
-																		}
-																		.ant-select-dropdown{
-																	    width: 655px !important;
-																		  height:160px !important;
-																		}
 																		`
                                         }</style>
                                         <Form.Item label="课程名称">
@@ -647,7 +633,7 @@ class CoursesNew extends Component {
                                             })(
 
                                               <AutoComplete
-                                                style={{	width: 720}}
+                                                style={{	width: 704}}
                                                 onSearch={this.handleSearch}
                                                 onSelect={this.handleSearchsysl}
                                                 className="fl construction yslzxueshis "
@@ -693,7 +679,7 @@ class CoursesNew extends Component {
 																		}
 																		
 																		.yslzxueshiskmc .ant-input-group{
-																	   width: 720px !important;
+																	   width: 704px !important;
 																		}
 																		 .yslzxueshisy span .ant-input-group-addon{
 																		  width: 65px !important;
@@ -704,10 +690,10 @@ class CoursesNew extends Component {
 																		  background-color: #fafafa!important;
 																		 }
 																		 .yslzxueshiskmc .ant-input-group-wrapper{
-																		   width: 720px !important;
+																		   width: 704px !important;
 																		 }
 																		 .yslzxueshiskmcs .ant-input-group-wrapper{
-																		   width: 720px !important;
+																		   width: 704px !important;
 																		 }
 																		`
                                     }</style>
@@ -884,7 +870,7 @@ class CoursesNew extends Component {
 																		<AutoComplete style={{ width: 280 }}
 																		onSearch={this.handleSearchschool}
 																		// onChange={this.handleChangeschools}
-																		className={"fl construction mr10 "}
+																		className={"fl construction mr10 yslzxueshis2"}
 																		placeholder="请输入并选择课本堂的所属单位"
 																		>
 																	  {optionschool}

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

@@ -794,18 +794,7 @@ class Goldsubject extends Component {
 																		  width: 65px !important;
 																		  background-color: #fafafa!important;
 																		 }
-																		 
+																	
-																	 .yslzxueshis .ant-select-dropdown{
-																	    width: 655px !important;
-																		  height:160px !important;
-																		}
-																	 .yslzxueshis	.ant-select-dropdown-menu{
-																 width: 655px !important;
-																		}
-																		.ant-select-dropdown{
-																	    width: 655px !important;
-																		  height:160px !important;
-																		}
 																		`
 									}</style>
 									<style>
@@ -828,7 +817,7 @@ class Goldsubject extends Component {
 															})(
 
 																<AutoComplete
-																							style={{width: 720}}
+																							style={{width: 704}}
 																							onSearch={this.handleSearch}
 																							className={"fl construction yslzxueshis "}
 																							dataSource={options}
@@ -1029,6 +1018,7 @@ class Goldsubject extends Component {
 								{/*</div>*/}
 
 								<div className="stud-class-set padding10200 mb20">
+
 									<Form.Item label="课堂所属单位">
 										{getFieldDecorator('school', {
 											rules: [{required: true, message: "不能为空"}],
@@ -1036,7 +1026,7 @@ class Goldsubject extends Component {
 											<AutoComplete style={{ width: 280 }}
 																		onSearch={this.handleSearchschool}
 												// onChange={this.handleChangeschools}
-																		className={"fl construction mr10 "}
+																		className={"fl construction mr10 yslzxueshis2 "}
 																		placeholder="请输入并选择课本堂的所属单位"
 											>
 												{optionschool}