updated test1&2

psych251 · Nov 22, 2023 · b07353f · b07353f
1 parent bd98318
commit b07353f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/docs/test1.html b/docs/test1.html
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <html>
-
 <head>
   <title>Test1</title>
   <script src="https://unpkg.com/[email protected]"></script>
   <script src="https://unpkg.com/@jspsych/[email protected]"></script>
-  <script src="https://unpkg.com/@jspsych/[email protected]"></script>
   <script src="https://unpkg.com/@jspsych/[email protected]"></script>
   <script src="https://unpkg.com/@jspsych/[email protected]"></script>
   <script src="https://unpkg.com/@jspsych/[email protected]"></script>
@@ -17,14 +15,12 @@
   <script src="https://unpkg.com/@jspsych/[email protected]"></script>
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
   <script src="https://proliferate.alps.science/static/js/proliferate.js" type="text/javascript"></script>
-
-
 </head>
 <body></body>
 <script>
 
-  /* initialize jsPsych */
-  var jsPsych = initJsPsych({
+   /* initialize jsPsych */
+   var jsPsych = initJsPsych({
     override_safe_mode: true,
     on_finish: function (data) {
            // jsPsych.data.displayData("csv");
@@ -46,11 +42,6 @@
   });
   var timeline = [];
 
-
-
-
-
-
   var fullscreen_trial = {
   type: jsPsychFullscreen,
   fullscreen_mode: true,

diff --git a/docs/test2.html b/docs/test2.html
@@ -22,22 +22,22 @@
 </head>
 <body></body>
 <script>
-
-
-
-  /* initialize jsPsych */
-  var jsPsych = initJsPsych({
+/* initialize jsPsych */
+var jsPsych = initJsPsych({
     override_safe_mode: true,
     on_finish: function (data) {
            // jsPsych.data.displayData("csv");
            proliferate.submit({"trials": data.values()});
   }});
-
+  jsPsych.data.addProperties({
+  condition: "spatial"  // add the condition property here
+});
   // capture info from Prolific
   var subject_id = jsPsych.data.getURLVariable('PROLIFIC_PID');
   var study_id = jsPsych.data.getURLVariable('STUDY_ID');
   var session_id = jsPsych.data.getURLVariable('SESSION_ID');
 
+
   jsPsych.data.addProperties({
     subject_id: subject_id,
     study_id: study_id,

diff --git a/experiment/test1.html b/experiment/test1.html
@@ -24,12 +24,13 @@
 
 
   /* initialize jsPsych */
-  var jsPsych = initJsPsych({
+    /* initialize jsPsych */
+    var jsPsych = initJsPsych({
     override_safe_mode: true,
-    on_finish: function () {
-            jsPsych.data.displayData("csv");
+    on_finish: function (data) {
+           // jsPsych.data.displayData("csv");
+           proliferate.submit({"trials": data.values()});
   }});
-
   jsPsych.data.addProperties({
   condition: "social"  // add the condition property here
 });