From d4cde32eb39ff900b9f6cc183caee70c10fdaeb9 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Mon, 3 Jun 2013 09:12:53 +0200
Subject: [PATCH] Log view steps reordering

---
 app/models/dmsf_workflow_step_action.rb | 17 +++++++++++++++++
 app/views/dmsf_workflows/_log.html.erb  |  8 ++++----
 config/locales/en.yml                   |  3 +++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/models/dmsf_workflow_step_action.rb b/app/models/dmsf_workflow_step_action.rb
index 718bb16d..2e5f49aa 100644
--- a/app/models/dmsf_workflow_step_action.rb
+++ b/app/models/dmsf_workflow_step_action.rb
@@ -44,5 +44,22 @@ class DmsfWorkflowStepAction < ActiveRecord::Base
   def is_finished?
     DmsfWorkflowStepAction.is_finished? self.action
   end
+  
+  def self.action_str(action)
+    if action
+      case action.to_i
+        when ACTION_APPROVE
+          l(:title_approved)
+        when ACTION_REJECT
+          l(:title_rejected)
+        when ACTION_DELEGATE
+          l(:title_delegated)
+        when ACTION_ASSIGN
+          l(:title_assigned)
+        when ACTION_START
+          l(:title_started)       
+      end
+    end
+  end
    
 end
\ No newline at end of file
diff --git a/app/views/dmsf_workflows/_log.html.erb b/app/views/dmsf_workflows/_log.html.erb
index ac84c720..5524da96 100644
--- a/app/views/dmsf_workflows/_log.html.erb
+++ b/app/views/dmsf_workflows/_log.html.erb
@@ -18,24 +18,24 @@
               <tr id="step-0" class="<%= cycle 'odd', 'even' %> step">
                 <td class="step">-</td>
                 <td class="user"><%= link_to_user User.find_by_id(revision.dmsf_workflow_assigned_by) if revision.dmsf_workflow_assigned_by %></td>
-                <td class="action">Assigned</td>
+                <td class="action"><%=  DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %></td>
                 <td class="note"></td>
                 <td class="date" align="center"><%= format_time(revision.dmsf_workflow_assigned_at) if revision.dmsf_workflow_assigned_at %></td>
               </tr>  
               <tr id="step-1" class="<%= cycle 'odd', 'even' %> step">
                 <td class="step">-</td>
                 <td class="user"><%= link_to_user User.find_by_id(revision.dmsf_workflow_started_by) if revision.dmsf_workflow_started_by %></td>
-                <td class="action">Started</td>
+                <td class="action"><%=  DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_START) %></td>
                 <td class="note"></td>
                 <td class="date" align="center"><%= format_time(revision.dmsf_workflow_started_at) if revision.dmsf_workflow_started_at %></td>
               </tr>
-              <% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step FROM dmsf_workflow_step_actions c RIGHT JOIN dmsf_workflow_step_assignments a ON a.id = c.dmsf_workflow_step_assignment_id JOIN dmsf_workflow_steps s ON s.id = a.dmsf_workflow_step_id WHERE a.dmsf_file_revision_id = #{revision.id} ORDER BY c.created_at" %>
+              <% sql = "SELECT c.action, c.note, c.created_at, c.author_id, a.user_id, s.step FROM dmsf_workflow_step_actions c RIGHT JOIN dmsf_workflow_step_assignments a ON a.id = c.dmsf_workflow_step_assignment_id JOIN dmsf_workflow_steps s ON s.id = a.dmsf_workflow_step_id WHERE a.dmsf_file_revision_id = #{revision.id} ORDER BY s.step, c.created_at" %>
               <% result = DmsfWorkflowStep.connection.execute sql %>
               <% result.each_with_index do |row, i| %>    
                 <tr id="step-<%= i + 2 %> " class="<%= cycle 'odd', 'even' %> step">
                   <td class="step"><%= row[5] %></td>
                   <td class="user"><%= link_to_user User.find_by_id(row[3].present? ? row[3] : row[4]) %></td>
-                  <td class="action"><%= revision.workflow_str false %></td>
+                  <td class="action"><%= DmsfWorkflowStepAction.action_str(row[0]) %></td>
                   <td class="note"><%= row[1] %></td>
                   <td class="date" align="center"><%= format_time(row[2]) if row[2].present? %></td>
                 </tr>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5e6cd109..03eb745c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -226,6 +226,9 @@ en:
   message_dmsf_wokflow_note: Your note...
   title_draft: Draft
   title_rejected: Rejected
+  title_delegated: Delegated
+  title_assigned: Assigned
+  title_started: Started
   label_dmsf_wokflow_action_start: Start workflow
   info_revision: "r%{rev}"
   link_workflow: Workflow