Fix merge conflits

Signed-off-by: Lucas Ernesto Kindinger <lek@dinf.ufpr.br>

app/helpers/collections_helper.rb

@@ -16,4 +16,15 @@ module CollectionsHelper
     index % 3 == 0
   end
 
-end
\ No newline at end of file
+  def render_collection(orientation, collection)
+    case (orientation)
+      when "vertical"
+        render "collections/collection_vertical", collection: collection
+      when "horizontal"
+        render "collections/collection_horizontal", collection: collection
+      else
+        render "collections/collection_horizontal", collection: collection
+    end
+  end
+
+end

app/helpers/management/users_helper.rb

 module Management::UsersHelper
-end
\ No newline at end of file
+
+
+
+
+
+
+  def translate_role(name)
+    nome = case name
+      when "teacher" then "Professor"
+      when "admin" then "Administrador"
+      when "curator" then "Curador"
+    end
+    nome
+  end
+
+end

app/repositories/orient_db/complaint_repository.rb

@@ -26,7 +26,7 @@ module OrientDb
     #overwriting OrientDb::Base#create method
     def create(complaint)
       if complaint.valid?
-        create_and_set_edge('Complaint', complaint.user.rid, complaint.object.id, complaint.to_orientdb_hash)
+        create_and_set_edge('Complaint', complaint.user.rid, complaint.object, complaint.to_orientdb_hash)
         return true
       end
       false

app/services/search_service.rb

@@ -18,6 +18,7 @@ class SearchService
     # get results in cache or search
     Rails.cache.fetch(cache_key, expires_in: 10.minutes) do
       query = build_search_query params
+      p query
       @connection.query query, limit: 10000
     end
   end
@@ -25,8 +26,10 @@ class SearchService
   private
 
   def build_search_query(params={})
-    qry = "SELECT @rid.asString(), last_modified, @class FROM ("+main_query(params)+") ORDER BY #{order_by(params[:order])}"
-
+    order = order_by(params[:order])
+    ord_attr = order.split(' ', 2).first
+    qry = "SELECT @rid.asString(), last_modified, @class, #{ord_attr} FROM ("+main_query(params)+") ORDER BY #{order}"
+    
     puts Rainbow("\n\n------------------------------------Search Query------------------------------------").blue + "\n" + qry.to_s
 
     qry
@@ -38,26 +41,25 @@ class SearchService
 
   def collection_query(params={})
     qry = "SELECT *, created_at as published_at, out('BelongsTo')[0].name as author FROM Collection"
-    qry += " WHERE (name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}')" unless params[:query].blank?
-    qry_filter = params[:query].blank? ? " WHERE " : " AND "
+    qry += " WHERE name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}'" unless params[:query].blank?
+    qry = "SELECT FROM (#{qry}) WHERE privacy = 'public'"
     filter = collection_learning_objects_filter(params)
-    qry += qry_filter+filter unless filter.blank?
+    qry += " AND "+filter unless filter.blank?
     qry
   end
 
   def learning_object_query(params={})
     qry = "SELECT FROM LearningObject"
-    qry +=" WHERE (name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}' OR author LUCENE '#{params[:query]}')" unless params[:query].blank?
-    qry_filter = params[:query].blank? ? " WHERE " : " AND "
-    filter = learning_object_filters(params)
-    qry += qry_filter+filter unless filter.blank?
 
+    qry +=" WHERE name LUCENE '#{params[:query]}' OR description LUCENE '#{params[:query]}' OR author LUCENE '#{params[:query]}'" unless params[:query].blank?
+    filter = learning_object_filters(params)
+    qry = "SELECT FROM (#{qry}) WHERE "+filter unless filter.blank?
     qry
   end
 
   def collection_learning_objects_filter(params={})
     qry = learning_object_filters(params)
-    qry = "learning_objects contains(#{qry})" unless qry.blank?
+    qry = "learning_objects CONTAINS (#{qry})" unless qry.blank?
     qry
   end
 
