Add new fields to comment

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Add new fields to comment
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro · Álvaro Fernando Matos de Souza
1 parent e9757353
Showing 8 changed files with 100 additions and 1 deletions Show diff stats
db/migrate/20150701134012_add_new_fields_to_comments.rb
lib/ext/comments.rb
lib/software_communities_plugin.rb
public/initializer.js
public/style.css
public/views/comments-software-extra-fields.js
test/unit/comments_test.rb
views/comments_extra_fields.html.erb
@@ -0,0 +1,13 @@
+class AddNewFieldsToComments < ActiveRecord::Migration
+  def self.up
+    change_table :comments do |t|
+      t.integer :people_benefited
+      t.decimal :saved_value
+    end
+  end
+
+  def self.down
+    remove_column :comments, :people_benefited
+    remove_column :comments, :saved_value
+  end
+end
@@ -0,0 +1,5 @@
+require_dependency "comment"
+
+class Comment
+  attr_accessible :people_benefited, :saved_value
+end
@@ -63,12 +63,21 @@ class SoftwareCommunitiesPlugin &lt; Noosfero::Plugin
       views/search-software-catalog.js
       views/profile-tabs-software.js
       views/new-community.js
+      views/comments-software-extra-fields.js
       blocks/software-download.js
       initializer.js
       app.js
     )
   end
  
+  def communities_ratings_plugin_comments_extra_fields
+    Proc::new do render :file => 'comments_extra_fields' end
+  end
+
+  def communities_ratings_plugin_star_message
+    Proc::new do _("Rate this software") end
+  end
+
   # FIXME - if in error log apears has_permission?, try to use this method
   def has_permission?(person, permission, target)
     person.has_permission_without_plugins?(permission, target)
@@ -8,7 +8,8 @@
     'SearchSoftwareCatalog',
     'SoftwareDownload',
     'ProfileTabsSoftware',
-    'NewCommunity'
+    'NewCommunity',
+    'CommentsSoftwareExtraFields'
   ];
  
  
@@ -162,3 +162,13 @@
   display: block;
   background-color:rgba(255, 255, 255, 0.9);
 }
+
+/*===== Communities rate hotspot extra fields =====*/
+.comments-software-extra-fields span {
+  cursor: pointer;
+}
+
+.comments-software-extra-fields div {
+  display: none;
+}
+
@@ -0,0 +1,30 @@
+modulejs.define('CommentsSoftwareExtraFields', ['jquery'], function($) {
+  'use strict';
+
+  var DATA = {
+    information_display_state: "hidden"
+  }
+
+  function set_show_aditional_information() {
+    $(".comments-software-extra-fields span").on("click", function() {
+      if (DATA.information_display_state === "hidden") {
+        DATA.information_display_state = "show";
+        $(this).parent().children("div").show();
+      } else {
+        DATA.information_display_state = "hidden";
+        $(this).parent().children("div").hide();
+      }
+    });
+  }
+
+  return {
+    isCurrentPage: function() {
+      return $(".comments-software-extra-fields span").length === 1;
+    },
+
+
+    init: function() {
+      set_show_aditional_information();
+    }
+  }
+});
@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../lib/ext/comments.rb'
+
+class CommentsTest < ActiveSupport::TestCase
+
+  def teardown
+    Comment.destroy_all
+  end
+
+  should 'create comments with new fields' do
+    @person = fast_create(Person)
+    @article = Article.create(:profile => @person, :name => "Test")
+
+    comment = Comment.new(:body => "Comment new", :author => @person, :people_benefited => 2, :saved_value => 38.5)
+    assert comment.save
+  end
+end
@@ -0,0 +1,14 @@
+<div class="comments-software-extra-fields">
+  <span>
+    <%= _("Aditional informations") %>
+  </span>
+
+  <div class="comments-software-people-benefited">
+    <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%>
+    <%= text_field_tag "comments[people_benefited]", "" %>
+  </div>
+  <div class="comments-software-saved-values">
+    <%= label_tag "comments_saved_value", _("Saved resources")%>
+    <%= text_field_tag "comments[saved_value]", ""%>
+  </div>
+</div>
...	...	@@ -0,0 +1,13 @@
	1	+class AddNewFieldsToComments < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_table :comments do \|t\|
	4	+ t.integer :people_benefited
	5	+ t.decimal :saved_value
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ remove_column :comments, :people_benefited
	11	+ remove_column :comments, :saved_value
	12	+ end
	13	+end
