hot-glue 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c984f13c5f9639c6cea9837c4266cf0e4e529e9adef1dffea257551ebd80f8cd
-  data.tar.gz: ba87601c2e04556604a7900880f054fd67b95ee78c9113668664ffb591c0601f
+  metadata.gz: 54b2a13a1fb9740be4ca14f108d98b72d8f1250b6131389c5e1d2130f07578cb
+  data.tar.gz: 15010c5e7fb34e35503b5a43aa563159d52f19c0b36f690ff03d67b7f1468060
 SHA512:
-  metadata.gz: f9b1228beb6639f671f2138c0b62a891060da18089e23cb1a9f0518b77b0002e2c38018b18df49525f0dcf6b2715c6ed3c4c415bca8d203c8afad0c5113fad88
-  data.tar.gz: 34e37814fe29eb58097331279107b1b58a4e9dbb4f3f9887c0e5c6b095d484c8a893034d3dafeed2ffbd5350a3cbd7542ee7dba4ffbd0a149b04a4b6a936ab8c
+  metadata.gz: 7b4c9a3e48ea19199f95314a4f0bbff28ca7dfd5635c8ee34e3e2304944ad227d31cb359db1d7c4200f75336ebdb20133cfdb3c762cbe034590630e6d3051a0a
+  data.tar.gz: c6c26412000d4bfa3ee27571aa430a8cf7b1c6dc454c55254a618bd312a14f754088ddb2dd77cf485dd69f433d06fe985a6ba34242f3df47607f4a3955703653

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.6.1)
+    hot-glue (0.6.2)
       ffaker (~> 2.16)
       kaminari (~> 1.2)
       rails (> 5.1)
@@ -139,7 +139,7 @@ GEM
     mini_mime (1.1.2)
     mini_portile2 (2.8.4)
     minitest (5.16.3)
-    net-imap (0.4.5)
+    net-imap (0.4.7)
       date
       net-protocol
     net-pop (0.1.2)

data/README.md

