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/Events/RoleChanged.php

@@ -0,0 +1,47 @@
+<?php
+
+#SPECIAL EVENT FOR MEMORY TASK, ALLOWS USER TO PROCEED ONCE LEADER ANSWERS
+
+namespace Teamwork\Events;
+
+use Teamwork\User;
+use Teamwork\GroupTask;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Broadcasting\PresenceChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
+
+class RoleChanged implements ShouldBroadcastNow
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return Channel|array
+     */
+    public function broadcastOn()
+    {
+        return ['task-channel'];
+    }
+
+    public function broadcastAs()
+    {
+        return 'role-changed';
+    }
+}

app/Http/Controllers/AdminController.php

@@ -10,11 +10,9 @@
 class AdminController extends Controller
 {
     public function getAdminHome() {
-      $sessionOneTimeslots = $this->getTimeslotData(547);
-      $sessionTwoTimeslots = $this->getTimeslotData(548);
       return view('layouts.admin.admin')
-             ->with('sessionOneSlots', $sessionOneTimeslots)
-             ->with('sessionTwoSlots', $sessionTwoTimeslots);
+             ->with('sessionOneSlots', [])
+             ->with('sessionTwoSlots', []);
     }
 
     public function getCSV() {
@@ -104,7 +102,7 @@ private function getGroups() {
 
     public function getUsers() {
 
-      $users = \Teamwork\User::where('id', '>', 667) // When we went live with the lab version
+      $users = \Teamwork\User::where('id', '>', 1) // When we went live with the lab version
                             ->with('group')
                             ->get();
 
@@ -176,6 +174,24 @@ public function getIndividualCSV(Request $request) {
 
       }
 
+      //RULESETS
+        $rules = [
+    1=>[1,2],
+    2=>[3,1,2],
+    3=>[20,11,41,85,2,1],
+    4=>[1,61,5,2,36,89],
+    5=>[37,2,1,63,13,75],
+    6=>[69,9,22,38,1,2],
+    7=>[60,2,39,1,16,29],
+    8=>[2,87,64,11,48,1],
+    9=>[72,35,4,2,1,82],
+    10=>[49,65,1,2,24,6],
+    11=>[2,1,44,25,8,66],
+    12=>[58,32,1,62,7,2],
+    13=>[23,2,59,45,1,88],
+    14=>[1,11,67,2,21,47]
+  ];
+
       $responseData = [];
       foreach($userData as $data) {
         foreach($data as $user) {
@@ -195,6 +211,7 @@ public function getIndividualCSV(Request $request) {
                                       'task' => $task['name'],
                                       'introTime' => $task['introTime'],
                                       'taskTime' => $task['taskTime'],
+                                      'ruleset' => $task['ruleset'],
                                       'prompt' => $response['prompt'],
                                       'response' => $response['response'],
                                       'correct' => $response['correct'],
@@ -283,11 +300,35 @@ public function getGroupCSV(Request $request) {
 
       }
 
+      //RULESETS
+        $rules = [
+    1=>[1,2],
+    2=>[3,1,2],
+    3=>[20,11,41,85,2,1],
+    4=>[1,61,5,2,36,89],
+    5=>[37,2,1,63,13,75],
+    6=>[69,9,22,38,1,2],
+    7=>[60,2,39,1,16,29],
+    8=>[2,87,64,11,48,1],
+    9=>[72,35,4,2,1,82],
+    10=>[49,65,1,2,24,6],
+    11=>[2,1,44,25,8,66],
+    12=>[58,32,1,62,7,2],
+    13=>[23,2,59,45,1,88],
+    14=>[1,11,67,2,21,47]
+  ];
+
       $responseData = [];
       foreach($userData as $data) {
         foreach($data as $user) {
 
           foreach($user['tasks'] as $task) {
+            if(array_key_exists($task['ruleset'],$rules)){
+              $ruleset = implode(",",$rules[$task['ruleset']]);
+            }
+            else{
+              $ruleset = '';
+            }
 
             foreach($task['responses'] as $responses) {
 
@@ -298,9 +339,11 @@ public function getGroupCSV(Request $request) {
                 #Log::debug($user);
                 $responseData[] = ['user' => $user['user'],
                                 'group' => $user['group'],
+                                'role' => $response['role'],
                                 'score' => $user['score'],
                                 'task' => $task['name'],
                                 'taskTime' => $task['taskTime'],
+                                'ruleset' => $ruleset,
                                 'prompt' => $response['prompt'],
                                 'response' => $response['response'],
                                 'correct' => $response['correct'],
@@ -329,7 +372,7 @@ public function getGroupCSV(Request $request) {
       $data = $responseData;    
       $callback = function () use ($responseData) {
                 $fileHandle = fopen('php://output', 'w');
-                fputcsv($fileHandle,array('user', 'group', 'score', 'task', 'taskTime','prompt', 'response', 'correct', 'points', 'time'),"\t");
+                fputcsv($fileHandle,array('user', 'group', 'role','score', 'task', 'taskTime','rules','prompt', 'response', 'correct', 'points', 'time'),"\t");
                 foreach ($responseData as $row) {
                     fputcsv($fileHandle, $row, "\t");
                 }
@@ -449,6 +492,7 @@ private function collectResponses($users, $groupId) {
                     'score' => $user->score,
                     'surveyCode' => $user->survey_code,
                     'group'=> $groupId,
+                    'role'=>$user->group_role,
                     'tasks' => []];
 
           $groupTasks = \Teamwork\GroupTask::with('response')
@@ -498,6 +542,7 @@ private function collectResponses($users, $groupId) {
                          'parameters' => $params,
                          'taskTime' => $taskTime,
                          'introTime' => $introTime,
+                         'ruleset' => $task->task_id,
                          'responses' => []];
 
             $responses = [];

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

@@ -13,6 +13,7 @@
 use Teamwork\Events\PlayerLeftWaitingRoom;
 use \Teamwork\Tasks as Task;
 use Teamwork\Events\ActionSubmitted;
+use Teamwork\Events\RoleChanged;
 use Teamwork\Events\ClearStorage;
 use Teamwork\Events\RuleBroken;
 use Teamwork\Events\EndSubsession;
@@ -60,6 +61,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 +257,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 +273,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 +295,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
@@ -320,6 +336,7 @@ public function leaderAnswered(Request $request){
 
   //RECORD MEMORY RESULTS
   public function saveMemory(Request $request) {
+    $this_user = User::where('id',\Auth::user()->id)->first();
     $currentTask = \Teamwork\GroupTask::find($request->session()->get('currentGroupTask'));
     $parameters = unserialize($currentTask->parameters);
     $test = (new \Teamwork\Tasks\Memory)->getTest($parameters->test);
@@ -331,6 +348,7 @@ public function saveMemory(Request $request) {
       // We'll record an empty response here so that participants will be
       // able to move on to the next task once they are done with the intro
       $r = new Response;
+      $r->role = $this_user->group_role;
       $r->group_tasks_id = $currentTask->id;
       $r->user_id = \Auth::user()->id;
       $r->prompt = 'Memory Intro';
@@ -405,6 +423,7 @@ public function saveMemory(Request $request) {
       $prompt = $tests[$indices[1]]['test_name'].' type: '.$tests[$indices[1]]['task_type'].' '.$tests[$indices[1]]['blocks'][$indices[2]]['type'];
 
       $r = new Response;
+      $r->role = $this_user->group_role;
       $r->user_id = \Auth::user()->id;
       $r->group_tasks_id = $currentTask->id;
       $r->individual_tasks_id = $request->session()->get('currentIndividualTask');
@@ -676,7 +695,8 @@ public function ruleBroken(Request $request) {
     $r->user_id = $user->id;
     $r->prompt = 'Rule Broken';
 
-    $r->response = 'n/a';
+    $r->response = $rule_broken;
+    $r->role = $user->group_role;
     $r->save();
     return '200';
   }
@@ -687,6 +707,8 @@ public function cryptographyIntro(Request $request) {
     $user = User::find(\Auth::user()->id);
     $user->waiting = 0;
     $user->save();
+    $follower1 = User::where('group_id',$user->group_id)->where('group_role','follower1')->first();
+    $follower2 = User::where('group_id',$user->group_id)->where('group_role','follower2')->first();
     $currentTask = GroupTask::find($request->session()->get('currentGroupTask'));
     //$currentTask = \Teamwork\GroupTask::where('group_id',$user->group_id)->where('name','Cryptography')->orderBy('created_at','DESC')->first();
     $currentTask->started = 1;
@@ -715,6 +737,33 @@ public function cryptographyIntro(Request $request) {
     $sorted = $mapping;
     sort($sorted); // Sort and re-index
 
+    $admin = User::find(1);
+
+    if($admin->waiting != 2){
+      $task_length = env("CRYPTO_TASK_LENGTH");
+      if($admin->current_session == 1 and $admin->waiting < 4){
+        $intro_length = env("CRYPTO_INTRO_LENGTH");  
+      }
+      else{
+        $intro_length = env("CRYPTO_ALT_INTRO_LENGTH");  
+      }
+      $task_length -= $intro_length;
+    }
+    else{
+      $task_length = env("MEMORY_TASK_LENGTH");
+      if($admin->current_session == 1){
+        $intro_length = env("MEMORY_INTRO_LENGTH");  
+      }
+      else{
+        $intro_length = env("MEMORY_ALT_INTRO_LENGTH");  
+      }
+      $task_length -= $intro_length;
+    }
+
+    $buffer_length = env("BUFFER_LENGTH");
+    $survey_length = env("SURVEY_LENGTH");
+    $total_length = $task_length + $intro_length + $buffer_length + $survey_length;
+
     return view('layouts.participants.tasks.cryptography-group-intro')
            ->with('user', \Auth::user())
            ->with('maxResponses', $maxResponses)
@@ -724,11 +773,30 @@ public function cryptographyIntro(Request $request) {
            ->with('sorted', $aSorted)
            ->with('instructions',$currentTask->instructions)
            ->with('session_length',env('TASK_LENGTH',120))
-           ->with('introType', 'group_1');//$introType);
+           ->with('task_length',$task_length)
+           ->with('buffer_length',$buffer_length)
+           ->with('survey_length',$survey_length)
+           ->with('total_length',$total_length)
+           ->with('follower1',$follower1)
+           ->with('follower2',$follower2)
+           ->with('intro_length',$intro_length)
+           ->with('introType', $parameters->intro);//$introType);
+  }
+
+  public function assignRole(Request $request){
+    $user = User::find($request->user);
+    $user->group_role = $request->role;
+    $user->save();
+    event(new RoleChanged($user));
+
+
+    return '200 OK';
   }
 
   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'));
@@ -909,6 +977,7 @@ public function saveCryptographyResponse(Request $request) {
     }
 
     $r = new Response;
+    $r->role = $this_user->group_role;
     $r->group_tasks_id = $groupTaskId;
     $r->user_id = \Auth::user()->id;
     if($request->prompt == "Guess Full Mapping") {