ahoy_captain 0.91 → 1.0.1

data/app/queries/ahoy_captain/application_query.rb

@@ -1,8 +1,9 @@
+require_relative '../concerns/ahoy_captain/comparable_queries'
+
 module AhoyCaptain
   class ApplicationQuery
     # if you want to enforce returning a relation
     class_attribute :strict, default: true
-    include Rangeable
 
     delegate_missing_to :@query
 
@@ -63,7 +64,7 @@ module AhoyCaptain
           event: (AhoyCaptain.event.ransackable_attributes + AhoyCaptain.event.ransackable_scopes).map(&:to_s),
         }
 
-        pattern = /(?:_not_eq|_eq|_in|_not_in|_cont|_not_cont|_i_cont)$/
+        pattern = /(?:#{Ransack.predicates.sorted_names_with_underscores.to_h.values.join("|")})$/
         params[:q].each do |key, value|
           attribute_name = key.gsub(pattern, '')
           if type == :event && (ransackable_attributes[:visit].include?(attribute_name) || ransackable_attributes[:visit].include?(key))
@@ -76,35 +77,57 @@ module AhoyCaptain
         end
       end
 
+      merge_params = {}
+      ransackable_params.each do |k,v|
+        transform = false
+        if v == AhoyCaptain.none.value
+          transform = true
+        elsif v.is_a?(Array) && v[0] == AhoyCaptain.none.value
+          transform = true
+        end
+
+        if transform
+          key = k.dup
+          ransackable_params.delete(key)
+          predicate = Ransack::Predicate.detect_and_strip_from_string!(key)
+          if predicate.include?("not")
+            merge_params["#{key}_not_null"] = '1'
+          else
+            merge_params["#{key}_null"] = '1'
+          end
+        end
+      end
+
+      ransackable_params.merge!(merge_params)
       # send the right format
       #   ::Ahoy::Visit.ransack(events_time_lt: Time.now).result.to_sql
       # is not
       #   ::Ahoy::Visit.ransack(events_time_lt: Time.now.to_i).result.to_sql
       if range
         if type == :event
-          if range.size == 2
+          if range.realtime?
             ransackable_params['time_gt'] = range[0]
-            ransackable_params['time_lt'] = range[1]
             ransackable_params["visit_started_at_gt"] = range[0]
-            ransackable_params["visit_started_at_lt"] = range[1]
           else
             ransackable_params['time_gt'] = range[0]
+            ransackable_params['time_lt'] = range[1]
             ransackable_params["visit_started_at_gt"] = range[0]
+            ransackable_params["visit_started_at_lt"] = range[1]
           end
         elsif type == :visit
-          if range.size == 2
+          if range.realtime?
+            ransackable_params["started_at_gt"] = range[0]
+            ransackable_params["events_time_gt"] = range[0]
+          else
             ransackable_params["started_at_gt"] = range[0]
             ransackable_params["started_at_lt"] = range[1]
             ransackable_params["events_time_gteq"] = range[0]
             ransackable_params["events_time_lteq"] = range[1]
-          else
-            ransackable_params["started_at_gt"] = range[0]
-            ransackable_params["events_time_gt"] = range[0]
           end
         end
       end
 
-      ransackable_params
+      ransackify(ransackable_params, type)
     end
 
     # merge both sets of ransackable params and ensure that they're being set on the correct association
@@ -118,5 +141,46 @@ module AhoyCaptain
         raise ArgumentError, "use ransack_params_for(type)"
       end
     end
+
+    def ransackify(query, type)
+      return unless query
+
+      query = query.try(:permit!).try(:to_h) unless query.is_a?(Hash)
+      obj = query.each_with_object({}) do |(k, v), obj|
+        if k.starts_with?('properties.')
+          field = k.split('properties.').last
+          operation = Ransack::Predicate.detect_and_strip_from_string!(field)
+
+          raise ArgumentError, "No valid predicate for #{field}" unless operation
+
+          prefix = type == :event ? "" : "events_"
+          obj[:c] ||= []
+
+          obj[:c] << {
+            a: {
+              '0' => {
+                name: "#{prefix}properties",
+                ransacker_args: field
+              }
+            },
+            p: operation,
+            v: [v]
+          }
+
+        else
+          obj[k] = v
+        end
+      end
+
+      if type == :event
+        return obj
+      else
+        return obj
+      end
+    end
+
+    def range
+      RangeFromParams.from_params(params)
+    end
   end
 end

data/app/queries/ahoy_captain/event_query.rb

@@ -1,6 +1,5 @@
 module AhoyCaptain
   class EventQuery < ApplicationQuery
-    include Rangeable
 
     def build
       entry_pages = ransack_params_for(:event).select { |k,v| k.start_with?("entry_page") }
@@ -13,7 +12,7 @@ module AhoyCaptain
         ransack_params_for(:event).reject { |k,v| k.start_with?("visit_") }, context: shared_context
       )
 
