Merge branch 'forge' of http://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,35 @@
+class Admins::AboutsController < Admins::BaseController
+
+  def index
+    projects = Project.all.project_statics_select
+    by_time = params[:time]
+    project_type = params[:project_type]
+    is_private = params[:is_private]
+    project_category_id = params[:project_category_id]
+    project_language_id = params[:project_language_id]
+    license_id = params[:license_id]
+
+    projects = projects.where(project_type: project_type)  if project_type.present?
+    projects = projects.where(is_private: is_private)  if is_private.present?
+    projects = projects.where(project_category_id: project_category_id)  if project_category_id.present?
+    projects = projects.where(project_language_id: project_language_id)  if project_language_id.present?
+    projects = projects.where(license_id: license_id)  if license_id.present?
+
+    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
+    @projects = projects
+  end
+
+end

app/controllers/issues_controller.rb

@@ -162,9 +162,11 @@ class IssuesController < ApplicationController
         issue_tags_value: params[:issue_tag_ids].present? ? params[:issue_tag_ids].join(",") : "",
         closed_on: (params[:status_id].to_i == 5) ? Time.now : nil,
         issue_classify: "issue",
-        branch_name: params[:branch_name].to_s
+        branch_name: params[:branch_name].to_s,
+        author_id: current_user.id,
+        project_id: @project.id
       }
-      @issue = Issue.new(issue_params.merge(author_id: current_user.id, project_id: @project.id))
+      @issue = Issue.new(issue_params)
       if @issue.save!
         if params[:attachment_ids].present?
           params[:attachment_ids].each do |id|

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)}
 
 
   # 创建者

app/views/admins/statistics/index.html.erb

@@ -0,0 +1 @@
+<%= @projects %>

db/migrate/20200117032213_add_issue_priosity_to_table.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+class AddIssuePriosityToTable < ActiveRecord::Migration[5.2]
+  #本地需要修改，线上不用修改
+  # def change
+  #   create_table :issue_priorities do |t|
+  #     t.string :name, charset: :utf8
+  #     t.integer :position
+  #     t.timestamps
+  #   end
+  #   name = %w(低 正常 高 紧急 立刻)
+  #   position = %w(1 2 3 4 5)
+  #   name.each_with_index do |n, index|
+  #     IssuePriority.create!(name:n.to_s, position: position[index])
+  #   end
+  # end
+end

public/react/src/forge/Index.js

@@ -37,6 +37,7 @@ class Index extends Component{
   }
   componentDidMount=()=>{
     this.getUserInfo();
+    document.title="forge开源";
   }
 
   getUserInfo=()=>{

public/react/src/forge/Order/New.js

@@ -16,15 +16,15 @@ class New extends Component{
   constructor(props){
     super(props);
     this.state={
-      branch_name:"-1",
-      issue_tag_ids:"-1",
-      fixed_version_id:"-1",
-      tracker_id:"-1",
-      issue_type:"-1",
-      status_id:'-1',
-      assigned_to_id:"-1",
-      priority_id:"-1",
-      done_ratio:"-1",
+      branch_name:"",
+      issue_tag_ids:"",
+      fixed_version_id:"",
+      tracker_id:"",
+      issue_type:"",
+      status_id:'',
+      assigned_to_id:"",
+      priority_id:"",
+      done_ratio:"",
       issue_chosen:undefined,
       branches:undefined,
       fileList:undefined
@@ -78,17 +78,7 @@ class New extends Component{
         const { fileList } = this.state;
         const url = `/projects/${projectsId}/issues.json`;
         axios.post(url,{
-          subject:values.subject,
-          description:values.description,
-          branch_name:values.branch_name,
-          issue_tag_ids:values.issue_tag_ids > -1 ? values.issue_tag_ids : undefined,
-          fixed_version_id:values.fixed_version_id > -1 ? values.fixed_version_id : undefined,
-          tracker_id:values.tracker_id > -1 ? values.tracker_id : undefined,
-          issue_type:values.issue_type > -1 ? values.issue_type : undefined,
-          status_id:values.status_id > -1 ? values.status_id : undefined,
-          assigned_to_id:values.assigned_to_id > -1 ? values.assigned_to_id : undefined,
-          priority_id:values.priority_id > -1 ? values.priority_id : undefined,
-          done_ratio:values.done_ratio > -1 ? values.done_ratio : undefined,
+          ...values,
           attachment_ids:fileList
         }).then(result=>{
           if(result){
@@ -153,7 +143,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={branch_name}>
-                      <Option value={'-1'}>分支未指定</Option>
+                      <Option value={''}>分支未指定</Option>
                       {
                         branches && branches.length >0 && branches.map((item,key)=>{
                           return(
@@ -171,7 +161,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={issue_tag_ids}>
-                      <Option value={"-1"}>未选择标签</Option>
+                      <Option value={""}>未选择标签</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_tag) }
                     </Select>
                   )}
@@ -183,7 +173,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={fixed_version_id}>
-                      <Option value={"-1"}>未选择里程碑</Option>
+                      <Option value={""}>未选择里程碑</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_version) }
                     </Select>
                   )}
@@ -195,7 +185,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={status_id}>
-                      <Option value={"-1"}>未选择完成状态</Option>
+                      <Option value={""}>未选择完成状态</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_status) }
                     </Select>
                   )}
@@ -207,7 +197,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={issue_type}>
-                      <Option value={"-1"}>未选择类型</Option>
+                      <Option value={""}>未选择类型</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_type) }
                     </Select>
                   )}
@@ -219,7 +209,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={tracker_id}>
-                      <Option value={"-1"}>未选择分类</Option>
+                      <Option value={""}>未选择分类</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.tracker) }
                     </Select>
                   )}
@@ -231,7 +221,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={assigned_to_id}>
-                      <Option value={"-1"}>未指派成员</Option>
+                      <Option value={""}>未指派成员</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.assign_user) }
                     </Select>
                   )}
@@ -243,7 +233,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={priority_id}>
-                      <Option value={"-1"}>未选择优先度</Option>
+                      <Option value={""}>未选择优先度</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.priority) }
                     </Select>
                   )}
@@ -255,7 +245,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={done_ratio}>
-                      <Option value={"-1"}>未选择完成度</Option>
+                      <Option value={""}>未选择完成度</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.done_ratio) }
                     </Select>
                   )}