Changeset 743

Timestamp:

01/31/08 21:16:37 (1 year ago)

Author:

markku

Message:

Closes #526.

Files:

• trunk/app/controllers/task_controller.rb (modified) (4 diffs)
• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/app/views/asset/_view_table.rhtml (modified) (1 diff)
• trunk/app/views/task/print_view.rhtml (added)
• trunk/app/views/task/view.rhtml (modified) (1 diff)
• trunk/po/fi_FI/norfello_cmms.po (modified) (28 diffs)
• trunk/public/images/16x16/print.gif (added)
• trunk/public/stylesheets/print_task.css (added)
• trunk/test/functional/task_controller_test.rb (modified) (1 diff)

trunk/app/controllers/task_controller.rb

@@ -13 +13 @@
-class TaskController < ApplicationController
-  prepend_before_filter :login_required
+  before_filter :get_task_for_viewing, :only => [:view, :print_view]
-  skip_before_filter :check_new_service_requests, :only => :list_new_service_requests
-  LOCK_DURATION = 1.hour
@@ -68 +69 @@
-
-  def view
-    begin
-      @task = Task.find(params[:id], :include => [:data_permissions, :asset, :creator, :responsible_user])
-    rescue ActiveRecord::RecordNotFound
-      if params[:cmms_link]
-        redirect_with_error_message(msg_invalid_link_in_markup("{#{params[:id]}}"), :back)
-      else
-        redirect_with_error_message(msg_non_existing_data(Task, params[:id]), :action => 'list')
-      end
-      return
-    end
-
-    unless @task.authorized_to_read?
-      redirect_with_error_message(msg_unauthorized_operation(_('read'), "{#{@task.id}}"), :action => 'list')
-      return
-    end
-
-    @wo_title = _('Task %s (%s)', @task.to_s, @task.task_type.name)
-
@@ -424 +409 @@
-  end
-
+  # Method: print_view
+  # ==================
+  # Simple view for viewing and printing tasks.
+  #
+  require_key_for :print_view, 'task/view'
+  def print_view
+    @title = _('Task %s (%s)', @task.to_s, @task.task_type.name)
+    @hide_asset_information = (params[:hide_asset] == '1')
+    @hide_history = (params[:hide_history] == '1')
+    define_priority_options
+    render :layout => false
+  end
+
-protected
-
@@ -471 +469 @@
-                ]
-  end
+
+  # Method: get_task_for_viewing
+  # ============================
+  # Find a task and set @task for viewing it. Unauthorized users are redirected.
+  #
+  def get_task_for_viewing
+    begin
+      @task = Task.find(params[:id], :include => [:data_permissions, :asset, :creator, :responsible_user])
+
+      unless @task.authorized_to_read?
+        redirect_with_error_message(msg_unauthorized_operation(_('read'), "{#{@task.id}}"), :action => 'list')
+      end
+    rescue ActiveRecord::RecordNotFound
+      if params[:cmms_link]
+        redirect_with_error_message(msg_invalid_link_in_markup("{#{params[:id]}}"), :back)
+      else
+        redirect_with_error_message(msg_non_existing_data(Task, params[:id]), :action => 'list')
+      end
+    end
+  end
-end

trunk/app/helpers/application_helper.rb

@@ -811 +811 @@
-    return select_tag(name, option_tags, options)
-  end
+
+  # Method: asset_field_value
+  # =========================
+  # Format an asset field value for views.
+  #
+  def asset_field_value(field_value)
+    case field_value.asset_field.type_code
+      when AssetField::STRING
+        from_markup(field_value.value).gsub(/^<p>(.*)<\/p>$/, '\1')
+      when AssetField::BOOLEAN
+        field_value.value ? _('yes') : _('no')
+      when AssetField::TIME, AssetField::DATE, AssetField::DATETIME
+        h(format_date(field_value.value))
+      else
+        h(field_value.value.to_s)
+    end
+  end
-end

trunk/app/views/asset/_view_table.rhtml

@@ -32 +32 @@
-      <th><div><%= h(field_value.asset_field.name) %></div></th>
-      <td>
-
-
-
-
-
-
-
-
-
-
-
-
+
-      </td>
-    </tr>

