Merge pull request 'nps增加明细更新' (#329) from standalone_develop into pre_trustie_server

app/controllers/action/node_inputs_controller.rb

@@ -6,7 +6,7 @@ class Action::NodeInputsController < ApplicationController
     @node_inputs = @node.action_node_inputs
     respond_to do |format|
       format.html
-      format.json
+      format.json{ render_ok(data: @node_inputs.as_json) }
     end
   end
 

app/controllers/action/node_types_controller.rb

@@ -4,6 +4,10 @@ class Action::NodeTypesController < ApplicationController
 
   def index
     @node_types = Action::NodeType.all
+    respond_to do |format|
+      format.html
+      format.json { render_ok(data: @node_types.as_json) }
+    end
   end
 
   def create
@@ -20,7 +24,10 @@ class Action::NodeTypesController < ApplicationController
   end
 
   def show
-
+    respond_to do |format|
+      format.html
+      format.json { render_ok(data: @node_type.as_json) }
+    end
   end
 
   def new
@@ -45,7 +52,10 @@ class Action::NodeTypesController < ApplicationController
     else
       flash[:danger] = '删除失败'
     end
-    redirect_to action_node_types_path
+    respond_to do |format|
+      format.html { redirect_to action_node_types_path }
+      format.json { render_ok }
+    end
   end
 
   private

app/controllers/action/nodes_controller.rb

@@ -1,18 +1,25 @@
 class Action::NodesController < ApplicationController
-  before_action :require_admin, except: [:index]
+  # before_action :require_admin, except: [:index]
+  before_action :require_login
   before_action :find_action_node, except: [:index, :create, :new]
 
   def index
     @node_types = Action::NodeType.all
+    no_node_type = Action::NodeType.find_by(name: "未分类")
     @no_type_nodes = Action::Node.where(action_node_types_id: nil)
+    @no_type_nodes = Action::Node.where(action_node_types_id: nil).or(Action::Node.where(action_node_types_id: no_node_type.id)) if no_node_type.present?
     respond_to do |format|
-      format.html { @nodes = Action::Node.all }
+      format.html { @nodes = Action::Node.where("name LIKE :search OR full_name LIKE :search", :search => "%#{params[:search]}%") }
       format.json
     end
   end
 
   def create
     @node = Action::Node.new(node_params)
+    if params.require(:node).present? && params.require(:node)[:link_type_array].present?
+      @node.link_type = (params.require(:node)[:link_type_array] - [""]).join(",")
+    end
+    @node.user_id = current_user.id
     respond_to do |format|
       if @node.save
         format.html { redirect_to action_nodes_path, notice: '创建成功.' }
@@ -33,10 +40,16 @@ class Action::NodesController < ApplicationController
   end
 
   def edit
-
+    if @node.link_type.present?
+      @node.link_type_array = @node.link_type.to_s.split(",")
+    end
   end
 
   def update
+    if params.require(:node).present?  && params.require(:node)[:link_type_array].present?
+      @node.link_type = (params.require(:node)[:link_type_array] - [""]).join(",")
+    end
+    @node.user_id = current_user.id if @node.user_id.blank?
     @node.update(node_params)
     respond_to do |format|
       format.html { redirect_to action_nodes_path, notice: '更新成功.' }
@@ -50,7 +63,10 @@ class Action::NodesController < ApplicationController
     else
       flash[:danger] = '删除失败'
     end
-    redirect_to action_nodes_path
+    respond_to do |format|
+      format.html { redirect_to action_nodes_path }
+      format.json { render_ok() }
+    end
   end
 
   private
@@ -61,9 +77,11 @@ class Action::NodesController < ApplicationController
 
   def node_params
     if params.require(:action_node)
-      params.require(:action_node).permit(:name, :label, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url, :yaml, :sort_no)
+      params.require(:action_node).permit(:name, :label, :full_name, :description, :icon, :action_node_types_id,
+                                          :is_local, :local_url, :yaml, :sort_no, :node_type, :is_mutil_link, :link_type, :link_type_array)
     else
-      params.permit(:name, :label, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url, :yaml, :sort_no)
+      params.permit(:name, :label, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url,
+                    :yaml, :sort_no, :node_type, :is_mutil_link, :link_type, :link_type_array)
     end
   end
 end

app/controllers/action/templates_controller.rb

@@ -49,7 +49,10 @@ class Action::TemplatesController < ApplicationController
     else
       flash[:danger] = '删除失败'
     end
-    redirect_to action_templates_path
+    respond_to do |format|
+      format.html { redirect_to action_templates_path }
+      format.json { render_ok }
+    end
   end
 
   private

app/controllers/admins/nps_controller.rb

@@ -2,7 +2,7 @@ class Admins::NpsController < Admins::BaseController
   before_action :require_business
   def index
     @on_off_switch = EduSetting.get("nps-on-off-switch").to_s == 'true'
-    @user_nps = UserNp.joins(:user).order(created_at: :desc)
+    @user_nps = UserNp.order(created_at: :desc)
     keyword = params[:keyword].to_s.strip.presence
     if keyword
       sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword'

app/controllers/api/pm/dashboards_controller.rb

@@ -0,0 +1,137 @@
+class Api::Pm::DashboardsController <  Api::Pm::BaseController
+  before_action :require_login
+  def index 
+  end
+
+  def todo 
+    return render_error('请输入正确的pm_project_ids.') if params[:pm_project_ids].blank? 
+    pm_project_ids = params[:pm_project_ids].split(",") rescue []
+    date = params[:date].present? ? params[:date].to_date : Date.today rescue Date.today
+    @issues = Issue.where("start_date <= ? and due_date >= ?", date, date)
+    @issues = @issues.where(pm_project_id: pm_project_ids).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'})
+    @issues = @issues.where.not(status_id: 5)
+    @issues = kaminari_paginate(@issues.distinct.pm_includes)
+  end
+
+  def my_issues
+    return render_error('请输入正确的pm_project_ids.') if params[:pm_project_ids].blank? 
+    return render_error('请输入正确的pm_issue_types.') if params[:pm_issue_types].blank?
+    pm_project_ids = params[:pm_project_ids].split(",") rescue []
+    pm_issue_types = params[:pm_issue_types].split(",") rescue []
+    @all_issues = Issue.where(pm_project_id: pm_project_ids, pm_issue_type: pm_issue_types)
+    @issues = @all_issues.joins(:issue_participants).where(issue_participants: {participant_id: current_user.id})
+
+    @issues = kaminari_paginate(@issues.distinct.pm_includes)
+    @my_assign_requirements_count = @all_issues.where(pm_issue_type: 1).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}).size
+    @my_assign_tasks_count = @all_issues.where(pm_issue_type: 2).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}).size
+    @my_assign_bugs_count = @all_issues.where(pm_issue_type: 3).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}).size
+  end
+
+  def my_pm_projects
+    return render_error('请输入正确的pm_project_id.') if params[:pm_project_id].blank? 
+    @all_issues = Issue.where(pm_project_id: params[:pm_project_id])
+    time_now = Time.now
+    @last_week_create_issues_count = @all_issues.where("created_on > ? and created_on < ?", time_now - 7.days, time_now).size 
+    @before_last_week_create_issue_count = @all_issues.where("created_on > ? and created_on < ?", time_now - 14.days, time_now - 7.days).size
+    @compare_last_week_create_issues = @before_last_week_create_issue_count.zero? ? 0 :(@last_week_create_issues_count - @before_last_week_create_issue_count).to_f / @before_last_week_create_issue_count rescue 0
+    @last_week_close_issues_count = @all_issues.where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 7.days, time_now).size
+    @before_last_week_close_issue_count = @all_issues.where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 14.days, time_now - 7.days).size
+    @compare_last_week_close_issues = @before_last_week_close_issue_count.zero? ? 0 :(@last_week_close_issues_count - @before_last_week_close_issue_count).to_f / @before_last_week_close_issue_count rescue 0
+    @all_requirement_issues_count = @all_issues.where(pm_issue_type: 1).size
+    @open_requirement_issues_count = @all_issues.where(pm_issue_type: 1).where.not(status_id: 5).size
+    @last_week_close_requirement_issues_count = @all_issues.where(pm_issue_type: 1).where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 7.days, time_now).size
+    @last_month_close_requirement_issues_count = @all_issues.where(pm_issue_type: 1).where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 30.days, time_now).size
+    @all_task_issues_count = @all_issues.where(pm_issue_type: 2).size 
+    @open_task_issues_count = @all_issues.where(pm_issue_type: 2).where.not(status_id: 5).size
+    @last_week_close_tast_issues_count = @all_issues.where(pm_issue_type: 2).where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 7.days, time_now).size
+    @last_month_close_task_issues_count = @all_issues.where(pm_issue_type: 2).where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 30.days, time_now).size
+    @all_bug_issues_count = @all_issues.where(pm_issue_type: 3).size
+    @open_bug_issues_count = @all_issues.where(pm_issue_type: 3).where.not(status_id: 5).size
+    @last_week_close_bug_issues_count = @all_issues.where(pm_issue_type: 3).where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 7.days, time_now).size
+    @last_month_close_bug_issues_count = @all_issues.where(pm_issue_type: 3).where(status_id: 5).where("updated_on > ? and updated_on < ?", time_now - 30.days, time_now).size
+    
+
+    @requirement_close_trend = [[],[]]
+    @task_close_trend = [[],[]]
+    @bug_close_trend = [[],[]]
+    ((time_now-29.days).to_date..time_now.to_date).to_a.each do |i|
+      @requirement_close_trend[0] << i.strftime("%Y.%m.%d")
+      @task_close_trend[0] << i.strftime("%Y.%m.%d")
+      @bug_close_trend[0] << i.strftime("%Y.%m.%d") 
+      @requirement_close_trend[1] << @all_issues.where(pm_issue_type: 1, status_id: 5).where("DATE(updated_on) = ?", i).size
+      @task_close_trend[1] << @all_issues.where(pm_issue_type: 2, status_id: 5).where("DATE(updated_on) = ?", i).size
+      @bug_close_trend[1] << @all_issues.where(pm_issue_type: 3, status_id: 5).where("DATE(updated_on) = ?", i).size
+    end
+    @close_trend = {requirement: @requirement_close_trend, task: @task_close_trend, bug: @bug_close_trend}
+
+    render_ok(data: {
+      last_week_close_issues_count: @last_week_close_issues_count,
+      before_last_week_close_issue_count: @before_last_week_close_issue_count,
+      compare_last_week_close_issues: @compare_last_week_close_issues,
+      last_week_create_issues_count: @last_week_create_issues_count,
+      before_last_week_create_issue_count: @before_last_week_create_issue_count,
+      compare_last_week_create_issues: @compare_last_week_create_issues,
+      all_requirement_issues_count: @all_requirement_issues_count,
+      open_requirement_issues_count: @open_requirement_issues_count,
+      last_week_close_requirement_issues_count: @last_week_close_requirement_issues_count,
+      last_month_close_requirement_issues_count: @last_month_close_requirement_issues_count,
+      all_task_issues_count: @all_task_issues_count,
+      open_task_issues_count: @open_task_issues_count,
+      last_week_close_task_issues_count: @last_week_close_tast_issues_count,
+      last_month_close_task_issues_count: @last_month_close_task_issues_count,
+      all_bug_issues_count: @all_bug_issues_count,
+      open_bug_issues_count: @open_bug_issues_count,
+      last_week_close_bug_issues_count: @last_week_close_bug_issues_count,
+      last_month_close_bug_issues_count: @last_month_close_bug_issues_count,
+      close_trend: @close_trend
+    })
+  end
+
+  def my_projects
+    return render_error('请输入正确的project_id.') if params[:project_id].blank?
+    
+    @project = Project.find_by_id params[:project_id]
+    return render_error('请输入正确的project_id.') unless @project.present?
+    time_now = Time.now
+
+    branch_tag_result = $gitea_hat_client.get_repos_branch_tag_count_by_owner_repo(@project&.owner&.login, @project&.identifier) rescue {}
+    languages_result = $gitea_client.get_repos_languages_by_owner_repo(@project&.owner&.login, @project&.identifier) rescue {}
+
+    @open_pull_requests_count = @project.pull_requests.opening.size 
+    @last_week_close_pull_requests_count = @project.pull_requests.where(status: 1).where("updated_at > ? and updated_at < ?", time_now - 7.days, time_now).size
+    @last_month_close_pull_requets_count = @project.pull_requests.where(status: 1).where("updated_at > ? and updated_at < ?", time_now - 30.days, time_now).size
+
+    @commits_count = @project.commit_logs.size
+    @last_week_commits_count = @project.commit_logs.where("created_at > ? and created_at < ?", time_now - 7.days, time_now).size
+    @last_month_commits_count = @project.commit_logs.where("created_at > ? and created_at < ?", time_now - 30.days, time_now).size
+
+    render_ok(data: {
+      branch_count: branch_tag_result["branch_count"].to_i,
+      tag_count: branch_tag_result["tag_count"].to_i,
+      license_name: @project.license&.name,
+      open_pull_requests_count: @open_pull_requests_count,
+      last_week_close_pull_requests_count: @last_week_close_pull_requests_count,
+      last_month_close_pull_requets_count: @last_month_close_pull_requets_count,
+      commits_count: @commits_count,
+      last_week_commits_count: @last_week_commits_count,
+      last_month_commits_count: @last_month_commits_count,
+      language: hash_transform_precentagable(languages_result),
+    })
+  end
+
+  def my_operate_journals
+    return render_error('请输入正确的pm_project_id.') if params[:pm_project_id].blank? 
+    @journals = Journal.operate_journals.joins(:issue).where(issues: {pm_project_id: params[:pm_project_id], pm_issue_type: [1,2,3]})
+
+    @journals = kaminari_paginate(@journals.order(updated_on: :desc))
+  end
+
+  private 
+  def hash_transform_precentagable(hash)
+    total_byte_size = hash.values.sum
+    hash.transform_values { |v|
+      ActionController::Base.helpers
+        .number_to_percentage((v * 100.0 / total_byte_size), precision: 1)
+    }.select{|k,v| v != "0.0%"}
+  end
+end

