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

app/controllers/student_works_controller.rb

@@ -458,7 +458,7 @@ class StudentWorksController < ApplicationController
     @shixun = @homework.shixuns.take
     # 提示： 这里如果includes outputs表的话： sum(:evaluate_count)会出现错误
     @games = @work.myshixun.games.joins(:challenge).reorder("challenges.position asc") if @work.myshixun
-    @comment = @work.student_works_scores.shixun_comment.first
+    @comment = @work.shixun_work_comments.find_by(challenge_id: 0)
 
     # 用户最大评测次数
     if @games
@@ -474,20 +474,30 @@ class StudentWorksController < ApplicationController
 
   # 实训作品的评阅
   def shixun_work_comment
-    tip_exception("评阅不能为空") if params[:comment].blank?
+    tip_exception("请至少输入一个评阅") if params[:comment].blank? && params[:hidden_comment].blank?
-    tip_exception("缺少is_hidden参数") if params[:is_hidden].blank? || ![1, 0].include?(params[:is_hidden])
+    ActiveRecord::Base.transaction do
-    comment = @work.student_works_scores.shixun_comment.first || StudentWorksScore.new(student_work_id: @work.id, user_id: current_user.id)
+      challenge = @homework.shixuns.first&.challenges.find_by(id: params[:challenge_id]) unless params[:challenge_id].blank?
+      if challenge.present?
+        comment = @work.shixun_work_comments.find_by(challenge_id: challenge.id) ||
+          ShixunWorkComment.new(student_work_id: @work.id, user_id: current_user.id, challenge_id: challenge.id)
+      else
+        comment = @work.shixun_work_comments.find_by(challenge_id: 0) ||
+          ShixunWorkComment.new(student_work_id: @work.id, user_id: current_user.id, challenge_id: 0)
+      end
       comment.comment = params[:comment]
-    comment.is_hidden = params[:is_hidden]
+      comment.hidden_comment = params[:hidden_comment]
       comment.save!
       normal_status("评阅成功")
     end
+  end
 
   # 删除实训作品评阅
   def destroy_work_comment
-    @work.student_works_scores.shixun_comment.first.destroy! if @work.student_works_scores.shixun_comment.first.present?
+    ActiveRecord::Base.transaction do
+      @work.shixun_work_comments.find_by!(id: params[:comment_id]).destroy_all
       normal_status("删除成功")
     end
+  end
 
   def export_shixun_work_report
     @user = @work.user

app/models/shixun_work_comment.rb

@@ -0,0 +1,5 @@
+class ShixunWorkComment < ApplicationRecord
+  belongs_to :student_work
+  belongs_to :user
+  belongs_to :challenge, optional: true
+end

app/models/student_work.rb

@@ -7,6 +7,7 @@ class StudentWork < ApplicationRecord
   belongs_to :myshixun, optional: true
   has_many :student_works_evaluation_distributions, dependent: :destroy
   has_many :student_works_scores, dependent: :destroy
+  has_many :shixun_work_comments, dependent: :destroy
   belongs_to :project, optional: true
 
   # attachtype: 1（正常提交的附件）， 7（补交的附件）

app/views/student_works/shixun_work_report.json.jbuilder

@@ -36,6 +36,9 @@ if @shixun
       challenge_score = @homework.challenge_score game.challenge_id
       json.game_score_full challenge_score
       json.game_score @work.work_challenge_score game, challenge_score
+      challenge_comment = @work.shixun_work_comments.find_by(challenge_id: game.challenge_id)
+      json.challenge_comment challenge_comment&.comment
+      json.challenge_comment_hidden challenge_comment&.hidden_comment
     end
   end
 
@@ -54,8 +57,8 @@ if @shixun
   json.passed_time @work.myshixun&.passed_time
 
   # 评阅信息
-  json.work_comment @user_course_identity < Course::STUDENT || !@comment&.is_hidden ? @comment&.comment : nil
+  json.work_comment @comment&.comment
-  json.work_comment_hidden @comment&.is_hidden
+  json.work_comment_hidden @user_course_identity < Course::STUDENT ? @comment&.hidden_comment : nil
 
 # 图形统计
 # 1： 效率

db/migrate/20190909080508_create_shixun_work_comments.rb

@@ -0,0 +1,13 @@
+class CreateShixunWorkComments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :shixun_work_comments do |t|
+      t.references :student_work, index: true, type: :integer
+      t.references :challenge, index: true, type: :integer, default: 0
+      t.references :user, index: true, type: :integer
+      t.text :comment
+      t.text :hidden_comment
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190909082555_migrate_shixun_work_comment.rb

@@ -0,0 +1,13 @@
+class MigrateShixunWorkComment < ActiveRecord::Migration[5.2]
+  def change
+    StudentWorksScore.where(is_ultimate: 0, score: nil).where("created_at > '2019-09-04 00:00:00'").each do |work_score|
+      if work_score.student_work && work_score.student_work.homework_common&.shixuns
+        if work_score.is_hidden
+          ShixunWorkComment.create!(student_work_id: work_score.student_work_id, user_id: work_score.user_id, hidden_comment: work_score.comment)
+        else
+          ShixunWorkComment.create!(student_work_id: work_score.student_work_id, user_id: work_score.user_id, comment: work_score.comment)
+        end
+      end
+    end
+  end
+end

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

