diff --git a/app/models/glcc_medium_term_examine_material.rb b/app/models/glcc_medium_term_examine_material.rb index e2ec7aec2..ffb776591 100644 --- a/app/models/glcc_medium_term_examine_material.rb +++ b/app/models/glcc_medium_term_examine_material.rb @@ -18,6 +18,7 @@ class GlccMediumTermExamineMaterial < ActiveRecord::Base self.table_name = "glcc_medium_term_examine_material" belongs_to :glcc_student, :class_name => :GlccRegistrationStudent, :foreign_key => "student_reg_id" + belongs_to :task, :class_name => :GlccRegistrationTask, :foreign_key => "task_id" def check_pr_url state = [] @@ -68,7 +69,7 @@ class GlccMediumTermExamineMaterial < ActiveRecord::Base state = check_pr_url return unless state.present? - title = "2023年GitLink确实开源GLCC开源夏令营#{term == 1 ? "中期考核" : "结项考核"}提醒" + title = "#{self.created_on.year}年GitLink确实开源GLCC开源夏令营#{term == 1 ? "中期考核" : "结项考核"}提醒" content = gennerate_content(state) UserMailer.glcc_pr_check_email(mail,title, gcs.student_name, content).deliver_now end @@ -76,7 +77,7 @@ class GlccMediumTermExamineMaterial < ActiveRecord::Base def state_to_html gcs = glcc_student mail = gcs.mail - return "数据异常PR连接为空" if mail.nil? || code_or_pr_url.nil? + return "数据异常,PR链接为空" if mail.nil? || code_or_pr_url.nil? state = check_pr_url gennerate_content(state) end @@ -94,7 +95,7 @@ class GlccMediumTermExamineMaterial < ActiveRecord::Base when 1 "

PR链接为非GitLink平台链接

" when 2 - "

PR链接为GitLink平台非PR链接

" + "

PR链接为GitLink平台链接, 但非PR链接

" when 3 "

PR链接中的PR不存在

" end diff --git a/app/models/glcc_registration_task.rb b/app/models/glcc_registration_task.rb new file mode 100644 index 000000000..7c8671e6f --- /dev/null +++ b/app/models/glcc_registration_task.rb @@ -0,0 +1,23 @@ + +# == Schema Information +# +# Table name: ignores +# user_id +# student_name +# school +# profession +# location +# grade +# phone +# mail +# created_on +# is_delete +# prove_attachment_id +# cancel_count +# round +# + +class GlccRegistrationTask < ActiveRecord::Base + self.table_name = "glcc_registration_task" + has_many :examines, :class_name => :GlccMediumTermExamineMaterial, :foreign_key => "task_id" +end diff --git a/app/views/admins/glcc_pr_check/_examine_material.html.erb b/app/views/admins/glcc_pr_check/_examine_material.html.erb index df7c52abe..4fd0da8ec 100644 --- a/app/views/admins/glcc_pr_check/_examine_material.html.erb +++ b/app/views/admins/glcc_pr_check/_examine_material.html.erb @@ -1,16 +1,17 @@ - - - - - - - - - - + + + + + + + + + + + @@ -20,12 +21,13 @@ + - - + + - + <% end %>
序号昵称课题ID邮件地址视频地址PR地址考核阶段白名单检测状态提交时间序号学生姓名课题ID课题名称邮件地址视频地址PR地址考核阶段白名单检测状态提交时间
<%= list_index_no((params[:page] || 1).to_i, index) %> <%= material.glcc_student.student_name %> <%= material.task_id %><%= material.task.task_name %> <%= material.glcc_student.mail %> 查看视频 查看PR

<%= material.defence_video_url.to_s %>

<%= material.code_or_pr_url.to_s %>

<%= material.term == 1 ? "中期考核" : "结项考核"%> <%= material.white_list ? "是":"否" %><%= material.state_to_html.html_safe %><%= material.state_to_html.blank? ? "通过" : material.state_to_html.html_safe %> <%= material.created_on.strftime("%Y-%m-%d %H:%M")%>