chore: fixed prettier issues, refactored admin dashboard, added funct…

…ionality for info display slide

.prettierrc.json

@@ -1,4 +1,7 @@
 {
     "tabWidth": 4,
-    "printWidth": 120
+    "printWidth": 120,
+    "singleQuote": true,
+    "semi": true,
+    "trailingComma": "es5"
 }

.vscode/settings.json

@@ -1,6 +1,9 @@
 {
     "workbench.tree.indent": 18,
     "editor.tabSize": 4,
+    "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnSave": true
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
 }

src/app/common/commonMethods.ts

@@ -2,7 +2,7 @@
 
 // random numbers generated are lowerbound inclusive and upperbound exclusive: [lowerbound, upperbound)
 export function generateRandomNonrepeatingNumberList(size: number, lowerBound: number, upperBound: number): number[] {
-    if (size > upperBound - lowerBound) throw new Error("Size cannot be greater than the bounds");
+    if (size > upperBound - lowerBound) throw new Error('Size cannot be greater than the bounds');
     const randList = [];
     while (randList.length < size) {
         const randNum = getRandomNumber(lowerBound, upperBound);
@@ -79,30 +79,6 @@ export function wait(time: number): Promise<void> {
     });
 }
 
-export function isSurveyMonkeyQuestionnaire(task: string): boolean {
-    return false;
-    // return task.includes(RouteMap.surveymonkeyquestionnaire.id);
-}
-
-export function isCustomTask(task: string): boolean {
-    return false;
-    // return task.includes(RouteMap.pavloviatask.id);
-}
-
-export const ConsentIds = [
-    // RouteMap.consent.id,
-    // RouteMap.webPhenoClinical.id,
-    // RouteMap.webPhenoClinicalFR.id,
-    // RouteMap.stressClinical.id,
-    // RouteMap.stressClinicalFR.id,
-    // RouteMap.stressClinicalDebrief.id,
-    // RouteMap.stressPilot.id,
-];
-// remove later, this is a bandaid fix
-export function isConsent(id: string): boolean {
-    return ConsentIds.includes(id);
-}
-
 export function thisOrDefault<T>(value: T, defaultValue: T): T {
     return value === null || value === undefined ? defaultValue : value;
 }
@@ -114,3 +90,7 @@ export function throwErrIfNotDefined(value: any, errStr: string): any {
         return value;
     }
 }
+
+export function objIsEmpty(arg: any): boolean {
+    return Object.keys(arg).length === 0;
+}

src/app/models/TaskData.ts