@@ -71,7 +73,7 @@ class SearchService
     qry += " AND ("+type_filter(params[:type])+")" unless params[:type].blank?
     qry += " AND ("+year_filter(params[:year])+")" unless params[:year].blank?
     qry += " AND ("+source_filter(params[:source])+")" unless params[:source].blank?
-
+    
     qry[5..-1]
   end
 
@@ -105,13 +107,13 @@ class SearchService
     end
     qry
   end
-  
+
   def order_by(order)
     case order
       when 'author'
-        'author'
+        'author ASC'
       when 'publicationasc'
-        'published_at'
+        'published_at ASC'
       when 'publicationdesc'
         'published_at DESC'
       when 'title'
@@ -142,4 +144,4 @@ class SearchService
     cache_key
   end
 
-end
\ No newline at end of file
+end

app/views/collections/_collection.html.erb

-<%= link_to collection_path(id: collection.id) do %>
-          <div class="col-sm-4">
-        <div>
-          <%= image_tag 'icons/collection', width: 210,height:140 %>
-        </div>
-        <div class="panel-body">
-          <h4 class="media-heading"><%= collection.name unless collection.name == "Bookmarks" %><%= "Favoritos" if collection.name == "Bookmarks" %></h4>
-          <span><a><%= collection_length collection %></a></span><br />
-          <span><a><%= 'Por '+ collection.owner.name unless collection.owner.name.blank? %></a></span>
-        </div>
-      </div>
-<% end %>
+<%= render_collection orientation, collection %>

app/views/collections/_collection_horizontal.erb

+
+  <% link = collection_path(id: collection.id) %>
+  <div class="learning-object-horizontal row">
+    <!-- <div class="col-md-5"> -->
+      <div class="learning-object-thumbnail">
+        <%#= link_to link do
+          collection_thumbnail collection
+        end %>
+        <%= link_to link do
+          image_tag 'icons/collection', width: 210,height:140
+        end %>
+
+        <%# if user_signed_in? %>
+            <%#= render 'collections/actions_buttons', collection: collection %>
+        <%# end %>
+      </div>
+    <!-- </div> -->
+    <div class="learning-object-body">
+      <%= link_to link do %>
+        <h4 class="learning-object-heading"><%= collection.name %></h4>
+      <% end %>
+
+      <span class="author-label">Por <%= collection.owner.name %></span><br/>
+      <span><a><%= collection_length collection %></a></span>
+
+      <% unless collection.description.nil? %>
+        <div class="learning-object-text">
+          <%=
+            if collection.description.length > 150
+              d = collection.description[0..150]
+              d = d[0...d.rindex(' ')]
+              d << "..."
+            else
+              collection.description
+            end
+          %>
+        </div>
+        <br/>
+      <% end %>
+    </div>
+  </div>

app/views/collections/_collection_vertical.html.erb

+<%= link_to collection_path(id: collection.id) do %>
+          <div class="col-sm-4">
+        <div>
+          <%= image_tag 'icons/collection', width: 210,height:140 %>
+        </div>
+        <div class="panel-body">
+          <h4 class="media-heading"><%= collection.name unless collection.name == "Bookmarks" %><%= "Favoritos" if collection.name == "Bookmarks" %></h4>
+          <span><a><%= collection_length collection %></a></span><br />
+          <span><a><%= 'Por '+ collection.owner.name unless collection.owner.name.blank? %></a></span>
+        </div>
+      </div>
+<% end %>

app/views/collections/_group.html.erb

@@ -5,7 +5,7 @@
 
       <div style="margin-top: 10px;">
         <% collections.each do |collection| %>
-            <%= render collection %>
+            <%= render collection, orientation: 'vertical' %>
         <% end %>
       </div>
     </div>

app/views/collections/index.html.erb

@@ -8,7 +8,7 @@
 
     <div style="margin-top: 30px;" class="row recommend-collections">
       <% @collections.each do |collection| %>
-          <%= render collection %>
+          <%= render collection, orientation: 'vertical' %>
       <% end %>
     </div>
 <% end %>