trunk/app/views/task/view.rhtml

@@ -82 +82 @@
-    <td><%= link_to(image_tag('16x16/download.png') + _('Download'),
-                    {:action => 'download', :id => @task.id}) %></td>
+    <td><%= link_to(image_tag('16x16/print.gif') + _('Printer-friendly'),
+                    {:action => 'print_view', :id => @task.id}, :popup => true) %></td>
-  </tr>
-</table>

trunk/po/fi_FI/norfello_cmms.po

@@ -2 +2 @@
-msgstr ""
-"Project-Id-Version: NorfelloCMMS SVN trunk\n"
-17 16:06
-17 16:09
+31 19:21
+31 19:33
-"Last-Translator: Markku Oksanen <markku.oksanen@norfello.com>\n"
-"Language-Team: Norfello Ltd. <contact@norfello.com>\n"
@@ -751 +751 @@
-
-#: app/helpers/customer_interface_helper.rb:207
-51
+49
-#: app/controllers/overview_controller.rb:59
-msgid "New"
@@ -757 +757 @@
-
-#: app/helpers/customer_interface_helper.rb:209
-51
+49
-#: app/controllers/overview_controller.rb:59
-#: app/controllers/overview_controller.rb:65
@@ -764 +764 @@
-
-#: app/helpers/customer_interface_helper.rb:211
-51
+49
-#: app/controllers/overview_controller.rb:59
-#: app/controllers/overview_controller.rb:65
@@ -771 +771 @@
-
-#: app/helpers/customer_interface_helper.rb:213
-51
+49
-#: app/controllers/overview_controller.rb:65
-msgid "Closed"
@@ -897 +897 @@
-#: app/views/task/_form.rhtml:96
-#: app/views/task/_form.rhtml:98
+#: app/views/task/print_view.rhtml:69
+#: app/views/task/print_view.rhtml:71
-#: app/views/task/create.rhtml:39
-msgid "hours"
@@ -905 +907 @@
-msgstr "minuuttia"
-
+#: app/helpers/application_helper.rb:823
+msgid "yes"
+msgstr "kyllÀ"
+
+#: app/helpers/application_helper.rb:823
+msgid "no"
+msgstr "ei"
+
-#: app/helpers/asset_field_helper.rb:52
-#: app/helpers/asset_field_helper.rb:113
-49
-8
+50
+6
-#: app/controllers/message_controller.rb:28
-#: app/controllers/keyring_controller.rb:75
@@ -931 +941 @@
-
-#: app/controllers/asset_controller.rb:30
+#: app/views/task/print_view.rhtml:81
-msgid "Asset information"
-msgstr "Kohteen tiedot "
@@ -943 +954 @@
-#: app/controllers/data_permission_controller.rb:53
-#: app/controllers/data_permission_controller.rb:56
-82
+481
-#: app/controllers/attachment_controller.rb:68
-#: app/controllers/asset_tree_controller.rb:125
@@ -958 +969 @@
-#: app/controllers/customer_interface_controller.rb:164
-#: app/controllers/form_controller.rb:479
-2
-1
-83
-61
-70
+3
+2
+68
+59
+68
-#: app/controllers/attachment_controller.rb:26
-#: app/views/attachment/view.rhtml:4
@@ -1009 +1020 @@
-#: app/views/attachment/attach.rhtml:9
-#: app/views/asset_tree/search.rhtml:4
+#: app/views/task/print_view.rhtml:90
-#: app/views/form_type/create_step2.rhtml:6
-#: app/views/form_type/create_step4.rhtml:9
@@ -1038 +1050 @@
-#: app/controllers/asset_controller.rb:104
-#: app/controllers/asset_controller.rb:348
-5
+6
-#: app/controllers/asset_field_controller.rb:22
-#: app/controllers/asset_field_controller.rb:42
@@ -1054 +1066 @@
-#: app/controllers/asset_controller.rb:140
-#: app/controllers/asset_controller.rb:247
+#: app/views/task/print_view.rhtml:86
-#: app/views/asset/_view_table.rhtml:16
-msgid "Code"
@@ -1060 +1073 @@
-#: app/controllers/asset_controller.rb:143
-#: app/controllers/asset_controller.rb:250
+#: app/views/task/print_view.rhtml:95
-#: app/views/asset/_view_table.rhtml:25
-msgid "Customer"
@@ -1072 +1086 @@
-#: app/controllers/asset_type_controller.rb:46
-#: app/controllers/asset_type_controller.rb:56
-7
-9
+8
+7
-#: app/controllers/customer_controller.rb:51
-#: app/controllers/customer_controller.rb:78
@@ -1079 +1093 @@
-#: app/controllers/user_controller.rb:112
-#: app/views/task/_form.rhtml:108
-
+
+
+
-msgid "Description"
-msgstr "Kuvaus"
@@ -1090 +1106 @@
-#: app/controllers/asset_controller.rb:182
-#: app/controllers/form_controller.rb:455
-23
+08
-#: app/controllers/attachment_controller.rb:128
-#: app/controllers/type_attachment_controller.rb:120
@@ -1128 +1144 @@
-#: app/controllers/asset_controller.rb:315
-#: app/controllers/form_controller.rb:152
-64
-74
-306
+49
+59
+291
-msgid "edit"
-msgstr "muokkaa"
@@ -1763 +1779 @@
-msgstr "Aikajana kohteelle %s"
-
-4
-7
+5
+5
-#: app/controllers/asset_type_icon_controller.rb:20
-msgid "ID"
-msgstr "ID"
-
-6
-8
+7
+6
-#: app/views/task/_form.rhtml:34
-msgid "State"
-msgstr "Tila"
-
-8
+9
-#: app/views/task/_form.rhtml:79
+#: app/views/task/print_view.rhtml:62
-#: app/views/task/create.rhtml:26
-msgid "Priority"
-msgstr "Prioriteetti"
-
-39
+40
-msgid "Responsible worker"
-msgstr "Työn vastuuhenkilö"
-
-0
+1
-#: app/views/task/_form.rhtml:72
+#: app/views/task/print_view.rhtml:58
-#: app/views/task/create.rhtml:30
-msgid "Starting time"
-msgstr "Aloitusaika"
-
-1
+2
-#: app/views/task/_form.rhtml:87
+#: app/views/task/print_view.rhtml:64
-#: app/views/task/create.rhtml:34
-msgid "Deadline"
-msgstr "Takaraja"
-
-7
-6
+8
+4
-msgid "Select"
-msgstr "Valitse"
-
-0
-97
-9
+1
+82
+7
-#: app/views/asset_tree/_asset_tree.rhtml:51
-#: app/views/task/view.rhtml:75
@@ -1810 +1829 @@
-msgstr "SiirrÀ"
-
-5
+6
-msgid "Tasks for selected assets in branch %s"
-msgstr "Haaran %s valittujen kohteiden tehtÀvÀt"
-
-7
+8
-msgid "Tasks for asset %s"
-msgstr "Kohteen %s tehtÀvÀt"
-
-
+
+
-msgid "Task %s (%s)"
-msgstr "TehtÀvÀ %s (%s)"
-
-95
+80
-msgid "You have been removed from the list of workers in this task"
-msgstr "Sinut on poistettu tÀmÀn tehtÀvÀn työntekijÀlistasta"
-
-96
+81
-msgid "You have been added to the list of workers in this task"
-msgstr "Sinut on lisÀtty tÀmÀn tehtÀvÀn työntekijÀlistaan"
-
-18
+03
-msgid "Task accepted"
-msgstr "TehtÀvÀ hyvÀksytty"
-
-21
+06
-msgid "Task closed"
-msgstr "TehtÀvÀ suljettu"
-
-24
+09
-msgid "Task assigned"
-msgstr "TehtÀvÀ mÀÀrÀtty"
-
-27
+12
-msgid "Task reopened"
-msgstr "TehtÀvÀ avattu uudelleen"
-
-29
+14
-msgid "Unknown task action!"
-msgstr "Tuntematon toiminto tehtÀvÀlle!"
-
-72
+57
-msgid "Editing task #%i (%s)"
-msgstr "Muokataan tehtÀvÀÀ #%i (%s)"
-
-204
+189
-msgid "create task"
-msgstr "Luo tehtÀvÀ"
-
-210
+195
-msgid "Create new task"
-msgstr "Luo uusi tehtÀvÀ"
-
-15
+00
-#: app/controllers/customer_controller.rb:130
-msgid "No task types defined."
-msgstr "YhtÀÀn tehtÀvÀtyyppiÀ ei ole mÀÀritelty."
-
-43
+28
-msgid "New task created"
-msgstr "Uusi tehtÀvÀ luotu"
-
-79
+64
-msgid "Move the task {%i} to a another asset"
-msgstr "SiirrÀ tehtÀvÀ {%i} toiseen kohteeseen"
-
-89
+74
-msgid "The task {%i} moved to the asset %s"
-msgstr "TehtÀvÀ {%i} siirretty kohteeseen %s"
-
-94
+79
-msgid "Unable to move the task {%i} to the asset %s"
-msgstr "TehtÀvÀn {%i} siirtÀminen kohteeseen %s epÀonnistui"
-
-313
+298
-msgid "Unable to move task {%i}"
-msgstr "TehtÀvÀn {%i} siirtÀminen epÀonnistui"
-
-16
+01
-msgid "Moved %d tasks to asset %s"
-msgstr "Siirrettiin %d tehtÀvÀÀ kohteeseen %s"
-
-31
+16
-#: app/controllers/attachment_controller.rb:110
-#: app/controllers/type_attachment_controller.rb:102
@@ -1897 +1917 @@
-msgstr "kopioi omalle tietokoneelle"
-
-38
+23
-msgid "Template for task type \"%s\" not found"
-msgstr "TehtÀvÀtyypin \"%s\" tehtÀvÀpohjaa ei löytynyt"
-
-97
+82
-msgid "Service requests for selected assets in branch %s"
-msgstr "Haaran %s valittujen kohteiden palvelupyynnöt"
-
-99
+84
-msgid "Service requests for asset %s"
-msgstr "Kohteen %s palvelupyynnöt"
-
-17
+02
-msgid "New service requests"
-msgstr "Uudet palvelupyynnöt"
-
-41
+39
-msgid "Highest"
-msgstr "Korkein"
-
-2
+0
-msgid "Very high"
-msgstr "ErittÀin korkea"
-
-3
+1
-msgid "High"
-msgstr "Korkea"
-
-4
+2
-msgid "Normal"
-msgstr "Normaali"
-
-5
+3
-msgid "Low"
-msgstr "Matala"
-
-6
+4
-msgid "Very low"
-msgstr "ErittÀin matala"
-
-7
+5
-msgid "Lowest"
-msgstr "Matalin"
-
-60
+58
-#: app/views/task/_form.rhtml:59
+#: app/views/task/print_view.rhtml:52
-#: app/views/shared/_edit_account.rhtml:4
-msgid "Created at"
@@ -2442 +2463 @@
-#: app/controllers/type_attachment_controller.rb:23
-#: app/views/attachment/view.rhtml:9
+#: app/views/task/print_view.rhtml:101
-msgid "Asset type"
-msgstr "Kohdetyyppi"
@@ -2883 +2905 @@
-
-#: app/views/task/_form.rhtml:45
+#: app/views/task/print_view.rhtml:44
-#: app/views/task/create.rhtml:13
-msgid "Short description"
@@ -2888 +2911 @@
-
-#: app/views/task/_form.rhtml:55
+#: app/views/task/print_view.rhtml:50
-msgid "Created by"
-msgstr "Luonut"
-
-#: app/views/task/_form.rhtml:70
+#: app/views/task/print_view.rhtml:56
-msgid "Responsible user"
-msgstr "Vastuussa oleva kÀyttÀjÀ"
-
-#: app/views/task/_form.rhtml:71
+#: app/views/task/print_view.rhtml:57
-msgid "accepted"
-msgstr "hyvÀksytty"
-
-#: app/views/task/_form.rhtml:95
+#: app/views/task/print_view.rhtml:68
-msgid "Initial working<br/>time estimate"
-<br/>
+ 
-
-#: app/views/task/_form.rhtml:97
+#: app/views/task/print_view.rhtml:70
-msgid "Spent working time"
-msgstr "KÀytetty työaika"
@@ -2975 +3003 @@
-
-#: app/views/task/view.rhtml:56
+#: app/views/task/print_view.rhtml:121
-msgid "Change history"
-msgstr "Muutoshistoria"
@@ -2982 +3011 @@
-msgstr "Muuta tietoja"
-
+#: app/views/task/view.rhtml:84
+msgid "Printer-friendly"
+msgstr "Tulostettava"
+
-#: app/views/task/_display_task_event.rhtml:10
-msgid "Assiged to %s by %s"
-msgstr "%s asetettu vastuulliseksi kÀyttÀjÀn %s toimesta"
+
+#: app/views/task/print_view.rhtml:33
+msgid "Print"
+msgstr "Tulosta"
+
+#: app/views/task/print_view.rhtml:82
+#: app/views/task/print_view.rhtml:122
+msgid "Show"
+msgstr "NÀytÀ"
+
+#: app/views/task/print_view.rhtml:82
+#: app/views/task/print_view.rhtml:122
+msgid "Hide"
+msgstr "Piilota"
-
-#: app/views/task/create.rhtml:3
@@ -3192 +3239 @@
-msgid "Select this asset"
-msgstr "Valitse tÀmÀ kohde"
-
-#: app/views/asset/_view_table.rhtml:39
-msgid "yes"
-msgstr "kyllÀ"
-
-#: app/views/asset/_view_table.rhtml:39
-msgid "no"
-msgstr "ei"
-
-#: app/views/shared/reset_password.rhtml:6
@@ -4095 +4134 @@
-#~ msgid "Form categories"
-#~ msgstr "Lomakekategoriat"
-#~ msgid "Parent"
-#~ msgstr "Vanhempi"
-#~ msgid "Form type count"
-#~ msgstr "Lomaketyyppien lukumÀÀrÀ"

