From 99eaa92635191becc69501a729af3724e337d365 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 28 Nov 2019 18:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/admins/courses/index.js | 57 +++++++++++++++++++ app/controllers/admins/courses_controller.rb | 31 ++++++++++ app/controllers/admins/projects_controller.rb | 45 +++++++++++++++ app/models/course.rb | 4 ++ app/models/project.rb | 3 + app/models/version.rb | 3 + app/views/admins/courses/index.html.erb | 3 +- app/views/admins/courses/index.xlsx.axlsx | 29 ++++++++++ .../admins/courses/shared/_list.html.erb | 8 +-- app/views/admins/projects/destroy.js.erb | 2 + app/views/admins/projects/index.html.erb | 15 +++++ app/views/admins/projects/index.js.erb | 1 + .../admins/projects/shared/_list.html.erb | 48 ++++++++++++++++ app/views/admins/shared/_sidebar.html.erb | 2 +- config/routes.rb | 8 +-- spec/models/version_spec.rb | 5 ++ 16 files changed, 252 insertions(+), 12 deletions(-) create mode 100644 app/assets/javascripts/admins/courses/index.js create mode 100644 app/controllers/admins/projects_controller.rb create mode 100644 app/models/version.rb create mode 100644 app/views/admins/courses/index.xlsx.axlsx create mode 100644 app/views/admins/projects/destroy.js.erb create mode 100644 app/views/admins/projects/index.html.erb create mode 100644 app/views/admins/projects/index.js.erb create mode 100644 app/views/admins/projects/shared/_list.html.erb create mode 100644 spec/models/version_spec.rb diff --git a/app/assets/javascripts/admins/courses/index.js b/app/assets/javascripts/admins/courses/index.js new file mode 100644 index 000000000..336d8c7c9 --- /dev/null +++ b/app/assets/javascripts/admins/courses/index.js @@ -0,0 +1,57 @@ +$(document).on('turbolinks:load', function() { + if ($('body.admins-courses-index-page').length > 0) { + let searchContainer = $(".course-list-form"); + let searchForm = $("form.search-form",searchContainer); + + searchContainer.on('change', '.course-homepage-show', function(){ + searchForm.find('input[type="submit"]').trigger('click'); + }); + + //导出 + searchContainer.on('click', "#course-export", function () { + window.location.href = "/admins/courses.xlsx?" + searchForm.serialize(); + }); + + $(".course-list-container").on("change", '.course-setting-form', function () { + var s_id = $(this).attr("data-id"); + var s_value = $(this).val(); + var s_name = $(this).attr("name"); + var json = {}; + json[s_name] = s_value; + $.ajax({ + url: "/admins/courses/" + s_id, + type: "PUT", + dataType:'script', + data: json + }); + }); + + // ************** 学校选择 ************* + searchForm.find('.school-select').select2({ + theme: 'bootstrap4', + placeholder: '请选择单位', + minimumInputLength: 1, + ajax: { + delay: 500, + url: '/api/schools/search.json', + dataType: 'json', + data: function (params) { + return {keyword: params.term}; + }, + processResults: function (data) { + return {results: data.schools} + } + }, + templateResult: function (item) { + if (!item.id || item.id === '') return item.text; + return item.name; + }, + templateSelection: function (item) { + if (item.id) { + } + return item.name || item.text; + } + }); + } +}); + diff --git a/app/controllers/admins/courses_controller.rb b/app/controllers/admins/courses_controller.rb index c7275b0f8..19363057d 100644 --- a/app/controllers/admins/courses_controller.rb +++ b/app/controllers/admins/courses_controller.rb @@ -8,6 +8,16 @@ class Admins::CoursesController < Admins::BaseController @ended_courses = courses.where(is_end: 1).size @processed_courses = courses.where(is_end: 0).size @courses = paginate courses.includes(:school, :students, :attachments, :homework_commons, teacher: :user_extension) + + respond_to do |format| + format.js + format.html + format.xlsx do + @courses = courses.includes(:school, :students, :attachments, :homework_commons, :course_acts, teacher: :user_extension) + filename = "课堂列表_#{Time.current.strftime('%Y%m%d%H%M%S')}.xlsx" + render xlsx: 'index', filename: filename + end + end end def destroy @@ -18,9 +28,30 @@ class Admins::CoursesController < Admins::BaseController end end + def update + if @course.update_attributes(setting_params) + render_ok + else + redirect_to admins_courses_path + flash[:danger] = "更新失败" + end + end + + def homepage_show + + end + + def email_notify + + end + private def find_course @course = Course.find_by!(id: params[:id]) end + + def setting_params + params.permit(:homepage_show, :email_notify) + end end \ No newline at end of file diff --git a/app/controllers/admins/projects_controller.rb b/app/controllers/admins/projects_controller.rb new file mode 100644 index 000000000..f2f2aaa9d --- /dev/null +++ b/app/controllers/admins/projects_controller.rb @@ -0,0 +1,45 @@ +class Admins::ProjectsController < Admins::BaseController + + def index + default_sort('created_at', 'desc') + + search = params[:search].to_s.strip + projects = Project.where("name like ?", "%#{search}%") + @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score) + end + + def destroy + if @course.is_delete == 0 + @course.delete! + Tiding.create!(user_id: current_user.id, trigger_user_id: current_user.id, container_id: @course.id, + container_type: 'DeleteCourse', tiding_type: 'System', belong_container: @course, extra: @course.name) + end + end + + def update + if @course.update_attributes(setting_params) + render_ok + else + redirect_to admins_courses_path + flash[:danger] = "更新失败" + end + end + + def homepage_show + + end + + def email_notify + + end + + private + + def find_course + @course = Course.find_by!(id: params[:id]) + end + + def setting_params + params.permit(:homepage_show, :email_notify) + end +end \ No newline at end of file diff --git a/app/models/course.rb b/app/models/course.rb index f0b70b2f3..2f561bba7 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -375,6 +375,10 @@ class Course < ApplicationRecord Game.joins(:challenge).where(challenges: {shixun_id: shixun_ids}, games: {user_id: course_user_ids}).sum(:evaluate_count) end + def max_activity_time + course_acts.pluck(:updated_at).max + end + # 课堂作业数 def course_homework_count type homework_commons.select{|homework| homework.homework_type == type}.size diff --git a/app/models/project.rb b/app/models/project.rb index 2e0a8be64..af59f58de 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -7,6 +7,9 @@ class Project < ApplicationRecord has_many :issues has_many :user_grades, dependent: :destroy + has_many :attachments, as: :container, dependent: :destroy + has_one :project_score, dependent: :destroy + has_many :versions, -> { order("versions.effective_date DESC, versions.name DESC") }, dependent: :destroy after_create do SyncTrustieJob.perform_later("project", 1) if allow_sync_to_trustie? diff --git a/app/models/version.rb b/app/models/version.rb new file mode 100644 index 000000000..c278ff0a9 --- /dev/null +++ b/app/models/version.rb @@ -0,0 +1,3 @@ +class Version < ApplicationRecord + belongs_to :project +end diff --git a/app/views/admins/courses/index.html.erb b/app/views/admins/courses/index.html.erb index a46cabe24..84ea98223 100644 --- a/app/views/admins/courses/index.html.erb +++ b/app/views/admins/courses/index.html.erb @@ -19,13 +19,14 @@
<%= hidden_field_tag(:homepage_show, false, id:'') %> - <%= check_box_tag(:homepage_show, true, params[:homepage_show].to_s == 'true', class: 'form-check-input') %> + <%= check_box_tag(:homepage_show, true, params[:homepage_show].to_s == 'true', class: 'form-check-input course-homepage-show') %>
<%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> <% end %> + 导出
diff --git a/app/views/admins/courses/index.xlsx.axlsx b/app/views/admins/courses/index.xlsx.axlsx new file mode 100644 index 000000000..7cab54482 --- /dev/null +++ b/app/views/admins/courses/index.xlsx.axlsx @@ -0,0 +1,29 @@ +wb = xlsx_package.workbook + +wb.styles do |s| + blue_cell = s.add_style :bg_color => "FAEBDC", :sz => 10,:height => 25,:b => true, :border => { :style => :thin, :color =>"000000" },:alignment => {wrap_text: true,:horizontal => :center,:vertical => :center} + wb.add_worksheet(name: "课堂列表") do |sheet| + sheet.add_row %w(ID 课堂名称 成员 资源 普通作业 分组作业 实训作业 试卷 评测次数 私有 状态 单位 创建者 创建时间 动态时间), :height => 25,:style => blue_cell + + @courses.each do |course| + data = [ + course.id, + course.name, + course.course_members_count, + get_attachment_count(course, 0), + course.course_homework_count(1), + course.course_homework_count(3), + course.course_homework_count(4), + course.exercises_count, + course.evaluate_count, + course.is_public == 1 ? "--" : "√", + course.is_end ? "已结束" : "正在进行", + course.school&.name, + course.teacher&.real_name, + course.created_at&.strftime('%Y-%m-%d %H:%M'), + course.max_activity_time ? course.max_activity_time&.strftime('%Y-%m-%d %H:%M') : "--" + ] + sheet.add_row(data) + end + end +end diff --git a/app/views/admins/courses/shared/_list.html.erb b/app/views/admins/courses/shared/_list.html.erb index 225437ba9..31661d8c5 100644 --- a/app/views/admins/courses/shared/_list.html.erb +++ b/app/views/admins/courses/shared/_list.html.erb @@ -37,16 +37,14 @@ <%= course.evaluate_count %> <%= course.is_public == 1 ? "--" : "√" %> <%= course.is_end ? "已结束" : "正在进行" %> - <%= course.school.name %> + <%= course.school&.name %> <%= course.teacher&.real_name %> <%= course.created_at&.strftime('%Y-%m-%d %H:%M') %> - class="magic-checkbox" id="course_homepage_show_<%= course.id %>"> - + <%= check_box_tag :homepage_show,!course.homepage_show,course.homepage_show,remote:true,data:{id:course.id},class:"course-setting-form" %> - class="magic-checkbox" id="course_email_notify_<%= course.id %>"> - + <%= check_box_tag :email_notify,!course.email_notify,course.email_notify,remote:true,data:{id:course.id},class:"course-setting-form" %> <% if course.is_delete == 0 %> diff --git a/app/views/admins/projects/destroy.js.erb b/app/views/admins/projects/destroy.js.erb new file mode 100644 index 000000000..811038193 --- /dev/null +++ b/app/views/admins/projects/destroy.js.erb @@ -0,0 +1,2 @@ +alert("删除成功"); +$(".course-item-<%= @course.id %>").find(".delete-course-action").remove(); \ No newline at end of file diff --git a/app/views/admins/projects/index.html.erb b/app/views/admins/projects/index.html.erb new file mode 100644 index 000000000..c2cdd3946 --- /dev/null +++ b/app/views/admins/projects/index.html.erb @@ -0,0 +1,15 @@ +<% define_admin_breadcrumbs do %> + <% add_admin_breadcrumb('项目列表') %> +<% end %> + +
+ <%= form_tag(admins_projects_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %> + <%= text_field_tag(:search, params[:search], class: 'form-control col-12 col-md-2 mr-3', placeholder: '项目名称检索') %> + <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %> + + <% end %> +
+ +
+ <%= render partial: 'admins/projects/shared/list', locals: { projects: @projects } %> +
\ No newline at end of file diff --git a/app/views/admins/projects/index.js.erb b/app/views/admins/projects/index.js.erb new file mode 100644 index 000000000..ceaabb423 --- /dev/null +++ b/app/views/admins/projects/index.js.erb @@ -0,0 +1 @@ +$('.project-list-container').html("<%= j( render partial: 'admins/projects/shared/list', locals: { projects: @projects } ) %>"); \ No newline at end of file diff --git a/app/views/admins/projects/shared/_list.html.erb b/app/views/admins/projects/shared/_list.html.erb new file mode 100644 index 000000000..e80f5551e --- /dev/null +++ b/app/views/admins/projects/shared/_list.html.erb @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + <% if projects.present? %> + <% projects.each do |project| %> + + + + + + + + + + + + + + + <% end %> + <% else %> + <%= render 'admins/shared/no_data_for_table' %> + <% end %> + +
ID项目名称公开issue资源版本库PullRequest里程碑成员管理员<%= sort_tag('创建时间', name: 'created_at', path: admins_projects_path) %>操作
<%= project.id %> + <%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %> + <%= project.is_public ? '√' : '' %><%= project.issues.size %><%= project.attachments.size %><%= project.project_score.try(:changeset_num).to_i %><%= project.project_score.try(:pull_request_num).to_i %><%= project.versions.size %><%= project.members.size %> + <%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %> + <%= project.created_on&.strftime('%Y-%m-%d %H:%M') %> + <%= delete_link '删除', admins_project_path(project, element: ".project-item-#{project.id}"), class: 'delete-project-action' %> +
+ +<%= render partial: 'admins/shared/paginate', locals: { objects: projects } %> \ No newline at end of file diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb index 33749f467..6681d82b2 100644 --- a/app/views/admins/shared/_sidebar.html.erb +++ b/app/views/admins/shared/_sidebar.html.erb @@ -41,7 +41,7 @@
  • <%= sidebar_item(admins_course_lists_path, '课程列表', icon: 'list', controller: 'admins-course_lists') %>
  • <%= sidebar_item(admins_courses_path, '课堂列表', icon: 'list', controller: 'admins-courses') %>
    • - +
  • <%= sidebar_item(admins_projects_path, '项目列表', icon: 'server', controller: 'admins-projects') %>
    • <% end %> diff --git a/config/routes.rb b/config/routes.rb index 5c7437614..34b384da3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1177,11 +1177,9 @@ Rails.application.routes.draw do post :merge, on: :collection end - resources :courses, only: [:index, :destroy] do - post :hidden, on: :member - post :homepage_show, on: :member - post :email_notify, on: :member - end + resources :courses, only: [:index, :destroy, :update] + + resources :projects, only: [:index, :destroy] end namespace :cooperative do diff --git a/spec/models/version_spec.rb b/spec/models/version_spec.rb new file mode 100644 index 000000000..6ca56219e --- /dev/null +++ b/spec/models/version_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Version, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end