@@ -1,20 +1,20 @@
-import { UseHand } from "../pages/tasks/task-playables/finger-tapping/finger-tapping-task.component";
-import { RatingTaskCounterBalance } from "../pages/tasks/task-playables/everyday-choice/rater/rater.component";
-import { SmileyFaceTaskCounterbalance } from "../pages/tasks/task-playables/smiley-face/smiley-face.component";
-import { Key, UserResponse } from "./InternalDTOs";
-import { ParticipantType } from "./enums";
+import { UseHand } from '../pages/tasks/task-playables/finger-tapping/finger-tapping-task.component';
+import { RatingTaskCounterBalance } from '../pages/tasks/task-playables/everyday-choice/rater/rater.component';
+import { SmileyFaceTaskCounterbalance } from '../pages/tasks/task-playables/smiley-face/smiley-face.component';
+import { Key, UserResponse } from './InternalDTOs';
+import { ParticipantType } from './enums';
 
 export enum TaskNames {
-    ODDBALL = "oddball",
-    DIGITSPAN = "digitspan",
-    FINGERTAPPING = "fingertapping",
-    NBACK = "nback",
-    STROOP = "stroop",
-    TRAILMAKING = "trailmaking",
-    TASKSWITCHING = "taskswitching",
-    DEMANDSELECTION = "demandselection",
-    SMILEYFACE = "smileyface",
-    EVERYDAYCHOICE = "everydaychoice",
+    ODDBALL = 'oddball',
+    DIGITSPAN = 'digitspan',
+    FINGERTAPPING = 'fingertapping',
+    NBACK = 'nback',
+    STROOP = 'stroop',
+    TRAILMAKING = 'trailmaking',
+    TASKSWITCHING = 'taskswitching',
+    DEMANDSELECTION = 'demandselection',
+    SMILEYFACE = 'smileyface',
+    EVERYDAYCHOICE = 'everydaychoice',
 }
 
 export abstract class TaskData {
@@ -132,17 +132,10 @@ export class EverydayChoiceTaskData extends TaskData {
     activity: string;
     question: string;
     userAnswer: number;
-    activityType: "DoNothing" | "DoSomething" | "";
+    activityType: 'DoNothing' | 'DoSomething' | '';
     responseTime: number;
 }
 
-export class CustomTask {
-    customTaskID: string;
-    name: string;
-    url: string;
-    description: string;
-}
-
 export class ParticipantData {
     userId: string;
     studyId: number;

src/app/models/enums.ts

@@ -1,69 +1,72 @@
 export enum RouteNames {
-    LANDINGPAGE_LOGIN_SUBROUTE = "login",
-    LANDINGPAGE_REGISTER_SUBROUTE = "register",
-    LANDINGPAGE_FORGOT_PASSWORD = "send-reset-email",
-    LANDINGPAGE_RESET_PASSWORD = "reset",
+    LANDINGPAGE_LOGIN_SUBROUTE = 'login',
+    LANDINGPAGE_REGISTER_SUBROUTE = 'register',
+    LANDINGPAGE_FORGOT_PASSWORD = 'send-reset-email',
+    LANDINGPAGE_RESET_PASSWORD = 'reset',
 
-    TASKPLAYER = "playtask",
+    TASKPLAYER = 'playtask',
 
-    QUESTIONNAIRE = "questionnaire",
+    QUESTIONNAIRE = 'questionnaire',
 
-    PAVLOVIA = "pavlovia",
+    PAVLOVIA = 'pavlovia',
 
-    CONSENT = "consent",
+    CONSENT = 'consent',
+
+    INFO_DISPLAY = 'infodisplay',
 }
 
 export enum AdminRouteNames {
-    DASHBOARD_BASEROUTE = "admin-dashboard",
+    DASHBOARD_BASEROUTE = 'admin-dashboard',
 
-    COMPONENTS_SUBROUTE = "components",
-    DATA_SUBROUTE = "data",
-    GUESTS_SUBROUTE = "guests",
-    STUDIES_SUBROUTE = "studies",
-    STUDIES_CREATE_SUBROUTE = "create",
-    STUDIES_VIEW_SUBROUTE = "view",
+    COMPONENTS_SUBROUTE = 'components',
+    DATA_SUBROUTE = 'data',
+    GUESTS_SUBROUTE = 'guests',
+    STUDIES_SUBROUTE = 'studies',
+    STUDIES_CREATE_SUBROUTE = 'create',
+    STUDIES_VIEW_SUBROUTE = 'view',
 }
 
 export enum ParticipantRouteNames {
-    DASHBOARD_BASEROUTE = "participant-dashboard",
-    CROWDSOURCEPARTICIPANT_REGISTER_BASEROUTE = "crowdsource-participant",
+    DASHBOARD_BASEROUTE = 'participant-dashboard',
+    CROWDSOURCEPARTICIPANT_REGISTER_BASEROUTE = 'crowdsource-participant',
 
-    STUDIES_SUBROUTE = "studies",
-    PROFILE_SUBROUTE = "profile",
+    STUDIES_SUBROUTE = 'studies',
+    PROFILE_SUBROUTE = 'profile',
 }
 
 // Each task is one of the following type
 export enum TaskType {
-    NAB = "NAB",
-    EXPERIMENTAL = "EXPERIMENTAL",
-    QUESTIONNAIRE = "QUESTIONNAIRE",
-    CONSENT = "CONSENT",
+    NAB = 'NAB',
+    EXPERIMENTAL = 'EXPERIMENTAL',
+    QUESTIONNAIRE = 'QUESTIONNAIRE',
+    CONSENT = 'CONSENT',
+    INFO_DISPLAY = 'INFO_DISPLAY',
 }
 
 export enum Platform {
-    PSHARPLAB = "PSHARPLAB",
-    SURVEYMONKEY = "SURVEYMONEKY",
-    PAVLOVIA = "PAVLOVIA",
+    PSHARPLAB = 'PSHARPLAB',
+    SURVEYMONKEY = 'SURVEYMONEKY',
+    PAVLOVIA = 'PAVLOVIA',
 }
 
 export enum SnackbarType {
-    SUCCESS = "SUCCESS",
-    ERROR = "ERROR",
-    INFO = "INFO",
+    SUCCESS = 'SUCCESS',
+    ERROR = 'ERROR',
+    INFO = 'INFO',
 }
 
 export enum Role {
-    ADMIN = "ADMIN",
-    PARTICIPANT = "PARTICIPANT",
-    GUEST = "GUEST", // access to admin views but cannot make any calls to backend
+    ADMIN = 'ADMIN',
+    PARTICIPANT = 'PARTICIPANT',
+    GUEST = 'GUEST', // access to admin views but cannot make any calls to backend
 }
 
 export enum StimuliProvidedType {
-    HARDCODED = "hardcoded",
-    GENERATED = "generated",
+    HARDCODED = 'hardcoded',
+    GENERATED = 'generated',
 }
 
 export enum ParticipantType {
-    CROWDSOURCED = "CROWDSOURCED",
-    ACCOUNTHOLDER = "ACCOUNTHOLDER",
+    CROWDSOURCED = 'CROWDSOURCED',
+    ACCOUNTHOLDER = 'ACCOUNTHOLDER',
 }

src/app/pages/admin/admin-dashboard/studies/create-modify-study/create-modify-study.component.scss

@@ -93,10 +93,6 @@
     background-color: #b157a6;
 }
 
-.CustomTask {
-    background-color: #3e1e52;
-}
-
 .badge {
     padding: 5px 8px;
     border-radius: 10px;