Changeset 715

Timestamp:

11/02/07 17:49:45 (1 year ago)

Author:

markku

Message:

Closes #484

Files:

• trunk/app/controllers/application.rb (modified) (3 diffs)
• trunk/app/controllers/task_controller.rb (modified) (3 diffs)
• trunk/app/views/layouts/mainlevel.rhtml (modified) (1 diff)
• trunk/config/menu.rb (modified) (1 diff)
• trunk/db/migrate/010_customer_interface_data.rb (modified) (2 diffs)
• trunk/public/stylesheets/typography.css (modified) (8 diffs)
• trunk/test/functional/task_controller_test.rb (modified) (1 diff)

trunk/app/controllers/application.rb

@@ -20 +20 @@
-
-  layout 'mainlevel'
-
+, :check_new_service_requests
-  after_filter :reset_timedout_session, :process_model_events
-
@@ -206 +206 @@
-    login = session[:user].login if session[:user]
-    ActiveRecord::Base.logged_information(login, request.remote_ip)
-s_a
-"unread = '1'"
-"unread = '1'"
+nstance_of
+['unread = ?', true]
+['unread = ?', true]
-    end
-    GetText.locale = session[:user].lang
@@ -681 +681 @@
-  end
-
+  # Function: check_new_service_requests
+  # ====================================
+  # Checks for new service requests by counting them.
+  #
+  def check_new_service_requests
+    conditions = ['task_type_id = ? AND state = ?', TaskType.get_service_request_type.id, Task.NEW]
+    @service_request_count = Task.count_authorized_to(:read, conditions)
+    @service_request_id = Task.find_authorized_to_read(:first, :conditions => conditions).id if @service_request_count == 1
+  end
-end

trunk/app/controllers/task_controller.rb

@@ -389 +389 @@
-  # Method: list_service_requests
-  # =============================
-s task
+ tasks
-  #
-  def list_service_requests
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    if session[:select_branches]
@@ -422 +406 @@
-
-    @items = items_for_page(Task, :finder_method => :find_authorized_to_read, :conditions => conditions, :readonly => true)
+    common_list
+  end
+
+  # Method: list_new_service_requests
+  # ==================================
+  # Shows a list of new service request tasks in all assets.
+  #
+  def list_new_service_requests
+    setup_service_request_list
+    @title = _('New service requests')
+    @hide_subaction_links = true
+
+    @items = items_for_page(Task, :finder_method => :find_authorized_to_read,
+                            :conditions => ['task_type_id = ? AND state = ?', TaskType.get_service_request_type.id, Task.NEW],
+                            :readonly => true)
-    common_list
-  end
@@ -452 +451 @@
-    @state_to_text = {0 => _('New'), 1 => _('Assigned'), 2 =>  _('Accepted'), 3 => _('Closed')}
-  end
+
+  def setup_service_request_list
+    define_priority_options
+    @fields = [
+                [_('ID'), :self, 'id'],
+                [_('State'), {:name => :state}.merge(@state_to_text), 'state'],
+                [_('Description'), :short_description, 'short_description'],
+                [_('Created at'), :created_at, 'created_at'],
+                [_('Asset'), :asset, 'asset_id']
+              ]
+
+    asset_options = Asset.find_authorized_to(:create_task, [:all]).collect { |a| [a.full_code, a.id] }
+    @actions = []
+    @check_title = _('Select')
+    @list_actions =  [
+                  { :name => _('Remove'), :url => {:action => 'remove'} },
+                  { :name => _('Move'), :url => {:action => 'move'},
+                    :fields => [ [_('Asset'), :our_select_tag, 'asset_id', asset_options] ] }
+                ]
+  end
-end

trunk/app/views/layouts/mainlevel.rhtml

@@ -267 +267 @@
-      <% end -%>
-
+      <% if @service_request_count == 1 and not (controller.controller_name == 'task' and controller.action_name == 'view' and params.has_key?(:id) and params[:id].to_i == @service_request_id) -%>
+        <p id="service_request_count">
+          <%= link_to(_('There is a new service request'), :controller => 'task', :action => 'view', :id => @service_request_id) %>
+        </p>
+      <% elsif @service_request_count > 1 and controller.action_name != 'list_new_service_requests' -%>
+        <p id="service_request_count">
+          <%= link_to(_('There are %i new service requests', @service_request_count), :controller => 'task', :action => 'list_new_service_requests') %>
+        </p>
+        <% end -%>
+
-        <%= @content_for_layout %>
-      </div>

trunk/config/menu.rb

