Merge pull request #827 from BIDMCDigitalPsychiatry/gyroscope

Gyroscope game changes in dashboard
BIDMCDigitalPsychiatry · Aug 13, 2024 · dc0c1f9 · dc0c1f9
2 parents 3fb8f50 + 32d9ca6
commit dc0c1f9
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 654 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "jsonata": "^1.8.4",
     "jsonexport": "^3.2.0",
     "jspdf": "^2.3.1",
-    "lamp-core": "^2024.8.7",
+    "lamp-core": "^2022.3.8",
     "material-icons": "^1.10.11",
     "monaco-editor": "^0.33.0",
     "notistack": "^2.0.5",
@@ -138,4 +138,4 @@
     "not ie <= 11",
     "not op_mini all"
   ]
-}
+}
diff --git a/src/components/EmbeddedActivity.tsx b/src/components/EmbeddedActivity.tsx
@@ -45,6 +45,7 @@ const demoActivities = {
   "lamp.maze_game": "maze_game",
   "lamp.emotion_recognition": "emotion_recognition",
   "lamp.symbol_digit_substitution": "symbol_digit_substitution",
+  "lamp.gyroscope": "gyroscope",
 }
 
 export default function EmbeddedActivity({ participant, activity, name, onComplete, noBack, tab, ...props }) {

diff --git a/src/components/Participant.tsx b/src/components/Participant.tsx
@@ -177,6 +177,7 @@ export default function Participant({
   }, [])
 
   useEffect(() => {
+    setLoading(true)
     if (activities !== null) {
       Service.getAllTags("activitytags").then((result) => {
         if ((result || []).length == 0) {

diff --git a/src/components/Researcher/ActivityList/Activity.tsx b/src/components/Researcher/ActivityList/Activity.tsx
@@ -29,6 +29,7 @@ export const games = [
   "lamp.maze_game",
   "lamp.emotion_recognition",
   "lamp.symbol_digit_substitution",
+  "lamp.gyroscope",
 ]
 
 const useStyles = makeStyles((theme: Theme) =>

diff --git a/src/components/Researcher/ActivityList/ActivityMethods.ts b/src/components/Researcher/ActivityList/ActivityMethods.ts
@@ -1306,6 +1306,29 @@ export const SchemaList = () => {
         },
       },
     },
+    "lamp.gyroscope": {
+      type: "object",
+      properties: {
+        settings: {
+          title: i18n.t("Activity Settings"),
+          required: ["level"],
+          type: "object",
+          properties: {
+            level: {
+              title: i18n.t("Game Level"),
+              description: i18n.t(
+                '"Easy" - 10 rotation trials, "Medium" - 20 trials with rotations +15, -15, +30, -30, "Hard" - 30 trails with rotation +15, -15, +30, -30, +45, -45 degrees'
+              ),
+              type: "string",
+              minLength: 1,
+              enum: ["Easy", "Medium", "Hard"],
+              enumNames: [i18n.t("Easy"), i18n.t("Medium"), i18n.t("Hard")],
+              default: "Easy",
+            },
+          },
+        },
+      },
+    },
   }
 }
 

diff --git a/src/components/Researcher/ActivityList/Index.tsx b/src/components/Researcher/ActivityList/Index.tsx
@@ -7,7 +7,7 @@ import Header from "./Header"
 import { sortData } from "../Dashboard"
 import Pagination from "../../PaginatedElement"
 import useInterval from "../../useInterval"
-
+import LAMP from "lamp-core"
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
     backdrop: {
@@ -72,6 +72,7 @@ export const games = [
   "lamp.maze_game",
   "lamp.emotion_recognition",
   "lamp.symbol_digit_substitution",
+  "lamp.gyroscope",
 ]
 export default function ActivityList({
   researcherId,
@@ -106,6 +107,7 @@ export default function ActivityList({
   )
 
   useEffect(() => {
+    // LAMP.ActivitySpec.all().then((res) => console.log(res))
     let params = JSON.parse(localStorage.getItem("activities"))
     setPage(params?.page ?? 0)
     setRowCount(params?.rowCount ?? 40)

diff --git a/src/components/Survey.tsx b/src/components/Survey.tsx
@@ -31,6 +31,7 @@ export const games = [
   "lamp.maze_game",
   "lamp.emotion_recognition",
   "lamp.symbol_digit_substitution",
+  "lamp.gyroscope",
 ]
 
 export default function Survey({ participant, activities, showStreak, ...props }) {

diff --git a/src/index.tsx b/src/index.tsx
@@ -14,7 +14,6 @@ import "regenerator-runtime/runtime"
 import "url-search-params-polyfill"
 import "material-icons"
 import "./i18n"
-import { sensorEventUpdate } from "./components/BottomMenu"
 
 // in index.html: <!DOCTYPE html><html></html>
 let root = document.createElement("div")
@@ -40,7 +39,6 @@ input, textarea, .contenteditable, .lamp-editable *, .swagger-ui * {
     user-select: text;
     cursor: text;
 }`
-
 // IE9+ CustomEvent polyfill.
 ;(function () {
   if (typeof window.CustomEvent === "function") return false