trunk/test/functional/task_controller_test.rb

@@ -382 +382 @@
-  end
-
+  # Method: test_print_view
+  # =======================
+  # Cehck that the task printing view (task/print_view) works.
+  #
+  def test_print_view
+    @keyring.action_keys << create_action_key('task/view')
+    login('test')
+
+    task = create_task_in_state(Task.NEW)
+
+    get 'print_view', :id => task.id
+    assert_response :success
+    assert_template 'task/print_view'
+    assert_equal task, assigns(:task)
+    assert_equal false, assigns(:hide_asset_information)
+    assert_equal false, assigns(:hide_history)
+  end
+
+  # Method: test_print_view_with_hide_options
+  # =========================================
+  # Cehck that the task printing view (task/print_view) works.
+  #
+  def test_print_view_with_hide_option
+    @keyring.action_keys << create_action_key('task/view')
+    login('test')
+
+    task = create_task_in_state(Task.NEW)
+
+    get 'print_view', :id => task.id, :hide_asset => '1', :hide_history => '1'
+    assert_response :success
+    assert_template 'task/print_view'
+    assert_equal task, assigns(:task)
+    assert_equal true, assigns(:hide_asset_information)
+    assert_equal true, assigns(:hide_history)
+  end
+
+  # Method: test_print_view_with_show_options
+  # =========================================
+  # Cehck that the task printing view (task/print_view) works.
+  #
+  def test_print_view_with_hide_option
+    @keyring.action_keys << create_action_key('task/view')
+    login('test')
+
+    task = create_task_in_state(Task.NEW)
+
+    get 'print_view', :id => task.id, :hide_asset => '0', :hide_history => '0'
+    assert_response :success
+    assert_template 'task/print_view'
+    assert_equal task, assigns(:task)
+    assert_equal false, assigns(:hide_asset_information)
+    assert_equal false, assigns(:hide_history)
+  end
+
-  private
-