added support for no aggregation reports

Author: puthre

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Time Tracker</name>
     <summary>Time Tracker App</summary>
     <description><![CDATA[Time Tracker App]]></description>
-    <version>0.0.37</version>
+    <version>0.0.38</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >MTier Ltd.</author>
     <namespace>TimeTracker</namespace>

js/reports.js

@@ -165,6 +165,7 @@
                   //{title:"Id", field:"id", width:100}, //column has a fixed width of 100px;
                   {title:"#", field:"", formatter:"rownum"},
                   {title:"Name", field:"name", widthGrow:1}, //column will be allocated 1/5 of the remaining space
+                  {title:"Details", field:"details", widthGrow:1}, //column will be allocated 1/5 of the remaining space
                   {title:"User", field:"userUid", widthGrow:1}, //column will be allocated 1/5 of the remaining space
                   {title:"Project", field:"project", widthGrow:1}, //column will be allocated 1/5 of the remaining space
                   {title:"Client", field:"client", widthGrow:1}, //column will be allocated 1/5 of the remaining space
@@ -187,11 +188,11 @@
                   return response.items; //return the tableData property of a response json object
               },
               });
-              $("#download-csv").click(function(){
+              $("#download-csv").off().click(function(){
                 table.download("csv", "data.csv");
                 return false;
             });
-            $("#download-json").click(function(){
+            $("#download-json").off().click(function(){
               table.download("json", "data.json");
               return false;
             });

lib/Db/ReportItem.php

@@ -8,6 +8,7 @@ class ReportItem extends Entity {
 
     public $id;
     public $name;
+    public $details;
     public $projectId;
     public $userUid;
     public $time;
@@ -23,6 +24,7 @@ public function __construct() {
 
         $this->addType('id', 'integer');
         $this->addType('name', 'string');
+        $this->addType('name', 'details');
         $this->addType('projectId', 'integer');
         $this->addType('userUid', 'string');
         $this->addType('time', 'string');

lib/Db/ReportItemMapper.php

@@ -51,7 +51,11 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
             }
         } else {
             if(empty($timegroup)){
-                $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(min(start)),'%Y-%m-%d') as time";
+                if (empty($groupOn1) && empty($groupOn2)) {
+                    $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d %H:%i') as time";
+                } else {
+                    $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(min(start)),'%Y-%m-%d') as time";
+                }
             } elseif ($timegroup == 'week') {
                 $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start)),' Monday'), '%x%v %W') as time";
             }elseif ($timegroup == 'day') {
@@ -63,7 +67,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
             }
 
         }
-        if(($groupOn1 != 'name') && ($groupOn2 != 'name')){
+        if(($groupOn1 != 'name') && ($groupOn2 != 'name') && !empty($groupOn1) && !empty($groupOn2)){
             if ($this->dbengine != 'MYSQL') {
                 $selectFields[] = '\'*\' as name';
             } else {
@@ -73,7 +77,14 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
         } else {
             $selectFields[] = 'wi.name as name';
         }
-        if(($groupOn1 != 'project') && ($groupOn2 != 'project')){
+
+        if(($groupOn1 != 'name') && ($groupOn2 != 'name') && !empty($groupOn1) && !empty($groupOn2)){
+                $selectFields[] = '\'*\' as details';
+        } else {
+            $selectFields[] = 'wi.details as details';
+        }
+
+        if(($groupOn1 != 'project') && ($groupOn2 != 'project'  && !empty($groupOn1) && !empty($groupOn2))){
             $selectFields[] = '\'*\' as "projectId"';
             if ($this->dbengine != 'MYSQL') {
                 $selectFields[] = 'string_agg(distinct p.name, \',\') as project';
@@ -198,6 +209,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
         }
         if (!empty($groups)){
             $group = "group by ".implode(",",$groups);
+        } else {
+            $group = "group by wi.id";
         }
         if (empty($start)){
             $start = 0;
@@ -206,7 +219,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
             $limit = 10000;
         }
         $sql = 'SELECT '.$selectItems.' where '.implode(" and ",$filters).' '.$group. ' order by time desc';
-        // var_dump($sql);
+        //var_dump($sql);
         // var_dump($params);
         return $this->findEntities($sql, $params, $limit, $start);
     }

templates/content/reports.php

@@ -30,8 +30,9 @@
 <div class="group-controls">
   <label for="group1">
     Group by
-      <select id="group1" style="width: 200px;">>
-          <option value="project">Project</option>
+      <select id="group1" style="width: 200px;">
+          <option value="">None</option>
+          <option value="project" selected>Project</option>
           <option value="userUid">User</option>
           <option value="client">Client</option>
       </select>
@@ -41,12 +42,13 @@
       <select id="group2" style="width: 200px;">
           <option value="">None</option>  
           <option value="name">Time Entry</option>
-          <option value="userUid">User</option>
+          <option value="userUid" selected >User</option>
           <option value="project">Project</option>
       </select>
   </label>
       <select id="group3" style="width: 200px;">
-          <option value="day">Daily</option>
+        <option value="">None</option>
+          <option value="day" selected>Daily</option>
           <option value="week">Weekly</option>
           <option value="month">Monthly</option>
           <option value="year">Yearly</option>