Merge branch 'dev_aliyun' into dev_hjm_a

app/controllers/attachments_controller.rb

@@ -172,7 +172,7 @@ class AttachmentsController < ApplicationController
           # 课堂资源、作业、毕设相关资源的权限判断
           if @file.container.is_a?(Course)
             course = @file.container
-            candown = current_user.member_of_course?(course) || @file.is_public == 1
+            candown = current_user.member_of_course?(course) || (course.is_public? && @file.publiced?)
           elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic)
             course = @file.container&.course
             candown = current_user.member_of_course?(course)

app/controllers/exercise_questions_controller.rb

@@ -339,10 +339,11 @@ class ExerciseQuestionsController < ApplicationController
           @exercise_question.exercise_shixun_challenges.each_with_index do |challenge, index|
             challenge.question_score = params[:question_scores][index].to_f.round(1)
             challenge.save
-            question_score += challenge.question_score
+            question_score += params[:question_scores][index].to_f.round(1)
           end
           @exercise_question.question_score = question_score
           @exercise_question.shixun_name = shixun_name
+          @exercise_question.save
         end
 
         #当试卷已发布时（试卷的总状态),当标准答案修改时，如有已提交的学生，需重新计算分数.

app/controllers/users/base_controller.rb

@@ -26,6 +26,12 @@ class Users::BaseController < ApplicationController
     render_forbidden
   end
 
+  def require_teacher!
+    return if current_user.admin_or_business? || observed_user.is_teacher?
+
+    render_forbidden
+  end
+
   def require_auth_teacher!
     return if current_user.admin_or_business? || observed_user.certification_teacher?
 

app/controllers/users/videos_controller.rb

@@ -1,5 +1,6 @@
 class Users::VideosController < Users::BaseController
   before_action :private_user_resources!, :check_account
+  before_action :require_teacher!
   before_action :require_auth_teacher!, except: [:index, :review]
 
   helper_method :current_video

app/libs/aliyun_vod/service/base.rb

@@ -10,7 +10,15 @@ module AliyunVod::Service::Base
 
     Rails.logger.info("[AliyunVod] response => status: #{response.status}, result: #{result}")
 
-    raise AliyunVod::Error, result['Code'] if response.status != 200
+    if response.status != 200
+      message =
+        case result['Code']
+        when 'InvalidFileName.Extension' then '不支持的视频格式'
+        when 'IllegalCharacters' then '视频名称包含非法字符'
+        else raise AliyunVod::Error, result['Message']
+        end
+      raise AliyunVod::Error, message if message.present?
+    end
 
     result
   rescue => ex

app/libs/aliyun_vod/service/video_upload.rb

@@ -16,15 +16,6 @@ module AliyunVod::Service::VideoUpload
 
     result = request(:post, params)
 
-    if result['Code'].present?
-      message =
-        case result['Code']
-        when 'InvalidFileName.Extension' then '不支持的文件格式'
-        when 'IllegalCharacters' then '文件名称包含非法字符'
-        end
-      raise AliyunVod::Error, message if message.present?
-    end
-
     raise AliyunVod::Error, '获取上传凭证失败' if result['UploadAddress'].blank?
 
     result

app/services/videos/create_auth_service.rb

@@ -21,7 +21,14 @@ class Videos::CreateAuthService < ApplicationService
   private
 
   def title
-    @_title ||= params.delete(:title).to_s.strip
+    @_title ||= begin
+      str = params.delete(:title).to_s.strip
+      if str.length > 30
+        "#{str[0, 15]}...#{str.reverse[0,10].reverse}"
+      else
+        str
+      end
+    end
   end
 
   def filename

app/services/videos/dispatch_callback_service.rb

@@ -13,6 +13,7 @@ class Videos::DispatchCallbackService < ApplicationService
     case params['EventType']
     when 'FileUploadComplete' then # 视频上传完成
       video.file_url = params['FileUrl']
+      video.filesize = params['Size']
       video.upload_success
       video.save!
     when 'SnapshotComplete' then # 封面截图完成

db/migrate/20190819081514_add_filesize_to_videos.rb

@@ -0,0 +1,5 @@
+class AddFilesizeToVideos < ActiveRecord::Migration[5.2]
+  def change
+    add_column :videos, :filesize, :integer, default: 0
+  end
+end

