From 5b93f7e420a7d485507089bda0421e495567cf90 Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Mon, 28 Sep 2015 11:12:40 -0300
Subject: [PATCH] adding collections views
---
.../application/learning_objects.coffee | 11 +++--
app/helpers/learning_objects_helper.rb | 4 ++
.../orient_db/learning_object_repository.rb | 10 +++++
app/views/collections/_collection.html.erb | 30 +------------
app/views/collections/_create.html.erb | 2 +-
app/views/collections/_form.html.erb | 22 ++++-----
.../_learning_object_horizontal.erb | 3 ++
.../shared/application/_object_tag.html.erb | 44 ------------------
app/views/users/show.html.erb | 45 +++++++++++++++++++
9 files changed, 85 insertions(+), 86 deletions(-)
delete mode 100644 app/views/shared/application/_object_tag.html.erb
diff --git a/app/assets/javascripts/application/learning_objects.coffee b/app/assets/javascripts/application/learning_objects.coffee
index 24f83d18b..019c35f93 100644
--- a/app/assets/javascripts/application/learning_objects.coffee
+++ b/app/assets/javascripts/application/learning_objects.coffee
@@ -1,3 +1,8 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
+$ ->
+ $('.add_to_collection').popover
+ html: true
+ content: ->
+ $('#collections_list_popover').html()
+ title: ->
+ $('#collections_list_popover_title').html()
+ return
\ No newline at end of file
diff --git a/app/helpers/learning_objects_helper.rb b/app/helpers/learning_objects_helper.rb
index 0860a2086..37aa17b22 100644
--- a/app/helpers/learning_objects_helper.rb
+++ b/app/helpers/learning_objects_helper.rb
@@ -15,4 +15,8 @@ module LearningObjectsHelper
end
end
+ def collections_list(learning_object)
+ collections = @collections.diff(learning_object_collections(learning_object))
+ end
+
end
diff --git a/app/repositories/orient_db/learning_object_repository.rb b/app/repositories/orient_db/learning_object_repository.rb
index 313be3c9d..22ca9a084 100644
--- a/app/repositories/orient_db/learning_object_repository.rb
+++ b/app/repositories/orient_db/learning_object_repository.rb
@@ -15,6 +15,16 @@ module OrientDb
create_edge "Likes", user.rid, learning_object.id
end
+ # Example:
+ # list = repository.for(:learning_objects).all
+ # list.each do |learning_object|
+ # learning_object.inspect <LearningObject model>
+ # end
+ def all
+ learning_objects_hash = connection.query "SELECT FROM LearningObject"
+ build_objects(learning_objects_hash) || []
+ end
+
# Usage:
# learning_object = repository.for(:learning_objects).get_by_dspace_id 123
#
diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb
index eaa86d05f..0688d28bd 100644
--- a/app/views/collections/_collection.html.erb
+++ b/app/views/collections/_collection.html.erb
@@ -1,31 +1,5 @@
<div class="row collections">
- <h2><%= title %></h2>
-
- <% learning_objects.each do |learning_object| %>
- <!-- item -->
- <div class="col-sm-4">
- <div class="row">
- <h4><b><%= learning_object.categories %></b></h4>
-
- <div class="object-vertical">
- <div class="panel">
- <div>
- <img src="http://dummyimage.com/250x150/363336/fff" alt="dummy image" class="img-responsive">
- </div>
- <div class="panel-body">
- <h4 class="media-heading"><%= learning_object.name %></h4>
- <span class="glyphicon glyphicon-eye-open"> <%= learning_object.views %> </span>
- <span class="glyphicon glyphicon-star">4,5 </span>
- <span>Por <a>Usuário </a></span>
- </div>
- </div>
- </div>
- <p>
- <a href="#">Ver Mais</a>
- </p>
- </div>
- </div>
- <!-- /item -->
- <% end %>
+ <h2><%= collection.title %></h2>
+ <p><%= collection_length collection %></p>
</div>
\ No newline at end of file
diff --git a/app/views/collections/_create.html.erb b/app/views/collections/_create.html.erb
index a0f489623..cf67f6c19 100644
--- a/app/views/collections/_create.html.erb
+++ b/app/views/collections/_create.html.erb
@@ -1,7 +1,7 @@
<a href="#" id="create_collection_popover">Criar coleção</a>
<div id="create_collection_popover_content" style="display: none">
- <%= render 'form' %>
+ <%= render 'collections/form' %>
</div>
<div id="create_collection_popover_title" style="display: none">
diff --git a/app/views/collections/_form.html.erb b/app/views/collections/_form.html.erb
index aaa75f9e1..7330b0254 100644
--- a/app/views/collections/_form.html.erb
+++ b/app/views/collections/_form.html.erb
@@ -1,12 +1,14 @@
-<form>
- <label>Nome da coleção</label>
- <input type='text' style="width:250px"/>
+<%= form_for @collection do |f| %>
- <label>Privacidade</label>
- <select>
- <option>Público</option>
- <option>Somente seguidores</option>
- </select>
+ <%= f.label :title %>
+ <%= f.text_field :title, required: true, style: 'width: 250px;' %>
- <input type="submit"/>
-</form>
\ No newline at end of file
+ <%= f.label :privacy %>
+ <select name="collection[privacy]">
+ <option value="public">Público</option>
+ <option value="followers">Meus seguidores</option>
+ <option value="only_me">Somente eu</option>
+ </select>
+
+ <%= f.submit %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/learning_objects/_learning_object_horizontal.erb b/app/views/learning_objects/_learning_object_horizontal.erb
index 31a37eebd..4ce6a687e 100644
--- a/app/views/learning_objects/_learning_object_horizontal.erb
+++ b/app/views/learning_objects/_learning_object_horizontal.erb
@@ -13,6 +13,9 @@
<h4 class="media-heading"><%= learning_object.name %></h4>
<% end %>
</a>
+
+ <%= render 'learning_objects/add_to_collection_btn', collections_list(learning_object) %>
+
<span>Por <a>Usuário </a></span><br/>
<span class="glyphicon glyphicon-eye-open"><%= learning_object.views %> </span>
<span class="glyphicon glyphicon-star"><%= learning_object.likes %> </span><br>
diff --git a/app/views/shared/application/_object_tag.html.erb b/app/views/shared/application/_object_tag.html.erb
deleted file mode 100644
index c11756997..000000000
--- a/app/views/shared/application/_object_tag.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--<%=debug obj%>-->
-
-<div class="row">
- <div class="col-sm-3">
- <a href="app/assets/images/logo.png" class="thumbnail">
- <p><%= obj.name %></p>
- <!-- <%= link_to image_tag("logo.png", :class => "img-responsive"), :class => "thumbnail" %><img src="app/assets/images/logo.png" alt="" width="284" height="213">-->
- <%= image_tag("logo.png") %>
- </a>
- </div>
- <div class="col-sm-9">
- <div class="col-sm-12">
- <%= obj.description %>
- </div>
- <div class="col-sm-12">
- <div align="right"><%= link_to "Ver mais...", learning_object_path(obj.id_dspace), :class => "btn btn-primary" %></div>
- <br/>
- <table class="table ">
- <tr>
- <td class="stars">Avaliações:</td><td>Postado por:</td><td class="visualis">Visualizações:</td>
- </tr>
- <tr>
- <td>
- <span class="starRating">
- <input id="rating5" type="radio" name="rating" value="5" disabled>
- <label for="rating5">5</label>
- <input id="rating4" type="radio" name="rating" value="4" checked disabled>
- <label for="rating4">4</label>
- <input id="rating3" type="radio" name="rating" value="3" disabled>
- <label for="rating3">3</label>
- <input id="rating2" type="radio" name="rating" value="2" disabled>
- <label for="rating2">2</label>
- <input id="rating1" type="radio" name="rating" value="1" disabled>
- <label for="rating1">1</label>
- </span>
- ()
- </td>
- <td><%= link_to "<<Autor>>" %> Há ... anos</td>
- <td><%= obj.views %></td>
- </tr>
- </table>
- </div>
- </div>
- </div>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2d04b8d96..87c2fec0c 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -10,6 +10,7 @@
<div class="media-body">
<h4 class="media-heading">Usuário</h4>
<span>nome da instituição</span>
+
<p>
x items
</p>
@@ -27,6 +28,46 @@
<div class="media">
<div class="media-body">
<h4 class="media-heading">Arquivos do usuário</h4>
+
+ <p>
+ x items
+ </p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 right-column">
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-md-3">
+ <%= render @objects[0], orientation: "vertical" %>
+ </div>
+ <div class="col-md-6">
+ <div class="row">
+ <div class="col-md-3"></div>
+ <div class="col-md-6">
+ <%= render @objects[1], orientation: "vertical" %>
+ </div>
+ <div class="col-md-3"></div>
+ </div>
+ </div>
+ <div class="col-md-3">
+ <%= render @objects[2], orientation: "vertical" %>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<div class="row">
+ <div class="user-files">
+ <div class="row">
+ <div class="col-md-6">
+ <div class="media">
+ <div class="media-body">
+ <h4 class="media-heading">Coleções</h4>
+
<p>
x items
</p>
@@ -56,3 +97,7 @@
</div>
</div>
</div>
+
+<div class="row">
+ <%= render 'collections/create' %>
+</div>
\ No newline at end of file
--
GitLab