-      visit_params = ransack_params_for(:visit).reject { |k,v| k.start_with?("event_") || k.start_with?("events_") }.transform_keys { |key| "visit_#{key}" }
+      visit_params = ransack_params_for(:visit).reject { |k,v| k.start_with?("event_") || k.start_with?("events_") || k == :c  }.transform_keys { |key| "visit_#{key}" }
       search_children = AhoyCaptain.visit.ransack(
         visit_params, context: shared_context
       )
@@ -33,5 +32,11 @@ module AhoyCaptain
 
       joined.where(shared_conditions.reduce(&:and))
     end
+
+    def page_view
+      @query = @query.page_view
+
+      self
+    end
   end
 end

data/app/queries/ahoy_captain/stats/average_views_per_visit_query.rb

@@ -1,12 +1,19 @@
 module AhoyCaptain
   module Stats
     # pls fix
-    class AverageViewsPerVisitQuery < ApplicationQuery
+    class AverageViewsPerVisitQuery < BaseQuery
       def build
-        event_query.joins(:visit)
-                              .where(name: "$view")
-                              .group("#{AhoyCaptain.visit.table_name}.id")
+        subquery = event_query.select("count(ahoy_events.visit_id) as count").where(name: "$view").group(:visit_id)
 
+        AhoyCaptain.event.select("count").from("(#{subquery.to_sql}) as events")
+      end
+
+      def self.cast_type(_column)
+        nil
+      end
+
+      def self.cast_value(_, value)
+        value.to_i
       end
     end
   end

data/app/queries/ahoy_captain/stats/average_visit_duration_query.rb

@@ -1,11 +1,23 @@
 module AhoyCaptain
   module Stats
-    class AverageVisitDurationQuery < ApplicationQuery
+    class AverageVisitDurationQuery < BaseQuery
       def build
         max_events = event_query.select("#{AhoyCaptain.event.table_name}.visit_id, max(#{AhoyCaptain.event.table_name}.time) as created_at").group("visit_id")
-        visit_query.select("avg((max_events.created_at - #{AhoyCaptain.visit.table_name}.started_at)) as average_visit_duration")
+        visit_query.select("avg((max_events.created_at - #{AhoyCaptain.visit.table_name}.started_at))::interval as average_visit_duration")
                    .joins("LEFT JOIN (#{max_events.to_sql}) as max_events ON #{AhoyCaptain.visit.table_name}.id = max_events.visit_id")
       end
+
+      def self.cast_type(value)
+        ActiveRecord::Type.lookup(:string)
+      end
+
+      def self.cast_value(_type, value)
+        if value.present?
+          ActiveSupport::Duration.parse(value)
+        else
+          ActiveSupport::Duration.parse("P0MT0S")
+        end
+      end
     end
   end
 end

data/app/queries/ahoy_captain/stats/base_query.rb

@@ -0,0 +1,18 @@
+module AhoyCaptain
+  module Stats
+    class BaseQuery < ApplicationQuery
+      include ComparableQuery
+      include LazyComparableQuery
+
+      protected
+
+      def self.cast_type(column)
+        ActiveRecord::Type.lookup(::Ahoy::Visit.columns_hash[column.to_s].type)
+      end
+
+      def self.cast_value(type, value)
+        type.cast(value)
+      end
+    end
+  end
+end

data/app/queries/ahoy_captain/stats/bounce_rates_query.rb

@@ -1,6 +1,6 @@
 module AhoyCaptain
   module Stats