@@ -91,7 +91,7 @@ class AppraiseModal extends Component{
 								    padding: 0px 15px 15px 15px;
 								}
 								.font{
-								    width: 48px;
+
 										height: 16px;
 										font-size: 16px;
 										font-weight: 400;
@@ -111,15 +111,21 @@ class AppraiseModal extends Component{
 						</style>
 						<div className="clearfix">
 							<p className={"font mt10 mb10"}>
-								权限：
+								可见:(学生可查看老师的评阅内容）
 							</p>
-							<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>
+							{/*<Radio.Group onChange={this.onChanges} value={this.state.valuetype}>*/}
-								<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>
+								{/*<Radio value={0} style={radioStyle} className={"newfont"}>可见  (学生查看老师的评阅内容）</Radio>*/}
-								<Radio value={1} style={radioStyle} className={"newfont"}>不可见  (仅对课堂老师可见）</Radio>
+								{/*<Radio value={1} style={radioStyle} className={"newfont"}>不可见  (仅对课堂老师可见）</Radio>*/}
-							</Radio.Group>
+							{/*</Radio.Group>*/}
+							<WordNumberTextarea
+								placeholder={"请填写评阅内容"}
+								onInput={(e)=>this.settextarea(e)}
+								value={textareaval}
+								maxlength={500}
+							/>
 
 							<p className={"font mt10 mb20"}>
-								内容：
+								不可见:(仅对课堂老师可见）
 							</p>
 							<WordNumberTextarea
 								placeholder={"请填写评阅内容"}

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

@@ -157,9 +157,44 @@ class Ecerciseallbackagain extends Component{
         console.log()
         return(
             <div>
+							<style>
+								{
+									`
+								@media (max-width: 2000px) {
+											.newupload_select_box{
+											  height: 265px !important;
+											}
+									}
+
+								 @media (max-width: 1350px) {
+										.HomeworkModal{
+ 										  top:10px !important;
+ 										}
+ 											.newupload_select_box{
+											  height: 220px !important;
+											}
+									}
+
+	 								@media (max-width: 1250px) {
+ 										.HomeworkModal{
+ 										  top:0px !important;
+ 										}
+
+ 										.newupload_select_box{
+											  height: 150px !important;
+									  }
+									}
+									.eerxisbox:hover {
+											background: #e4eaf6;
+									}
+									.upload_select_box li:hover {
+										background:transparent;
+									}
+									`
+								}
+							</style>
                 <Modal
                     className={"HomeworkModal"}
-										style={{ top: 20 }}
                     title={this.props.modalname}
                     visible={this.props.visible}
                     closable={false}
@@ -175,6 +210,7 @@ class Ecerciseallbackagain extends Component{
 												}
 												.fontlefts{text-align: left;}
 											`}</style>
+
                         <div className="clearfix edu-txt-center mb10" style={{color:"#333333",fontSize: '15px'}}>学生将得到一次重新答题的机会，现有的答题情况将被清空</div>
                         <ul className="clearfix edu-txt-center ml35">
                             <li className="fl paddingleft22 fontlefts" style={{width:'160px'}}>姓名</li>
@@ -183,7 +219,7 @@ class Ecerciseallbackagain extends Component{
                         </ul>
 
                         {datalist===undefined?"":
-                            <ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto",height: "217px"}}
+                            <ul className="upload_select_box fl clearfix mt10 mb10 newupload_select_box" style={{"overflow-y":"auto"}}
                                 id="search_not_members_list"
                                 onScroll={this.contentViewScroll}
                             >
@@ -191,7 +227,7 @@ class Ecerciseallbackagain extends Component{
 
                                     { datalist.map((item,key)=>{
                                                 return(
-                                                    <div className="clearfix edu-txt-center lineh-40" key={key}>
+                                                    <div className="clearfix edu-txt-center lineh-40 eerxisbox" key={key}>
                                                         <li className="fl" style={{width: '158px'}}>
                                                             <Checkbox
                                                                 className="fl task-hide edu-txt-left"
@@ -199,8 +235,12 @@ class Ecerciseallbackagain extends Component{
                                                                 value={item.user_id}
 																																key={item.user_id}
                                                             >
-                                                                <label style={{"textAlign": "left", "color": "#05101A"}}
+                                                                <a style={{"textAlign": "left"}}
-                                                                       className="task-hide color-grey-name" title="frerere">{item.user_name}</label>
+                                                                   className="task-hide color-grey-name"
+																																	 href={`/users/${item.user_id}/courses`}
+																																	 target={'_blank'}
+																																	 title={item.user_name}
+																																>{item.user_name}</a>
                                                             </Checkbox>
                                                         </li>
                                                         <li className="fl" style={{width: '150px'}}>

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

@@ -421,6 +421,7 @@ class ShixunWorkReport extends Component {
 								jumptopic={this.jumptopic}
 								getdatalist={()=>this.getdatalist()}
 								setupdalist={(challenge_score,overall_appraisal,work_score)=>this.setupdalist(challenge_score,overall_appraisal,work_score)}
+								showAppraiseModal={(sum)=>this.showAppraiseModal(sum)}
 							/>
 
 						</div>

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

@@ -273,7 +273,7 @@ class ShixunWorkModal extends Component{
 
 								</div>
 								:
-							<ul className="upload_select_box fl clearfix mt10 mb10" tyle={{"overflow-y":"auto"}}id="search_not_members_list"
+							<ul className="upload_select_box fl clearfix mt10 mb10" style={{"overflow-y":"auto"}} id="search_not_members_list"
 									onScroll={this.contentViewScroll}
 							>
 
@@ -286,7 +286,7 @@ class ShixunWorkModal extends Component{
 											group_list&&group_list.length===0?"":group_list.map((item,key)=>{
 												return(
 													 <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-														<li className="fl task-hide" style={{width: '240px'}}>
+														<li className="fl task-hide" style={{width: '240px',paddingLeft: '10px'}}>
 															<Checkbox
 																className="fl task-hide edu-txt-left"
 																name="shixun_homework[]"
@@ -294,7 +294,7 @@ class ShixunWorkModal extends Component{
 																key={item=== undefined?"":item.id}
 															>
 																<label style={{"textAlign": "left", "color": "#05101A"}}
-																			 className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
+																			 className="task-hide color-grey-name" title={item===undefined?"":item.name}>{item===undefined?"":item.name}</label>
 															</Checkbox>
 														</li>
 														<li className="fl" style={{width: '100px'}}>

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

@@ -196,6 +196,19 @@ class OfficialAcademicTranscript extends Component {
 							   // min={0} max={record.game_scores.game_score_full}
 						 /></a>
 						 {/*<a style={{textAlign: "center"}} className="color-blue font-14 mr20">查看</a>*/}
+        </span>
+			),
+		},{
+			title: '操作',
+			key: 'operation',
+			dataIndex: 'operation',
+
+			render: (text, record) => (
+				<span>
+			     <a
+						 className=" color-blue font-14 fr mr22"
+						 onClick={()=>this.props.showAppraiseModal(1)}
+					 >评阅</a>
         </span>
 			),
 		}];
@@ -210,6 +223,13 @@ class OfficialAcademicTranscript extends Component {
 				 }
 			 }
 		 )
+		 columns.some((item,key)=> {
+				 if (item.title === "操作") {
+					 columns.splice(key, 1)
+					 return true
+				 }
+			 }
+		 )
 	 }
 		return (
 			<div>
@@ -276,6 +296,9 @@ class OfficialAcademicTranscript extends Component {
 					.linhe15{
 					    line-height: 15px;
 					}
+					.mr22{
+					    margin-right: 22px;
+					}
 			`}
 				</style>
 				{datas===undefined?"":<Table

public/react/src/modules/modals/WordNumberTextarea.css

@@ -12,7 +12,6 @@
     width: 100%;
     height:150px;
     border:none;
-    padding: 10px;
     display: block;
 }
 
@@ -26,12 +25,9 @@
     height: auto;
     border: 1px solid rgba(234,234,234,1);
     border-radius: 0.125rem;
-    margin: 0.31rem;
+    margin: 10px 10px 0px 10px;
-    padding: 0.19rem;
+    padding: 10px 10px 5px 10px
     backgroud:rgba(234,234,234,1);
-    padding-bottom: 10px;
-    padding-right: 10px;
-
 }
 .WordNumberTextarea-count {
     display: inline-block;

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -518,7 +518,7 @@ class DetailCardsEditAndAdd extends Component{
                                     style={{"width":"298px"}}
                                     name="shixun_homework[]"
                                   >
-                                    <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.shixun_name}</label>
+                                    <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.shixun_name}>{item.shixun_name}</label>
                                   </Checkbox>
                                 </li>
                                 <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>

public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js

@@ -554,7 +554,7 @@ class DetailCardsEditAndEdit extends Component{
                                   style={{"width":"298px"}}
                                   name="shixun_homework[]"
                                 >
-                                  <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title="frerere">{item.shixun_name}</label>
+                                  <label style={{"textAlign":"left","color":"#05101A"}} className="task-hide color-grey-name" title={item.shixun_name}>{item.shixun_name}</label>
                                 </Checkbox>
                               </li>
                               <li className="fl with30 edu-txt-left task-hide paddingl5">{item.school_users}</li>

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -460,7 +460,7 @@ class PathDetailIndex extends Component{
                   <div className="edu-back-white myProgress padding40-20 mb10">
                     <p className="mb20">
                       <span className="font-16 mr10">关卡数</span>
-                      <Tooltip placement="bottom" title="已通过数/总关卡数">
+                      <Tooltip placement="bottom" title="已通过关卡数/总关卡数">
                           <span className="color-green"  >{progress.my_score} / {progress.all_score}</span>
                       </Tooltip>
                     </p>

spec/models/shixun_work_comment_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ShixunWorkComment, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end