feat: added total count to prop values

shafy · May 20, 2022 · 59eb699 · 59eb699
1 parent e2f3a8f
commit 59eb699
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/app/javascript/controllers/chart_controller.js b/app/javascript/controllers/chart_controller.js
@@ -75,7 +75,7 @@ export default class extends Controller {
 
   createDataSet(label, data, index) {
     return {
-      label: htmlDecode(label),
+      label: `${htmlDecode(label)} (${data["total_count"]})`,
       backgroundColor: this.colorPalette[index % this.colorPalette.length],
       borderColor: this.colorPalette[index % this.colorPalette.length],
       borderJointStyle: "round",
@@ -86,7 +86,7 @@ export default class extends Controller {
       pointHitRadius: 5,
       hoverBorderWidth: 4,
       data: data["data"],
-      hidden: index > 5
+      hidden: !data["visible"]
     }
   }
 
@@ -118,7 +118,6 @@ export default class extends Controller {
     e.preventDefault();
 
     this.chart.data.datasets.forEach((dataset, index) => {
-      //dataset.hidden = true;
       this.chart.setDatasetVisibility(index, false);
     });
     this.chart.update();

diff --git a/app/javascript/helpers/chart_helpers.js b/app/javascript/helpers/chart_helpers.js
@@ -17,7 +17,14 @@ const htmlLegendPlugin = {
       propertiesUnselected.firstChild.remove();
     }
 
+    // this.chart.data.datasets.forEach((dataset, index) => {
+    //   this.chart.setDatasetVisibility(index, true);
+    // });
+
+    //console.log(chart.data.datasets)
+
     items.forEach(item => {
+      //console.log(item)
       const propertyItem = propertyItemTemplate.content.cloneNode(true);
       const propertyItemContents = propertyItem.querySelectorAll("div");
       const colorBox = propertyItemContents[0];

diff --git a/app/models/event.rb b/app/models/event.rb
@@ -89,7 +89,11 @@ def self.format_for_chart(events_array)
       }
       total_count += events_grouped[k][:total_count]
     end
-    [events_grouped.sort_by { |k, v| [-v[:total_count], k] }.to_h, total_count]
+    events_grouped.sort_by { |k, v| [-v[:total_count], k] }.each_with_index do |e, i|
+      e[1][:visible] = true
+      break if i >= 5
+    end
+    [events_grouped.sort.to_h, total_count]
   end
 
   # rubocop:disable Metrics/ParameterLists

diff --git a/app/views/events/_chart.html.erb b/app/views/events/_chart.html.erb
@@ -4,7 +4,7 @@
   data-chart-events-value="<%= events.to_json %>"
   data-chart-event-name-value="<%= selected_event.titleize %>"
   data-chart-agg-value="<%= @aggregation %>"
-  data-chart-has-prop-values-value="<%= @property_values.present? %>"
+  data-chart-has-prop-values-value="<%= property_values.present? %>"
   class="flex flex-col w-full p-4 rounded-md shadow-md bg-yellow-50"
 >
   <div class="text-sm font-medium mb-2>">

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -19,7 +19,8 @@
     locals: {
       dates: @dates,
       events: @events,
-      selected_event: @selected_event
+      selected_event: @selected_event,
+      property_values: @property_values
     }
   %>
 <% end %>