| @@ -63,7 +63,7 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController | |||||
| end | end | ||||
| @close_trend = {requirement: @requirement_close_trend, task: @task_close_trend, bug: @bug_close_trend} | @close_trend = {requirement: @requirement_close_trend, task: @task_close_trend, bug: @bug_close_trend} | ||||
| render_ok(data={ | |||||
| render_ok(data: { | |||||
| last_week_close_issues_count: @last_week_close_issues_count, | last_week_close_issues_count: @last_week_close_issues_count, | ||||
| before_last_week_close_issue_count: @before_last_week_close_issue_count, | before_last_week_close_issue_count: @before_last_week_close_issue_count, | ||||
| compare_last_week_close_issues: @compare_last_week_close_issues, | compare_last_week_close_issues: @compare_last_week_close_issues, | ||||
| @@ -104,7 +104,7 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController | |||||
| @last_week_commits_count = @project.commit_logs.where("created_at > ? and created_at < ?", time_now - 7.days, time_now).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 | @last_month_commits_count = @project.commit_logs.where("created_at > ? and created_at < ?", time_now - 30.days, time_now).size | ||||
| render_ok(data={ | |||||
| render_ok(data: { | |||||
| branch_count: branch_tag_result["branch_count"].to_i, | branch_count: branch_tag_result["branch_count"].to_i, | ||||
| tag_count: branch_tag_result["tag_count"].to_i, | tag_count: branch_tag_result["tag_count"].to_i, | ||||
| license_name: @project.license&.name, | license_name: @project.license&.name, | ||||
| @@ -1,10 +1,11 @@ | |||||
| json.status 0 | json.status 0 | ||||
| json.message "success" | json.message "success" | ||||
| json.total_count @issues.total_count | |||||
| json.my_assign_requirements_count @my_assign_requirements_count | |||||
| json.my_assign_tasks_count @my_assign_tasks_count | |||||
| json.my_assign_bugs_count @my_assign_bugs_count | |||||
| json.issues @issues.each do |issue| | |||||
| json.partial! "api/v1/issues/simple_detail", locals: {issue: issue} | |||||
| end | |||||
| json.data do | |||||
| json.total_count @issues.total_count | |||||
| json.my_assign_requirements_count @my_assign_requirements_count | |||||
| json.my_assign_tasks_count @my_assign_tasks_count | |||||
| json.my_assign_bugs_count @my_assign_bugs_count | |||||
| json.issues @issues.each do |issue| | |||||
| json.partial! "api/v1/issues/simple_detail", locals: {issue: issue} | |||||
| end | |||||
| end | |||||
| @@ -1,21 +1,23 @@ | |||||
| json.status 0 | json.status 0 | ||||
| json.message "success" | json.message "success" | ||||
| json.total_count @journals.total_count | |||||
| json.journals @journals do |journal| | |||||
| journal.associate_attachment_container | |||||
| json.id journal.id | |||||
| json.is_journal_detail journal.is_journal_detail? | |||||
| json.created_at journal.created_on.strftime("%Y-%m-%d %H:%M") | |||||
| json.updated_at journal.updated_on.strftime("%Y-%m-%d %H:%M") | |||||
| json.user do | |||||
| if journal.user.present? | |||||
| json.partial! "api/v1/users/simple_user", user: journal.user | |||||
| else | |||||
| json.nil! | |||||
| json.data do | |||||
| json.total_count @journals.total_count | |||||
| json.journals @journals do |journal| | |||||
| journal.associate_attachment_container | |||||
| json.id journal.id | |||||
| json.is_journal_detail journal.is_journal_detail? | |||||
| json.created_at journal.created_on.strftime("%Y-%m-%d %H:%M") | |||||
| json.updated_at journal.updated_on.strftime("%Y-%m-%d %H:%M") | |||||
| json.user do | |||||
| if journal.user.present? | |||||
| json.partial! "api/v1/users/simple_user", user: journal.user | |||||
| else | |||||
| json.nil! | |||||
| end | |||||
| end | end | ||||
| detail = journal.journal_details.take | |||||
| json.operate_category journal.pm_operate_category | |||||
| json.operate_content journal.is_journal_detail? ? journal.pm_dashboard_operate_content : nil | |||||
| end | end | ||||
| detail = journal.journal_details.take | |||||
| json.operate_category journal.pm_operate_category | |||||
| json.operate_content journal.is_journal_detail? ? journal.pm_dashboard_operate_content : nil | |||||
| end | |||||
| end | |||||
| @@ -1,7 +1,10 @@ | |||||
| json.status 0 | json.status 0 | ||||
| json.message "success" | json.message "success" | ||||
| json.total_count @issues.total_count | |||||
| json.data do | |||||
| json.total_count @issues.total_count | |||||
| json.issues @issues.each do |issue| | |||||
| json.partial! "api/v1/issues/simple_detail", locals: {issue: issue} | |||||
| end | |||||
| json.issues @issues.each do |issue| | |||||
| json.partial! "api/v1/issues/simple_detail", locals: {issue: issue} | |||||
| end | |||||
| end | |||||