Memory integration

app/Events/LeaderAnswered.php

@@ -37,7 +37,7 @@ public function __construct(User $user)
      */
     public function broadcastOn()
     {
-        return ['memory-channel'];
+        return ['task-channel'];
     }
 
     public function broadcastAs()

app/GroupTask.php

@@ -96,6 +96,7 @@ public static function initializeCombinedPilotTasks($group_id, $randomize) {
     $taskArray = '[
       {"taskName":"Consent","taskParams":{"url_endpoint":"end-individual-task","hasIndividuals":"true","hasGroup":"false","subjectPool":"july_pilot"}},
       {"taskName":"Intro","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"chat_notification"}},
+      {"taskName":"Intro","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"incognito"}},
       {"taskName":"Intro","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"adblock"}},
       {"taskName":"DeviceCheck","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"eligibility"}},
       {"taskName":"Cryptography","taskParams":{"intro":"combined_pilot","hasIndividuals":"true","hasGroup":"false","mapping":"random","maxResponses":"10"}},
@@ -110,6 +111,39 @@ public static function initializeCombinedPilotTasks($group_id, $randomize) {
     return Self::initializeTasks($group_id, $taskArray, $randomize);
   }
 
+  #TASK LIST FOR PHASE 1+2 MEMORY PILOT
+  public static function initializeCombinedMemoryTasks($group_id, $randomize) {
+    $taskArray = '[
+      {"taskName":"Consent","taskParams":{"url_endpoint":"end-individual-task","hasIndividuals":"true","hasGroup":"false","subjectPool":"memory_pilot"}},
+      {"taskName":"Intro","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"chat_notification"}},
+      {"taskName":"Intro","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"adblock"}},
+      {"taskName":"Intro","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"no_notes"}},
+      {"taskName":"DeviceCheck","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"eligibility"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"intro"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"words_instructions"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"words_1"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"images_instructions"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"faces_1"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"story_instructions"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"story_1"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"true","hasGroup":"false","test":"results"}},
+      {"taskName":"WaitingRoom","taskParams":{"hasIndividuals":"true","hasGroup":"false","task":"2"}}
+      ]';
+
+
+    return Self::initializeTasks($group_id, $taskArray, $randomize);
+  }
+
+  #TASK LIST FOR MEMORY WAITING ROOM SHORTCUT
+  public static function initializeMemoryWaitingRoomTasks($group_id, $randomize) {
+    $taskArray = '[
+      {"taskName":"WaitingRoom","taskParams":{"hasIndividuals":"true","hasGroup":"false","task":"2"}}
+      ]';
+
+
+    return Self::initializeTasks($group_id, $taskArray, $randomize);
+  }
+
   #TASK LIST FOR PHASE 2 PILOT
   public static function initializePhaseTwoTasks($group_id, $randomize) {
     $taskArray = '[
@@ -139,9 +173,9 @@ public static function initializeTestTasks($group_id, $randomize) {
     return Self::initializeTasks($group_id, $taskArray, $randomize);
   }
 
-  public static function initializeConclusionTasks($group_id, $randomize) {
+  public static function initializeConclusionTasks($group_id, $randomize,$qualtrics_type) {
     $taskArray = '[
-      {"taskName":"Conclusion","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"mturk","hasCode":"false","displayScoreGroup":"false", "digitalReceipt":"false", "sonaId": "547", "payment": "30", "feedback":"true", "feedbackLinkType":"qualtrics"}}
+      {"taskName":"Conclusion","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"mturk","hasCode":"false","displayScoreGroup":"false", "digitalReceipt":"false", "sonaId": "547", "payment": "30", "feedback":"true", "feedbackLinkType":"'.$qualtrics_type.'"}}
       ]';
 
     return Self::initializeTasks($group_id, $taskArray, $randomize);
@@ -153,22 +187,51 @@ public static function initializeCryptoTasks($group_id, $randomize,$final) {
       $taskArray = '[
       {"taskName":"Cryptography","taskParams":{"hasIndividuals":"false","intro":"group_1","hasGroup":"true","mapping":"random","maxResponses":"10","type":"intro"}},
       {"taskName":"Cryptography","taskParams":{"hasIndividuals":"false","intro":"group_1","hasGroup":"true","mapping":"random","maxResponses":"10","type":"task"}},
-      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered"}},
+      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered","task_name":"Cryptography"}},
       {"taskName":"Conclusion","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"mturk","hasCode":"false","displayScoreGroup":"false", "digitalReceipt":"false", "sonaId": "547", "payment": "30", "feedback":"true", "feedbackLinkType":"qualtrics"}}
       ]';
     }
     else{
       $taskArray = '[
       {"taskName":"Cryptography","taskParams":{"hasIndividuals":"false","intro":"group_1","hasGroup":"true","mapping":"random","maxResponses":"10","type":"intro"}},
       {"taskName":"Cryptography","taskParams":{"hasIndividuals":"false","intro":"group_1","hasGroup":"true","mapping":"random","maxResponses":"10","type":"task"}},
-      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered"}},
+      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered","task_name":"Cryptography"}},
       {"taskName":"WaitingRoom","taskParams":{"hasIndividuals":"false","hasGroup":"true","task":"1"}}
       ]';
     }
 
     return Self::initializeTasks($group_id, $taskArray, $randomize);
   }
 
+  public static function initializeMemoryTasks($group_id, $randomize,$final,$test) {
+    if($final){
+      $taskArray = '[
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_'.$test.'_instructions","type":"intro"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_'.$test.'","type":"task"}},
+      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered","task_name":"Memory"}},
+      {"taskName":"Conclusion","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"mturk","hasCode":"false","displayScoreGroup":"false", "digitalReceipt":"false", "sonaId": "547", "payment": "30", "feedback":"true", "feedbackLinkType":"memory"}}
+      ]';
+    }
+    elseif($test == 1){
+      $taskArray = '[
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_'.$test.'_instructions","type":"intro"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_'.$test.'","type":"task"}},
+      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered","task_name":"Memory"}},
+      {"taskName":"WaitingRoom","taskParams":{"hasIndividuals":"false","hasGroup":"true","task":"2"}}
+      ]';
+    }
+    else{
+      $taskArray = '[
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_'.$test.'_instructions","type":"intro"}},
+      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_'.$test.'","type":"task"}},
+      {"taskName":"GroupSurvey","taskParams":{"hasIndividuals":"false","hasGroup":"true","type":"1","statementOrder":"ordered","task_name":"Memory"}},
+      {"taskName":"WaitingRoom","taskParams":{"hasIndividuals":"false","hasGroup":"true","task":"2"}}
+      ]';
+    }
+
+    return Self::initializeTasks($group_id, $taskArray, $randomize);
+  }
+
   #TASK LIST FOR CRYPTO MTURK TEST
   public static function initializeCryptoMturkTasks($group_id, $randomize) {
     $taskArray = '[
@@ -306,25 +369,9 @@ public static function initializeWaitingRoomTasks($group_id, $randomize) {
     return Self::initializeTasks($group_id, $taskArray, $randomize);
   }
 
-
-
-  public static function initializeMemoryWaitingRoomTasks($group_id, $randomize) {
-    $taskArray = '[
-      {"taskName":"WaitingRoom","taskParams":{"hasIndividuals":"false","hasGroup":"true","task":"2"}}
-      ]';
-    return Self::initializeTasks($group_id, $taskArray, $randomize);
-  }
-
 
 
-  public static function initializeMemoryTasks($group_id, $randomize) {
-    $taskArray = '[
-      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_1_instructions"}},
-      {"taskName":"Memory","taskParams":{"hasIndividuals":"false","hasGroup":"true","test":"group_1"}},
-      {"taskName":"Conclusion","taskParams":{"hasIndividuals":"true","hasGroup":"false","type":"group_1","hasCode":"false","displayScoreGroup":"false", "digitalReceipt":"false", "sonaId": "547", "payment": "30", "feedback":"false", "feedbackLinkType":"group1Pilot"}}
-      ]';
-    return Self::initializeTasks($group_id, $taskArray, $randomize);
-  }
+
 
 
 

app/Http/Controllers/AjaxController.php

@@ -95,7 +95,7 @@ public function markIndividualReadyForGroup(Request $request) {
     $step = (int) $request->step;
     $teammates = \Teamwork\User::where('group_id', $request->group_id)
                                 ->get();
-    foreach($teammates as $key => $teammate){
+    /*foreach($teammates as $key => $teammate){
       for($i = 1; $i < $step; $i++){
         $has_turn_for_step = \DB::table('waiting')
                                 ->where('user_id', $teammate->id)
@@ -112,7 +112,7 @@ public function markIndividualReadyForGroup(Request $request) {
                                      'updated_at' => date("Y-m-d H:i:s")]);
         }
       }
-    }
+    }*/
     if(!$exists){
       \DB::table('waiting')->insert(['user_id' => $request->user_id,
                                      'group_id' => $request->group_id,
@@ -121,6 +121,7 @@ public function markIndividualReadyForGroup(Request $request) {
                                      'created_at' => date("Y-m-d H:i:s"),
                                      'updated_at' => date("Y-m-d H:i:s")]);
     }
+    return '200';
    }
 
    public function checkGroupReady(Request $request) {

app/Http/Controllers/GroupTaskController.php

@@ -60,6 +60,14 @@ public function getTask(Request $request) {
     $currentTask = $groupTasks->first();
     $request->session()->put('currentGroupTask', $currentTask->id);
 
+    $parameters = unserialize($currentTask->parameters);
+
+    if(($currentTask->name == 'Cryptography' || $currentTask->name == "Memory") ){
+      if($parameters->hasGroup != 'true')
+        return redirect('/get-individual-task');
+    }
+
+
 
     //send along to task router
     return $this->routeTask($currentTask);
@@ -248,6 +256,9 @@ public function memoryGroupIntro(Request $request) {
 
     $user_id = \Auth::user()->id;
     $this_user = User::where('id',$user_id)->first();
+    $this_user->status = 'Active';
+    $this_user->save();
+    event(new StatusChanged($this_user));
 
     return view('layouts.participants.tasks.memory-group-intro')
            ->with('introType', $intro['test_name'])
@@ -261,6 +272,7 @@ public function memory(Request $request) {
     $currentTask->started = 1;
     $currentTask->save();
 
+
     $parameters = unserialize($currentTask->parameters);
     $memory = new \Teamwork\Tasks\Memory;
     $test = $memory->getTest($parameters->test);
@@ -282,15 +294,18 @@ public function memory(Request $request) {
     $group_users = \Teamwork\User::where('group_id',\Auth::user()->group_id)->get();
     foreach($group_users as $key => $group_user){
       $scores = $this->getIndividualMemoryTaskResults($group_user);
-      $group_users_array[$group_user->participant_id] = $scores;
+      $group_users_array[$group_user->group_role] = $scores;
     }
 
     // Determine is this user is the reporter for the group
     $isReporter = $this->isReporter(\Auth::user()->id, \Auth::user()->group_id);
 
     $user_id = \Auth::user()->id;
     $this_user = User::where('id',$user_id)->first();
-
+    $this_user->status = 'Active';
+    $this_user->in_room = 0;
+    $this_user->save();
+    event(new StatusChanged($this_user));
     // GABE:
     // Originally, there was an array of multiple tests. We've separated the
     // different memory tasks into individual tasks but to avoid rewriting a
@@ -729,6 +744,8 @@ public function cryptographyIntro(Request $request) {
 
   public function cryptography(Request $request) {
     $user = User::find(\Auth::user()->id);
+    $user->in_room = 0;
+    $user->save();
     $isReporter = $this->isReporter(\Auth::user()->id, \Auth::user()->group_id);
 
     $currentTask = GroupTask::with('Response')->find($request->session()->get('currentGroupTask'));

app/Http/Controllers/IndividualTaskController.php

@@ -187,6 +187,8 @@ public function groupSurvey(Request $request){
     $admin = User::find(1);
 
     $currentTask = \Teamwork\GroupTask::find($request->session()->get('currentGroupTask'));  
+    $currentTask->started = 1;
+    $currentTask->save();
 
     $groupSurveyTask =  \Teamwork\GroupTask::where('name','GroupSurvey')
                                            ->where('group_id',$this_user->group_id)
@@ -196,6 +198,7 @@ public function groupSurvey(Request $request){
 
 
     $parameters = unserialize($currentTask->parameters);
+    $task_name = $parameters->task_name;
 
     $this_progress = Progress::where('user_id',$this_user->id)
                               ->where('group_id',$this_user->group_id)
@@ -214,15 +217,35 @@ public function groupSurvey(Request $request){
 
           $time_elapsed = $session_start->created_at->diffInSeconds(\Carbon\Carbon::now());
 
-          $task_length = env('TASK_LENGTH',300);
+          if($admin->waiting == 1)
+            $task_length = env('CRYPTO_TASK_LENGTH',300);
+          else
+            $task_length = env('MEMORY_TASK_LENGTH',300);
 
           $survey_length = env('SURVEY_LENGTH',120);
 
           $buffer_length = env('BUFFER_LENGTH',30);
 
-          $session_length = $task_length + $survey_length + $buffer_length;
+          $intro_length = env('MEMORY_INTRO_LENGTH',300);
+
+          $alt_intro_length = env('MEMORY_ALT_INTRO_LENGTH',30);
+
+          if($admin->waiting == 2){
+            $alt_task_length = $task_length - $intro_length + $alt_intro_length;
+
+            $session_length = $task_length + $survey_length + $buffer_length;
+
+            $alt_session_length = $alt_task_length + $survey_length + $buffer_length;
+
+
+            $time_remaining = $alt_session_length * ($admin->current_session - 1) + $session_length - $time_elapsed - $buffer_length;
+          }
+          else{
+            $session_length = $task_length + $survey_length + $buffer_length;
+
+            $time_remaining = $session_length * ($admin->current_session) - $time_elapsed - $buffer_length;
+          }
 
-          $time_remaining = $session_length * $admin->current_session - $time_elapsed - $buffer_length;
 
         }
         else
@@ -232,6 +255,7 @@ public function groupSurvey(Request $request){
           ->with('surveyType',$parameters->type)
           ->with('time_remaining',$time_remaining)
           ->with('questions',$statements[$this_user->group_role == 'leader' ? 'leader' : 'member'])
+          ->with('task_name',$task_name)
           ->with('user',$this_user);
     }
 
@@ -253,15 +277,34 @@ public function groupSurvey(Request $request){
 
         $time_elapsed = $session_start->created_at->diffInSeconds(\Carbon\Carbon::now());
 
-        $task_length = env('TASK_LENGTH',300);
+        if($admin->waiting == 1)
+          $task_length = env('CRYPTO_TASK_LENGTH',300);
+        else
+          $task_length = env('MEMORY_TASK_LENGTH',300);
 
         $survey_length = env('SURVEY_LENGTH',120);
 
         $buffer_length = env('BUFFER_LENGTH',30);
 
-        $session_length = $task_length + $survey_length + $buffer_length;
+        $intro_length = env('MEMORY_INTRO_LENGTH',300);
 
-        $time_remaining = $session_length * $admin->current_session - $time_elapsed - $buffer_length;
+        $alt_intro_length = env('MEMORY_ALT_INTRO_LENGTH',30);
+
+        if($admin->waiting == 2){
+          $alt_task_length = $task_length - $intro_length + $alt_intro_length;
+
+          $session_length = $task_length + $survey_length + $buffer_length;
+
+          $alt_session_length = $alt_task_length + $survey_length + $buffer_length;
+
+
+          $time_remaining = $alt_session_length * ($admin->current_session - 1) + $session_length - $time_elapsed - $buffer_length;
+        }
+        else{
+          $session_length = $task_length + $survey_length + $buffer_length;
+
+          $time_remaining = $session_length * ($admin->current_session) - $time_elapsed - $buffer_length;
+        }
 
       }
       else
@@ -271,6 +314,7 @@ public function groupSurvey(Request $request){
       ->with('surveyType',$parameters->type)
       ->with('time_remaining',$time_remaining)
       ->with('questions',$statements[$this_user->group_role == 'leader' ? 'leader' : 'member'])
+      ->with('task_name',$task_name)
       ->with('user',$this_user);
   }