app/controllers/api/pm/issues_controller.rb

@@ -237,7 +237,47 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
     end
   end
 
+  def link_issues
+    children_issues = @issue.pm_issue_type == 1 ? @issue.child_count > 0 ? Issue.where(id: @issue.id) : Issue.none : Issue.where(root_id: @issue.id)
+    linkable_issues = Issue.where(id: PmLink.where(linkable_type: "Issue", linkable_id: @issue.id).pluck(:be_linkable_id))
+    belinkable_issues = Issue.where(id: PmLink.where(be_linkable_type: "Issue", be_linkable_id: @issue.id).pluck(:linkable_id))
+
+    full_link_issues_ids = children_issues.pluck(:id) | linkable_issues.pluck(:id) | belinkable_issues.pluck(:id)
+    compare_link_issues_ids = children_issues.pluck(:id) | linkable_issues.pluck(:id) | belinkable_issues.pluck(:id)
+    i = compare_link_issues_ids.count
+    while i > 0 do 
+      children_issues = Issue.where(root_id: compare_link_issues_ids)
+      linkable_issues = Issue.where(id: PmLink.where(linkable_type: "Issue", linkable_id: compare_link_issues_ids).pluck(:be_linkable_id))
+      belinkable_issues = Issue.where(id: PmLink.where(be_linkable_type: "Issue", be_linkable_id: compare_link_issues_ids).pluck(:linkable_id))
+
+      compare_link_issues_ids = (children_issues.pluck(:id) | linkable_issues.pluck(:id) | belinkable_issues.pluck(:id)) - full_link_issues_ids
+      full_link_issues_ids = full_link_issues_ids | compare_link_issues_ids
+      i = compare_link_issues_ids.count
+    end
+    exclude_issues_ids = []
+    exclude_issues = Issue.where(id: full_link_issues_ids).where.not(root_id: nil)
+    exclude_issues.each do |i| 
+      exclude_issues_ids << i.id if i.pm_issue_type == 1 && full_link_issues_ids.include?(i.root_id)
+    end
+    full_link_issues_ids = full_link_issues_ids - exclude_issues_ids
+    @requirement_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:1, root_id: nil).pm_includes
+    @task_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:2).pm_includes
+    @bug_issues = Issue.where(id:full_link_issues_ids, pm_issue_type:3).pm_includes
+  end
+
   private
