Last commit before vue-version

juggl-server/index.html

@@ -17,6 +17,7 @@
 
     <script>
         var intervallId = undefined;
+
         window.onblur = () => {
             stopBackgroundUpdates();
         }
@@ -27,21 +28,20 @@
             // Create Callbacks
             callbacks.entering[States.RECORDING] = () => {
                 updateProgess();
+                loadRecordTags();
+            };
+            callbacks.entering[States.IDLE] = () => {
+                loadProjectList().then(() => {
+                    checkForUpdate();
+                });
             };
             
             initState();
-            onLogIn();
             updateVisibility();
             updateAuthBtnText();
             startBackgroundUpdates();
         }
 
-        function onLogIn() {
-            loadProjectList().then(() => {
-                checkForUpdate();
-            });
-        }
-        
         function checkForUpdate() {
             if (currentRecord !== undefined) {
                 updateProgess();
@@ -98,20 +98,26 @@
         </ul>
     </header>
     <main>
-        <div class="idle hidden" style="text-align: center;">
+        <div class="recording hidden" style="text-align: center;">
+            <h1>
+                Currently Tracking
+            </h1>
+            <div id="tracking-list">
+            </div>
+        </div>
+        <div class="idle recording hidden" style="text-align: center;">
             <h1>
                 Select project to track
             </h1>
             <div id="project-list">
             </div>
         </div>
-        <div class="recording hidden" style="text-align: center;">
+        <div class="idle recording hidden" style="text-align: center;">
             <h1>
-                Tracking <span id="current-project-name"></span>
+                Records
             </h1>
-            <h2 id="current-record-duration" style="color: red;"></h2>
+            <div id="record-list">
-            <small id="update-notice" >Updated every 30 seconds</small><br/>
+            </div>
-            <button id="stop-btn" onclick="stopRecord()">Stop</button>
         </div>
     </main>
 </body>

juggl-server/js/api.js

@@ -14,6 +14,19 @@ const api = {
         return {};
       });
   },
+  getRecordTags() {
+    return request("/getRecordTags.php")
+      .then((r) => {
+        return r.json();
+      })
+      .then((j) => {
+        return j.record_tags;
+      })
+      .catch((e) => {
+        console.log(e);
+        return {};
+      });
+  },
   startRecord(projectId, startTime = new Date()) {
     return request("/startRecord.php", {
       project_id: projectId,
@@ -72,6 +85,32 @@ const api = {
       return undefined;
     });
   },
+  addTagToRecord(tagId, recordId) {
+    return request("/addTagToRecord.php", {
+      tag_id: tagId,
+      record_id: recordId,
+    }).catch((e) => {
+      console.log(e);
+      return undefined;
+    });
+  },
+  removeTagFromRecord(tagId, recordId) {
+    return request("/removeTagFromRecord.php", {
+      tag_id: tagId,
+      record_id: recordId,
+    }).catch((e) => {
+      console.log(e);
+      return undefined;
+    });
+  },
+  addRecordTag(tagName) {
+    return request("/addRecordTag.php", {
+      tag_name: tagName,
+    }).catch((e) => {
+      console.log(e);
+      return undefined;
+    });
+  },
 };
 
 function request(path, json = {}, options = {}) {

juggl-server/js/auth.js

@@ -37,7 +37,6 @@ function handleAuthBtn() {
     }
 
     logIn(apiKey, userId);
-    onLogIn();
   }
   u("#api-key").first().value = "";
   updateAuthBtnText();

juggl-server/js/helper.js

@@ -4,6 +4,7 @@ const PROJECT_META = "p";
 let currentRecord = undefined;
 let currentProject = undefined;
 let projectList = undefined;
+let recordTags = undefined;
 
 function loadProjectList() {
   return api.getProjects().then((projects) => {
@@ -38,6 +39,39 @@ function loadProjectList() {
   });
 }
 
+function loadRecordTags() {
+  return api.getRecordTags().then((tags) => {
+    projectList = Object.values(projects);
+
+    var container = u(u("#project-list").first());
+    container.children().remove();
+    Object.values(projects).forEach((project) => {
+      var obj = createNode(PROJECT_OBJECT);
+      var data = undefined;
+
+      data = createNode(PROJECT_TITLE);
+      append(obj, data);
+      u(data).text(project["name"]);
+
+      var duration = Number((parseFloat(project["duration"]) / 60 / 60).toFixed(2));
+      var unit = "hours";
+      data = createNode(PROJECT_META);
+      append(obj, data);
+      u(data).text(duration + " " + unit);
+
+      data = createNode(PROJECT_META);
+      append(obj, data);
+      u(data).text(project["record_count"] + " records");
+
+      obj = u(obj);
+      obj.data("project-id", project["project_id"]);
+      obj.on("click", projectClicked);
+
+      container.append(obj);
+    });
+  });
+}
+
 // Created new DOM object
 // element: Type of DOM object (div, p, ...)
 function createNode(element) {