...	...
...	...	@@ -0,0 +1,5 @@
	1	+require_dependency "comment"
	2	+
	3	+class Comment
	4	+ attr_accessible :people_benefited, :saved_value
	5	+end
...	...
...	...	@@ -63,12 +63,21 @@ class SoftwareCommunitiesPlugin < Noosfero::Plugin
63	63	views/search-software-catalog.js
64	64	views/profile-tabs-software.js
65	65	views/new-community.js
	66	+ views/comments-software-extra-fields.js
66	67	blocks/software-download.js
67	68	initializer.js
68	69	app.js
69	70	)
70	71	end
71	72
	73	+ def communities_ratings_plugin_comments_extra_fields
	74	+ Proc::new do render :file => 'comments_extra_fields' end
	75	+ end
	76	+
	77	+ def communities_ratings_plugin_star_message
	78	+ Proc::new do _("Rate this software") end
	79	+ end
	80	+
72	81	# FIXME - if in error log apears has_permission?, try to use this method
73	82	def has_permission?(person, permission, target)
74	83	person.has_permission_without_plugins?(permission, target)
...	...
...	...	@@ -8,7 +8,8 @@
8	8	'SearchSoftwareCatalog',
9	9	'SoftwareDownload',
10	10	'ProfileTabsSoftware',
11		- 'NewCommunity'
	11	+ 'NewCommunity',
	12	+ 'CommentsSoftwareExtraFields'
12	13	];
13	14
14	15
...	...
...	...	@@ -162,3 +162,13 @@
162	162	display: block;
163	163	background-color:rgba(255, 255, 255, 0.9);
164	164	}
	165	+
	166	+/===== Communities rate hotspot extra fields =====/
	167	+.comments-software-extra-fields span {
	168	+ cursor: pointer;
	169	+}
	170	+
	171	+.comments-software-extra-fields div {
	172	+ display: none;
	173	+}
	174	+
...	...
...	...	@@ -0,0 +1,30 @@
	1	+modulejs.define('CommentsSoftwareExtraFields', ['jquery'], function($) {
	2	+ 'use strict';
	3	+
	4	+ var DATA = {
	5	+ information_display_state: "hidden"
	6	+ }
	7	+
	8	+ function set_show_aditional_information() {
	9	+ $(".comments-software-extra-fields span").on("click", function() {
	10	+ if (DATA.information_display_state === "hidden") {
	11	+ DATA.information_display_state = "show";
	12	+ $(this).parent().children("div").show();
	13	+ } else {
	14	+ DATA.information_display_state = "hidden";
	15	+ $(this).parent().children("div").hide();
	16	+ }
	17	+ });
	18	+ }
	19	+
	20	+ return {
	21	+ isCurrentPage: function() {
	22	+ return $(".comments-software-extra-fields span").length === 1;
	23	+ },
	24	+
	25	+
	26	+ init: function() {
	27	+ set_show_aditional_information();
	28	+ }
	29	+ }
	30	+});
...	...
...	...	@@ -0,0 +1,17 @@
	1	+require File.dirname(__FILE__) + '/../../../../test/test_helper'
	2	+require File.dirname(__FILE__) + '/../../lib/ext/comments.rb'
	3	+
	4	+class CommentsTest < ActiveSupport::TestCase
	5	+
	6	+ def teardown
	7	+ Comment.destroy_all
	8	+ end
	9	+
	10	+ should 'create comments with new fields' do
	11	+ @person = fast_create(Person)
	12	+ @article = Article.create(:profile => @person, :name => "Test")
	13	+
	14	+ comment = Comment.new(:body => "Comment new", :author => @person, :people_benefited => 2, :saved_value => 38.5)
	15	+ assert comment.save
	16	+ end
	17	+end
...	...
...	...	@@ -0,0 +1,14 @@
	1	+<div class="comments-software-extra-fields">
	2	+ <span>
	3	+ <%= _("Aditional informations") %>
	4	+ </span>
	5	+
	6	+ <div class="comments-software-people-benefited">
	7	+ <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%>
	8	+ <%= text_field_tag "comments[people_benefited]", "" %>
	9	+ </div>
	10	+ <div class="comments-software-saved-values">
	11	+ <%= label_tag "comments_saved_value", _("Saved resources")%>
	12	+ <%= text_field_tag "comments[saved_value]", ""%>
	13	+ </div>
	14	+</div>
...	...