From df86ba7160ea3ec2b1210e6947f16c1c1a2d9b6a Mon Sep 17 00:00:00 2001
From: Max <m.giller.dev@gmail.com>
Date: Sat, 21 Nov 2020 00:49:22 +0100
Subject: [PATCH] Fixed stats readout

---
 juggl-server/api/services/dbOperations.inc.php | 5 +++--
 juggl-server/api/services/jugglDbApi.inc.php   | 2 +-
 juggl-server/js/helper.js                      | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/juggl-server/api/services/dbOperations.inc.php b/juggl-server/api/services/dbOperations.inc.php
index e2ea954..16ee546 100644
--- a/juggl-server/api/services/dbOperations.inc.php
+++ b/juggl-server/api/services/dbOperations.inc.php
@@ -34,7 +34,7 @@ class DbOperations
         $this->pdo = new PDO($dsn, $this->config['username'], $this->config['password'], $options);
     }
 
-    function select(string $table, array $attributes = array())
+    function select(string $table, array $attributes = array(), bool $addTableName = true)
     {
         $this->table = $this->tablePrefix . $table;
         if (count($attributes) == 0)
@@ -42,7 +42,8 @@ class DbOperations
         else {
             for ($i = 0; $i < count($attributes); $i++) {
                 $a = $attributes[$i];
-                if (strpos($a, ".") === false) {
+                // Add table name prefix if missing
+                if ($addTableName && strpos($a, ".") === false) {
                     $attributes[$i] = "$this->table.$a";
                 }
             }
diff --git a/juggl-server/api/services/jugglDbApi.inc.php b/juggl-server/api/services/jugglDbApi.inc.php
index 6612972..8c8c248 100644
--- a/juggl-server/api/services/jugglDbApi.inc.php
+++ b/juggl-server/api/services/jugglDbApi.inc.php
@@ -76,7 +76,7 @@ function getProjectRecordDerivedData($user_id, $project_id)
     $recordCountAttribute = "COUNT(*) AS record_count";
 
     $db = new DbOperations();
-    $db->select("time_records", ["*", $durationAttribute, $recordCountAttribute]);
+    $db->select("time_records", ["*", $durationAttribute, $recordCountAttribute], false);
     $db->where("user_id", Comparison::EQUAL, $user_id);
     $db->where("project_id", Comparison::EQUAL, $project_id);
     $results = $db->execute();
diff --git a/juggl-server/js/helper.js b/juggl-server/js/helper.js
index 6bcffed..25265d3 100644
--- a/juggl-server/js/helper.js
+++ b/juggl-server/js/helper.js
@@ -5,6 +5,7 @@ const PROJECT_META = "p";
 function loadProjectList() {
   api.getProjects().then((projects) => {
     var container = u(u("#project-list").first());
+    container.children().remove();
     Object.values(projects).forEach((project) => {
       var obj = createNode(PROJECT_OBJECT);
       var data = undefined;
@@ -13,7 +14,7 @@ function loadProjectList() {
       append(obj, data);
       u(data).text(project["name"]);
 
-      var duration = parseFloat(project["duration"]) / 60 / 60;
+      var duration = Number((parseFloat(project["duration"]) / 60 / 60).toFixed(2));
       var unit = "hours";
       data = createNode(PROJECT_META);
       append(obj, data);