-    class BounceRatesQuery < ApplicationQuery
+    class BounceRatesQuery < BaseQuery
       def build
         total_visits = visit_query.select("date(#{AhoyCaptain.visit.table_name}.started_at) as date, count(*) as count").group("date(#{AhoyCaptain.visit.table_name}.started_at)")
         subquery = visit_query.select(:id, :started_at).joins(:events).group("#{AhoyCaptain.visit.table_name}.id, #{AhoyCaptain.visit.table_name}.started_at").having("count(#{AhoyCaptain.event.table_name}.id) = 1")
@@ -12,6 +12,20 @@ module AhoyCaptain
         ::Ahoy::Visit.with(total_visits: total_visits, single_page_visits: single_page_visits, daily_bounce_rate: daily_bounce_rate).select("bounce_rate, date").from("daily_bounce_rate")
       end
 
+      protected
+
+      def self.cast_type(column)
+        ActiveRecord::Type.lookup(:decimal)
+      end
+
+      def self.cast_value(type, value)
+        if value.blank?
+          return 0.to_d
+        end
+
+        super.round(2)
+      end
+
     end
   end
 end

data/app/queries/ahoy_captain/stats/total_pageviews_query.rb

@@ -1,8 +1,8 @@
 module AhoyCaptain
   module Stats
-    class TotalPageviewsQuery < ApplicationQuery
+    class TotalPageviewsQuery < BaseQuery
       def build
-        event_query.where(name: AhoyCaptain.config.event[:view_name])
+        event_query.page_view
       end
     end
   end

data/app/queries/ahoy_captain/stats/total_visitors_query.rb

@@ -1,6 +1,6 @@
 module AhoyCaptain
   module Stats
-    class TotalVisitorsQuery < ApplicationQuery
+    class TotalVisitorsQuery < BaseQuery
       def build
         visit_query.distinct.select(:id)
       end

data/app/queries/ahoy_captain/stats/unique_visitors_query.rb

@@ -1,6 +1,6 @@
 module AhoyCaptain
   module Stats
-    class UniqueVisitorsQuery < ApplicationQuery
+    class UniqueVisitorsQuery < BaseQuery
       def build
         visit_query.distinct.select(:visitor_token)
       end

data/app/queries/ahoy_captain/stats/views_per_visit_query.rb

@@ -1,6 +1,6 @@
 module AhoyCaptain
   module Stats
-    class ViewsPerVisitQuery < ApplicationQuery
+    class ViewsPerVisitQuery < BaseQuery
       def build
         events = event_query
                    .joins(:visit)

data/app/queries/ahoy_captain/stats/visit_duration_query.rb

@@ -1,13 +1,13 @@
 module AhoyCaptain
   module Stats
-    class VisitDurationQuery < ApplicationQuery
+    class VisitDurationQuery < BaseQuery
       def build
         events = event_query
                    .reselect("max(#{AhoyCaptain.event.table_name}.time) - min(#{AhoyCaptain.event.table_name}.time) as duration, #{AhoyCaptain.event.table_name}.visit_id")
                    .group("#{AhoyCaptain.event.table_name}.visit_id")
 
         ::Ahoy::Visit
-          .select("duration as duration, started_at")
+          .select("duration::duration as duration, started_at")
           .from(events, :views_per_visit_table)
           .joins("inner join #{AhoyCaptain.visit.table_name} on #{AhoyCaptain.visit.table_name}.id = views_per_visit_table.visit_id")
       end

data/app/queries/ahoy_captain/visit_query.rb

@@ -1,6 +1,5 @@
 module AhoyCaptain
   class VisitQuery < ApplicationQuery
-    include Rangeable
 
     def build
       shared_context = Ransack::Context.for(AhoyCaptain.visit)
