From dec3922a2a2ee4cdd0d556c0302a68589d3e616e Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 18 May 2019 21:59:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=AF=84=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 83637277..c1e4c55a 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -853,7 +853,7 @@ class ManagementsController < ApplicationController def evaluate_simple page = params[:page] - @recodes = EvaluateRecord.where("created_at > ?", Time.now - 1.days).order("consume_time desc") + @recodes = EvaluateRecord.where("created_at > ?", Time.now - 1000.days).reorder("consume_time desc") @recodes_count = @recodes.size @record_pages = Paginator.new @recodes_count, 20, page || 1 @offset ||= @record_pages.offset From 2862d530f70501590f228e96ad4e186e20667b58 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 18 May 2019 22:00:51 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E7=AE=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index c1e4c55a..2d7ba1e2 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -853,7 +853,7 @@ class ManagementsController < ApplicationController def evaluate_simple page = params[:page] - @recodes = EvaluateRecord.where("created_at > ?", Time.now - 1000.days).reorder("consume_time desc") + @recodes = EvaluateRecord.where("created_at > ?", Time.now - 1.days).reorder("consume_time desc") @recodes_count = @recodes.size @record_pages = Paginator.new @recodes_count, 20, page || 1 @offset ||= @record_pages.offset From 2374e6f31c038945e49e55f74dfd04d32dc25b4f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 20 May 2019 09:56:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=AF=84=E6=B5=8B=E6=97=B6=E9=97=B4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=A4=A7=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 21 +++++++++++------- .../_evaluate_records_list.html.erb | 6 +++-- .../managements/evaluate_records.html.erb | 22 ++++++++++++++++++- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 2d7ba1e2..f67099b9 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -863,19 +863,19 @@ class ManagementsController < ApplicationController # 评测时间列表 def evaluate_records shixun_tomcat = Redmine::Configuration['shixun_tomcat'] - uri = "#{shixun_tomcat}/bridge/monitor/getPodsInfo" - res = uri_exec uri, params - if res['code'] == 0 - @pod_num = res['sum'] - @pod_dis = JSON.parse(res['distr']) if res['distr'].present? - end + #uri = "#{shixun_tomcat}/bridge/monitor/getPodsInfo" + #res = uri_exec uri, params + #if res['code'] == 0 + @pod_num = 1 # res['sum'] + @pod_dis = [{ip: 1, num: 1}] #JSON.parse(res['distr']) if res['distr'].present? + #end page = (params['page'] || 1).to_i search = params[:search] keyword = params[:keyword] limit = 20 - if search + if search.present? if "u_name" == keyword @evaluate_recods = EvaluateRecord.joins("join users u on evaluate_records.user_id = u.id").where("concat(u.lastname, u.firstname) like '%#{search}%'") # @evaluate_recods = EvaluateRecord.where(user_id: User.where("concat(lastname, firstname) like '%#{search}%'").pluck(:id)) @@ -884,7 +884,12 @@ class ManagementsController < ApplicationController # @evaluate_recods = EvaluateRecord.where(user_id: UserExtensions.where(school_id: School.where("name like '%#{search}%'").pluck(:id)).pluck(:user_id)) end else - @evaluate_recods = EvaluateRecord.where("0=0") + @evaluate_recods = EvaluateRecord.where(nil) + end + + if params[:beginTime].present? + endTime = params[:endTime].present? ? params[:endTime] : Time.now + @evaluate_recods = @evaluate_recods.where("created_at >= ? and created_at <= ?", params[:beginTime], endTime) end @evaluate_recods_count = @evaluate_recods.count diff --git a/app/views/managements/_evaluate_records_list.html.erb b/app/views/managements/_evaluate_records_list.html.erb index 4bb7e844..338981dd 100644 --- a/app/views/managements/_evaluate_records_list.html.erb +++ b/app/views/managements/_evaluate_records_list.html.erb @@ -16,13 +16,14 @@ 开始时间 结束时间 耗时 - 评测者 + 最大执行时间 + 评测者 评测者单位 耗时详细 - <% @evaluate_recods.each do |record| %> + <% @evaluate_recods.includes(:shixun).each do |record| %> <%= record.id %> <%= record.game.try(:identifier) %> @@ -33,6 +34,7 @@ <%= record.created_at.strftime('%Y-%m-%d %H:%M:%S') %> <%= record.updated_at.strftime('%Y-%m-%d %H:%M:%S') %> <%= record.try(:consume_time) %> + <%= record.shixun.exec_time %> <%= link_to record.user.show_real_name, user_path(record.user), :target => "_blank" %> diff --git a/app/views/managements/evaluate_records.html.erb b/app/views/managements/evaluate_records.html.erb index ab284308..535ac4d1 100644 --- a/app/views/managements/evaluate_records.html.erb +++ b/app/views/managements/evaluate_records.html.erb @@ -1,14 +1,21 @@ +
<%= form_tag(url_for(evaluate_records_managements_path),:id=>"evaluate_records",:method => "post",:remote=>true) do %> -
+
+
  • + 开始时间 + + +
    • 搜索 清除
    <% end %> +
    <%= render :partial => "evaluate_records_list" %>
    @@ -19,4 +26,17 @@ $("#Look_name").val(""); $.get('<%= evaluate_records_managements_path() %>'); } + + $("input[name='beginTime']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); + $("input[name='endTime']").datetimepicker({ + allowBlank:true, + lang:'ch', + format:'Y-m-d H:i', + validateOnBlur:false + }); From 5360ed4d3a400ca0000c426a4ffbc80be250dddb Mon Sep 17 00:00:00 2001 From: p31729568 Date: Mon, 20 May 2019 11:23:45 +0800 Subject: [PATCH 4/8] fix save school fail bug --- app/controllers/colleges_controller.rb | 6 +++--- app/controllers/managements/schools_controller.rb | 10 +++++----- app/controllers/managements_controller.rb | 2 +- app/views/managements/upload_logo.html.erb | 5 ++++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb index 960030c9..fff508a8 100644 --- a/app/controllers/colleges_controller.rb +++ b/app/controllers/colleges_controller.rb @@ -31,9 +31,9 @@ class CollegesController < ApplicationController end def verification_school_identifier - school = School.where(:identifier => params[:identifier]).first - status = school.present? ? 1 : 0 - render :json => {status: status} + schools = School.where(identifier: params[:identifier]) + schools = schools.where('id != ?', params[:school_id]) if params[:school_id].present? + render :json => { status: schools.exists? ? 1 : 0 } end def online_school diff --git a/app/controllers/managements/schools_controller.rb b/app/controllers/managements/schools_controller.rb index f27e00ae..a5c789ff 100644 --- a/app/controllers/managements/schools_controller.rb +++ b/app/controllers/managements/schools_controller.rb @@ -4,8 +4,8 @@ class Managements::SchoolsController < Managements::BaseController def statistics @sub_type = 1 - params[:sort_by] = :teacher_count if params[:sort_by].blank? - params[:sort_direction] = :desc if params[:sort_direction].blank? + params[:sort_by] = params[:sort_by].presence || :teacher_count + params[:sort_direction] = params[:sort_direction].presence || :desc service = Management::SchoolReportService.new(params) @obj_count, @schools = service.call @@ -20,8 +20,8 @@ class Managements::SchoolsController < Managements::BaseController def data_grow @sub_type = 2 params[:data_type] ||= 'grow' - params[:sort_by] = :teacher_increase_count if params[:sort_by].blank? - params[:sort_direction] = :desc if params[:sort_direction].blank? + params[:sort_by] = params[:sort_by].presence || :teacher_increase_count + params[:sort_direction] = params[:sort_direction].presence || :desc service = Management::SchoolDataGrowService.new(params) @grow_summary = service.grow_summary @@ -31,7 +31,7 @@ class Managements::SchoolsController < Managements::BaseController end def data_contrast - params[:contrast_column] = :teacher_increase_count if params[:contrast_column].blank? + params[:contrast_column] = params[:contrast_column].presence || :teacher_increase_count params[:sort_direction] ||= :desc params[:sort_by] = :percentage diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index f67099b9..1eab7439 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1518,7 +1518,7 @@ end if search.blank? @schools = School.where("0=0") else - @schools = School.where("name like '%#{search}%'") + @schools = School.where("name like ?", "%#{search}%") end if params[:index] == '8' @schools = @schools.reorder("created_at #{@sx_order}") diff --git a/app/views/managements/upload_logo.html.erb b/app/views/managements/upload_logo.html.erb index 5da56c47..487f3eba 100644 --- a/app/views/managements/upload_logo.html.erb +++ b/app/views/managements/upload_logo.html.erb @@ -130,7 +130,10 @@ if($("#unit_head_route").val().trim() !=""){ $.ajax({ url: "<%= verification_school_identifier_colleges_path %>", - data: {identifier: $("#unit_head_route").val().trim()}, + data: { + school_id: <%= @school.id %>, + identifier: $("#unit_head_route").val().trim() + }, async:false, success: function (data) { if(data.status == 0){ From 0bfee488292455608a8a9d0a4852ac3850acdeb4 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 20 May 2019 16:29:42 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index f67099b9..87936acc 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -863,12 +863,12 @@ class ManagementsController < ApplicationController # 评测时间列表 def evaluate_records shixun_tomcat = Redmine::Configuration['shixun_tomcat'] - #uri = "#{shixun_tomcat}/bridge/monitor/getPodsInfo" - #res = uri_exec uri, params - #if res['code'] == 0 - @pod_num = 1 # res['sum'] - @pod_dis = [{ip: 1, num: 1}] #JSON.parse(res['distr']) if res['distr'].present? - #end + uri = "#{shixun_tomcat}/bridge/monitor/getPodsInfo" + res = uri_exec uri, params + if res['code'] == 0 + @pod_num = res['sum'] + @pod_dis = JSON.parse(res['distr']) if res['distr'].present? + end page = (params['page'] || 1).to_i search = params[:search] From 2912f320411ae9bcedc14368e02bca0b17f87c88 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 20 May 2019 17:37:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=9A=84=E8=AF=BE=E5=A0=82=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=20=E8=AF=BE=E5=A0=82=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E7=9A=84=E2=80=9C=E8=AF=84=E6=B5=8B=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E2=80=9D=E7=BB=9F=E8=AE=A1=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/course.rb | 9 +++++++++ app/views/managements/_classroom_classment_list.html.erb | 2 ++ 2 files changed, 11 insertions(+) diff --git a/app/models/course.rb b/app/models/course.rb index 843d846d..c6c6d3df 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -500,6 +500,15 @@ class Course < ActiveRecord::Base end end + # 课堂实训作业的评测次数 + def evaluate_count + course_user_ids = self.members.map(&:user_id) + shixun_ids = self.homework_commons.joins(:homework_commons_shixuns).where(homework_type: 4).pluck(:shixun_id) + return 0 if shixun_ids.blank? + Game.joins(:challenge).where(challenges: {shixun_id: shixun_ids}, games: {user_id: course_user_ids}).sum(:evaluate_count) + end + + #课程动态公共表记录 def act_as_course_activity self.course_acts << CourseActivity.new(:user_id => self.tea_id,:course_id => self.id) diff --git a/app/views/managements/_classroom_classment_list.html.erb b/app/views/managements/_classroom_classment_list.html.erb index 5051be80..25b13911 100644 --- a/app/views/managements/_classroom_classment_list.html.erb +++ b/app/views/managements/_classroom_classment_list.html.erb @@ -9,6 +9,7 @@ 普通作业 实训作业 试卷 + 评测次数 私有 状态 创建者单位 @@ -28,6 +29,7 @@ <%= course.homework_commons.where(:homework_type => 1).count %> <%= course.homework_commons.where(:homework_type => 4).count %> <%= course.exercises.count %> + <%= course.evaluate_count %> <%= course.is_public.to_i == 1 ? '--' : '√' %> <%= course.is_end ? "已结束" : "正在进行" %> <%= course.teacher.try(:user_extensions).try(:school).try(:name).blank? ? "--" : course.teacher.try(:user_extensions).try(:school) %> From 146873ffdc553feccd87f17673a2dd28df8c1b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 20 May 2019 20:46:07 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E3=80=91=E9=A1=B9=E7=9B=AE-issue=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E5=AF=BC=E8=87=B4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form_attachments.html.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/attachments/_form_attachments.html.erb b/app/views/attachments/_form_attachments.html.erb index e1d6b3b5..58ae4aa0 100644 --- a/app/views/attachments/_form_attachments.html.erb +++ b/app/views/attachments/_form_attachments.html.erb @@ -49,8 +49,9 @@ <%= javascript_include_tag 'attachments' %>