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

[Raul Raat]

- if multiple users added timetracking to the issue show sum of time spent by user in timetracking section

- if multiple users added timetracking to the issue show sum of time spent by user in timetracking section

[lp:~raulraat/eventum/raul]

4272. By Raul Raat on 2011-01-26

- code formatting

4273. By Raul Raat on 2011-01-26

- name things the same way everywhere

4274. By Raul Raat on 2011-01-26

- make total_time_by_user value array

=== modified file 'htdocs/view.php'
--- htdocs/view.php	2011-01-20 18:45:20 +0000
+++ htdocs/view.php	2011-01-26 14:27:14 +0000
@@ -151,6 +151,7 @@
                     'checkins'           => SCM::getCheckinList($issue_id),
                     'time_categories'    => Time_Tracking::getAssocCategories(),
                     'time_entries'       => $time_entries['list'],
+                    'total_time_by_user' => $time_entries['total_time_by_user'],
                     'total_time_spent'   => $time_entries['total_time_spent'],
                     'impacts'            => Impact_Analysis::getListing($issue_id),
                     'statuses'           => $statuses,

=== modified file 'lib/eventum/class.time_tracking.php'
--- lib/eventum/class.time_tracking.php	2010-07-28 08:50:32 +0000
+++ lib/eventum/class.time_tracking.php	2011-01-26 14:27:14 +0000
@@ -317,16 +317,30 @@
             return 0;
         } else {
             $total_time_spent = 0;
+            $total_time_by_user = array();
             for ($i = 0; $i < count($res); $i++) {
                 $res[$i]["ttr_summary"] = Link_Filter::processText(Issue::getProjectID($issue_id), nl2br(htmlspecialchars($res[$i]["ttr_summary"])));
                 $res[$i]["formatted_time"] = Misc::getFormattedTime($res[$i]["ttr_time_spent"]);
                 $res[$i]["ttr_created_date"] = Date_Helper::getFormattedDate($res[$i]["ttr_created_date"]);
 
+                if (isset($total_time_by_user[$res[$i]['ttr_usr_id']])) {
+                   $total_time_by_user[$res[$i]['ttr_usr_id']]['time_spent'] += $res[$i]['ttr_time_spent'];
+                } else {
+                    $total_time_by_user[$res[$i]['ttr_usr_id']] = array(
+                        'usr_full_name' => $res[$i]['usr_full_name'],
+                        'time_spent'    => $res[$i]['ttr_time_spent']
+                    );
+                }
                 $total_time_spent += $res[$i]["ttr_time_spent"];
             }
+            usort($total_time_by_user, create_function('$a,$b', 'return $a["time_spent"]<$b["time_spent"];'));
+            foreach ($total_time_by_user as &$item) {
+                $item['time_spent'] = Misc::getFormattedTime($item['time_spent']);
+            }
             return array(
-                "total_time_spent" => Misc::getFormattedTime($total_time_spent),
-                "list"             => $res
+                "total_time_spent"   => Misc::getFormattedTime($total_time_spent),
+                "total_time_by_user" => $total_time_by_user,
+                "list"               => $res
             );
         }
     }

=== modified file 'templates/time_tracking.tpl.html'
--- templates/time_tracking.tpl.html	2010-10-07 11:42:43 +0000
+++ templates/time_tracking.tpl.html	2011-01-26 14:27:14 +0000
@@ -64,6 +64,14 @@
                 <td class="default">{$time_entries[i].ttr_summary}</td>
               </tr>
               {if $smarty.section.i.last}
+                {if count($total_time_by_user) > 1}
+                  {foreach from=$total_time_by_user item=item}
+                  <tr>
+                    <td bgcolor="{$internal_color}" colspan="3" class="default_white" align="right" width="30%">{$item.usr_full_name}:</td>
+                    <td bgcolor="{$dark_color}" colspan="3" class="default" width="70%">{$item.time_spent}</td>
+                  </tr>
+                  {/foreach}
+                {/if}
               <tr>
                 <td bgcolor="{$internal_color}" colspan="3" class="default_white" align="right" width="30%">{t}Total Time Spent{/t}:</td>
                 <td bgcolor="{$dark_color}" colspan="3" class="default" width="70%">{$total_time_spent}</td>