@@ -9,7 +8,7 @@ module AhoyCaptain
         ransack_params_for(:visit).reject { |k,v| k.start_with?("events_") }, context: shared_context
       )
       search_children = AhoyCaptain.event.ransack(
-        ransack_params_for(:event).reject { |k,v| k.start_with?("visit_") }.transform_keys { |key| "events_#{key}" }, context: shared_context
+        ransack_params_for(:event).reject { |k,v| k.start_with?("visit_") || k == :c }.transform_keys { |key| "events_#{key}" }, context: shared_context
       )
 
       shared_conditions = [search_parents, search_children].map { |search|

data/app/queries/concerns/ahoy_captain/comparable_queries.rb

@@ -0,0 +1,25 @@
+module AhoyCaptain
+  module ComparableQueries
+    def compare_range
+      @compare_range ||= begin
+                           ComparisonMode.new(@params).compared_to_range
+                         end
+    end
+
+    def range
+      @range ||= @query.send(:range)
+    end
+
+    def comparison_params
+      params = @params.deep_dup
+      params.delete("period")
+
+      params[:start_date] = compare_range[0]
+      params[:end_date] = compare_range[1]
+      params
+    end
+  end
+end
+
+require_relative './lazy_comparable_query'
+require_relative './comparable_query'

data/app/queries/concerns/ahoy_captain/comparable_query.rb

@@ -0,0 +1,138 @@
+module AhoyCaptain
+  module ComparableQuery
+    class Comparison
+      class ComparisonResult
+        attr_reader :current, :compared_to
+        def initialize(current, compared_to)
+          @current = current
+          @compared_to = compared_to
+        end
+      end
+
+      def initialize(query)
+        @query = query
+        @params = @query.params.deep_dup
+        @compare = @query.class.call(comparison_params)
+        @model = @query.all.klass
+        @query_class = @query.class
+      end
+
+      def count(column_name = :id)
+        @operation = :count
+        @column = column_name
+        perform_calculations(:count, column_name)
+
+        self
+      end
+
+      def average(column_name)
+        @operation = :average
+        @column = column_name
+
+        perform_calculations(:average, column_name)
+
+        self
+      end
+
+      def perform_calculations(operation, column_name)
+        @query = perform_calculation(@query, operation, column_name)
+        @compare = perform_calculation(@compare, operation, column_name)
+      end
+
+      def perform_calculation(q, operation, column_name)
+        operation = operation.to_s.downcase
+        # If #count is used with #distinct (i.e. `relation.distinct.count`) it is
+        # considered distinct.
+        distinct = q.send(:distinct_value)
+
+        if operation == "count"
+          column_name ||= q.send(:select_for_count)
+          if column_name == :all
+            if !distinct
+              distinct = q.send(:distinct_select?, :select_for_count) if q.group_values.empty?
+            elsif q.send(:group_values).any? || q.send(:select_values).empty? && q.order_values.empty?
+              column_name = q.primary_key
+            end
+          elsif q.all.send(:distinct_select?, column_name)
+            distinct = nil
+          end
+        end
+
+        if q.group_values.any?
+          raise "use a subquery"
+        else
+          execute_simple_calculation(q, operation, column_name, distinct)
+        end
+      end
+
+      def result
+        result = @model.with(
+          current: @query.to_sql,
+          compare: @compare.to_sql
+        ).select("current, compare").from("current, compare")[0]
+        type = @query_class.cast_type(@column)
+
+        if result
+          current = @query_class.cast_value(type, result.current[1...-1])
+          compare = @query_class.cast_value(type, result.compare[1...-1])
+        else
+          current = @query_class.cast_value(type, '0')
+          compare = @query_class.cast_value(type, '0')
+        end
+
+        @result = ComparisonResult.new((current), (compare))
+      end
+
+      def compare_range
+        @compare_range ||= begin
+                             og_range = range
+                             [og_range[0] - (og_range[1] - og_range[0]), og_range[0]]
+                           end
+
+      end
+
+      def range
+        @range ||= @query.send(:range)
+      end
+
+      private
+
+      def execute_simple_calculation(q, operation, column_name, distinct) # :nodoc:
+        if operation == "count" && (column_name == :all && distinct || q.has_limit_or_offset?)
+          # Shortcut when limit is zero.
+          return 0 if q.limit_value == 0
+
+          q.send(:build_count_subquery, q.spawn, column_name, distinct)
+        else
+          # PostgreSQL doesn't like ORDER BY when there are no GROUP BY
+          relation = q.all.unscope(:order).distinct!(false)
+
+          column = q.all.send(:aggregate_column, column_name)
+          select_value = q.all.send(:operation_over_aggregate_column, column, operation, distinct)
+          select_value.distinct = true if operation == "sum" && distinct
+
+          relation.select_values = [select_value]
+
+          relation.arel
+        end
+      end
+
+      def comparison_params
+        params = @params.deep_dup
+        params.delete("period")
+
+        params[:start_date] = compare_range[0]
+        params[:end_date] = compare_range[1]
+        params
+      end
+    end
+
+    def with_comparison(enabled = false)
+      if enabled
+        Comparison.new(self)
+      else
+        self
+      end
+    end
+  end
+end

data/app/queries/concerns/ahoy_captain/lazy_comparable_query.rb

@@ -0,0 +1,42 @@
+module AhoyCaptain
+  module LazyComparableQuery
+    class LazyComparison
+      class LazyComparisonResult
+        attr_accessor :current, :compared_to
+      end
+
+      include ::AhoyCaptain::ComparableQueries
+
+      def initialize(query)
+        @query = query
+        @params = @query.params.deep_dup
+        @compare = @query.class.call(comparison_params)
+      end
+
+      def method_missing(name, *args)
+        perform_operations(name, *args)
+      end
+
+      def perform_operations(name, *args)
+        @query = @query.public_send(name, *args)
+        @compare = @compare.public_send(name, *args)
+
+        self
+      end
+
+      def result
+        return @result if @result
+
+        @result = LazyComparisonResult.new.tap { |comparison| comparison.current =  @query; comparison.compared_to = @compare }
+      end
+    end
+
+    def with_lazy_comparison(enabled = false)
+      if enabled
+        LazyComparison.new(self)
+      else
+        self
+      end
+    end
+  end
+end

data/app/views/ahoy_captain/devices/_table.html.erb

@@ -1,5 +1,2 @@
 <%= render AhoyCaptain::TableComponent.new(items: @devices,
-                                           category_name: 'Devices',
-                                           unit_name: 'Visitors',
-                                           header: ::AhoyCaptain::Tables::Headers::DevicesHeaderComponent,
-                                           row: ::AhoyCaptain::Tables::Rows::DevicesRowComponent) %>
+                                           table: ::AhoyCaptain::Tables::DevicesTableComponent) %>

