Merge pull request #34 from gelic-idealab/dev

Data export page, About page and learn more button, Course sidebar fix

backend/controller/data.js

@@ -1,5 +1,5 @@
 const express = require("express");
-const { getAllInteractions, getAllRaw } = require("../service/data");
+const { getAllInteractions, getAllRawCapture, getAllRawLab, getAllRawCourse } = require("../service/data");
 const dataController = express.Router();
 
 
@@ -14,10 +14,24 @@ dataController.get("/interactions",
     res.status(200).json(results.data);
   });
 
-dataController.get("/export/raw/:captureId",
+dataController.get("/export/raw/capture/:captureId",
 async (req, res) => {
   const { captureId } = req.params;
-  let results = await getAllRaw(captureId);
+  let results = await getAllRawCapture(captureId);
+  res.status(200).json(results.data);
+});
+
+dataController.get("/export/raw/lab/:labId",
+async (req, res) => {
+  const { labId } = req.params;
+  let results = await getAllRawLab(labId);
+  res.status(200).json(results.data);
+});
+
+dataController.get("/export/raw/course/:courseId",
+async (req, res) => {
+  const { courseId } = req.params;
+  let results = await getAllRawCourse(courseId);
   res.status(200).json(results.data);
 });
 

backend/controller/lab.js

@@ -16,9 +16,9 @@ labController.get("/",
 // get list of Lab captures
 labController.get("/captures",
   async (req, res) => {
-  const { courseId } = req.query;
+  const { labId } = req.query;
     const results = await getCaptures({
-      courseId,
+      labId,
     });
     res.status(results.code || 200).json(results.data);
   });

backend/query/data.js

@@ -1,5 +1,20 @@
-const getAllInteractions = `SELECT * FROM KP_Interactions WHERE capture_id IS NOT NULL`
-const getRawPos = `SELECT * FROM positions p JOIN captures c ON p.session_id = c.session_id WHERE c.capture_id = ?`;
-const getRawInt = `SELECT * FROM interactions i JOIN captures c ON i.session_id = c.session_id WHERE c.capture_id = ?`;
+const getAllInteractions = `SELECT * FROM KP_Interactions WHERE capture_id IS NOT NULL`;
 
-module.exports = { getAllInteractions, getRawPos, getRawInt }
+const getRawPosCapture = `SELECT * FROM positions p WHERE capture_id = ?`;
+const getRawIntCapture = `SELECT * FROM interactions i WHERE capture_id = ?`;
+
+const getRawPosLab = `SELECT * FROM positions WHERE session_id = ?`;
+const getRawIntLab = `SELECT * FROM interactions WHERE session_id = ?`;
+
+const getRawPosCourse = `SELECT * FROM positions p JOIN KP_Lab l ON p.session_id = l.session_id WHERE l.course_id = ?`;
+const getRawIntCourse = `SELECT * FROM interactions i JOIN KP_Lab l ON i.session_id = l.session_id WHERE l.course_id = ?;`;
+
+module.exports = { 
+    getAllInteractions, 
+    getRawPosCapture, 
+    getRawIntCapture,
+    getRawPosLab,
+    getRawIntLab,
+    getRawPosCourse,
+    getRawIntCourse
+}

backend/query/lab.js

@@ -37,10 +37,8 @@ WHERE session_id = ?;
 
 const capturesQuery = `
 SELECT *
-FROM KP_Lab l
-JOIN captures c
-WHERE l.session_id = c.session_id
-AND l.course_id = ?
+FROM captures
+WHERE session_id = ?;
 `
 
 module.exports = {

backend/service/data.js

@@ -8,16 +8,37 @@ const getAllInteractions = async() => {
   }
 }
 
-const getAllRaw = async(captureId) => {
+const getAllRawCapture = async(id) => {
   const results = {}
-  results.pos = await pool.execute(dataQuery.getRawPos, [captureId]);
-  results.int = await pool.execute(dataQuery.getRawInt, [captureId]);
+  results.pos = await pool.execute(dataQuery.getRawPosCapture, [id]);
+  results.int = await pool.execute(dataQuery.getRawIntCapture, [id]);
   return {
     data: results
   }
 }
 
+const getAllRawLab = async(id) => {
+  const results = {}
+  results.pos = await pool.execute(dataQuery.getRawPosLab, [id]);
+  results.int = await pool.execute(dataQuery.getRawIntLab, [id]);
+  return {
+    data: results
+  }
+}
+
+const getAllRawCourse = async(id) => {
+  const results = {}
+  results.pos = await pool.execute(dataQuery.getRawPosCourse, [id]);
+  results.int = await pool.execute(dataQuery.getRawIntCourse, [id]);
+  return {
+    data: results
+  }
+}
+
+
 module.exports = {
   getAllInteractions,
-  getAllRaw
+  getAllRawCapture,
+  getAllRawLab,
+  getAllRawCourse
 };

backend/service/lab.js

@@ -125,11 +125,11 @@ const deleteLab = async({labId}) => {
   }
 }
 
-// Get captures for the specific course id
-const getCaptures = async ({ courseId }) => {
+// Get captures for the specific lab id
+const getCaptures = async ({ labId }) => {
   const results = await pool.execute(
     labQuery.capturesQuery,
-    [courseId || 0]
+    [labId || 0]
   );
   const captures = results[0];
   return {

frontend/.gitignore

@@ -1,4 +1,5 @@
 node_modules
 *.local
 .env.development
-.env.production
+.env.production
+dist

frontend/src/components/Layout/SideBar.vue

@@ -35,8 +35,9 @@
         :append-icon-name="showCourses ? 'mdi-menu-down' : 'mdi-menu-left'"
         @click.native="switchShowCourses"
       />
+      <!-- TODO -- wrap the following so that menu items only show if showCourses is true -->
       <SideBarMenuItem
-        v-if="showCourses"
+        v-show="showSideBarCourseList"
         v-for="course in courseList"
         :key="course.courseId"
         :title="course.courseNo"
@@ -67,12 +68,14 @@ export default {
       user: this.$store.getters.user,
       logoPath: require("../../assets/img/komodo-logo-white.svg"),
       courseList: this.$store.getters.courses.sort((a, b) => (a.courseNo > b.courseNo) ? 1 : -1),
-      showCourses: false
+      showCourses: false,
+      showSideBarCourseList: false
     }
   },
   methods: {
     switchShowCourses() {
       this.showCourses = !this.showCourses;
+      this.showSideBarCourseList = !this.showSideBarCourseList;
     },
     goToAccountPage() {
       this.$router.push({