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

app/controllers/graduation_tasks_controller.rb

@@ -324,7 +324,7 @@ class GraduationTasksController < ApplicationController
     tip_exception("缺少截止时间参数") if params[:end_time].blank?
     tip_exception("截止时间必须晚于当前时间") if params[:end_time] <= strf_time(Time.now)
     tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
-      @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
+      @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
 
     # ActiveRecord::Base.transaction do
       begin
@@ -401,7 +401,7 @@ class GraduationTasksController < ApplicationController
             tip_exception("截止时间不能早于当前时间") if params[:end_time] <= Time.now.strftime("%Y-%m-%d %H:%M:%S")
             tip_exception("截止时间不能早于发布时间") if params[:publish_time] > params[:end_time]
             tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
-              @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
+              @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
 
             @task.publish_time = params[:publish_time]
             @task.end_time = params[:end_time]
@@ -414,7 +414,7 @@ class GraduationTasksController < ApplicationController
             tip_exception("截止时间不能为空") if params[:end_time].blank?
             tip_exception("截止时间不能早于当前时间") if params[:end_time] <= Time.now.strftime("%Y-%m-%d %H:%M:%S")
             tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
-              @course.end_date.present? && params[:end_time] > @course.end_date.end_of_day
+              @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
             @task.end_time = params[:end_time]
           end
 
