Merge lp:~raulraat/eventum/customFieldWeeklyReport into lp:eventum

[Raul Raat]

I did a small change to Custom Fields Weekly Report - added the option to show time spent per user.
If enabled it will add a new colum "User" to the report. If multiple users have spent time on the issue then the issue will be listed as many times in the report as many users spent time on it.

=== modified file 'htdocs/reports/custom_fields_weekly.php'
--- htdocs/reports/custom_fields_weekly.php	2010-02-10 13:50:11 +0000
+++ htdocs/reports/custom_fields_weekly.php	2010-04-14 13:34:19 +0000
@@ -68,6 +68,7 @@
         (@$_POST["end"]["Day"] != 0)) {
     $end_date = join("-", $_POST["end"]);
 }
+$per_user = empty($_POST['time_per_user']) ? false : true;
 
 $tpl->assign(array(
     "custom_fields" =>  $custom_fields,
@@ -78,6 +79,7 @@
     "start_date"    =>  @$start_date,
     "end_date"      =>  @$end_date,
     "report_type"   =>  @$_POST["report_type"],
+    "per_user"   =>  $per_user,
     "weeks" => Date_Helper::getWeekOptions(3,0),
 ));
 
@@ -101,7 +103,7 @@
 }
 
 if (count(@$_POST['custom_field']) > 0) {
-	$data = Report::getCustomFieldWeeklyReport($_POST["custom_field"], $_POST["custom_options"], $dates[0], $dates[1]);
+	$data = Report::getCustomFieldWeeklyReport($_POST["custom_field"], $_POST["custom_options"], $dates[0], $dates[1], $per_user);
     $tpl->assign(array(
         "data"  =>  $data
     ));

=== modified file 'lib/eventum/class.report.php'
--- lib/eventum/class.report.php	2010-02-10 13:50:11 +0000
+++ lib/eventum/class.report.php	2010-04-14 13:34:19 +0000
@@ -782,9 +782,10 @@
      * @param   array $cfo_ids An array of option ids.
      * @param   string $start_date
      * @param   string $end_date
+     * @param   boolean $per_user Show time spent per user
      * @return  array An array of data.
      */
-    function getCustomFieldWeeklyReport($fld_id, $cfo_ids, $start_date, $end_date)
+    function getCustomFieldWeeklyReport($fld_id, $cfo_ids, $start_date, $end_date, $per_user = false)
     {
         $prj_id = Auth::getCurrentProject();
         $fld_id = Misc::escapeInteger($fld_id);
@@ -799,9 +800,21 @@
                     iss_customer_id,
                     iss_private,
                     fld_id
+               ";
+
+
+            if ($per_user) {
+                $sql .= ', usr_full_name ';
+            }
+            $sql .= "
                  FROM
                     " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "custom_field, 
                     " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "time_tracking,";
+
+            if ($per_user) {
+                    $sql .= APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "user, ";
+            }
+
             if (count($options) > 0) {
                 $sql .= "
                         " . APP_DEFAULT_DB . "." . APP_TABLE_PREFIX . "custom_field_option,";
@@ -819,6 +832,9 @@
                 $sql .=
                         " cfo_id = icf_value AND";
             }
+            if ($per_user) {
+                 $sql .= " usr_id = ttr_usr_id AND ";
+            }
             $sql .= "
                         icf_iss_id = iss_id AND
                         isu_iss_id = iss_id AND
@@ -827,9 +843,15 @@
                 $sql .= " AND
                         cfo_id IN('" . join("','", Misc::escapeString(array_keys($options))) . "')";
             }
-            $sql .= "
-                    GROUP BY
-                        iss_id";
+            if ($per_user) {
+                $sql .= "
+                    GROUP BY
+                    iss_id, ttr_usr_id";
+            } else {
+                $sql .= "
+                    GROUP BY
+                    iss_id";
+           }
 
         $res = DB_Helper::getInstance()->getAll($sql, DB_FETCHMODE_ASSOC);
         if (PEAR::isError($res)) {

=== modified file 'templates/reports/custom_fields_weekly.tpl.html'
--- templates/reports/custom_fields_weekly.tpl.html	2010-02-10 13:50:11 +0000
+++ templates/reports/custom_fields_weekly.tpl.html	2010-04-14 13:34:19 +0000
@@ -89,7 +89,7 @@
           </td>
         </tr>
         <tr>
-          <td width="120" class="default">
+          <td width="120" class="default" valign="top">
             <b>{t}Options:{/t}</b>
           </td>
           <td width="200" class="default" NOWRAP>
@@ -97,6 +97,10 @@
             <a id="link" class="link" href="javascript:void(null)"
                             onClick="javascript:toggleCheckbox('custom_fields_report', 'time_in_min', 0)">{t}Time spent as minutes{/t}</a>&nbsp;
             <br />
+            <input type="checkbox" name="time_per_user" value="1" class="default" {if $smarty.post.time_per_user == 1}checked{/if}>
+            <a id="link" class="link" href="javascript:void(null)"
+                            onClick="javascript:toggleCheckbox('custom_fields_report', 'time_per_user', 0)">{t}Time spent per user{/t}</a>&nbsp;
+            <br />
           </td>
         </tr>
         
@@ -170,7 +174,7 @@
 </script>
 
 {if $data|@count > 0}
-{assign var="colspan" value=4}
+{assign var="colspan" value=5}
 <table bgcolor="{$cell_color}" border="0" cellspacing="0" cellpadding="1" align="center">
   <tr>
     <td>
@@ -185,6 +189,9 @@
           <td bgcolor="{$cell_color}" class="default_white">{t}Summary{/t}</td>
           <td bgcolor="{$cell_color}" class="default_white">{t}Time Spent{/t}</td>
           <td bgcolor="{$cell_color}" class="default_white">{$field_info.fld_title}</td>
+          {if $per_user}
+              <td bgcolor="{$cell_color}" class="default_white">{t}User{/t}</td>
+          {/if}
         </tr>
         {foreach from=$data item=row}
         {cycle values=$cycle assign="row_color"}
@@ -195,6 +202,9 @@
           <td class="default" bgcolor="{$row_color}">{$row.iss_summary}</td>
           <td class="default" bgcolor="{$row_color}">{if $smarty.post.time_in_min == 1}{$row.ttr_time_spent_sum}{else}{$row.ttr_time_spent_sum_formatted}{/if}</td>
           <td class="default" bgcolor="{$row_color}">{$row.field_value}</td>
+          {if $per_user}
+              <td class="default" bgcolor="{$row_color}">{$row.usr_full_name}</td>
+          {/if}
         </tr>
         {foreachelse}
         <tr>
@@ -208,4 +218,4 @@
 {/if}
 
 
-{include file="footer.tpl.html"}
\ No newline at end of file
+{include file="footer.tpl.html"}