data/app/views/ahoy_captain/goals/index.html.erb

@@ -1,7 +1,4 @@
 <%= turbo_frame_tag :goals do %>
   <%= render AhoyCaptain::TableComponent.new(items: @presenter.goals,
-                                             header: ::AhoyCaptain::Tables::Headers::GoalsHeaderComponent,
-                                             row: ::AhoyCaptain::Tables::Rows::GoalsRowComponent) %>
-
-
+                                             table: ::AhoyCaptain::Tables::GoalsTableComponent) %>
 <% end %>

data/app/views/ahoy_captain/layouts/application.html.erb

@@ -21,7 +21,6 @@
   <meta name="theme-color" content="#ffffff">
   <link href="https://cdn.jsdelivr.net/npm/daisyui@3.5.0/dist/full.css" rel="stylesheet" type="text/css"/>
   <script src="https://cdn.tailwindcss.com"></script>
-  <link href="https://unpkg.com/slim-select@latest/dist/slimselect.css" rel="stylesheet" />
   <%= ahoy_captain_importmap_tags %>
   <style>
       /* Application styles */

data/app/views/ahoy_captain/layouts/shared/_tile_loader.html.erb

@@ -0,0 +1,12 @@
+<div class="mt-5" >
+  <div role="status" class="animate-pulse">
+    <div class="flex justify-between w-full mb-2">
+      <div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-32"></div>
+      <div class="h-2.5 bg-gray-300 rounded-full dark:bg-gray-600 w-24"></div>
+    </div>
+    <% 10.times do |i| %>
+      <div class="h-6 bg-gray-200 dark:bg-gray-700 max-w-[<%= 100 - (i * 10) %>%] mb-2.5"></div>
+    <% end %>
+    <span class="sr-only">Loading...</span>
+  </div>
+</div>

data/app/views/ahoy_captain/locations/maps/show.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag :geography do %>
+  <canvas style="position: relative; width: 500px; height: 300px;" data-controller="map" data-map-data-value="<%= @countries.to_json %>"></canvas>
+<% end %>

data/app/views/ahoy_captain/properties/_form.html.erb

@@ -0,0 +1,6 @@
+<select class="select text-accent select-sm w-full max-w-sm" data-controller="properties" data-action="change->properties#handleChange">
+  <option></option>
+  <% @options.each do |key, value| %>
+    <option value="<%= property_path(id: key) %>" <%= 'selected' if local_assigns[:selected] == value %>><%= value %></option>
+  <% end %>
+</select>

data/app/views/ahoy_captain/properties/index.html.erb

