Merge branches 'courseware' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into courseware

app/controllers/application_controller.rb

@@ -330,7 +330,7 @@ class ApplicationController < ActionController::Base
 		end
 
 		if !User.current.logged? && Rails.env.development?
-			User.current = User.find 1
+			User.current = User.find 3117
 		end
 
 

app/controllers/collections_controller.rb

@@ -0,0 +1,21 @@
+class CollectionsController < ApplicationController
+
+  before_action :require_login
+
+  def create
+    tip_exception("勿重复收藏") if current_user.collections.find_by(create_params).present?
+    current_user.collections.create!(create_params)
+    normal_status("收藏成功，您可以在个人主页对应的栏目中查看")
+  end
+
+  def cancel
+    collection = current_user.collections.find_by!(create_params)
+    collection.destroy!
+    normal_status("操作成功")
+  end
+
+  private
+  def create_params
+    params.permit(:container_id, :container_type)
+  end
+end

app/controllers/exercise_answers_controller.rb

@@ -102,18 +102,7 @@ class ExerciseAnswersController < ApplicationController
       normal_status(-1,"已提交/已结束的试卷不允许修改！")
     else
       if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + @exercise.time.to_i.minutes) < Time.now))
-        objective_score = calculate_student_score(@exercise,current_user,Time.now)[:total_score]
-        subjective_score = @exercise_user.subjective_score < 0.0 ? 0.0 : @exercise_user.subjective_score
-        total_score = objective_score + subjective_score
-        commit_option = {
-            :status => 1,
-            :commit_status => 1,
-            :end_at => Time.now,
-            :objective_score => objective_score,
-            :score => total_score,
-            :subjective_score => subjective_score
-        }
-        @exercise_user.update!(commit_option)
+        commit_exercise_user @exercise, @exercise_user
         normal_status(-1,"试卷提交时间已截止！")
       end
     end

app/controllers/exercises_controller.rb

@@ -816,7 +816,7 @@ class ExercisesController < ApplicationController
 
           ex_user_ids = exercise_users.pluck(:id)
 
-          EndExerciseCalculateJob.perform_later(ex_user_ids, exercise, Time.now.to_s)
+          EndExerciseCalculateJob.perform_later(ex_user_ids, exercise, Time.now.to_s, true, 4)
           # exercise_users.each do |user|
           #   if user.commit_status == 0 && user.start_at.present?
           #     objective_score = calculate_student_score(exercise,user.user)[:total_score]
@@ -982,11 +982,17 @@ class ExercisesController < ApplicationController
         @shixun_undo = 0
         @ques_undo = 0
         ex_answer_time = @exercise.time.to_i
+        exercise_user = @exercise.exercise_users.find_by(user_id: current_user.id)
         if ex_answer_time > 0 #有剩余时间的时候
           user_left_time = get_exercise_left_time(@exercise, current_user)
           @ex_end_time = Time.now + user_left_time.to_i.seconds
+
+          # 提交用户试卷
+          commit_exercise_user @exercise, exercise_user if user_left_time.nil?
         else
           @ex_end_time = @exercise.get_exercise_end_time(current_user.id)
+
+          commit_exercise_user @exercise, exercise_user if @ex_end_time < Time.now
         end
         # @ex_end_time = @exercise.get_exercise_end_time(current_user.id)
         # if ex_answer_time > 0
@@ -1033,20 +1039,7 @@ class ExercisesController < ApplicationController
           can_commit_exercise = true
         end
         if can_commit_exercise
-          objective_score = calculate_student_score(@exercise, current_user, Time.now)[:total_score]
-          subjective_score = @answer_committed_user.subjective_score
-          total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
-          total_score = objective_score + total_score_subjective_score
-          commit_option = {
-            :status => 1,
-            :commit_status => 1,
-            :end_at => Time.now,
-            :objective_score => objective_score,
-            :score => total_score,
-            :subjective_score => subjective_score,
-            :commit_method => @answer_committed_user&.commit_method.to_i > 0 ? @answer_committed_user&.commit_method.to_i : params[:commit_method].to_i
-          }
-          @answer_committed_user.update!(commit_option)
+          commit_exercise_user @exercise, @answer_committed_user, Time.now
           CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
           normal_status(0, "试卷提交成功！")
         else
