From 0a8229946d0cc4a5bb5184d151239f343a6de0d2 Mon Sep 17 00:00:00 2001
From: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
Date: Sun, 12 Jul 2015 17:11:29 -0300
Subject: [PATCH] Added the moderated and validated dates into processed view

---
 lib/proposals_discussion_plugin/proposal_task.rb |  4 ++++
 po/proposals_discussion.pot                      | 16 ++++++++++++++++
 po/pt/proposals_discussion.po                    | 12 ++++++++++++
 views/tasks/processed.html.erb                   | 15 ++++++++++++---
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/lib/proposals_discussion_plugin/proposal_task.rb b/lib/proposals_discussion_plugin/proposal_task.rb
index 14ae584..eb8030b 100644
--- a/lib/proposals_discussion_plugin/proposal_task.rb
+++ b/lib/proposals_discussion_plugin/proposal_task.rb
@@ -6,6 +6,8 @@ class ProposalsDiscussionPlugin::ProposalTask < Task
   foreign_key: :task_id,
   association_foreign_key: :category_id
 
+  has_one :proposal_evaluation
+
   validates_presence_of :requestor_id, :target_id
   validates_associated :article_object
 
@@ -150,6 +152,8 @@ class ProposalsDiscussionPlugin::ProposalTask < Task
 
   def perform
     article_object.save!
+    self.data[:article][:id] = article_object[:id]
+    self.save!
   end
 
   def title
diff --git a/po/proposals_discussion.pot b/po/proposals_discussion.pot
index 05db84f..850f7ed 100644
--- a/po/proposals_discussion.pot
+++ b/po/proposals_discussion.pot
@@ -413,3 +413,19 @@ msgstr ""
 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3
 msgid "Source"
 msgstr ""
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:67
+msgid "Evaluator"
+msgstr ""
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
+msgid "Evaluator at"
+msgstr "Validado em"
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
+msgid "Moderator"
+msgstr "Validador"
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:61
+msgid "Moderator at"
+msgstr "Moderado em"
diff --git a/po/pt/proposals_discussion.po b/po/pt/proposals_discussion.po
index 089e12d..14e29e6 100644
--- a/po/pt/proposals_discussion.po
+++ b/po/pt/proposals_discussion.po
@@ -438,3 +438,15 @@ msgstr "Atribuído para:"
 #: plugins/proposals_discussion/views/proposals_discussion_plugin_tasks/_task.html.erb:3
 msgid "Source"
 msgstr "Origem"
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
+msgid "Evaluator"
+msgstr "Validador"
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:71
+msgid "Moderator"
+msgstr "Validador"
+
+#: plugins/proposals_discussion/views/tasks/processed.html.erb:61
+msgid "Moderator at"
+msgstr "Moderado em"
diff --git a/views/tasks/processed.html.erb b/views/tasks/processed.html.erb
index d229481..8e91abb 100644
--- a/views/tasks/processed.html.erb
+++ b/views/tasks/processed.html.erb
@@ -52,16 +52,25 @@
             <span class="label"><%= _('Created:') %></span>
             <span class="value"><%= show_date(item.created_at) %></span>
           </span>
+        </div>
+        <div class="closed-by">
+          <span class="label"><%= _('Moderator') %>:</span>
+          <span class="value"><%= link_to(item.proposal_evaluation.evaluated_by.name, item.proposal_evaluation.evaluated_by.url) %></span>
           &nbsp; &#151; &nbsp;
           <span class="processed">
-            <span class="label"><%= _('Processed:') %></span>
-            <span class="value"><%= show_date(item.end_date) %></span>
+            <span class="label"><%= _('Moderated at') %>:</span>
+            <span class="value"><%= show_time(item.proposal_evaluation.created_at) %></span>
           </span>
         </div>
         <% if item.closed_by.present? %>
           <div class="closed-by">
-            <span class="label"><%= _('Closed by:') %></span>
+            <span class="label"><%= _('Evaluator') %>:</span>
             <span class="value"><%= link_to(item.closed_by.name, item.closed_by.url) %></span>
+            &nbsp; &#151; &nbsp;
+            <span class="processed">
+              <span class="label"><%= _('Evaluated at') %>:</span>
+              <span class="value"><%= show_time(item.end_date) %></span>
+            </span>
           </div>
         <% end %>
       </li>
--
libgit2 0.21.2