🎨 more instructions, better X, track example fruits (WIP #1)

LabNeuroCogDevel · May 26, 2020 · 02476e6 · 02476e6
1 parent f6deef9
commit 02476e6
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/index.html b/index.html
@@ -82,7 +82,7 @@
 
 function init(){
    //fdbktl(1);
-   showInstructions('ID_wf');
+   showInstructions('OD_wf');
    //trials(fullTL);
 
 }

diff --git a/static/css/task.css b/static/css/task.css
@@ -3,12 +3,12 @@
 .box.open    {background: url('../images/box_open_sm.gif')}
 .box.closed  {background: url('../images/box_closed_sm.gif')}
 /*x over devalued*/
-.disabled::after {
-    content: url('../images/devalue.png');
+.disabled::before {
+    content: url('../images/X.png');
     position: absolute;
-    opacity: 50%;
-    margin-left: -100px;
-    margin-top: -50px;
+    opacity: 90%;
+    margin-left: -70px;
+    margin-top: -77px;
 }
 .feedback {text-align: center;} /* unnecessary */
 .feedback>.score {

diff --git a/static/images/X.png b/static/images/X.png
diff --git a/static/images/blueberry.gif b/static/images/blueberry.gif
diff --git a/static/images/olive.gif b/static/images/olive.gif
diff --git a/static/js/instructions.js b/static/js/instructions.js
diff --git a/static/js/utils.js b/static/js/utils.js
@@ -225,7 +225,7 @@ function mkBoxTrial(b, soa_block, block) {
         type: 'html-keyboard-response',
         stimulus: b.S.render(false),
         choices: accept_keys,
-        //post_trial_gap: ITI,
+        post_trial_gap: ITI,
         trial_duration: dur,
         prompt: "<p>left or right</p>",
         on_finish: function (data) {
@@ -252,7 +252,8 @@ function mkIDFbk() {
         stimulus: function (trial) {
             // setup win vs nowin feedback color and message
             var prev = jsPsych.data.get().last().values()[0];
-            return (FRTS[prev.outcome].feedback(prev.score));
+            var frt = FRTS[prev.outcome];
+            return (frt.feedback(prev.score));
         },
         //update
         //on_load: save_data(),

diff --git a/static/js/utils.ts b/static/js/utils.ts
@@ -1,5 +1,5 @@
 declare var jsPsych: any;
-declare var FRTS: {[key: string]: Fruit; }[]; // e.g. 'apple' => Fruit. see fruits()
+declare var FRTS: {[key: string]: Fruit; }; // e.g. 'apple' => Fruit. see fruits()
 declare var uniqueId: any;
 declare var psiturk: any;
 //declare var $: any;   //jquery
@@ -241,7 +241,7 @@ function mkBoxTrial(b: Box, soa_block: number, block: string): PsychEvent {
         type: 'html-keyboard-response',
         stimulus: b.S.render(false),
         choices: accept_keys,
-        //post_trial_gap: ITI,
+        post_trial_gap: ITI, // 20200526 - ITI helpful for knowning when fruit changed
         trial_duration: dur,
         prompt: "<p>left or right</p>",
         on_finish: function(data) {
@@ -268,7 +268,8 @@ function mkIDFbk(): PsychEvent {
         stimulus: function(trial) {
             // setup win vs nowin feedback color and message
             let prev = jsPsych.data.get().last().values()[0];
-            return (FRTS[prev.outcome].feedback(prev.score))
+	    let frt : Fruit = FRTS[prev.outcome]
+            return (frt.feedback(prev.score))
         },
         //update
         //on_load: save_data(),