Adding event to models and adding styles

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

Adding event to models and adding styles
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Macartur Sousa
1 parent fb3fc6e4
Showing 6 changed files with 78 additions and 50 deletions Show diff stats
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/public/style.css
plugins/elasticsearch/views/elasticsearch_plugin/_article_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -3,14 +3,14 @@ class ElasticsearchPluginController &lt; ApplicationController
   SEARCHABLE_TYPES = { :all       => { label: _("All Results")},
                        :community => { label: _("Communities")},
-                       :article   => { label: _("Articles")},
                        :event     => { label: _("Events")},
                        :person    => { label: _("People")}
-                      }
-  SEARCH_FILTERS = { :lexical => { label: _("Alphabetical Order")},
-                     :recent => { label: _("More Recent Order")},
-                     :access => { label: _("More accessed")}
-                   }
+                     }
+
+  SEARCH_FILTERS   = { :lexical => { label: _("Alphabetical Order")},
+                       :recent => { label: _("More Recent Order")},
+                       :access => { label: _("More accessed")}
+                     }
   def index
     search()
@@ -18,22 +18,21 @@ class ElasticsearchPluginController &lt; ApplicationController
   end
   def search
-    @searchable_types = SEARCHABLE_TYPES
-    @selected_type = selected_type params
-    @search_filter_types = SEARCH_FILTERS
+    define_searchable_types
+    define_search_fields_types
     @query = params[:q]
     @results = []
-#    results 'article'
-   results 'people'
-     # results "community"
+    if @selected_type == :all
+      SEARCHABLE_TYPES.keys.each do |type|
+         results type.to_s
+      end
+    else
+      results @selected_type
+    end
   end
-  def selected_type params
-    return :all if params[:selected_type].nil?
-    params[:selected_type]
-  end
   private
@@ -76,10 +75,23 @@ class ElasticsearchPluginController &lt; ApplicationController
   end
   def results model
-    klass = model.to_s.classify.constantize
+    begin
+      klass = model.to_s.classify.constantize
+    rescue
+      return
+    end
     query = get_query params[:q], klass
-    query = {}
     @results |= klass.__elasticsearch__.search(query).records.to_a
   end
+  def define_searchable_types
+    @searchable_types = SEARCHABLE_TYPES
+    @selected_type = params[:selected_type].nil? ? :all : params[:selected_type].to_sym
+  end
+
+  def define_search_fields_types
+    @search_filter_types = SEARCH_FILTERS
+    @selected_filter_field = params[:selected_filter_field].nil? ? SEARCH_FILTERS.keys.first : params[:selected_filter_field].to_sym
+  end
+
 end
-.wrapper {
+.controller-elasticsearch_plugin .wrapper {
   display: flex;
 }
-.sidebar {
+
+.controller-elasticsearch_plugin .sidebar {
   width: 150px;
 }
-.search_form {
+.controller-elasticsearch_plugin .search_form {
   flex: 1;
 }
+.controller-elasticsearch_plugin .search_form .search_field {
+  margin-top: 5px;
+}
+.controller-elasticsearch_plugin .search_form .search_field #q {
+  width: 500px;
+}
+
+.controller-elasticsearch_plugin .results-count {
+  margin-top: 7px;
+  margin-right: 15px;
+  text-align: right;
+}
+
 .controller-elasticsearch_plugin ul {
   list-style: none;
   list-style-position: inside;
@@ -38,8 +52,7 @@
   color: black;
 }
-.controller-elasticsearch_plugin .search-item .right-side .model-label,
-.controller-elasticsearch_plugin .community-header .model-label {
+.controller-elasticsearch_plugin .search-item .model-label {
   background: #ddd;
   color: black;
   font-weight: 900;
@@ -49,6 +62,9 @@
 .controller-elasticsearch_plugin .search-item {
   margin-bottom: 25px;
   margin-top: 25px;
+}
+
+.controller-elasticsearch_plugin .search-item .person-item {
   display: flex;
 }
@@ -1,10 +0,0 @@
-<div class="article-model">
-  <h3> <%= article.name %> </h3>
-  <div class="article-info">
-    <%= article.created_at %>    <strong><%= article.class %></strong>
-  </div>
-
-  <div class="article-content">
-    MY BODY CONTENT
-  </div>
-</div>
@@ -0,0 +1,8 @@
+<div class="event-header">
+  <%= event.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label">EVENT</span>
+</div>
+
+<div class="body">
+   <h2><%= event.name %></h2>
+   <p><%= event.body %></p>
+</div>
-<div class="left-side">
-  <%= profile_image person %>
-</div>
-<div class="right-side">
-  <%= person.created_at.strftime("%d %B %Y at %H:%M") %> - <%= person.name %> <span class="model-label"><%= _("PERSON") %></span>
-  <div class="body">
-    <h2><%= person.name %></h2>
-    <p><%= person.description %></p>
+<div class="person-item">
+  <div class="left-side">
+    <%= profile_image person %>
+  </div>
+  <div class="right-side">
+    <%= person.created_at.strftime("%d %B %Y at %H:%M") %> - <%= person.name %> <span class="model-label"><%= _("PERSON") %></span>
+    <div class="body">
+      <h2><%= person.name %></h2>
+      <p><%= person.description %></p>
+    </div>
   </div>
 </div>
-
 <div class="wrapper">
   <div class="sidebar">
-    <%= @results.count %>
+    <div class="results-count">
+      <%= @results.count %> <%= _(" results by") %> :
+    </div>
     <ul>
-      <li class="select-search-type active"><a href="#"> <%= @searchable_types.values[0][:label] %></a></li>
-      <% for type in @searchable_types.values %>
-        <li class="select-search-type"><a href="#"> <%= type[:label] %></a></li>
+      <% for type,value in @searchable_types %>
+        <li class="select-search-type <%= "active" if type == @selected_type %>">
+          <%= link_to  value[:label], "?selected_type=#{type}&q=#{@query}&selected_filter_field=#{@selected_filter_field}"%>
+        </li>
       <% end %>
     </ul>
@@ -23,7 +26,8 @@
       <div class="search_field">
         <%= form_tag controller: "elasticsearch_plugin", action: "search" do %>
             <%= text_field_tag(:q, @query) %>
-
+            <%= hidden_field_tag 'selected_type', @selected_type %>
+            <%= hidden_field_tag  'selected_filter_field', @selected_filter_field %>
             <%= submit_tag _("Send") %>
         <% end %>
       </div>
@@ -32,17 +36,14 @@
       <% for result in @results %>
         <% for klass in @searchable_types.keys %>
           <% next if klass.to_s.include? "all" %>
-
           <% if result.is_a? klass.to_s.classify.constantize %>
             <div class="search-item">
               <%= render partial: "#{klass}_display", :locals => { klass => result} %>
             </div>
             <% break %>
           <% end %>
-
         <% end %>
       <% end %>
     </div>
   </div>
-
 </div>
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-<div class="article-model">
2	- <h3> <%= article.name %> </h3>
3	- <div class="article-info">
4	- <%= article.created_at %> <strong><%= article.class %></strong>
5	- </div>
6	-
7	- <div class="article-content">
8	- MY BODY CONTENT
9	- </div>
10	-</div>
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+<div class="event-header">
	2	+ <%= event.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label">EVENT</span>
	3	+</div>
	4	+
	5	+<div class="body">
	6	+ <h2><%= event.name %></h2>
	7	+ <p><%= event.body %></p>
	8	+</div>