@@ -426,7 +426,7 @@ class GraduationTasksController < ApplicationController
             tip_exception("补交结束时间不能为空") if params[:late_time].blank?
             tip_exception("补交结束时间不能早于截止时间") if params[:late_time] <= @task.end_time
             tip_exception("补交结束时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
-              @course.end_date.present? && params[:late_time] > @course.end_date.end_of_day
+              @course.end_date.present? && params[:late_time] > strf_time(@course.end_date.end_of_day)
             tip_exception("迟交扣分应为正整数") if params[:late_penalty] && params[:late_penalty].to_i < 0
 
             @task.allow_late = true

app/controllers/myshixuns_controller.rb

@@ -271,7 +271,11 @@ class MyshixunsController < ApplicationController
       unless @hide_code || @myshixun.shixun&.vnc_evaluate
         # 远程版本库文件内容
         last_content = GitService.file_content(repo_path: @repo_path, path: path)["content"]
-        content = params[:content]
+        content = if @myshixun.mirror_name.select {|a| a.include?("MachineLearning") || a.include?("Python")}.present? && params[:content].present?
+                    params[:content].gsub(/\t/, '    ').gsub(/ /, ' ') # 这个不是空格，在windows机器上带来的问题
+                  else
+                    params[:content]
+                  end
         Rails.logger.info("###11222333####{content}")
         Rails.logger.info("###222333####{last_content}")
 

app/controllers/question_banks_controller.rb

@@ -264,8 +264,9 @@ class QuestionBanksController < ApplicationController
       #   new_exercise.create_exercise_list
       #   exercise.update_column(:quotes, exercise.quotes+1)
       # end
-      new_exercise if new_exercise.save!
+      new_exercise.save!
       exercise.update_column(:quotes, exercise.quotes+1)
+      new_exercise
     end
   end
 
@@ -292,8 +293,9 @@ class QuestionBanksController < ApplicationController
       #   new_poll.create_polls_list
       #   poll.update_column(:quotes, poll.quotes+1)
       # end
-      new_poll if new_poll.save!
+      new_poll.save!
       poll.update_column(:quotes, poll.quotes+1)
+      new_poll
     end
   end
 

app/models/subject.rb

@@ -46,8 +46,7 @@ class Subject < ApplicationRecord
 
   # 挑战过路径的成员数(金课统计去重后的报名人数)
   def member_count
-    excellent && CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length > shixuns.pluck(:myshixuns_count).sum ?
-      CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length : shixuns.pluck(:myshixuns_count).sum
+    excellent ? CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length : shixuns.pluck(:myshixuns_count).sum
   end
 
   def all_score

app/models/tiding.rb

@@ -22,4 +22,9 @@ class Tiding < ApplicationRecord
 
     value
   end
+
+  def anonymous?
+    (container_type == 'StudentWorksScore' && extra.to_i == 3) ||
+      (container_type == 'StudentWorksScoresAppeal' && parent_container_type == 'StudentWork' && tiding_type == 'System')
+  end
 end

app/views/tidings/_tiding.json.jbuilder

@@ -17,8 +17,13 @@ json.homework_type homework_type
 json.time tiding.how_long_time
 json.new_tiding tiding.unread?(@onclick_time)
 
+# 需要系统头像
+show_system_user = tiding.trigger_user_id.zero? ||
+  (tiding.trigger_user_id == 1 && tiding.tiding_type == 'System') ||
+  tiding.anonymous?
+
 json.trigger_user do
-  if tiding.trigger_user_id.zero? || (tiding.trigger_user_id == 1 && tiding.tiding_type == 'System')
+  if show_system_user
     json.id 0
     json.name "系统"
     json.login ""

config/locales/tidings/zh-CN.yml

@@ -202,6 +202,7 @@
         2_end: "别人对你的匿评发起的申诉申请：%s，审核未通过"
       StudentWork:
         Apply_end: "发起了匿评申诉申请：%s"
+        HomeworkCommon_end: "发起了匿评申诉申请：%s"
         System_end: "有人对你的匿评发起了申诉：%s"
     Department_end: "你选填的二级单位：%s（%s）因不符合规范,已被系统删除.请重新选择"
     Library:

lib/tasks/public_course_sync.rake

@@ -81,8 +81,10 @@ namespace :public_classes do
 
         homework.update_columns(publish_time: publish_time, end_time: end_time, created_at: created_at, updated_at: updated_at)
         homework.homework_detail_manual.update_columns(comment_status: 6, created_at: created_at, updated_at: updated_at)
+        homework.update_homework_work_score
+        homework.update_attribute('calculation_time', end_time)
 
-        homework.student_works.where("work_status !=0 and update_time > '#{end_time}'").update_all(update_time: end_time)
+        # homework.student_works.where("work_status !=0 and update_time > '#{end_time}'").update_all(update_time: end_time)
       end
     when 3
       # 试卷

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

@@ -35,10 +35,15 @@ class ShixunWorkDetails extends Component {
 			}
 		}).then((result) => {
 			if (result.status === 200) {
-				this.setState({
-					data:result.data,
-					spinning:false
-				})
+				if (result.data.status === 403 || result.data.status === 401 || result.data.status === 407 || result.data.status === 408|| result.data.status === 409 || result.data.status === 500) {
+
+				}else{
+					this.setState({
+						data:result.data,
+						spinning:false
+					})
+				}
+
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -50,7 +55,33 @@ class ShixunWorkDetails extends Component {
 			shixuntypes:type[3]
 		})
 	}
+  updatas=()=>{
+		this.setState({
+			spinning:true
+		})
+		let homeworkid=this.props.match.params.homeworkid;
+		let userid=this.props.match.params.userid;
+		let url = "/homework_commons/"+homeworkid+"/code_review_detail.json";
+		axios.get(url,{
+			params: {
+				user_id:userid,
+			}
+		}).then((result) => {
+			if (result.status === 200) {
+				if (result.data.status === 403 || result.data.status === 401 || result.data.status === 407 || result.data.status === 408|| result.data.status === 409 || result.data.status === 500) {
 
+				}else{
+					this.setState({
+						data:result.data,
+						spinning:false
+					})
+				}
+
+			}
+		}).catch((error) => {
+			console.log(error)
+		})
+	}
 	goback=(sum)=>{
 		// let{data}=this.state
 		// if(sum===1){
@@ -102,14 +133,18 @@ class ShixunWorkDetails extends Component {
 						<span className="fl color-orange font-14">非编程类型任务，不参与查重</span>
 						<span className="fr mt4">
 							<span className={"color656565"}>被查作品：</span>
-							<span className={"mr20"}>{data&&data.username}</span>
-							<span className={"color-orange"}>{data&&data.final_score}分</span>
+							<span className={"mr50"}><span className={"color-orange"}>{data&&data.username}</span></span>
+							{data&&data.eff_score===null||data&&data.eff_score===undefined||data&&data.eff_score_full===null||data&&data.eff_score_full===undefined?"":<span className={"mr50"}>效率分：<span className={"color-orange"}>{data&&data.eff_score}</span>/{data&&data.eff_score_full}</span>}
+							<span className={""}>最终成绩：<span className={"color-orange"}>{data&&data.final_score}</span>分</span>
 						</span>
 					</div>
 
 					<div className="stud-class-set bor-bottom-greyE">
 						<div className="clearfix edu-back-white poll_list">
 							<ShixunCustomsPass
+								{...this.props}
+								{...this.state}
+								updatas={()=>this.updatas()}
 								data={data}
 							/>
 						</div>

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

@@ -1,10 +1,10 @@
 import React, {Component} from "react";
 import {WordsBtn} from 'educoder';
-import {Table} from "antd";
+import {Table,InputNumber} from "antd";
 import {Link,Switch,Route,Redirect} from 'react-router-dom';
 import moment from 'moment';
 import { MonacoDiffEditor } from 'react-monaco-editor';
-
+import axios from 'axios';
 class ShixunCustomsPass extends Component {
 
 	constructor(props) {
@@ -18,10 +18,51 @@ class ShixunCustomsPass extends Component {
 	componentDidMount() {
 
 	}
+	editgame_scores=(e,id,maxsum,code_rate,copy_user_id)=>{
+
+		let{datas}=this.state;
+		let newdatas=datas;
+		let score=e.target.value;
+
+		if(score!=null&&score!=undefined&&score!=""){
+			if(score<0){
+				this.props.showNotification("不能小于0");
+				this.setState({
+					customsids:id
+				})
+			}else if(score>maxsum){
+				this.props.showNotification(`不能大于关卡分值${maxsum}`);
+				this.setState({
+					customsids:id
+				})
+			}else{
+				let work_id=this.props.data.work_id;
+				let url=`/student_works/${work_id}/adjust_review_score.json`
+				axios.post(url,{
+					type:"review",
+					score:score,
+					challenge_id:id,
+					code_rate:code_rate,
+					copy_user_id:copy_user_id
+				}).then((result)=>{
+					if(result.data.status===0){
+						this.props.updatas();
+						this.props.showNotification(result.data.message);
+					}else{
+						this.props.showNotification(result.data.message);
+					}
+				}).catch((error)=>{
 
+				})
+			}
+		}else{
+			this.props.showNotification("调分为空将不会修改之前的分数");
+		}
+	}
 	render() {
 		let {data}=this.props;
-		console.log(data)
+		let {customsids}=this.state;
+		// console.log(data)
     let datas=[];
 
 		data&&data.challenge_list.forEach((item,key)=>{
@@ -33,6 +74,8 @@ class ShixunCustomsPass extends Component {
 				finishtime:item.copy_username,
 				elapsedtime:item.copy_end_time===null?"无":item.copy_end_time===undefined?"无":item.copy_end_time===""?"无":moment(item.copy_end_time).format('YYYY-MM-DD HH:mm:ss'),
 				empvalue:item.code_rate,
+				challenge_id:{id:item.id},
+				copy_user_id:item.copy_user_id
 				// adjustmentminute:asdasd
 			})
 		})
@@ -112,6 +155,22 @@ class ShixunCustomsPass extends Component {
 			render: (text, record) => (
 				<span className={"color-grey-9"}>
 					  {record.elapsedtime}
+        </span>
+			),
+		},{
+			title: '调分',
+			key: 'adjustmentminute',
+			dataIndex: 'adjustmentminute',
+
+			render: (text, record) => (
+				<span>
+			       <a>
+							 {record.copy_user_id===null?"":<InputNumber size="small" className={customsids===record.challenge_id.id?"bor-red":""} defaultValue={record.evaluating.final_score}
+														 onBlur={(e) => this.editgame_scores(e,record.challenge_id.id,record.evaluating.all_score,record.empvalue,record.copy_user_id)}
+							 // min={0} max={record.game_scores.game_score_full}
+							 />}
+			       </a>
+					{/*<a style={{textAlign: "center"}} className="color-blue font-14 mr20">查看</a>*/}
         </span>
 			),
 		}, {
@@ -138,7 +197,15 @@ class ShixunCustomsPass extends Component {
 		// },
 
 
-
+		if(this.props.isAdmin()===false){
+			columns.some((item,key)=> {
+					if (item.title === "调分") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
 		return (
 			<div>
 
@@ -177,6 +244,9 @@ class ShixunCustomsPass extends Component {
 					.customsPass{
             text-align: left !important;
 					}
+					.ant-table-thead > tr > th, .ant-table-tbody > tr > td {
+							padding: 16px 12px;
+					}
 			`}
 				</style>
 				{datas===undefined?"":<Table