redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log view steps reordering

Browse Source
This commit is contained in:
Karel Picman 2013-06-03 09:12:53 +02:00
parent b2106ad01b
commit d4cde32eb3
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/models/dmsf_workflow_step_action.rb
View File

@ -45,4 +45,21 @@ class DmsfWorkflowStepAction < ActiveRecord::Base
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

8
app/views/dmsf_workflows/_log.html.erb
View File

@ -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>

3
config/locales/en.yml
View File

@ -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