add institution to community rating

Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

add institution to community rating
Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Fabio Teixeira
1 parent e7eecf9f
Showing 5 changed files with 41 additions and 6 deletions Show diff stats
db/migrate/20150714123613_add_institution_to_community_rating.rb
lib/ext/community_rating.rb
lib/institution.rb
public/views/gov-user-comments-extra-fields.js
views/comments_extra_field.html.erb
@@ -0,0 +1,11 @@
+class AddInstitutionToCommunityRating < ActiveRecord::Migration
+  def up
+    change_table :community_ratings do |t|
+      t.belongs_to :institution
+    end
+  end
+
+  def down
+    remove_column :community_ratings, :institution_id
+  end
+end
@@ -0,0 +1,18 @@
+require_dependency "community_rating"
+
+CommunityRating.class_eval do
+  attr_accessible :institution_id
+
+  belongs_to :institution
+
+  validate :verify_institution
+
+  private
+
+    def verify_institution
+      if self.institution_id != nil
+        institution = Institution.find_by_id self.institution_id
+        self.errors.add :institution, _("not found") unless institution
+      end
+    end
+end
 class Institution < ActiveRecord::Base
+  has_many :community_ratings
+  alias :communities_ratings :community_ratings
+  alias :communities_ratings= :community_ratings=
   SEARCH_FILTERS = {
     :order => %w[],
@@ -5,11 +5,11 @@ modulejs.define(&quot;GovUserCommentsExtraFields&quot;, [&#39;jquery&#39;,&#39;CreateInstitution&#39;], fu
     }
-    function prepend_to_aditional_information() {
-      var aditional_information = $(".comments-software-extra-fields");
-      var institution_comments = $("#input_institution_comments");
+    function prepend_to_additional_information() {
+      var additional_information = $("#comments-additional-information");
+      var institution_comments = $("#input_institution_comments").remove();
-      aditional_information.prepend(institution_comments.remove());
+      institution_comments.insertAfter(additional_information);
     }
@@ -19,7 +19,7 @@ modulejs.define(&quot;GovUserCommentsExtraFields&quot;, [&#39;jquery&#39;,&#39;CreateInstitution&#39;], fu
       },
       init: function() {
-        prepend_to_aditional_information();
+        prepend_to_additional_information();
         set_events();
       }
     }
 <div id="input_institution_comments">
   <%= label_tag "input_institution", _("Organiztion name or Enterprise name")%>
-  <%= text_field_tag "comments[instituton_name]", "", id: "input_institution" %>
+
+  <input type="text" id="input_institution">
+
   <%= content_tag(:div, _("No institution found"),
                   :id=>"institution_empty_ajax_message",
                   :class=>"errorExplanation hide-field") %>
+  <%= hidden_field_tag "community_rating[institution_id]", "", id: "institution_selected" %>
 </div>
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddInstitutionToCommunityRating < ActiveRecord::Migration
	2	+ def up
	3	+ change_table :community_ratings do \|t\|
	4	+ t.belongs_to :institution
	5	+ end
	6	+ end
	7	+
	8	+ def down
	9	+ remove_column :community_ratings, :institution_id
	10	+ end
	11	+end
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+require_dependency "community_rating"
	2	+
	3	+CommunityRating.class_eval do
	4	+ attr_accessible :institution_id
	5	+
	6	+ belongs_to :institution
	7	+
	8	+ validate :verify_institution
	9	+
	10	+ private
	11	+
	12	+ def verify_institution
	13	+ if self.institution_id != nil
	14	+ institution = Institution.find_by_id self.institution_id
	15	+ self.errors.add :institution, _("not found") unless institution
	16	+ end
	17	+ end
	18	+end
1	class Institution < ActiveRecord::Base	1	class Institution < ActiveRecord::Base
		2	+ has_many :community_ratings
		3	+ alias :communities_ratings :community_ratings
		4	+ alias :communities_ratings= :community_ratings=
2		5
3	SEARCH_FILTERS = {	6	SEARCH_FILTERS = {
4	:order => %w[],	7	:order => %w[],