+  def circle_link_issues(issue_ids)
+    if issue_ids.present?
+      children_issues = Issue.joins(:parent_issue).where(issues: {id: issue_ids})
+      linkable_issues = Issue.where(id: PmLink.where(linkable_type: "Issue", linkable_id: issue_ids))
+      belinkable_issues = Issue.where(id: PmLink.where(be_linkable_type: "Issue", be_linkable_id: issue_ids))
+
+      return circle_link_issues(children_issues.pluck(:id))
+    else
+      return []
+    end
+  end
+
   def check_issue_operate_permission
     return if params[:project_id].to_i.zero?
     render_forbidden('您没有操作权限！') unless @project.member?(current_user) || current_user.admin? || @issue.user == current_user

app/controllers/api/pm/projects_controller.rb

@@ -56,12 +56,15 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
   def statistics
     return tip_exception '参数错误' if params[:pm_project_id].blank?
     @issues = Issue.where(pm_project_id: params[:pm_project_id], pm_issue_type:[1, 2, 3])
+    @last_week_close_issues = @issues.where(status_id: 5).where("updated_on > ? and updated_on < ?", Time.now - 7.days, Time.now)
+    last_week_close_type_count_data = @last_week_close_issues.group(:pm_issue_type).count
     type_count_data =  @issues.group(:pm_issue_type).count
     type_status = @issues.group(:pm_issue_type,:status_id).count
     type_status_data = {}
     IssueStatus.all.map do |e|
       # next if e.id == 5
       [1,2,3].map{ |type|
+        next if type == 1 && [1, 6].include?(e.id)
         type_status_data[type] = {} if type_status_data[type].nil?
         if type_status[[type,e.id]].nil?
           type_status_data[type][e.id] = 0
@@ -71,9 +74,9 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
       }
     end
     open_data = {
-      "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i,
-      "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i,
-      "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i,
+      "1": type_status_data[1][1].to_i + type_status_data[1][2].to_i + type_status_data[1][3].to_i + type_status_data[1][6].to_i,
+      "2": type_status_data[2][1].to_i + type_status_data[2][2].to_i + type_status_data[2][3].to_i + type_status_data[2][6].to_i,
+      "3": type_status_data[3][1].to_i + type_status_data[3][2].to_i + type_status_data[3][3].to_i + type_status_data[3][6].to_i,
     }
     if type_count_data.keys.size < 3
       nedd_add = [1,2,3] - type_count_data.keys
