Interaction counts and feedback averages, both by course

app/.eslintrc.json

@@ -25,8 +25,7 @@
  "jsx": true
  },
  "ecmaVersion": 2018,
- "sourceType": "module",
- "tsconfigRootDir": "."
+ "sourceType": "module"
  },
  "plugins": [
  "button-label-required",

app/Makefile

@@ -3,12 +3,13 @@ default: clean local_build upload
 local_build:
  npm run eslint
  npm run build
+ rm -rf ./build/.idea
 
 upload:
  ssh [email protected] "rm -rf ~/public_html/LA-Feedback"
  scp -r ./build [email protected]:~/public_html/LA-Feedback
  ssh [email protected] "mkdir ~/public_html/LA-Feedback/log; chmod -R 755 public_html/LA-Feedback/*; chmod 700 public_html/LA-Feedback/data/"
 
 clean:
- rm -rf ./.idea
  rm -rf ./build
+

app/package.json

@@ -1,6 +1,6 @@
 {
  "name": "la-feedback-system",
- "version": "1.2.1",
+ "version": "1.3.0",
  "private": true,
  "license": "Apache-2.0",
  "description": "A website to gather feedback from students after interactions with LAs",
@@ -49,7 +49,7 @@
  "build": "react-scripts build",
  "eject": "react-scripts eject",
  "test": "react-scripts test",
- "eslint": "eslint . --ext .js,.jsx,.ts,.tsx",
+ "eslint": "eslint . --ext .ts,.tsx",
  "prettify": "npx prettier --write ."
  },
  "eslintConfig": {

app/public/admin.php

@@ -7,8 +7,6 @@
 
 include_once 'sqlManager.php';
 
-session_start();
-
 ini_set('error_log', './log/admin.log');
 
 function get_time_to_complete() {

app/public/averages.php

@@ -0,0 +1,25 @@
+<?php
+
+include_once 'sqlManager.php';
+
+ini_set('error_log', './log/times.log');
+
+function get_averages() {
+ $conn = get_connection();
+ $ps = $conn->prepare('SELECT course, AVG(rating) AS avg FROM feedback LEFT JOIN interactions i on ' .
+ 'feedback.interaction_key = i.interaction_key WHERE time_of_interaction >= (CURRENT_DATE() - INTERVAL 7 DAY) ' .
+ 'GROUP BY course;');
+ $returnVal = [];
+ if ($ps) {
+ $ps->execute();
+ $result = $ps->get_result();
+ while ($row = $result->fetch_assoc()) {
+ array_push($returnVal, $row);
+ }
+ $ps->close();
+ }
+ $conn->close();
+ return $returnVal;
+}
+
+echo json_encode(get_averages());

app/public/times.php

@@ -0,0 +1,23 @@
+<?php
+
+include_once 'sqlManager.php';
+
+ini_set('error_log', './log/times.log');
+
+function get_times() {
+ $conn = get_connection();
+ $ps = $conn->prepare('SELECT time_of_interaction, course FROM interactions ORDER BY time_of_interaction;');
+ $returnVal = [];
+ if ($ps) {
+ $ps->execute();
+ $result = $ps->get_result();
+ while ($row = $result->fetch_assoc()) {
+ array_push($returnVal, $row);
+ }
+ $ps->close();
+ }
+ $conn->close();
+ return $returnVal;
+}
+
+echo json_encode(get_times());

app/src/App.tsx

@@ -50,8 +50,8 @@ function App() {
  // No Deps == componentDidMount
  }, []);
 
- const hasResponse =
- (response && response.content.trim().length !== 0) ?? false;
+ const hasResponse: boolean =
+ (response && response?.content?.trim().length !== 0) ?? false;
 
  return (
  <div className="App">

app/src/CHANGELOG.json

@@ -1,5 +1,6 @@
 {
  "changes": [
+ "## 1.3.0\n- Chart interactions based on hour of the day\n- Display the average feedback for the last 7 days based on course",
  "## 1.2.1\n- Highlight borderline ratings in admin table",
  "## 1.2.0\n- Convert to Redux state management (using Zustand)\n- Implement Dispatch\n- Add version check",
  "## 1.1.2\n- Mark low ratings on admin table",