Download as
Browse Code »

Commit 654b80778396c868fc01b7510f577ad8e33d4b3e

Authored by Gabriel Silva
1 parent 7d9f05ae
Exists in organization_rating_style_changes

Adds message to warn that a community has a rating with an institution 

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Showing 2 changed files with 17 additions and 1 deletions   Show diff stats
src/noosfero-spb/gov_user/lib/institution.rb
  Diff comments   View file @654b807
@@ -36,6 +36,17 @@ class Institution &lt; ActiveRecord::Base @@ -36,6 +36,17 @@ class Institution &lt; ActiveRecord::Base
36 :verify_institution_type, :validate_format_cnpj 36 :verify_institution_type, :validate_format_cnpj
37 37
38 38
  39 + def has_accepted_rating? user_rating
  40 + rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id)
  41 + tasks = CreateOrganizationRatingComment.where(status: Task::Status::FINISHED).select { |task| rating_ids.include?(task.organization_rating_id) }
  42 +
  43 + rating_tasks = CreateOrganizationRatingComment.all.select{|c| c.organization_rating_id == user_rating.id}
  44 + pending_task = rating_tasks.first.status == Task::Status::ACTIVE if rating_tasks
  45 + pending_task ||= false
  46 +
  47 + !tasks.empty? && pending_task
  48 + end
  49 +
39 protected 50 protected
40 51
41 def verify_institution_type 52 def verify_institution_type
src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb
  Diff comments   View file @654b807
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 <div class="comments-user-institution"> 3 <div class="comments-user-institution">
4 <span><%=_("Institution")%> :<span> <%= user_rating.institution.name %> 4 <span><%=_("Institution")%> :<span> <%= user_rating.institution.name %>
5 </div> 5 </div>
  6 +
  7 + <% if user_rating.institution.has_accepted_rating?(user_rating) %>
  8 + <div class="">
  9 + <span>Esta Instituição já possui uma avaliação aceita. Ao aceitar uma nova avaliação, o recurso será somado ao total</span>
  10 + </div>
  11 + <% end %>
6 </div> 12 </div>
7 <% end %> 13 <% end %>
8 -