@@ -81,17 +84,24 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
         type_count_data[e] = 0
       }
     end
+    if last_week_close_type_count_data.keys.size < 3
+      nedd_add = [1,2,3] - last_week_close_type_count_data.keys
+      nedd_add.map{ |e| 
+        last_week_close_type_count_data[e] = 0
+      }
+    end
     data = {
       pie_chart: type_count_data,
       bar_chart: type_status_data,
-      open_data: open_data
+      open_data: open_data,
+      last_week_close_data: last_week_close_type_count_data, 
     }
     render_ok(data: data)
   end
 
   def polyline
     return tip_exception '参数错误' if params[:pm_project_id].blank?
-    time_line = (Time.current.beginning_of_day - 6.day) .. Time.current
+    time_line = (Time.current.beginning_of_day - 29.day) .. Time.current
     @create_issues = Issue.where(pm_project_id: params[:pm_project_id],created_on: time_line)
     @due_issues = Issue.where(pm_project_id: params[:pm_project_id],status_id:[3,5],due_date: time_line)
     @create_issues_count = @create_issues.group(:pm_issue_type,"DATE(created_on)").count
@@ -100,7 +110,7 @@ class Api::Pm::ProjectsController < Api::Pm::BaseController
       create_issues: {},
       due_issues: {}
     }