@@ -1197,10 +1190,19 @@ class ExercisesController < ApplicationController
 
       @exercise_users_size = @exercise_users_list.size
 
+      if @exercise.time > 0
+        start_time = Time.current - @exercise.time * 60
+        ex_user_ids = @exercise_users_list.where("start_at <= '#{Time.at(start_time)}' and commit_status = 0").pluck(:user_id)
+        if ex_user_ids.size > 0
+          EndExerciseCalculateJob.perform_later(ex_user_ids, @exercise, Time.now.to_s, false, 2)
+        end
+      end
+
       # 分页
       @page = params[:page] || 1
       @limit = params[:limit] || 20
       @exercise_users_list = @exercise_users_list.page(@page).per(@limit)
+
     else
       @exercise_users_list = []
       @export_ex_users = @exercise_users_list

app/helpers/exercises_helper.rb

@@ -961,4 +961,36 @@ module ExercisesHelper
   def content_line(content)
     content.split(/\r?\n/).length + 1
   end
+
+  def commit_exercise_user exercise, exercise_user, commit_time = nil
+    exercise_end_time = exercise.get_exercise_end_time(exercise_user.user_id)  #没有考虑分班的情况
+    objective_score = calculate_student_score(exercise, exercise_user.user, exercise_end_time)[:total_score]
+    subjective_score = exercise_user.subjective_score < 0.0 ? 0.0 : exercise_user.subjective_score
+    total_score = objective_score + subjective_score
+
+    if commit_time.nil?
+      if exercise.time > 0
+        start_time = Time.at(exercise_user.start_at + exercise.time * 60)
+        end_time = start_time > exercise_end_time ? exercise_end_time : start_time
+        commit_method = start_time > exercise_end_time ? 3 : 2
+      else
+        commit_method = 3
+        end_time = exercise_end_time
+      end
+    else
+      commit_method = 1
+    end
+    commit_time = commit_time.present? && end_time > commit_time ? commit_time : end_time
+
+    commit_option = {
+      :status => 1,
+      :commit_status => 1,
+      :end_at => commit_time,
+      :objective_score => objective_score,
+      :score => total_score,
+      :subjective_score => subjective_score,
+      :commit_method => commit_method
+    }
+    exercise_user.update!(commit_option)
+  end
 end

app/helpers/weapps/attendances_helper.rb

@@ -2,7 +2,9 @@ module Weapps::AttendancesHelper
 
   def student_attendance_status attendance, user
     st_attendance = attendance.course_member_attendances.find_by(user_id: user.id)
-    st_attendance.present? ? st_attendance.attendance_status : "ABSENCE"
+    attendance_status = st_attendance.present? ? st_attendance.attendance_status : "ABSENCE"
+    attendance_mode = st_attendance.present? ? st_attendance.attendance_mode : "DEFAULT"
+    {attendance_status: attendance_status, attendance_mode: attendance_mode}
   end
 
   def group_attendance_count attendances, member_ids

app/jobs/end_exercise_calculate_job.rb

@@ -5,10 +5,12 @@ class EndExerciseCalculateJob < ApplicationJob
 
   queue_as :default
 
-  def perform(ex_user_ids,exercise,end_time)
+  def perform(ex_user_ids,exercise,end_time,work_time,commit_method)
     exercise_users = ExerciseUser.where(id: ex_user_ids)
     exercise_users.each do |user|
       if user.commit_status == 0 && user.start_at.present?
+        end_at = work_time ? end_time : Time.at(user.start_at + exercise.time * 60)
+
         objective_score = calculate_student_score(exercise,user.user,end_time.to_time)[:total_score]
         user_sub_score = user.subjective_score
         subjective_score = user_sub_score < 0.0 ? 0.0 : user_sub_score
@@ -16,11 +18,11 @@ class EndExerciseCalculateJob < ApplicationJob
         commit_option = {
           :status => 1,
           :commit_status => 1,
-          :end_at => Time.now,
+          :end_at => end_at,
           :objective_score => objective_score,
           :score => total_score,
           :subjective_score => user_sub_score,
-          :commit_method => user&.commit_method.to_i > 0 ? user&.commit_method.to_i : 4
+          :commit_method => user&.commit_method.to_i > 0 ? user&.commit_method.to_i : commit_method
         }
         user.update_attributes(commit_option)
       end