@@ -48 +48 @@
-                    Page.new('task', 'edit'),
-                    Page.new('task', 'view'),
-
+
+
-                  ),
-                  MenuButton.new(_('Timeline'), '22x22/menu_clock.gif',

trunk/db/migrate/010_customer_interface_data.rb

@@ -21 +21 @@
-    # The new 'task/list_service_requests' key is added to all keyrings
-    # which have the 'task/list' key.
-
+
+
+
+
-    old_list_key = TempActionKey.find_by_name('task/list')
-    if old_list_key
@@ -27 +30 @@
-      unless keyring_ids.empty?
-        TempKeyring.find(keyring_ids).each { |keyring|
-'task/list_service_requests' action key
-keyring.grant(new_list_key)
+service request listing keys
+new_list_keys.each { |key| keyring.grant(key) }
-        }
-      end

trunk/public/stylesheets/typography.css

@@ -8 +8 @@
-
-h1, h2, h3, h4, h5, h6 {
-       
-       
+        
+        
-}
-
-h2 {
-       
-       
-       
-       
-       
+        
+        
+        
+        
+        
-}
-
-h3 {
-       
-       
-       
-       
-       
+        
+        
+        
+        
+        
-}
-
-h4 {
-       
-       
-       
+        
+        
+        
-}
-
@@ -37 +37 @@
-
-p {
-       
-       
-       
-       
+        
+        
+        
+        
-
-/* BASE LINK STYLES */
@@ -48 +48 @@
-a:active,
-a:visited {
-       
-       
+        
+        
-}
-
-a:hover {
-       
+        
-}
-
@@ -64 +64 @@
-
-ul, ol, dl {
-       
-       
+        
+        
-}
-
-ul, ol {
-       
-       
+        
+        
-}
-
@@ -77 +77 @@
-
-ul li, ol li {
-       
+        
-}
-
-dt {
-       
+        
-}
-
-dt.sub {
-       
-       
+        
+        
-}
-
-dd {
-       
+        
-}
-
-/* BASE TABLE STYLES */
- 
+
-   their section sheets and a base table design needs to be written */
-
-table {
-     
-     
-     
+      
+      
+      
-}
-
-th {
-     
-     
-     
+      
+      
+      
-}
-
-td {
-     
+      
-}
-
-table.form td, table.form th {
-       
-       
+        
+        
-}
-
-table.form th {
-     
+      
-}
-
-table.form th.light {
-     
+      
-}
-
-table.form td {
-     
-     
+      
+      
-}
-
-table.buttons {
-       
-       
-       
+        
+        
+        
-}
-
-table.buttons td, table.buttons th {
-       
+        
-}
-
@@ -273 +273 @@
-/* FORM STYLES */
-
- 
-       
+
+        
-}
-
-form#cancel {
-       
+        
-}
-
@@ -302 +302 @@
-
-#notice {
-       
-       
-       
-       
+        
+        
+        
+        
-}
-
-#error {
-       
-       
-       
-       
+        
+        
+        
+        
-}
-
-#message_count {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
-div.errorExplanation p, div.errorExplanation ul { /* Validation errors */
-       
+        
-}
-
-div.errorExplanation {
-   
-       
-       
-       
-       
+    
+        
+        
+        
+        
-}
-
@@ -342 +349 @@
-
-div.fieldWithErrors input {
-       
+        
-}
-
-input.error {
-       
+        
-}
-
-#table-form-buttons {
-       
-       
-       
-       
-       
+        
+        
+        
+        
+        
-}
-
-/* SEARCH BOX (hidden) */
-div#search_box {
-       
+        
-    visibility: hidden; /* FIXME: Find a better location */
-}

trunk/test/functional/task_controller_test.rb

@@ -344 +344 @@
-  end
-
+  def test_list_new_service_request_GET_empty
+    @keyring.action_keys << create_action_key('task/list_new_service_requests')
+    login('test')
+
+    customer = create_customer('customer')
+    UserAccount.current_user = @user
+    assert @root.update_attribute(:customer, customer)
+
+    UserAccount.current_user = customer
+    create_task_in_state(Task.ACCEPTED)
+    create_task_in_state(Task.ASSIGNED)
+    create_task_in_state(Task.CLOSED)
+
+    get 'list_new_service_requests'
+    assert_response :success
+    assert_template 'shared/_list_items'
+    assert_equal true, assigns(:items).empty?
+  end
+
+  def test_list_new_service_request_GET_not_empty
+    @keyring.action_keys << create_action_key('task/list_new_service_requests')
+
+    customer = create_customer('customer')
+    UserAccount.current_user = @user
+    assert @root.update_attribute(:customer, customer)
+
+    UserAccount.current_user = customer
+    for i in 1..100
+      create_task(@root, true, 'Service request %d' % i)
+    end
+
+    login('test')
+
+    get 'list_new_service_requests'
+    assert_response :success
+    assert_template 'shared/_list_items'
+    assert_equal false, assigns(:items).empty?
+  end
+
-  private
-