-    7.times do |time|
+    30.times do |time|
       current_time = Date.current - time.day
       if @create_issues_count.present?
         data[:create_issues][current_time] = {

app/controllers/api/v1/projects/actions/actions_controller.rb

@@ -1,5 +1,49 @@
 class Api::V1::Projects::Actions::ActionsController < Api::V1::Projects::Actions::BaseController
 
+  def new_index 
+    @files = $gitea_client.get_repos_contents_by_owner_repo_filepath(@project&.owner&.login, @project&.identifier, ".gitea/workflows")
+    puts @files
+    @action_runs = Gitea::ActionRun.where(repo_id: @project.gpid, status: [1,2])
+    group_data = @action_runs.group(:workflow_id, :status).count 
+    @result = []
+    @files.map{|i|i['name']}.each do |file| 
+      last_action_run = @action_runs.where(workflow_id: file).order(updated: :desc).first
+      last_action_run_json = last_action_run.present? ? {
+        id: last_action_run.id,
+        schedule: last_action_run.schedule_id > 0,
+        title: last_action_run.title,
+        index: last_action_run.index,
+        status: last_action_run.status,
+        started: last_action_run.started,
+        stopped: last_action_run.stopped,
+        length: last_action_run.stopped-last_action_run.started,
+        created: last_action_run.created,
+        updated: last_action_run.updated,
+      } : {}
+
+      total = 0 
+      success = 0 
+      failure = 0
+      group_data.each do |k,v| 
+        total += v if k[0] == file 
+        success += v if k[0] == file && k[1] == 1 
+        failure += v if k[0] == file && k[1] == 1 
+      end
+
+      @result << {
+        name: file,
+        last_action_run: last_action_run_json,
+        history: {
+          total: total, 
+          success: success,
+          failure: failure,
+        }
+      }
+    end
+
+    render :json => @result
+  end
+
   def index 
     begin 
       gitea_result = $gitea_hat_client.get_repos_actions_by_owner_repo(@project&.owner&.login, @project&.identifier)

app/controllers/organizations/projects_controller.rb

@@ -12,7 +12,7 @@ class Organizations::ProjectsController < Organizations::BaseController
     keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('')
     @projects = @projects.where(id: params[:pm_project_repository_ids].split(',')) if params[:pm_project_repository_ids].present?
     @projects = @projects.where.not(id: params[:exclude_ids].to_s.split(",")) if params[:exclude_ids].present?
-    @projects = @projects.where("gpid is not null") if params[:actived].present?
+    @projects = @projects.where(project_type: ['mirror', 'common']).where("gpid is not null") if params[:actived].present?
     @projects = @projects.ransack(name_or_identifier_cont: keywords).result if params[:search].present?
     @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
     @projects = paginate(@projects)