From c17c6cfa02daa7c49af0bad99a47c7844a360ff1 Mon Sep 17 00:00:00 2001
From: Max <m.giller.dev@gmail.com>
Date: Mon, 26 Jul 2021 22:57:39 +0200
Subject: [PATCH] Fixed stats call + minor formatting

---
 public/api/services/jugglDbApi.inc.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/api/services/jugglDbApi.inc.php b/public/api/services/jugglDbApi.inc.php
index 23ab448..e0b3cdb 100644
--- a/public/api/services/jugglDbApi.inc.php
+++ b/public/api/services/jugglDbApi.inc.php
@@ -216,7 +216,7 @@ function updateRecord($user_id, $record)
     $data = [];
     $props = ["end_time", "start_time", "duration", "project_id"];
     foreach ($props as $p) {
-        if (array_key_exists ($p, $record)) {
+        if (array_key_exists($p, $record)) {
             $data[$p] = $record[$p];
         }
     }
@@ -236,7 +236,7 @@ function updateProject($user_id, $project)
     $data = [];
     $props = ["name", "start_date", "color", "visible"];
     foreach ($props as $p) {
-        if (array_key_exists ($p, $project)) {
+        if (array_key_exists($p, $project)) {
             $data[$p] = $project[$p];
         }
     }
@@ -256,7 +256,7 @@ function updateRecordTag($user_id, $tag)
     $data = [];
     $props = ["name", "visible", "bundle"];
     foreach ($props as $p) {
-        if (array_key_exists ($p, $tag)) {
+        if (array_key_exists($p, $tag)) {
             $data[$p] = $tag[$p];
         }
     }
@@ -465,7 +465,8 @@ function removeTagFromRecord($tag_id, $record_id)
     $db->execute();
 }
 
-function getStats($user_id, $from_date, $until_date) {
+function getStats($user_id, $from_date, $until_date)
+{
     $sum_duration = "SUM(ju_time_records.duration) AS duration";
     $date = "DATE(ju_time_records.start_time) AS date";
     $record_count = "COUNT(*) AS record_count";
@@ -475,16 +476,18 @@ function getStats($user_id, $from_date, $until_date) {
     $where3 = " ) AND ju_time_records.end_time IS NOT NULL ";
 
     $db = new DbOperations();
-    $db->select("projects", ["name", "project_id", "color", "visible", $sum_duration, $date, $record_count], false);
+    $db->select("projects", ["ju_projects.name AS name", "ju_projects.project_id", "color", "visible", $sum_duration, $date, $record_count], false);
     $db->innerJoin("time_records", "project_id");
+    // $db->innerJoin("tags_on_records", "record_id", "record_id", "time_records");
+    // $db->innerJoin("record_tags", "record_tag_id", "record_tag_id", "tags_on_records");
 
-    $db->where("user_id", Comparison::EQUAL, $user_id);
+    $db->where("ju_projects.user_id", Comparison::EQUAL, $user_id);
     $db->addSql($where1);
     $db->addValue($from_date);
     $db->addSql($where2);
     $db->addValue($until_date);
     $db->addSql($where3);
 
-    $db->groupBy(["project_id", "date"]);
+    $db->groupBy(["ju_projects.project_id", "date"], false);
     return $db->execute();
 }