Changeset 1699

Timestamp:

03/09/10 15:37:42 (5 months ago)

Author:

klemens

Message:

ullTime: reporting drill down

Location:

trunk/plugins/ullTimePlugin

Files:

• lib/generator/ullTimeReportGenerator.class.php (modified) (2 diffs)
• modules/ullTime/lib/BaseUllTimeActions.class.php (modified) (1 diff)

trunk/plugins/ullTimePlugin/lib/generator/ullTimeReportGenerator.class.php

@@ -38 +38 @@
 
   
-//  protected function customizeTableConfig()
-//  {
-//    // Override default orderby
-//    $this->tableConfig->setOrderBy('last_name_first');
-//  }   
-//  
-//  
   protected function customizeColumnsConfig()
   {
-//    $this->columnsConfig['email']
-//      ->setWidgetOption('show_icon_only', true)
-//      ->setLabel(' ')
-//    ;
-//    $this->columnsConfig['phone_extension']
-//      ->setLabel(__('Ext.', null, 'ullPhoneMessages'))
-//    ;        
-//    $this->columnsConfig['mobile_number']
-//      ->setLabel(__('Mobile', null, 'ullPhoneMessages'))
-//      ->setWidgetOption('nowrap', true)
-//      ->setOption('show_local_short_form', true)
-//    ;
-
-    // Create columnConfig for artificial "last_name_first" column
     $this->getColumnsConfig()
       ->create('duration_seconds_sum')
@@ -69 +48 @@
     ;
     
+  }
+ 
+  protected function customizeRelationColumns()
+  {
+    switch ($this->report)
+    {
+      case 'by_project':      
+        $url = urldecode(ull_url_for(array('report' => 'by_user', 'filter[ull_project_id]' => '%d')));
+        
+        $this->getColumnsConfig()->offsetGet('UllProject->name')
+          ->setMetaWidgetClassName('ullMetaWidgetForeignKey')
+          ->setWidgetOption('link_name_to_url', $url)
+        ;
+        break;
+        
+      case 'by_user':
+        $url = urldecode(ull_url_for(array('report' => 'by_project', 'filter[ull_user_id]' => '%d')));
+        
+        $this->getColumnsConfig()->offsetGet('UllUser->display_name')
+          ->setMetaWidgetClassName('ullMetaWidgetForeignKey')
+          ->setWidgetOption('link_name_to_url', $url)
+          ->setWidgetOption('link_icon_to_popup', true)
+        ;
+        break;
+    }    
     
   }
-//
-//  
-//  protected function customizeRelationColumns()
-//  {
-//    $this->columnsConfig['UllLocation->name']
-//      ->setWidgetOption('nowrap', true)
-//    ;
-//  }  
+  
 }

trunk/plugins/ullTimePlugin/modules/ullTime/lib/BaseUllTimeActions.class.php

@@ -126 +126 @@
     $this->generator = new ullTimeReportGenerator($this->report);
     $this->generator->setCalculateSums(true);
-
+    
     $rows = $this->getFilterFromRequest();
 
     $this->generator->buildForm($rows);
+    
+//    var_dump($this->generator->getForm()->debug());
+//    var_dump($this->generator->getColumnsConfig());
     
     $this->setVar('generator', $this->generator, true);