Display job_family by count.

thape-cn · Oct 28, 2024 · b384700 · b384700
1 parent b949506
commit b384700
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/app/controllers/admin/home_controller.rb b/app/controllers/admin/home_controller.rb
@@ -3,6 +3,11 @@ class HomeController < BaseController
     before_action :check_brower, if: -> { request.format.html? }
 
     def index
+      @job_family_data = JobRole.joins(:user_job_roles)
+        .group(:job_family)
+        .order("count(user_job_roles.user_id) desc")
+        .limit(7)
+        .count
     end
 
     protected

diff --git a/app/javascript/lazy_controllers/dashboard.js b/app/javascript/lazy_controllers/dashboard.js
@@ -18,8 +18,6 @@ const options = {
         }
       },
       y: {
-        min: 30,
-        max: 89,
         display: false,
         grid: {
           display: false
@@ -51,6 +49,7 @@ Stimulus.register("dashboard", class extends Controller {
   }
 
   connect() {
+    console.log(this.labelsValue, this.dataValue);
     this.cardChart = new Chart(this.cardChartTarget, {
       type: 'line',
       data: {

diff --git a/app/views/admin/home/index.html.erb b/app/views/admin/home/index.html.erb
@@ -15,11 +15,11 @@
               <div><%= t('user.active_user') -%></div>
             </div>
           </div>
-          <div class="c-chart-wrapper mt-3 mx-3" style="height:70px;" data-controller="dashboard"
-            data-dashboard-title-value='My First dataset'
-            data-dashboard-labels-value='["January", "February", "March", "April", "May", "June", "July"]'
-            data-dashboard-data-value='[65, 59, 84, 84, 51, 55, 40]'>
-            <canvas class="chart" height="70" data-dashboard-target="cardChart"></canvas>
+          <div class="c-chart-wrapper mt-3 mx-3" style="height:100px;" data-controller="dashboard"
+            data-dashboard-title-value='人数'
+            data-dashboard-labels-value='<%= @job_family_data.keys.to_json.html_safe -%>'
+            data-dashboard-data-value='<%= @job_family_data.values.to_json.html_safe -%>'>
+            <canvas class="chart" height="100" data-dashboard-target="cardChart"></canvas>
           </div>
         </div>
       </div>