Changeset 712

Timestamp:

11/01/07 14:01:38 (1 year ago)

Author:

markku

Message:

• Comment open service requests - Closes #481.
  
• Simplified Task#save.
  

Files:

• trunk/app/controllers/customer_interface_controller.rb (modified) (4 diffs)
• trunk/app/helpers/customer_interface_helper.rb (modified) (4 diffs)
• trunk/app/models/customer.rb (modified) (1 diff)
• trunk/app/models/task.rb (modified) (2 diffs)
• trunk/app/views/customer_interface/_item_list.rhtml (modified) (3 diffs)
• trunk/app/views/customer_interface/index.rhtml (modified) (1 diff)
• trunk/app/views/layouts/customer_interface.rhtml (modified) (1 diff)
• trunk/db/migrate/010_customer_interface_data.rb (modified) (1 diff)
• trunk/doc/manual/latex/tex/customer_interface.tex (modified) (2 diffs)
• trunk/public/stylesheets/customer_interface_timeline.css (modified) (1 diff)
• trunk/test/functional/customer_interface_controller_test.rb (modified) (2 diffs)

trunk/app/controllers/customer_interface_controller.rb

@@ -53 +53 @@
-    # Find timeline events that:
-    # - Belong to an asset the user is authorized to view.
-
+created by Users 
-    from = 'timeline_events e'
-    condition_strings = []
@@ -60 +60 @@
-    if TaskEvent.count > 0
-      from += ', tasks t'
-e.event_type != ?
-
+(e.event_type != ? OR e.created_by = ?)
+, session[:user].id
-    end
-
@@ -196 +196 @@
-    render(:partial => 'shared/create_or_edit',
-           :layout => 'customer_interface',
-
+submit_text => _('Submit'), :
-  end
-
@@ -242 +242 @@
-  end
-
+  # Method: comment_service_request
+  # ===============================
+  # Enables a customer to comment her open service request.
+  #
+  def comment_service_request
+    @task = Task.find(params[:id], :conditions => ['state != ?', Task.CLOSED])
+    @title = _('Comment service request %s', @task.to_s)
+
+    unless @assets.include?(@task.asset) and @task.task_type and @task.task_type.is_service_request_type
+      flash[:error] = _('Service request %s not found!', @task.to_s)
+      redirect_to(:action => 'index')
+      return
+    end
+
+    if request.post?
+      if params[:comment] and params[:comment].strip != ''
+        if TaskEvent.create(:task => @task, :event_type => TaskEvent.TYPES[:COMMENTED], :comment_text => params[:comment])
+          flash[:notice] = _('Comment successfully received')
+          redirect_to(:action => 'index')
+        else
+          flash[:error] = msg_saving_failed
+        end
+      else
+        flash[:notice] = _("Comment can't be empty. Please provide one.")
+      end
+    end
+  end
+
-  protected
-

trunk/app/helpers/customer_interface_helper.rb

@@ -21 +21 @@
-  # include_name   - Include name of the <Asset>
-  # max_code_width - Maximum width for the full code of the <Asset>.
+  #                  Non-positive value means infinite width.
-  #                  Ignored if include_name is true.
-  #
-12
+nil
-    return '' unless asset
-
@@ -29 +30 @@
-
-    return span_tag(tag_class, '%s (%s)' % [asset.full_code, asset.name]) if include_name
+    return span_tag(tag_class, asset.full_code) unless max_code_width and max_code_width > 0
-
-    text = ''
@@ -85 +87 @@
-  # asset_code_width - Maximum width for the full code of the <Asset>.
-  #                    Ignored if show_asset_and_description is false.
-
-
+
+
+
+
-    return '' unless task
-
@@ -92 +96 @@
-    content = _('Task') + ' ' + content unless no_text
-    content += " (#{task.task_type.name})" if show_type
-
+how_comment_link ? link_to(content, {:action => 'comment_service_request', :id => task.id}, {:class => 'task', :title => _('Comment service request %s', task.to_s)}) : s
-    return result unless show_asset_and_description
-    result += nbsp(1)

trunk/app/models/customer.rb

@@ -33 +33 @@
-                 'customer_interface/submit_service_request',
-                 'customer_interface/edit_my_information',
-
+
+
-                ]
-

trunk/app/models/task.rb