public/react/src/common/components/attachment/AttachmentList.js

@@ -0,0 +1,33 @@
+import React,{ Component } from "react";
+
+class AttachmentsList extends Component{
+  constructor(props){
+    super(props);
+  }
+  render(){
+    let { attachments } = this.props;
+    return(
+      <React.Fragment>
+        {
+          attachments.map((item,key)=>{
+            return(
+              <p key={key}>
+                <a className="color-grey">
+                  <i className="font-14 color-green iconfont icon-fujian mr8"></i>
+                </a>
+                {
+                  item.is_pdf && item.is_pdf == true ?
+                  <a href={item.url} className="mr12" length="58" target="_blank">{item.title}</a>
+                  :
+                  <a href={item.url} className="mr12" length="58">{item.title}</a>
+                }
+                <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
+              </p>
+            )
+          })
+        }
+      </React.Fragment>
+    )
+  }
+}
+export default AttachmentsList;

public/react/src/common/educoder.js

@@ -30,6 +30,9 @@ export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info
 export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
     , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from 	'./Const'
 
+    
+export { default as AttachmentList } from './components/attachment/AttachmentList'
+
 export { themes, ThemeContext } from 	'./context/ThemeContext'
 
 export { ModalHOC } from 	'./components/ModalHOC'

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -45,6 +45,7 @@ class Studentshavecompletedthelist extends Component {
 			teacherlist: undefined,
 			searchtext: "",
 			Teacherliststudentlist: undefined,
+			mylistansum:0,
 			review: null,
 			course_groupysls: undefined,
 			nocomment: false,
@@ -1252,6 +1253,7 @@ class Studentshavecompletedthelist extends Component {
 					exercise_users: response.data.exercise_users,
 					current_answer_user: response.data.current_answer_user,
 					course_groups: response.data.course_groups,
+					mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users
 				})
 				if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) {
 					// 学生未截止
@@ -1622,6 +1624,7 @@ class Studentshavecompletedthelist extends Component {
 				commit_status: response.data.commit_status,
 				exercise_users: response.data.exercise_users,
 				current_answer_user: response.data.current_answer_user,
+				mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 			})
 			if (response.data.exercise_types.subjective === 0) {
 
@@ -1756,6 +1759,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
 					})
@@ -1788,6 +1792,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						columnsys: arr,
 					})
 				}
@@ -1823,6 +1828,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys:	arr,
 					})
@@ -1854,6 +1860,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
 					})
@@ -1885,6 +1892,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						columnsys: arr,
 					})
 				} else {
@@ -1909,6 +1917,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						columnsys:arr,
 					})
 				}
@@ -1923,6 +1932,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: this.state.columnsystwo,
 					})
@@ -1948,6 +1958,7 @@ class Studentshavecompletedthelist extends Component {
 						commit_status: response.data.commit_status,
 						exercise_users: response.data.exercise_users,
 						course_groups: response.data.course_groups,
+						mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users,
 						loadingstate: false,
 						columnsys: arr,
 					})