app/models/collection.rb

@@ -0,0 +1,4 @@
+class Collection < ApplicationRecord
+  belongs_to :user
+  belongs_to :container, polymorphic: true, optional: true
+end

app/models/shixun.rb

@@ -53,6 +53,9 @@ class Shixun < ApplicationRecord
   has_many :shixun_service_configs, :dependent => :destroy
   has_many :tidings, as: :container, dependent: :destroy
 
+  # 收藏
+  has_many :collections, as: :container, dependent: :destroy
+
   # 实训审核记录
   has_many :shixun_reviews, -> {order("shixun_reviews.created_at desc")}, :dependent => :destroy
 

app/models/subject.rb

@@ -16,6 +16,9 @@ class Subject < ApplicationRecord
 
   has_many :subject_appointments, dependent: :destroy
 
+  # 收藏
+  has_many :collections, as: :container, dependent: :destroy
+
   has_many :subject_members, ->{ order("subject_members.position asc")}, dependent: :destroy
   has_many :users, through: :subject_members
   has_many :tidings, as: :container, dependent: :destroy

app/models/user.rb

@@ -48,6 +48,8 @@ class User < ApplicationRecord
   has_many :course_messages
   has_many :courses, foreign_key: 'tea_id', dependent: :destroy
 
+  has_many :collections, dependent: :destroy
+
   #试卷
   has_many :exercise_banks, :dependent => :destroy
   has_many :exercise_users, :dependent => :destroy

app/views/attendances/index.json.jbuilder

@@ -11,7 +11,9 @@ json.attendances @attendances do |attendance|
   json.edit_auth @user_course_identity < Course::PROFESSOR || attendance.user_id == User.current.id
 
   if @user_course_identity == Course::STUDENT
-    json.attendance_status student_attendance_status(attendance, User.current)
+    student_attendance_status = student_attendance_status(attendance, User.current)
+    json.attendance_status student_attendance_status[:attendance_status]
+    json.attendance_mode student_attendance_status[:attendance_mode]
   end
 end
 

app/views/weapps/attendances/_student_attendance.json.jbuilder

@@ -2,4 +2,7 @@ json.(attendance, :id, :name, :mode)
 json.attendance_date attendance.attendance_date.strftime("%Y/%m/%d")
 json.start_time attendance.start_time.strftime("%H:%M")
 json.end_time attendance.end_time.strftime("%H:%M")
-json.attendance_status student_attendance_status(attendance, User.current)
+
+student_attendance_status = student_attendance_status(attendance, User.current)
+json.attendance_status student_attendance_status[:attendance_status]
+json.attendance_mode student_attendance_status[:attendance_mode]

config/routes.rb

@@ -306,6 +306,10 @@ Rails.application.routes.draw do
     resources :subject_lists
     resources :shixun_lists
 
+    resources :collections do
+      delete :cancel, on: :collection
+    end
+
     resources :shixuns, param: :identifier do
 
       collection do

db/migrate/20200320074850_create_collections.rb

@@ -0,0 +1,13 @@
+class CreateCollections < ActiveRecord::Migration[5.2]
+  def change
+    create_table :collections do |t|
+      t.references :user, index: true
+      t.integer :container_id
+      t.string :container_type
+
+      t.timestamps
+    end
+
+    add_index :collections, [:container_type, :container_id]
+  end
+end

db/migrate/20200320082708_uniq_index_on_collections.rb

@@ -0,0 +1,6 @@
+class UniqIndexOnCollections < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :collections, [:container_type, :container_id]
+    add_index :collections, [:container_type, :container_id], unique: true
+  end
+end

public/react/src/modules/courses/signin/component/Teacherentry.js

@@ -163,7 +163,7 @@ class Teacherentry extends Component {
 													{
 														item.attendance_status?
 															(
-																item.attendance_status==="ABSENCE"?
+																item.attendance_status==="ABSENCE"&&item.attendance_mode!="TEACHER"?
 																	<div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}>
 																		签到
 																	</div>

spec/models/collection_spec.rb

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