@@ -63,10 +63,14 @@ Instantly get a simple CRUD interface
 _If you are on Rails 6, see [LEGACY SETUP FOR RAILS 6](https://github.com/jasonfb/hot-glue/README2.md) and complete those steps FIRST._
 
 ## The Super-Quick Setup
+https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/hot-glue-quick-install-mega-script/
+Copy & paste the whole code block into your terminal.
+Remember, there is a small "Copy" button at the top-right of the code block.
+Be sure to use your Node + Ruby version managers to switch into the Node & Ruby versions **before running the quick script**. 
 
-https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/
 
-Copy & paste the whole code block from each section into your terminal. Remember, there is a small "Copy" button at the top-right of each code block to help you copy & paste the script into your terminal. 
+For more of a step-by-step, see the full cookbook at:
+https://jasonfleetwoodboldt.com/courses/stepping-up-rails/jason-fleetwood-boldts-rails-cookbook/
 
 These are the sections you need, you can ignore any others:
 
@@ -1064,6 +1068,73 @@ Both should be wrapped in quotation marks when specified in the command line, an
 (Notice the funky indentation of the lines in the generated code. Adjust you input to get the indentation correct.)
 
 
+## Searching
+
+### `--search` (options: simple, set, false predicate, default: false)
+
+
+#### Set Search
+If you specify `--search` to `set`, you will get a whole bar across the top of the list with search fields for each field.
+Within the set, the search query is **_combinative_** ("and"), so records matching all criteria are shown as the **result set.**
+For date pickers and time pickers, you need the additional Stimulus.
+Install this with :
+
+```
+bin/rails generate hot_glue:set_search_interface_install
+```
+
+_Additional search option for Set Search_
+##### `--search-fields=aaa,bbb,ccc,ddd,eee` 
+to specify which fields you want to be searchable.
+
+
+##### `--search-query-fields=aaa,ddd` 
+to specify a list of strings only which will be taken out of the search set and presented in a singular query box (allowing search across multiple string fields)
+
+##### `--search-position=vertical` 
+to specify vertical or horizontal (default: horizontal)
+
+##### `--search-clear-button` (no option) 
+to specify whether to show a clear button to clear the whole search form at once (default: false)
+
+##### `--search-autosearch` (no option) 
+to specify whether to automatically search when the user exit or changes any field (default: false)
+
+examples:
+```
+bin/rails generate Thing --include=name,description --search=set --search-fields=name,description
+```
+
+_Make a searchable table with two foreign keys (author_id and category_id) and a query field for title, including a clear button._
+```
+bin/rails generate Articles --inclue=title,author_id,category_id --search=set --search-fields=title,author_id,category_id --search-query-fields=title --search-clear-button
+```
+
+_Make a searchable table with vertical position and autosearch on._
+```
+bin/rails generate Inications --inclue=patient_id,drug_id,quantity --search=set --search-fields=patient_id,drug_id --search-position=vertical --search-autosearch
+```
+
+
+Here's how you would add a search interface to Example #1 in the [Hot Glue Tutorial](https://school.jfbcodes.com/8188)
+```
+bin/rails generate Book --include=name,author_id --search=set --search-fields=name,author_id
+```
+
+
+
+
+
+#### Predicate
+NOT IMPLEMENTED YET
+TODO: implement me
+
+
+
+
+
+
+
 
 ## Special Features
 
@@ -1535,6 +1606,45 @@ These automatic pickups for partials are detected at buildtime. This means that
 
 # VERSION HISTORY
 
+#### D2024-01-15 - v0.6.3
+
+## Set Searching
+
+### `--search` (options: set, false default: false)
+
+(Future options include simple, predicate)
+
+A set search is a search form that allows you to search across multiple fields at once. It is a set of search fields, each of which is a search field for a single field.
+
+
+#### Set Search
+If you specify `--search` to `set`, you will get a whole bar across the top of the list with search fields for each field.
+Within the set, the search query is **_combinative_** ("and"), so records matching all criteria are shown as the **result set.**
+For date pickers, time pickers, and the clear form interaction, you need the additional Stimulus JS. 
+Install this with :
+
+```
+bin/rails generate hot_glue:set_search_interface_install
+```
+
+_Additional search option for Set Search_
+##### `--search-fields=aaa,bbb,ccc,ddd,eee`
+to specify which fields you want to be searchable.
+
+##### `--search-query-fields=aaa,ddd`
+to specify a list of strings only which will be taken out of the search set and presented in a singular query box (allowing search across multiple string fields)
+
+##### `--search-position=vertical`
+to specify vertical or horizontal (default: horizontal)
+
+##### `--search-clear-button` (no option)
+to specify whether to show a clear button to clear the whole search form at once (default: false)
+
+
+
+
+
+
 #### 2023-12-02 - v0.6.2
 
 • Fixes to typeahead when using Pundit.

data/app/helpers/hot_glue/controller_helper.rb

@@ -5,28 +5,42 @@ module HotGlue
       (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
     end
 
-    def datetime_field_localized(form_object, field_name, value, label, nothing = nil )
+    def datetime_field_localized(form_object, field_name, value, **args )
       current_timezone
-      form_object.text_field(field_name, class: 'form-control',
-                                    type: 'datetime-local',
-                                    value: date_to_current_timezone(value, current_timezone))  + timezonize(current_timezone)
+
+      args = args.merge({class: 'form-control',
+                                  type: 'datetime-local' })
+
+      if !value.nil?
+        args[:value] = date_to_current_timezone(value, current_timezone) + timezonize(current_timezone)
+      end
+
+      form_object.text_field(field_name, args)
+
     end
 
 
-    def date_field_localized(form_object, field_name, value, label, timezone = nil )
-      form_object.text_field(field_name, class: 'form-control',
-                                    type: 'date',
-                                    value: value )
+    def date_field_localized(form_object, field_name, value, **args)
+
+      form_object.text_field(field_name,  args.merge({class: 'form-control',
+                                                       type: 'date',
+                                                       value: value }))
     end
 
-    def time_field_localized(form_object, field_name, value, label )
+    def time_field_localized(form_object, field_name, value, **args )
       current_timezone
-      form_object.text_field(field_name, class: 'form-control',
-                                    type: 'time',
-                                    value: value && value.strftime("%H:%M"))
+
+      form_object.text_field(field_name,  args.merge({class: 'form-control',
+                                                      type: 'time',
+                                                      value: value }))
 
     end
 
+
+
+
+
+
     def current_timezone
       # returns a TimeZone (https://apidock.com/rails/TimeZone) object
       if defined?(current_user)
@@ -104,6 +118,96 @@ module HotGlue
       modified_params
     end
 
+    def string_query_constructor(match, search)
+      if match.blank? || search.blank?
+        nil
+      else
+        case match
+        when 'contains'
+          "%#{search}%"
+        when 'is_exactly'
+          "#{search}"
+        when 'starts_with'
+          "#{search}%"
+        when 'ends_with'
+          "%#{search}"
+        else
+          nil
+        end
+      end
+    end
+
+    def enum_constructor(field_name, value, **args)
+      return nil if value.blank?
+      ["#{field_name} = ?", value]
+    end
+
+
+    def date_query_constructor(field, match, search_start, search_end)
+      if match.blank?
+        nil
+      elsif ['is_on', 'not_on'].include?(match) && search_start.blank?
+        nil
+      elsif ['is_on_or_after','is_between'].include?(match) && (search_start.blank? )
+        nil
+      elsif ['is_before_or_on'].include?(match) && (search_end.blank? )
+        nil
+      elsif ['is_between'].include?(match) && (search_start.blank? || search_end.blank? )
+        nil
+      else
+        case match
+        when 'is_on'
+          ["#{field} = ?", search_start]
+        when 'is_on_or_after'
+          ["#{field} = ? OR #{field} > ?", search_start, search_start]
+        when "is_before_or_on"
+          ["#{field} = ? OR #{field} < ?", search_end, search_end]
+        when "is_between"
+          ["#{field} BETWEEN ? AND ?", search_start, search_end]
+        when "not_on"
+          ["#{field} != ?", search_start]
+        end
+      end
+    end
+
+    def time_query_constructor(field, match, search_start, search_end)
+      if match.blank?
+        nil
+      elsif ['is_at'].include?(match) && search_start.blank?
+        nil
+      elsif ['is_ar_or_after', 'is_before_or_at', 'is_between'].include?(match) && (search_start.blank? || search_end.blank?)
+        nil
+      else
+        case match
+        when 'is_at_exactly'
+          ["EXTRACT(HOUR FROM #{field}) = ?
+          AND EXTRACT(MINUTE FROM #{field}) = ? ", search_start.split(":")[0], search_start.split(":")[1]]
+        # when 'is_at_or_after'
+        #   ["#{field} = ? OR #{field} > ?", search_start, search_start]
+        # when "is_before_or_at"
+        #   ["#{field} = ? OR #{field} < ?", search_end, search_end]
+        # when "is_between"
+        #   ["#{field} BETWEEN ? AND ?", search_start, search_end]
+        end
+      end
+    end
+
+    def association_constructor(field, search)
+      unless search.blank?
+        ["#{field} = ?", search]
+      else
+        nil
+      end
+    end
+
+    def boolean_query_constructor(field, search)
+      unless search.blank?
+        ["#{field} = ?", search]
+      else
+        nil
+      end
+    end
+
     private
 
     def server_timezone_offset # returns integer of hours to add/subtract from UTC

data/app/helpers/hot_glue_helper.rb

@@ -1,5 +1,7 @@
 module HotGlueHelper
 
+
+
   def enum_to_collection_select(hash)
     hash.collect{|k,v| OpenStruct.new({key: k, value: v})}
 

data/lib/generators/hot_glue/fields/association_field.rb

@@ -149,4 +149,76 @@ class AssociationField < Field
 
     "<%= #{singular}.#{assoc}.try(:#{display_column}) || '<span class=\"content \">MISSING</span>'.html_safe %>"
   end
+
+
+  def search_field_output
+
+    assoc_name = name.to_s.gsub("_id","")
+    assoc = eval("#{class_name}.reflect_on_association(:#{assoc_name})")
+    if modify_as && modify_as[:typeahead]
+      search_url  = "#{namespace ? namespace + "_" : ""}#{assoc.class_name.downcase.pluralize}_typeahead_index_url"
+
+      # \"q[0][#{name}_search]\"
+      # @q['0']['#{name}_search']
+      "<div class='typeahead typeahead--q_0_#{name}_search'
+      data-controller='typeahead'
+      data-typeahead-url-value='<%= #{search_url} %>'
+      data-typeahead-typeahead-results-outlet='#search-results'>
+      <%= text_field_tag \'q[0][#{name}_search]_query\', '', placeholder: 'Search #{assoc.plural_name}', class: 'search__input',
+                     data: { action: 'keyup->typeahead#fetchResults keydown->typeahead#navigateResults', typeahead_target: 'query' },
+                     autofocus: true,
+                     autocomplete: 'off',
+                     value: @q['0']['#{name}'] ? #{assoc.class_name}.find(@q['0']['#{name}']).try(:name) : \"\"  %>
+      <%= f.hidden_field \'q[0][#{name}]\', value: @q['0']['#{name}_search'].try(:id), 'data-typeahead-target': 'hiddenFormValue' %>
+      <div data-typeahead-target='results'></div>
+      <div data-typeahead-target='classIdentifier' data-id=\"typeahead--q_0_#{name}_search\"></div>
+      </div>"
+    else
+      if assoc.nil?
+        exit_message = "*** Oops. on the #{class_name} object, there doesn't seem to be an association called '#{assoc_name}'"
+        exit
+      end
+
+      is_owner = name == ownership_field
+      assoc_class_name = assoc.class_name.to_s
+      display_column = HotGlue.derrive_reference_name(assoc_class_name)
+
+      if hawk_keys[assoc.foreign_key.to_sym]
+        hawk_definition = hawk_keys[assoc.foreign_key.to_sym]
+        hawked_association = hawk_definition[:bind_to].join(".")
+      else
+        hawked_association = "#{assoc.class_name}.all"
+      end
+
+      (is_owner ? "<% unless @#{assoc_name} %>\n" : "") +
+        "  <%= f.collection_select(\"q[0][#{name}_search]\", #{hawked_association}, :id, :#{display_column}, {include_blank: true, selected: @q['0']['#{name}_search'] }, class: 'form-control') %>\n" +
+        (is_owner ? "<% else %>\n <%= @#{assoc_name}.#{display_column} %>" : "") +
+        (is_owner ? "\n<% end %>" : "")
+    end
+
+
+    # "      "+
+    #   "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is on', 'is_on'], " +
+    #   "\n         ['is between', 'is_between'], ['is on or after', 'is_on_or_after'], " +
+    #   "\n         ['is before or on', 'is_before_or_on'], ['not on', 'not_on']], @q[\'0\']['#{name}_match'] ), {} ," +
+    #   "\n         { class: 'form-control match', 'data-action': 'change->date-range-picker#matchSelection' } %>"+
+    #   "\n        <%= date_field_localized f, 'q[0][#{name}_search_start]',  @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'start', 'data-date-range-picker-target': 'start' %>" +
+    #   "\n        <%= date_field_localized f, 'q[0][#{name}_search_end]',  @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'end' , 'data-date-range-picker-target': 'end'%>" +
+    #   "\n     "
+  end
+
+
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    if modify_as && modify_as[:typeahead]
+      "#{name}_query = association_constructor(:#{name}, @q['0'][:#{name}])"
+    else
+      "#{name}_query = association_constructor(:#{name}, @q['0'][:#{name}_search])"
+    end
+  end
+
+
 end

data/lib/generators/hot_glue/fields/boolean_field.rb

@@ -78,4 +78,34 @@ class BooleanField < Field
   def label_class
     super + " form-check-label"
   end
+
+
+
+  def search_field_output
+    "  <%= f.radio_button('q[0][#{name}_match]', '-1', checked: @q[\'0\']['#{name}_match']==-1  ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('q[0][#{name}_match]', value: '-1', for: 'q[0][#{name}_match]_-1'  ) %>\n" +
+
+      "  <%= f.radio_button('q[0][#{name}_match]', '0', checked: @q[\'0\']['#{name}_match']==0 ? '' : 'checked', class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('q[0][#{name}_match]_0', value: '#{modify_binary? && modify_as[:binary][:falsy] || 'No'}', for: 'q[0][#{name}_match]_0') %>\n" +
+      " <br /> <%= f.radio_button('q[0][#{name}_match]', '1',  checked: @q[\'0\']['#{name}_match']==1  ? 'checked' : '' , class: '#{@layout_strategy.form_checkbox_input_class}') %>\n" +
+      "  <%= f.label('q[0][#{name}_match]_1', value: '#{modify_binary? && modify_as[:binary][:truthy] || 'Yes'}', for: 'q[0][#{name}_match]_1') %>\n"
+
+
+    # "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
+    #   "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+  end
+
+
+  def where_query_statement
+    ".where('#{name} ILIKE ?', #{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = boolean_query_constructor(@q['0'][:#{name}_match], @q['0'][:#{name}_search])"
+  end
+
+  # def code_to_reset_match_if_search_is_blank
+  #   "    @q['0'][:#{name}_match] = '' if @q['0'][:#{name}_search] == ''"
+  # end
+
 end

data/lib/generators/hot_glue/fields/date_field.rb

@@ -10,7 +10,7 @@ class DateField < Field
 
 
   def form_field_output
-    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize  }') %>"
+    "<%= date_field_localized(f, :#{name}, #{singular}.#{name}, label:  '#{ name.to_s.humanize  }') %>"
   end
 
   def line_field_output
@@ -20,4 +20,24 @@ class DateField < Field
       <span class=''>MISSING</span>
     <% end %>"
   end
+
+  def search_field_output
+    "      <div data-controller='date-range-picker' >"+
+    "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is on', 'is_on'], " +
+    "\n         ['is between', 'is_between'], ['is on or after', 'is_on_or_after'], " +
+    "\n         ['is before or on', 'is_before_or_on'], ['not on', 'not_on']], @q[\'0\']['#{name}_match'] ), {} ," +
+    "\n         { class: 'form-control match', 'data-action': 'change->date-range-picker#matchSelection' } %>"+
+    "\n        <%= date_field_localized f, 'q[0][#{name}_search_start]',  @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'start', 'data-date-range-picker-target': 'start' %>" +
+    "\n        <%= date_field_localized f, 'q[0][#{name}_search_end]',  @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'end' , 'data-date-range-picker-target': 'end'%>" +
+    "\n      </div>"
+  end
+
+
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = date_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+  end
 end

data/lib/generators/hot_glue/fields/date_time_field.rb

@@ -34,7 +34,7 @@ class DateTimeField < Field
   end
 
   def form_field_output
-    "<%= datetime_field_localized(f, :#{name}, #{singular}.#{name}, '#{ name.to_s.humanize }') %>"
+    "<%= datetime_field_localized(f, :#{name}, #{singular}.#{name}, label: '#{ name.to_s.humanize }' ) %>"
   end
 
   def viewable_output
@@ -48,4 +48,24 @@ class DateTimeField < Field
   <% end %>"
     end
   end
+
+  def search_field_output
+    "      <div data-controller='date-range-picker' >"+
+      "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is on', 'is_on'], " +
+      "\n         ['is between', 'is_between'], ['is on or after', 'is_on_or_after'], " +
+      "\n         ['is before or on', 'is_before_or_on'], ['not on', 'not_on']], @q[\'0\']['#{name}_match'] ), {} ," +
+      "\n         { class: 'form-control match', 'data-action': 'change->date-range-picker#matchSelection' } %>"+
+      "\n        <%= datetime_local_field 'q[0]', '#{name}_search_start', {value: @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', placeholder: 'start', 'data-date-range-picker-target': 'start' } %>" +
+      "\n        <%= datetime_local_field 'q[0]', '#{name}_search_end', {value: @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', placeholder: 'end' , 'data-date-range-picker-target': 'end' } %>" +
+      "\n      </div>"
+  end
+
+
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = date_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+  end
 end

data/lib/generators/hot_glue/fields/enum_field.rb

@@ -38,7 +38,7 @@ class EnumField < Field
       enum_definer = "#{class_name}.defined_enums['#{name}']"
     end
 
-    res = "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {selected: #{singular}.#{name} }, class: 'form-control') %>"
+    res = "<%= f.collection_select(:#{name},  enum_to_collection_select(#{enum_definer}), :key, :value, {include_blank: true, selected: #{singular}.#{name} }, class: 'form-control') %>"
 
 
     if modify_as && modify_as[:enum] == :partials
@@ -79,4 +79,25 @@ class EnumField < Field
   def form_show_only_output
     viewable_output
   end
+
+
+  def search_field_output
+    enum_type = eval("#{class_name}.columns.select{|x| x.name == '#{name}'}[0].sql_type")
+    if eval("defined? #{class_name}.#{enum_type}_labels") == "method"
+      enum_definer = "#{class_name}.#{enum_type}_labels"
+    else
+      enum_definer = "#{class_name}.defined_enums['#{name}']"
+    end
+
+    "<%= f.collection_select(\'q[0][#{name}_search]\', enum_to_collection_select(#{enum_definer}), :key, :value, {include_blank: true, selected: @q['0']['#{name}_search'] }, class: 'form-control') %>"
+  end
+
+
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = enum_constructor(:#{name}, @q['0'][:#{name}_search])"
+  end
 end

data/lib/generators/hot_glue/fields/field.rb

@@ -177,4 +177,8 @@ class Field
   def label_for
 
   end
+
+  def code_to_reset_match_if_search_is_blank
+    nil
+  end
 end

data/lib/generators/hot_glue/fields/float_field.rb

@@ -19,4 +19,16 @@ class FloatField < Field
   #
   #   "<%= #{singular}.#{name} %>"
   # end
+
+  def search_field_output
+    ""
+  end
+
+
+  def where_query_statement
+  end
+
+  def load_all_query_statement
+
+   end
 end

data/lib/generators/hot_glue/fields/string_field.rb

@@ -47,4 +47,22 @@ class StringField < Field
       text_area_output( 65536)
     end
   end
+
+  def search_field_output
+    "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
+    "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+  end
+
+
+  def where_query_statement
+    ".where('#{name} ILIKE ?', #{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = string_query_constructor(@q['0'][:#{name}_match], @q['0'][:#{name}_search])"
+  end
+
+  def code_to_reset_match_if_search_is_blank
+    "    @q['0'][:#{name}_match] = '' if @q['0'][:#{name}_search] == ''"
+  end
 end

data/lib/generators/hot_glue/fields/text_field.rb

@@ -28,4 +28,24 @@ class TextField < Field
       text_area_output( 65536)
     end
   end
+
+
+  def search_field_output
+    "<%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['contains', 'contains'], ['is exactly', 'is_exactly'], ['starts with', 'starts_with'], ['ends with', 'ends_with']], @q[\'0\']['#{name}_match'] ), {} , { class: 'form-control match' } %>"+
+      "<%= f.text_field 'q[0][#{name}_search]', value: @q[\'0\'][:#{name}_search], autocomplete: 'off', size: 40, class: 'form-control', type: 'text' %>"
+  end
+
+
+  def where_query_statement
+    ".where('#{name} ILIKE ?', #{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = string_query_constructor(@q['0'][:#{name}_match], @q['0'][:#{name}_search])"
+  end
+
+  def code_to_reset_match_if_search_is_blank
+    "    @q['0'][:#{name}_match] = '' if @q['0'][:#{name}_search] == ''"
+  end
+
 end

data/lib/generators/hot_glue/fields/time_field.rb

@@ -5,7 +5,7 @@ class TimeField < Field
   end
 
   def form_field_output
-    "<%= time_field_localized(f, :#{name}, #{singular}.#{name},  '#{ name.to_s.humanize  }') %>"
+    "<%= time_field_localized(f, :#{name}, #{singular}.#{name}, label: '#{ name.to_s.humanize  }') %>"
   end
 
   def line_field_output
@@ -30,5 +30,21 @@ class TimeField < Field
     # "expect(page).to have_content(#{singular}#{1}.#{name})"
   end
 
+  def search_field_output
+    "      <div data-controller='time-range-picker' >"+
+      "\n        <%= f.select 'q[0][#{name}_match]', options_for_select([['', ''], ['is at exactly', 'is_at_exactly']], @q[\'0\']['#{name}_match']), {} ," +
+      "\n         { class: 'form-control match', 'data-action': 'change->time-range-picker#matchSelection' } %>"+
+      "\n        <%= time_field_localized f, 'q[0][#{name}_search_start]',  @q[\'0\'][:#{name}_search_start], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'start', 'data-time-range-picker-target': 'start' %>" +
+      "\n        <%= time_field_localized f, 'q[0][#{name}_search_end]',  @q[\'0\'][:#{name}_search_end], autocomplete: 'off', size: 40, class: 'form-control', type: 'text', placeholder: 'end' , 'data-time-range-picker-target': 'end' %>" +
+      "\n      </div>"
+  end
+
 
+  def where_query_statement
+    ".where(*#{name}_query)"
+  end
+
+  def load_all_query_statement
+    "#{name}_query = time_query_constructor(:#{name}, @q['0'][:#{name}_match], @q['0'][:#{name}_search_start], @q['0'][:#{name}_search_end])"
+  end
 end