@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | public function getTeams($id) {// |
| 12 | 12 | if (\Session::get("role") == 1) { |
| 13 | 13 | $teams = \DB::table('channels') |
| 14 | - ->select('team_channels.id', 'channels.channel_name', 'team_channels.channel_view_name', 'channels.author_id', "team_channels.created_at", 'team_channels.team_channel_id','team_heads.user_id') |
|
| 14 | + ->select('team_channels.id', 'channels.channel_name', 'team_channels.channel_view_name', 'channels.author_id', "team_channels.created_at", 'team_channels.team_channel_id', 'team_heads.user_id') |
|
| 15 | 15 | ->leftJoin('team_channels', 'channels.id', '=', 'team_channels.channel_name_id') |
| 16 | 16 | ->leftJoin('team_heads', 'team_heads.team_id', '=', 'team_channels.id') |
| 17 | 17 | ->where('team_channels.id', '!=', '') |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | else { |
| 21 | 21 | $teams = \DB::table('team_channels') |
| 22 | - ->select('team_channels.channel_view_name', 'team_channels.team_channel_id', 'team_channels.id', 'team_channels.created_at','team_heads.user_id') |
|
| 22 | + ->select('team_channels.channel_view_name', 'team_channels.team_channel_id', 'team_channels.id', 'team_channels.created_at', 'team_heads.user_id') |
|
| 23 | 23 | ->leftJoin('team_channel_users', 'team_channel_users.team_channel_name_id', '=', 'team_channels.id') |
| 24 | 24 | ->leftJoin('team_heads', 'team_heads.team_id', '=', 'team_channels.id') |
| 25 | 25 | ->where('team_channel_users.user_id', '=', \Auth::user()->id)->distinct()->get(); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | ->leftJoin('team_channel_users', 'team_channel_users.user_id', '=', 'users.id') |
| 41 | 41 | ->where('team_channel_users.team_channel_name_id', '=', $teamId)->get(); |
| 42 | 42 | foreach ($teamMembers as $memeber) { |
| 43 | - $teamArr[] = $memeber["first_name"] . "_" . $memeber["last_name"] . "_" . $memeber["id"]; |
|
| 43 | + $teamArr[] = $memeber["first_name"]."_".$memeber["last_name"]."_".$memeber["id"]; |
|
| 44 | 44 | } |
| 45 | 45 | return $teamArr; |
| 46 | 46 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | public function getTeamName($id) { |
| 56 | 56 | $team = \DB::table('team_channels') |
| 57 | - ->select('team_channels.channel_view_name',\DB::raw('CONCAT(users.first_name, " ", users.last_name) AS full_name')) |
|
| 57 | + ->select('team_channels.channel_view_name', \DB::raw('CONCAT(users.first_name, " ", users.last_name) AS full_name')) |
|
| 58 | 58 | ->leftJoin('team_heads', 'team_heads.team_id', '=', 'team_channels.id') |
| 59 | 59 | ->leftJoin('users', 'users.id', '=', 'team_heads.user_id') |
| 60 | 60 | ->where('team_channels.id', '=', $id)->first(); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | public function updateTeamName($id) { |
| 65 | 65 | $name = \Input::get('name'); |
| 66 | - if(empty($name)) |
|
| 66 | + if (empty($name)) |
|
| 67 | 67 | return "empty"; |
| 68 | 68 | try { |
| 69 | 69 | //validate for duplicates |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | return "true"; |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - public function updateNewMemberJoinNotification($team_id,$user_id){ |
|
| 104 | + public function updateNewMemberJoinNotification($team_id, $user_id) { |
|
| 105 | 105 | |
| 106 | 106 | /** |
| 107 | 107 | * |
@@ -112,10 +112,10 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | $teamArr = array(); |
| 114 | 114 | |
| 115 | - $details= $this->getUserDetails($user_id); |
|
| 115 | + $details = $this->getUserDetails($user_id); |
|
| 116 | 116 | |
| 117 | - $teamMembers =\DB::table('users') |
|
| 118 | - ->select('users.first_name','users.last_name', 'users.id','team_channels.channel_view_name','team_channels.team_channel_id','team_channels.id as team_id_decoded') |
|
| 117 | + $teamMembers = \DB::table('users') |
|
| 118 | + ->select('users.first_name', 'users.last_name', 'users.id', 'team_channels.channel_view_name', 'team_channels.team_channel_id', 'team_channels.id as team_id_decoded') |
|
| 119 | 119 | ->leftJoin('team_channel_users', 'team_channel_users.user_id', '=', 'users.id') |
| 120 | 120 | ->leftJoin('team_channels', 'team_channel_users.team_channel_name_id', '=', 'team_channels.id') |
| 121 | 121 | ->where('team_channel_users.team_channel_name_id', '=', $team_id)->get(); |
@@ -123,16 +123,16 @@ discard block |
||
| 123 | 123 | foreach ($teamMembers as $memeber) { |
| 124 | 124 | //insert notification |
| 125 | 125 | $lastId = \DB::table('invitation_notification')->insertGetId( |
| 126 | - ['team_id' => $team_id, "team_user" => $memeber["id"],'new_user'=>$user_id] |
|
| 126 | + ['team_id' => $team_id, "team_user" => $memeber["id"], 'new_user'=>$user_id] |
|
| 127 | 127 | ); |
| 128 | 128 | //Publish data to redis |
| 129 | - $channelId = $memeber["id"] . "_" . $memeber["team_channel_id"]; |
|
| 129 | + $channelId = $memeber["id"]."_".$memeber["team_channel_id"]; |
|
| 130 | 130 | |
| 131 | 131 | $teamChannelId = $memeber["team_channel_id"]; |
| 132 | 132 | |
| 133 | 133 | $data = array( |
| 134 | - 'room' =>$memeber["id"] . "_" . $memeber["team_channel_id"], |
|
| 135 | - 'message' => array('new_user_id'=>$user_id,'new_user_channel_id' => $user_id."_".$teamChannelId,'user_id' =>$memeber["id"] ,'name'=>$details['first_name']." ".$details['last_name'],'team_name'=>$memeber['channel_view_name'],'team_id'=>$memeber['team_id_decoded']) |
|
| 134 | + 'room' =>$memeber["id"]."_".$memeber["team_channel_id"], |
|
| 135 | + 'message' => array('new_user_id'=>$user_id, 'new_user_channel_id' => $user_id."_".$teamChannelId, 'user_id' =>$memeber["id"], 'name'=>$details['first_name']." ".$details['last_name'], 'team_name'=>$memeber['channel_view_name'], 'team_id'=>$memeber['team_id_decoded']) |
|
| 136 | 136 | ); |
| 137 | 137 | // print_r($data); |
| 138 | 138 | \Event::fire(\JoinNotificationEventHandler::EVENT, array(json_encode($data))); |
@@ -142,9 +142,9 @@ discard block |
||
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | |
| 145 | - public function getUserDetails($user_id){ |
|
| 146 | - $details =\DB::table('users') |
|
| 147 | - ->select('users.first_name','users.last_name') |
|
| 145 | + public function getUserDetails($user_id) { |
|
| 146 | + $details = \DB::table('users') |
|
| 147 | + ->select('users.first_name', 'users.last_name') |
|
| 148 | 148 | ->where('id', '=', $user_id) |
| 149 | 149 | ->first(); |
| 150 | 150 | return $details; |
@@ -207,19 +207,19 @@ |
||
| 207 | 207 | * Task routes |
| 208 | 208 | * |
| 209 | 209 | */ |
| 210 | -Route::group(array('prefix' => 'task','before' => 'auth'), function() |
|
| 210 | +Route::group(array('prefix' => 'task', 'before' => 'auth'), function() |
|
| 211 | 211 | { |
| 212 | 212 | Route::post('/get_project_teams', 'TaskController@get_project_teams'); |
| 213 | 213 | Route::post('/get_members', 'TaskController@get_members'); |
| 214 | - Route::post('/create_project', array('before' => 'security_check:create_project,write', 'as'=>'createProject','uses' => 'TaskController@create_project')); |
|
| 215 | - Route::post('/create_task', array('before' => 'security_check:create_task,write', 'as'=>'createTask','uses' => 'TaskController@create_task')); |
|
| 214 | + Route::post('/create_project', array('before' => 'security_check:create_project,write', 'as'=>'createProject', 'uses' => 'TaskController@create_project')); |
|
| 215 | + Route::post('/create_task', array('before' => 'security_check:create_task,write', 'as'=>'createTask', 'uses' => 'TaskController@create_task')); |
|
| 216 | 216 | Route::post('/dashboard', 'TaskController@dashboard'); |
| 217 | 217 | Route::post('/validate_create_task', array('before' => 'security_check:create_task,write')); |
| 218 | - Route::post('/rollback_saved_task', array('as'=>'rollbackTask','uses' => 'TaskController@rollback_task')); |
|
| 219 | -Route::post('/filter_grid', array( 'as'=>'filterGrid','uses' => 'TaskController@filter_grid')); |
|
| 220 | - Route::post('/filter_all_dashboard_data', array( 'as'=>'filterAllDashboard','uses' => 'TaskController@filter_dashboard')); |
|
| 221 | -Route::post('/view_assignment', array( 'as'=>'viewAssignment','uses' => 'TaskController@view_assignment')); |
|
| 222 | -Route::get('/updates/{task_id}', array( 'as'=>'recentUpdates','uses' => 'TaskController@recent_updates')); |
|
| 218 | + Route::post('/rollback_saved_task', array('as'=>'rollbackTask', 'uses' => 'TaskController@rollback_task')); |
|
| 219 | +Route::post('/filter_grid', array('as'=>'filterGrid', 'uses' => 'TaskController@filter_grid')); |
|
| 220 | + Route::post('/filter_all_dashboard_data', array('as'=>'filterAllDashboard', 'uses' => 'TaskController@filter_dashboard')); |
|
| 221 | +Route::post('/view_assignment', array('as'=>'viewAssignment', 'uses' => 'TaskController@view_assignment')); |
|
| 222 | +Route::get('/updates/{task_id}', array('as'=>'recentUpdates', 'uses' => 'TaskController@recent_updates')); |
|
| 223 | 223 | }); |
| 224 | 224 | |
| 225 | 225 | Route::post('/delete_team', array( |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $date = new DateTime($timesTamp); |
| 31 | 31 | $date->setTimezone($tz); |
| 32 | - $dateTime=$date->format('F jS, Y h:i:s A'); |
|
| 32 | + $dateTime = $date->format('F jS, Y h:i:s A'); |
|
| 33 | 33 | return $dateTime; |
| 34 | 34 | |
| 35 | 35 | |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | * @return string unique id |
| 44 | 44 | */ |
| 45 | 45 | |
| 46 | -function generateId(){ |
|
| 46 | +function generateId() { |
|
| 47 | 47 | $date = date_create(); |
| 48 | - $id=md5(date_timestamp_get($date)); |
|
| 48 | + $id = md5(date_timestamp_get($date)); |
|
| 49 | 49 | return $id; |
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | \ No newline at end of file |
@@ -96,8 +96,8 @@ |
||
| 96 | 96 | |
| 97 | 97 | case "create_task":$check = SecurityHelper::authorizeWrite("create_task"); |
| 98 | 98 | if ($check == "notAllowed") |
| 99 | - return json_encode (array('success' => false)); |
|
| 100 | - if(\Request::segment(2)=='validate_create_task' && $check=="allowed") |
|
| 99 | + return json_encode(array('success' => false)); |
|
| 100 | + if (\Request::segment(2) == 'validate_create_task' && $check == "allowed") |
|
| 101 | 101 | return Response::json(array( |
| 102 | 102 | 'success' => true, |
| 103 | 103 | 200 |