@@ -2401,7 +2412,7 @@ class Studentshavecompletedthelist extends Component {
 	render() {
 		const isAdmin = this.props.isAdmin();
 
-		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users} = this.state;
+		let {data, datas, page, columns, course_groupyslsthree, columnstwo, styletable, course_groupyslstwodatas, limit, course_groupysls, course_groupyslstwodata, course_groupyslstwo, teacherlists, Teacherliststudentlist, order, columnss, course_groupsdatas, course_groups, Evaluationarray, unlimited, unlimiteds, unlimitedtwo, teacherlist, searchtext, loadingstate, review, nocomment, commented, unsubmitted, submitted, columnsys, exercise_users,mylistansum} = this.state;
 		// console.log("Studentshavecompletedthelist");
 		// console.log(this.props.current_status);
 		return (
@@ -2789,11 +2800,11 @@ class Studentshavecompletedthelist extends Component {
 								</div>
 
 								{
-									Teacherliststudentlist && Teacherliststudentlist.exercise_types.total_users && Teacherliststudentlist.exercise_types.total_users > limit ?
+									mylistansum && mylistansum > limit ?
 										<div className="edu-txt-center mt30 mb20">
 											<Pagination showQuickJumper current={page}
 																	onChange={this.paginationonChanges} pageSize={limit}
-																	total={Teacherliststudentlist.exercise_types.total_users}></Pagination>
+																	total={mylistansum}></Pagination>
 										</div>
 										: ""
 								}

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -413,7 +413,7 @@ class Testpapersettinghomepage extends Component{
 																		<a  className="fr color-blue font-16 mt20" onClick={()=>this.setgameexercise(`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`)}>开始答题</a>:
                                   <Link className="fr color-blue font-16 mt20"
                                         to={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${this.props.current_user.login}`}>
-                                      {start_Value[Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status]}
+																		{Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status===3?"":Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status===4?"":start_Value[Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.current_status]}
 																	</Link>
                                   :""}
 

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -206,7 +206,9 @@ class PollDetailIndex extends Component{
                   {
 										user_permission && user_permission.current_status!=3 ?
 											<WordsBtn style="blue" to={`/courses/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollId}/users/${this.props.current_user.login}`}>
-												{ user_permission && user_permission.current_status ==0 ? "继续答题" : user_permission.current_status == 1 ? "查看答题" : "开始答题"  }
+												{ user_permission && user_permission.current_status ==0 ? "继续答题" : user_permission.current_status == 1 ?
+													(pollDetail && pollDetail.polls_status===3?"":pollDetail && pollDetail.polls_status===4?"":"查看答题")
+													: "开始答题"  }
 											</WordsBtn>
 											:""
 									}

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

@@ -143,7 +143,7 @@ class CommitSummary extends Component{
               </div>
 
             </div>
-                        <div>
+            <div className="mt20">
               <p className=" fl color-black mt10 summaryname" onClick={this.asdasdsad}>{this.state.description ? '修改总结' : '提交总结'}</p>
               <a onClick={()=>this.gotohome()} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
             </div>
@@ -174,7 +174,27 @@ class CommitSummary extends Component{
                         )}
                       </div>
                     </Form.Item>
-
+                    <style>
+                      {
+                        `
+                                            .ant-form-item {
+                                              -webkit-box-sizing: border-box;
+                                              box-sizing: border-box;
+                                              margin: 0;
+                                              padding: 0;
+                                              color: rgba(0, 0, 0, 0.65);
+                                              font-size: 14px;
+                                              font-variant: tabular-nums;
+                                              line-height: 1.5;
+                                              list-style: none;
+                                              -webkit-font-feature-settings: 'tnum';
+                                              font-feature-settings: 'tnum';
+                                              /* margin-bottom: 24px; */
+                                              vertical-align: top;
+                                            }                  
+                                            `
+                      }
+                    </style>
                     <Form.Item>
                       <div className="clearfix mt40 mb30">
                         <Button type="primary" htmlType="submit" className="defalutSubmitbtn fl mr20" >

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

@@ -132,7 +132,7 @@ class ShixunHomeworkPage extends Component {
 			<div className="newMain clearfix ">
 
 
-				<div className={"educontent mt20 mb20"} style={{width: "1200px"}}>
+				<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
 
 					<div className="educontent mb20">
 						<p className="clearfix mb20 mt10">

public/react/src/modules/moop_cases/CaseDetail.js

@@ -2,13 +2,15 @@ import React,{ Component } from "react";
 import './css/moopCases.css'
 import '../courses/css/Courses.css'
 
-import { getImageUrl , MarkdownToHtml , ActionBtn } from 'educoder';
+import { getImageUrl , MarkdownToHtml , ActionBtn , AttachmentList } from 'educoder';
 
 import Tags from './CaseTags'
 
 import axios from 'axios';
 import Modals from '../modals/Modals'
 
+// import AttachmentList from '../../common/components/attachment/AttachmentList'
+
 class CaseDetail extends Component{
   constructor(props){
     super(props);
@@ -65,6 +67,9 @@ class CaseDetail extends Component{
     } = this.state;
     return(
       <div className="educontent mt10 mb50">
+        {
+          CaseDetail &&
+          <React.Fragment>
             <Modals
               modalsType={modalsType}
               modalsTopval={modalsTopval}
@@ -74,22 +79,22 @@ class CaseDetail extends Component{
             >
             </Modals>
             <p className="mt10 mb20 clearfix lineh-20">
-          <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{ CaseDetail && CaseDetail.title}</span>
+              <a href="/moop_cases" className="color-grey-9">教学案例</a> &gt; <span className="color-grey-3">{ CaseDetail.title}</span>
             </p>
             <p className="lineh-25 mb20 clearfix">
               <span className="font-22 fl mr10 task-hide" style={{maxWidth:"800px"}}>
-            { CaseDetail && CaseDetail.title}
+                { CaseDetail.title}
               </span>
               <span className="mt5 fl">
                 <Tags tags={tags}></Tags>
                 {
-              CaseDetail && CaseDetail.status == "pending" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">草稿</span>
+                  CaseDetail.status == "pending" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">草稿</span>
                 }
                 {
-              CaseDetail && CaseDetail.status == "processing" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">审核中</span>
+                  CaseDetail.status == "processing" && <span class="edu-filter-btn fl cdefault edu-activity-green ml10">审核中</span>
                 }
                 {
-              CaseDetail && CaseDetail.status == "refused" && <span class="edu-filter-btn fl cdefault edu-activity-orange ml10">未通过</span>
+                  CaseDetail.status == "refused" && <span class="edu-filter-btn fl cdefault edu-activity-orange ml10">未通过</span>
                 }
               </span> 
               <a href="/moop_cases" className="fr color-grey-9 mt5">返回</a>
@@ -112,19 +117,19 @@ class CaseDetail extends Component{
                     <li className="clearfix lineh-20">
                       <span className="fl color-grey-9 mr20">{creator && creator.school_name}</span>
                       <span className="fr">
-                    <span className="fl color-grey-9 mr30">编码：<span className="color-grey-6">{CaseDetail && CaseDetail.uuid}</span></span>
+                        <span className="fl color-grey-9 mr30">编码：<span className="color-grey-6">{CaseDetail.uuid}</span></span>
                         {
                           CaseDetail && CaseDetail.status=="published" ?
-                      <span className="fl color-grey-9">发布时间：<span className="color-grey-6">{CaseDetail && CaseDetail.published_at}</span></span>
+                          <span className="fl color-grey-9">发布时间：<span className="color-grey-6">{CaseDetail.published_at}</span></span>
                           :
-                      <span className="fl color-grey-9">上传时间：<span className="color-grey-6">{CaseDetail && CaseDetail.created_at}</span></span>
+                          <span className="fl color-grey-9">上传时间：<span className="color-grey-6">{CaseDetail.created_at}</span></span>
                         }
                       </span>
                     </li>
                   </div>
                 </div>
                 <div>
-              <span className="fl color-grey-9">作者：</span>{CaseDetail && CaseDetail.author_name}/{CaseDetail && CaseDetail.author_school_name}
+                  <span className="fl color-grey-9">作者：</span>{CaseDetail.author_name}/{CaseDetail.author_school_name}
                 </div>
                 <style>
                   {`
@@ -134,23 +139,11 @@ class CaseDetail extends Component{
                   `}
                 </style>
                 <div class="mt20 setMDStyle">
-              { CaseDetail && CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} id="casesDetail" selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
+                  { CaseDetail.content && <MarkdownToHtml content={CaseDetail.content} id="casesDetail" selector="casesDetail" style={{width:"100%!important"}}></MarkdownToHtml>}
                 </div>
                 { attachments && 
                   <div className="mt10">
-                {
-                  attachments.map((item,key)=>{
-                    return(
-                      <p>
-                        <a className="color-grey">
-                          <i className="font-14 color-green iconfont icon-fujian mr8"></i>
-                        </a>
-                        <a href={item.url} className="mr12" length="58">{item.title}</a>
-                        <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
-                      </p>
-                    )
-                  })
-                }
+                    <AttachmentList {...this.props} {...this.state} attachments={attachments}></AttachmentList>
                   </div>
                 }     
                 <div class="mt40">
@@ -169,6 +162,8 @@ class CaseDetail extends Component{
                 </div>
               </div>
             </div>
+          </React.Fragment>
+        }
       </div>
     )
   }