Skip to content

Commit 2cb410c

Browse files
Gerenciar Times que Participo, mas não sou Admin
1 parent d5aba16 commit 2cb410c

File tree

8 files changed

+78
-7
lines changed

8 files changed

+78
-7
lines changed

application/config/routes.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
$route['time/tarefa/concluir/(:num)/(:num)'] = 'teamTask/complete/$1/$2';
8383
$route['time/tarefa/reabrir/(:num)/(:num)'] = 'teamTask/reopen/$1/$2';
8484

85-
8685
$route['etiqueta/inserir'] = 'tag/insert';
8786
$route['etiqueta/editar/(:num)'] = 'tag/edit/$1';
8887
$route['etiqueta/excluir/(:num)'] = 'tag/delete/$1';

application/controllers/Team.php

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,29 @@ class Team extends CI_Controller{
55
public function index(){
66
$user = authorize(1);
77

8-
$this->load->model('TeamModel');
8+
$this->load->model(array('TeamModel', 'TeamMemberModel'));
99

1010
$page = [
1111
'page_title' => "Meus Times",
1212
'page_content' => 'team/list',
1313
'user' => $user,
1414
'teams' => $this->TeamModel->searchTeamsThatIManagement($user->id_user),
15+
'other_teams' => $this->TeamMemberModel->searchTeamsIParticipateIn($user->id_user),
16+
];
17+
18+
$this->load->view('public/base', $page);
19+
}
20+
21+
public function other(){
22+
$user = authorize(1);
23+
24+
$this->load->model('TeamMemberModel');
25+
26+
$page = [
27+
'page_title' => 'Times que Participo',
28+
'page_content' => 'team/list_other',
29+
'user' => $user,
30+
'teams' => $this->TeamMemberModel->searchTeamsIParticipateIn($user->id_user),
1531
];
1632

1733
$this->load->view('public/base', $page);
@@ -127,8 +143,14 @@ public static function iManageThisTeam($id, $user_id){
127143
$my_team = $ci->TeamModel->iManageThisTeam($id, $user_id);
128144

129145
if(!$my_team){
130-
$ci->session->set_flashdata('error', 'Escolha um time válido');
131-
redirect('/');
146+
147+
$ci->load->model('TeamMemberModel');
148+
$my_team = $ci->TeamMemberModel->searchMemberInTeam($id, $user_id);
149+
150+
if(!$my_team){
151+
$ci->session->set_flashdata('error', 'Escolha um time válido');
152+
redirect('/');
153+
}
132154
}
133155

134156
return $my_team;

application/controllers/TeamMember.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public function view($team_id){
1313
$availableMembers = $this->TeamMemberModel->searchAvailableMembersForThisTeam($team_id, $user->id_user);
1414

1515
$members = $this->TeamMemberModel->searchAllMembersOfTeam($team_id);
16+
$teamAdmin = $this->TeamModel->searchAdminTheOfTeam($team_id);
1617

1718
$tags = $this->TeamTagModel->searchAllByTeam($team_id);
1819

@@ -24,6 +25,7 @@ public function view($team_id){
2425
'page_content' => 'team/view',
2526
'user' => $user,
2627
'team' => $team,
28+
'admin' => $teamAdmin,
2729
'tags' => $tags,
2830
'tasksToDo' => $tasksToDo,
2931
'tasksDone' => $tasksDone,

application/controllers/TeamTask.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function insert($team_id){
1313

1414
$newTask = new stdClass();
1515
$newTask->team_id = $team_id;
16-
$newTask->teamtask_id = $this->input->post('tag', true);
16+
$newTask->teamtag_id = $this->input->post('tag', true);
1717
$newTask->created_by = $user->id_user;
1818
$newTask->title = $this->input->post('title', true);
1919
$newTask->priority = $this->input->post('priority', true);

application/models/TeamMemberModel.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,26 @@ public function searchAvailableMembersForThisTeam($team_id, $id_user){
4747
$this->db->from($this->table);
4848

4949

50+
return $this->db->get()->result();
51+
}
52+
53+
public function searchMemberInTeam($id, $member_id){
54+
$this->db->select('tb_team.*, tb_teammember.*');
55+
$this->db->where('member_id', $member_id);
56+
$this->db->where('id_team', $id);
57+
$this->db->limit(1);
58+
$this->db->join('tb_team', 'team_id = id_team');
59+
$this->db->from($this->table);
60+
61+
return $this->db->get()->row();
62+
}
63+
64+
public function searchTeamsIParticipateIn($member_id){
65+
$this->db->select('tb_team.*, tb_teammember.*');
66+
$this->db->where('member_id', $member_id);
67+
$this->db->join('tb_team', 'team_id = id_team');
68+
$this->db->from($this->table);
69+
5070
return $this->db->get()->result();
5171
}
5272
}

application/models/TeamModel.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ public function iManageThisTeam($id, $admin_id){
2626
return $this->db->get()->row();
2727
}
2828

29+
public function searchAdminTheOfTeam($team_id){
30+
$this->db->select('tb_team.*, tb_user.name, tb_user.photo, tb_user.id_user');
31+
$this->db->where('id_team', $team_id);
32+
$this->db->limit(1);
33+
$this->db->join('tb_user', 'admin_id = id_user');
34+
$this->db->from($this->table);
35+
36+
return $this->db->get()->row();
37+
}
38+
2939
public function searchById($id){
3040
$this->db->where('id_team', $id);
3141
$this->db->limit(1);

application/views/team/list.php

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
});
88

99
$('[data-target="#deleteTeam"]').on("click", function(){
10-
$('#confirmDeleteTeam').attr('href','time/excluir/'+$(this).val());
10+
$('#confirmDeleteTeam').attr('href','<?php echo base_url("time/excluir/");?>'+$(this).val());
1111
});
1212

1313
});
@@ -39,7 +39,20 @@
3939
echo '<td>',$each_team->description,'</td>';
4040
echo '<td>',$each_team->created_in,'</td>';
4141
echo '<td>';
42-
echo '<a href="',base_url('time/'.$each_team->id_team),'" data-placement="top" title="Gerenciar Membros" class="btn btn-info btn-sm"><span class="fa fa-group"></span></a> ';
42+
echo '<a href="',base_url('time/'.$each_team->id_team),'" data-placement="top" title="Gerenciar Time" class="btn btn-info btn-sm"><span class="fa fa-cogs"></span></a> ';
43+
echo '<a href="',base_url('time/editar/'.$each_team->id_team),'" data-placement="top" title="Editar" class="btn btn-warning btn-sm"><span class="fa fa-edit"></span></a> ';
44+
echo '<button data-target="#deleteTeam" value="',$each_team->id_team,'" data-toggle="modal" data-placement="top" title="Excluir" class="btn btn-danger btn-sm"><span class="fa fa-trash"></span></button>';
45+
echo '</td>';
46+
echo '</tr>';
47+
}
48+
foreach($other_teams as $each_team){
49+
echo '<tr>';
50+
echo '<td>',$each_team->name,'</td>';
51+
echo '<td><img src="',base_url('assets/img/teams/'.$each_team->logo),'" class="img-circle" width="25px"></td>';
52+
echo '<td>',$each_team->description,'</td>';
53+
echo '<td>',$each_team->created_in,'</td>';
54+
echo '<td>';
55+
echo '<a href="',base_url('time/'.$each_team->id_team),'" data-placement="top" title="Gerenciar Times" class="btn btn-info btn-sm"><span class="fa fa-cogs"></span></a> ';
4356
echo '<a href="',base_url('time/editar/'.$each_team->id_team),'" data-placement="top" title="Editar" class="btn btn-warning btn-sm"><span class="fa fa-edit"></span></a> ';
4457
echo '<button data-target="#deleteTeam" value="',$each_team->id_team,'" data-toggle="modal" data-placement="top" title="Excluir" class="btn btn-danger btn-sm"><span class="fa fa-trash"></span></button>';
4558
echo '</td>';

application/views/team/view.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ function formatState (state) {
145145
</thead>
146146
<tbody>
147147
<?php
148+
echo '<tr>';
149+
echo '<td><img width="30px" src="',base_url('assets/img/users/'.$admin->photo),'" class="img-circle">&nbsp;&nbsp;', $member->name,' <span class="badge">Admin</span></td>';
150+
echo '<td>',$admin->created_in,'</td>';
151+
echo '<td></td>';
152+
echo '</tr>';
148153
foreach($members as $member){
149154
echo '<tr>';
150155
echo '<td><img width="30px" src="',base_url('assets/img/users/'.$member->photo),'" class="img-circle">&nbsp;&nbsp;', $member->name,'</td>';

0 commit comments

Comments
 (0)