Added text markdown to consent survey

packages/data/src/types.ts

@@ -137,4 +137,5 @@ export interface ResponseAttrsUpdate {
   exp_data?: DataCollection[];
   completed?: boolean;
   survey_consent?: boolean;
+  completed_consent_frame?:boolean;
 }

packages/surveys/src/consent.ts

@@ -1,7 +1,6 @@
-import data from "@lookit/data";
 import { TrialType } from "jspsych";
-import { Model } from "survey-jquery";
 import SurveyPlugin from "../../../../jsPsych/packages/plugin-survey/dist";
+import { consent_survey_function as survey_function } from "./utils";
 
 const info = <const>{
   ...SurveyPlugin.info,
@@ -10,19 +9,12 @@ const info = <const>{
 type Info = typeof info;
 type Trial = TrialType<Info>;
 
-function survey_function(survey: Model) {
-  survey.onComplete.add(async () => {
-    await data.updateResponse(window.chs.response.id, { survey_consent: true });
-  });
-  return survey;
-}
-
 export class ConsentSurveyPlugin extends SurveyPlugin {
   static readonly info = info;
   trial(display_element: HTMLElement, trial: Trial) {
     super.trial(display_element, {
       ...trial,
-      survey_function,
+      survey_function: survey_function(trial.survey_function),
     });
   }
 }

packages/surveys/src/exit.ts

@@ -1,7 +1,7 @@
 import { ParameterType, TrialType } from "jspsych";
 import SurveyPlugin from "../../../../jsPsych/packages/plugin-survey/dist";
 import surveyJSON from "./survey.json";
-import { exit_survey_function } from "./utils";
+import { exit_survey_function as survey_function } from "./utils";
 
 const info = <const>{
   ...SurveyPlugin.info,
@@ -105,7 +105,7 @@ export class ExitSurveyPlugin extends SurveyPlugin {
     super.trial(display_element, {
       ...trial,
       survey_json: surveyParameters(trial),
-      survey_function: exit_survey_function,
+      survey_function
     });
   }
 }

packages/surveys/src/utils.ts

@@ -1,3 +1,4 @@
+import Data from "@lookit/data";
 import DOMPurify from "dompurify";
 import { marked } from "marked";
 import { Model } from "survey-jquery";
@@ -7,7 +8,7 @@ const CONFIG = <const>{
   dompurify: { USE_PROFILES: { html: true } },
 };
 
-export function survey_function(survey: Model) {
+function text_markdown_survey_function(survey: Model) {
   survey.onTextMarkdown.add((_sender, options) => {
     // We can set the type as "string" because async is false.
     options.html = DOMPurify.sanitize(
@@ -19,7 +20,7 @@ export function survey_function(survey: Model) {
 }
 
 export function exit_survey_function(survey: Model) {
-  survey_function(survey);
+  text_markdown_survey_function(survey);
   // For the withdrawal checkbox question, this takes the boolean response value out of an array
   // and saves it as a single value (since there is always only one checkbox).
   // We went with the checkbox question type rather than boolean with "renderAs: checkbox" because the
@@ -31,3 +32,22 @@ export function exit_survey_function(survey: Model) {
   });
   return survey;
 }
+
+export function consent_survey_function(userfn?: (x: Model) => Model) {
+  return function (survey: Model) {
+    text_markdown_survey_function(survey);
+
+    survey.onComplete.add(async () => {
+      await Data.updateResponse(window.chs.response.id, {
+        survey_consent: true,
+        completed_consent_frame:true
+      });
+    });
+
+    if (typeof userfn === "function") {
+      userfn(survey);
+    }
+
+    return survey;
+  };
+}