@@ -107 +107 @@
-  end
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if new_record?
-      task_events << TaskEvent.new(:event_type => TaskEvent.TYPES[:CREATED],
-           
+
-      return super()
-    end
-
-
-
-
+
+
+
+
+
+
+
+
-      when @@ACCEPTED
-        @event = TaskEvent.create(:event_type => TaskEvent.TYPES[:ACCEPTED],
-  
-  
+
+
-      when @@CLOSED
-        @event = TaskEvent.create(:event_type => TaskEvent.TYPES[:CLOSED],
-  
-  
+
+
-      when @@ASSIGNED
-        @event = TaskEvent.create(:event_type => TaskEvent.TYPES[:ASSIGNED],
-  
-  
-  
+
+
+
-        _('Task was assigned to you') # This is to trigger the gettext
-        @message = Message.create(:receiver => self.responsible_user,
@@ -141 +154 @@
-      when @@NEW
-        @event = TaskEvent.create(:event_type => TaskEvent.TYPES[:REOPENED],
-
-
-
-
-
-
-
-
+
+
-    end
-

trunk/app/views/customer_interface/_item_list.rhtml

@@ -18 +18 @@
-  # table_id     - id attribute for the table containing the items
-  # asset_code_width - Width for the full code of an asset
+  # show_comment_task_link - Show 'Comment task' link for task items
-  #
-  # Optional instance variables:
@@ -46 +47 @@
-    table_id ||= 'itemlist'
-    asset_code_width ||= 10
+    show_comment_task_link ||= false
-  -%>
-  <!-- The item list -->
@@ -97 +99 @@
-                  format_attachment_event(value)
-                when 'Task'
-
+, show_comment_task_link
-                when 'User'
-                  format_user(value, true)

trunk/app/views/customer_interface/index.rhtml

@@ -33 +33 @@
-                            :items_offset => @service_request_offset,
-                            :table_id => 'service_request_list',
-
+
+
-  </div>
-  <div id="statistics" class="boxblock">

trunk/app/views/layouts/customer_interface.rhtml

@@ -48 +48 @@
-
-  <div id="loginstatus">
-}) : "<span class
+, :title => _('My information')}) : "<span id
-    <div id="logbutton"><%= link_to( image_tag('customer_interface/logout.jpg'), {:controller => 'user', :action => 'logout'} ) %></div>
-  </div>

trunk/db/migrate/010_customer_interface_data.rb

@@ -14 +14 @@
-     'customer_interface/submit_service_request',
-     'customer_interface/edit_my_information',
-
+
+
-    ].each { |name|
-      TempActionKey.create!(:name => name)

trunk/doc/manual/latex/tex/customer_interface.tex

@@ -6 +6 @@
-\item Submit service requests
-\item View and follow their open service request
-%
+
-\item View statistics: Open service requests by asset
-\end{itemize}
@@ -20 +20 @@
-\subsubsection{Submit a service request}
-Customers can submit service requests with this function. The service request will show up in the service request list in the Tasks menu found from the Application section. If a customer doesn't select an asset for the a service request, the service request will be saved to the customer's first asset --- You can move it to another asset if you wish.
+\subsubsection{Comment service request}
+An open Service request can be commented by 
-\subsubsection{My information}
-Customers can view and edit their contact information and language by clicking the account name link after the 'Logged in as:' text at the top of the page.  Changes to the account information can be saved with the 'Save changes' button.

trunk/public/stylesheets/customer_interface_timeline.css

@@ -8 +8 @@
-}
-
-
+, a.task
-        padding-left: 20px;
-        background: transparent url(../images/16x16/timeline_task.gif) 0px 0px no-repeat;

trunk/test/functional/customer_interface_controller_test.rb

@@ -189 +189 @@
-  # Method: test_submit_service_request
-  # ===================================
-asset
+required input (including asset)
-  #
-  def test_submit_service_request
@@ -280 +280 @@
-  end
-
+  # Method: test_comment_service_request
+  # ===================================
+  # Checks that the service request commenting function works with valid input.
+  #
+  def test_comment_service_request
+    service_request = create_simple_task(@asset1, @service_request_type)
+
+    login(@customer.login)
+
+    # GET form
+    get 'comment_service_request', :id => service_request.id
+    assert_response :success
+    assert_template 'customer_interface/comment_service_request'
+    assert_equal service_request, assigns(:task)
+    assert_nil flash[:error]
+    assert_nil flash[:notice]
+
+    # POST form
+    comment = 'This is the comment we want to submit to the open service request'
+    post 'comment_service_request', :id => service_request.id, :comment => comment
+    assert_redirected_to :action => 'index'
+    assert_nil flash[:error]
+    assert_not_nil flash[:notice]
+    assert_equal service_request, assigns(:task)
+    comment_event = assigns(:task).task_events.find_by_event_type(TaskEvent.TYPES[:COMMENTED])
+    assert_equal comment, comment_event.comment_text
+    assert_equal @customer, comment_event.creator
+  end
+
+  # Method: test_comment_closed_service_request
+  # ===================================
+  # Checks that closed service requests can't be commented.
+  #
+  def test_comment_closed_service_request
+    service_request = create_simple_task(@asset1, @service_request_type)
+    service_request.close
+    service_request.save!
+
+    login(@customer.login)
+
+    # GET form
+    assert_raise(ActiveRecord::RecordNotFound) { get('comment_service_request', :id => service_request.id) }
+ end
+
+  # Method: test_comment_service_request_unautorized_asset
+  # =====================================================
+  # Checks that customer can't comment service request in unauthorized assets.
+  #
+  def test_comment_service_request_unautorized_asset
+    service_request = create_simple_task(@asset2, @service_request_type)
+
+    login(@customer.login)
+
+    # GET form
+    get 'comment_service_request', :id => service_request.id
+    assert_redirected_to :action => 'index'
+    assert_not_nil flash[:error]
+    assert_nil flash[:notice]
+  end
+
+  # Method: test_comment_service_request_unautorized_task
+  # =====================================================
+  # Checks that customer can't comment tasks which aren't service requests
+  #
+  def test_comment_service_request_unautorized_task
+    service_request = create_simple_task(@asset1, @task_type)
+
+    login(@customer.login)
+
+    # GET form
+    get 'comment_service_request', :id => service_request.id
+    assert_redirected_to :action => 'index'
+    assert_not_nil flash[:error]
+    assert_nil flash[:notice]
+  end
+
+  # Method: test_comment_service_request_empty_comment
+  # ==================================================
+  # Checks that empty comments can't be submitted to the service request commenting function works with valid input.
+  #
+  def test_comment_service_request_empty_comment
+    service_request = create_simple_task(@asset1, @service_request_type)
+
+    login(@customer.login)
+
+    post 'comment_service_request', :id => service_request.id, :comment => '  '
+    assert_response :success
+    assert_template 'customer_interface/comment_service_request'
+    assert_nil flash[:error]
+    assert_not_nil flash[:notice]
+    assert_equal service_request, assigns(:task)
+    assert_nil assigns(:task).task_events.find_by_event_type(TaskEvent.TYPES[:COMMENTED])
+  end
-
-  def test_edit_my_information_get