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

Gemfile

@@ -12,7 +12,7 @@ gem 'uglifier', '>= 1.3.0'
 # gem 'coffee-rails', '~> 4.2'
 gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
-
+gem 'groupdate', '~> 4.1.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'kaminari', '~> 1.1', '>= 1.1.1'
 

app/controllers/admins/statistics_controller.rb

@@ -0,0 +1,29 @@
+class Admins::AboutsController < Admins::BaseController
+
+  def index
+    projects = Project.all.project_statics_select
+    by_time = params[:time]
+    b_classify = params[:classify]
+
+    if b_classify.present?
+
+    end
+
+    if by_time.present?
+      case by_time.to_s
+      when "week"
+        projects = projects.group_by_week(:created_on).count
+      when "month"
+        projects = projects.group_by_month(:created_on).count
+      when "quarter"
+        projects = projects.group_by_month(:created_on).count
+      when "year"
+        projects = projects.group_by_year(:created_on).count
+      else
+        projects = projects.group_by_day(:created_on).count
+      end
+    end
+
+  end
+
+end

app/helpers/tag_chosen_helper.rb

@@ -43,7 +43,7 @@ module TagChosenHelper
       project_members_info.push(member_info)
     end
 
-    tracker_info = project.trackers&.pluck(:id, :name, :position)
+    tracker_info = Tracker&.pluck(:id, :name, :position)
     new_tracker_info = []  #类型
     if tracker_info.size > 0
       tracker_info.each do |t|

app/models/project.rb

@@ -30,6 +30,7 @@ class Project < ApplicationRecord
   has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
 
   after_save :check_project_members
+  scope :project_statics_select, -> {select(:id,:name, :is_public, :identifier, :status, :project_type, :hidden_repo, :user_id, :forked_count, :visits, :project_category_id, :project_language_id, :license_id, :ignore_id, :watchers_count, :created_on)}
 
 
   # 创建者