app/views/management/users/admins.html.erb

@@ -44,16 +44,12 @@
       </tr>
       </thead>
       <tbody>
-        
+
       <% @admins.each do |c| %>
           <tr>
             <td>
               <a href="#"><%= c.name %></a>
-              <% nome = case c.roles[0].name
-                when "teacher" then "Professor"
-                when "admin" then "Administrador"
-                when "curator" then "Curador"
-              end %>
+              <% nome = translate_role(c.roles[0].name) %>
                   <span class="ls-tag hidden-xs"><%= nome %></span>
               </td>
             </td>
@@ -71,11 +67,7 @@
                 <a href="#" class="ls-btn ls-btn-sm" aria-expanded="false" role="combobox">Nível</a>
                 <ul class="ls-dropdown-nav" aria-hidden="true">
                   <% Role.all.each do |r| %>
-                  <% nome = case r.name
-                    when "teacher" then "Professor"
-                    when "admin" then "Administrador"
-                    when "curator" then "Curador"
-                  end %>
+                  <% nome = translate_role(r.name) %>
                       <li><%= link_to "Definir como #{nome}", change_roles_management_user_path(:id => c.id, :role_id => r.id), :method => :post %></li>
                   <% end %>
                 </ul>

app/views/management/users/curators.html.erb

@@ -50,11 +50,7 @@
         <tr>
           <td>
             <a href="#"><%= c.name %></a>
-            <% nome = case c.roles[0].name
-              when "teacher" then "Professor"
-              when "admin" then "Administrador"
-              when "curator" then "Curador"
-            end %>
+            <%nome = translate_role(c.roles[0].name) %>
                 <span class="ls-tag hidden-xs"><%= nome %></span>
             </td>
             <td class="ls-txt-center hidden-xs">
@@ -71,11 +67,7 @@
                 <a href="#" class="ls-btn ls-btn-sm" aria-expanded="false" role="combobox">Nível</a>
                 <ul class="ls-dropdown-nav" aria-hidden="true">
                   <% Role.all.each do |r| %>
-                  <% nome = case r.name
-                    when "teacher" then "Professor"
-                    when "admin" then "Administrador"
-                    when "curator" then "Curador"
-                  end %>
+                  <% nome = translate_role(r.name) %>
                       <li><%= link_to "Definir como #{nome}", change_roles_management_user_path(:id => c.id, :role_id => r.id), :method => :post %></li>
                   <% end %>
                 </ul>

app/views/management/users/index.html.erb

@@ -47,11 +47,7 @@
           <a href="#"><%= u.name %></a>
 
           <% u.roles.each do |r| %>
-          <% nome = case u.roles[0].name
-            when "teacher" then "Professor"
-            when "admin" then "Administrador"
-            when "curator" then "Curador"
-          end %>
+          <% nome = translate_role(u.roles[0].name) %>
               <span class="ls-tag hidden-xs"><%= nome %></span>
           </td>
           <% end %>
@@ -74,11 +70,7 @@
             <ul class="ls-dropdown-nav">
               <% @user = u %>
               <% Role.all.each do |r| %>
-                <% nome = case r.name
-                  when "teacher" then "Professor"
-                  when "admin" then "Administrador"
-                  when "curator" then "Curador"
-                end %>
+                <% nome = translate_role(r.name) %>
                 <li><%= link_to  "Definir como #{nome}", change_roles_management_user_path( :id => u, :role_id => r.id),:method => :post %></li>
               <% end %>
             </ul>

app/views/search/index.html.erb

@@ -64,8 +64,8 @@
             <select class="order sort-dropdown" name="order">
               <option value="">relevância</option>
               <option value="author">autor</option>
-              <option value="publicationasc">mais recente</option>
-              <!-- <option value="publicationdesc">mais velhos</option> -->
+              <option value="publicationdesc">mais recente</option>
+              <!-- <option value="publicationasc">mais velhos</option> -->
               <option value="title">título</option>
             </select>
           </form>