diff --git a/src/noosfero-spb/gov_user/lib/institution.rb b/src/noosfero-spb/gov_user/lib/institution.rb index ee5e870..bfe34cb 100644 --- a/src/noosfero-spb/gov_user/lib/institution.rb +++ b/src/noosfero-spb/gov_user/lib/institution.rb @@ -36,6 +36,17 @@ class Institution < ActiveRecord::Base :verify_institution_type, :validate_format_cnpj + def has_accepted_rating? user_rating + rating_ids = OrganizationRating.where(institution_id: self.id, organization_id: user_rating.organization_id).map(&:id) + tasks = CreateOrganizationRatingComment.where(status: Task::Status::FINISHED).select { |task| rating_ids.include?(task.organization_rating_id) } + + rating_tasks = CreateOrganizationRatingComment.all.select{|c| c.organization_rating_id == user_rating.id} + pending_task = rating_tasks.first.status == Task::Status::ACTIVE if rating_tasks + pending_task ||= false + + !tasks.empty? && pending_task + end + protected def verify_institution_type diff --git a/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb b/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb index 3d7e398..0bc83d7 100644 --- a/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb +++ b/src/noosfero-spb/gov_user/views/organization_ratings_extra_fields_show_institution.html.erb @@ -3,6 +3,11 @@
<%=_("Institution")%> : <%= user_rating.institution.name %>
+ + <% if user_rating.institution.has_accepted_rating?(user_rating) %> +
+ Esta Instituição já possui uma avaliação aceita. Ao aceitar uma nova avaliação, o recurso será somado ao total +
+ <% end %> <% end %> - -- libgit2 0.21.2