@@ -0,0 +1,3 @@
+<%= turbo_frame_tag :goals do %>
+  <%= render 'ahoy_captain/properties/form' %>
+<% end %>

data/app/views/ahoy_captain/properties/show.html.erb

@@ -0,0 +1,6 @@
+<%= turbo_frame_tag :goals do %>
+  <%= render 'ahoy_captain/properties/form', selected: Base64.strict_decode64(params[:id]) %>
+
+  <%= render AhoyCaptain::TableComponent.new(items: @properties,
+                                             table: ::AhoyCaptain::Tables::PropertiesTableComponent) %>
+<% end %>

data/app/views/ahoy_captain/roots/_filters.html.erb

@@ -6,12 +6,39 @@
     <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by #{name}", id: "#{filters.modal_name}") do |modal| %>
       <% modal.with_modal_display do %>
         <% filters.each do |filter| %>
-        <%= render AhoyCaptain::Filter::SelectComponent.new(label: filter.label, column: filter.column, url: public_send(filter.url), predicates: filter.predicates, multiple: filter.multiple, form: form) %>
+          <%= render AhoyCaptain::Filter::SelectComponent.new(label: filter.label, column: filter.column, url: public_send(filter.url), predicates: filter.predicates, multiple: filter.multiple, form: form) %>
         <% end %>
       <% end %>
     <% end %>
   <% end %>
 
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Filter by Custom Property", id: "customPropertyFilterModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <div data-controller="property-filter">
+        <fieldset class="flex space-x-4 items-end">
+          <% if current_property_filter %>
+            <%= render ::AhoyCaptain::ComboboxComponent.new(name: "", multiple: false, column: "", url: filters_properties_names_path, value: [current_property_filter[:key].delete_prefix("properties.")], select_html: { "data-property-filter-target" => 'name', id: "property-name" }) %>
+          <% else %>
+            <%= render ::AhoyCaptain::ComboboxComponent.new(name: "", multiple: false, column: "", url: filters_properties_names_path, select_html: { "data-property-filter-target" => 'name', id: "property-name" } ) %>
+          <% end %>
+
+          <div class="flex flex-col w-[20%]">
+            <select class='select select-primary bg-gray-900 ring-0  focus-within:ring-0 focus-within:ring-0 focus:ring-0 focus:outline-none inline-flex justify-between items-center w-full rounded-md border px-4 py-2 text-sm'>
+              <option value="in">in</option>
+            </select>
+          </div>
+
+          <% if current_property_filter %>
+            <%= render ::AhoyCaptain::ComboboxComponent.new(name: "q[#{current_property_filter[:key]}_in]", multiple: false, column: "", url: filters_properties_values_path, value: [current_property_filter[:value]], select_html: { "data-property-filter-target" => 'value', id: "property-value" } ) %>
+          <% else %>
+            <%= render ::AhoyCaptain::ComboboxComponent.new(name: "", multiple: false, column: "", url: filters_properties_values_path, select_html: { "data-property-filter-target" => 'value', id: "property-value" }, disabled: true) %>
+          <% end %>
+
+        </fieldset>
+
+      </div>
+    <% end %>
+  <% end %>
 
   <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Custom Range", id: "customRangeModal") do |modal| %>
     <% modal.with_modal_display do %>
@@ -31,4 +58,23 @@
       </div>
     <% end %>
   <% end %>
+
+  <%= render AhoyCaptain::Filter::ModalComponent.new(title: "Custom Comparison", id: "customComparisonModal") do |modal| %>
+    <% modal.with_modal_display do %>
+      <div class="flex gap-2 w-full">
+        <div class="form-control w-full max-w-xs">
+          <label class="label" for="start_date">
+            <span class="label-text">Start Date</span>
+          </label>
+          <input type="datetime-local" id="start_date" name="compare_to_start_date" class="input input-bordered w-full" value="<%= params[:compare_to_start_date] %>" />
+        </div>
+        <div class="form-control w-full max-w-xs">
+          <label class="label" for="end_date">
+            <span class="label-text">End Date</span>
+          </label>
+          <input type="datetime-local" id="end_date" name="compare_to_end_date" class="input input-bordered w-full" value="<%= params[:compare_to_end_date] %>" />
+        </div>
+      </div>
+    <% end %>
+  <% end %>
 <% end %>