Membres :
- {isCoach && } + {isCoach && ( + + )}
- 
+
)
-}
+}
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 4a4f0d4..113e79d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,6 +1,5 @@
map("GET", "/team/search", Action::auth(fn(SessionHandle $s) => getTeamController()->displayListTeamByName($s)));
$ar->map("POST", "/team/search", Action::auth(fn(SessionHandle $s) => getTeamController()->listTeamByName($_POST, $s)));
$ar->map("GET", "/team/[i:id]", Action::auth(fn(int $id, SessionHandle $s) => getTeamController()->displayTeam($id, $s)));
- $ar->map("GET", "/team/[i:id]/delete", Action::auth(fn(int $id,SessionHandle $s) => getTeamController()->deleteTeamById($id,$s)));
- $ar->map("GET", "/team/[i:id]/addMember", Action::auth(fn(int $id,SessionHandle $s) => getTeamController()->displayAddMember($id,$s)));
- $ar->map("POST", "/team/[i:id]/addMember", Action::auth(fn(int $id,SessionHandle $s) => getTeamController()->addMember($id,$_POST, $s)));
- $ar->map("GET", "/team/[i:idTeam]/remove/[i:idMember]", Action::auth(fn(int $idTeam,int $idMember,SessionHandle $s) => getTeamController()->deleteMember($idTeam,$idMember, $s)));
+ $ar->map("GET", "/team/[i:id]/delete", Action::auth(fn(int $id, SessionHandle $s) => getTeamController()->deleteTeamById($id, $s)));
+ $ar->map("GET", "/team/[i:id]/addMember", Action::auth(fn(int $id, SessionHandle $s) => getTeamController()->displayAddMember($id, $s)));
+ $ar->map("POST", "/team/[i:id]/addMember", Action::auth(fn(int $id, SessionHandle $s) => getTeamController()->addMember($id, $_POST, $s)));
+ $ar->map("GET", "/team/[i:idTeam]/remove/[i:idMember]", Action::auth(fn(int $idTeam, int $idMember, SessionHandle $s) => getTeamController()->deleteMember($idTeam, $idMember, $s)));
+ $ar->map("GET", "/team/[i:id]/edit", Action::auth(fn(int $idTeam,SessionHandle $s) => getTeamController()->displayEditTeam($idTeam,$s)));
+ $ar->map("POST", "/team/[i:id]/edit", Action::auth(fn(int $idTeam,SessionHandle $s) => getTeamController()->editTeam($idTeam,$_POST,$s)));
+
return $ar;
}
@@ -119,11 +121,10 @@ function runMatch($match, MutableSessionHandle $session): HttpResponse {
], HttpCodes::NOT_FOUND);
}
- return App::runAction($basePath . '/login', $match['target'], $match['params'], $session);
+ return App::runAction('/login', $match['target'], $match['params'], $session);
}
-
//this is a global variable
$basePath = get_public_path(__DIR__);
-App::render(runMatch(getRoutes()->match(), PhpSessionHandle::init()), fn() => getTwig());
+App::render(runMatch(getRoutes()->match(), PhpSessionHandle::init()), fn() => getTwig());
\ No newline at end of file
diff --git a/src/App/Controller/TeamController.php b/src/App/Controller/TeamController.php
index acc4839..92ecc14 100644
--- a/src/App/Controller/TeamController.php
+++ b/src/App/Controller/TeamController.php
@@ -64,7 +64,7 @@ class TeamController {
}
$teamId = $this->model->createTeam($request['name'], $request['picture'], $request['main_color'], $request['second_color']);
$this->model->addMember($session->getAccount()->getUser()->getEmail(),$teamId,'COACH');
- return ViewHttpResponse::redirect('/team/'.$teamId);
+ return HttpResponse::redirect('/team/'.$teamId);
}
/**
@@ -101,6 +101,7 @@ class TeamController {
}
/**
+ * Delete a team with its id
* @param int $id
* @param SessionHandle $session
* @return HttpResponse
@@ -111,10 +112,11 @@ class TeamController {
if($ret != 0){
return ViewHttpResponse::twig('display_team.html.twig',['notDeleted' => true]);
}
- return ViewHttpResponse::redirect('/');
+ return HttpResponse::redirect('/');
}
/**
+ * Display a team with its id
* @param int $id
* @param SessionHandle $session
* @return ViewHttpResponse a view that displays given team information
@@ -141,6 +143,7 @@ class TeamController {
}
/**
+ * @param int $idTeam
* @param SessionHandle $session
* @return ViewHttpResponse the team panel to add a member
*/
@@ -150,6 +153,7 @@ class TeamController {
/**
* add a member to a team
+ * @param int $idTeam
* @param array{member.user.name}
{member.role}
{member.user.email}
- {isCoach && currentUserId !== member.user.id && } - {isCoach && currentUserId == member.user.id && } - + {isCoach && currentUserId !== member.user.id && ( + + )} + {isCoach && currentUserId == member.user.id && ( + + )}
+
+
+
+
\ No newline at end of file
diff --git a/src/Core/Gateway/MemberGateway.php b/src/Core/Gateway/MemberGateway.php
index 9fb289a..aeb2042 100644
--- a/src/Core/Gateway/MemberGateway.php
+++ b/src/Core/Gateway/MemberGateway.php
@@ -41,7 +41,7 @@ class MemberGateway {
*/
public function getMembersOfTeam(int $teamId): array {
$rows = $this->con->fetch(
- "SELECT a.id,a.email,a.username,a.profilePicture,m.role FROM Account a,Team t,Member m WHERE t.id = :id AND m.id_team = t.id AND m.id_user = a.id",
+ "SELECT a.id,a.email,a.username,a.profilePicture,m.role FROM Account a,team t,Member m WHERE t.id = :id AND m.id_team = t.id AND m.id_user = a.id",
[
":id" => [$teamId, PDO::PARAM_INT],
]
diff --git a/src/Core/Gateway/TeamGateway.php b/src/Core/Gateway/TeamGateway.php
index 0160e00..601fe25 100644
--- a/src/Core/Gateway/TeamGateway.php
+++ b/src/Core/Gateway/TeamGateway.php
@@ -23,7 +23,7 @@ class TeamGateway {
*/
public function insert(string $name, string $picture, string $mainColor, string $secondColor): int {
$this->con->exec(
- "INSERT INTO Team(name, picture, main_color, second_color) VALUES (:team_name , :picture, :main_color, :second_color)",
+ "INSERT INTO team(name, picture, main_color, second_color) VALUES (:team_name , :picture, :main_color, :second_color)",
[
":team_name" => [$name, PDO::PARAM_STR],
":picture" => [$picture, PDO::PARAM_STR],
@@ -41,7 +41,7 @@ class TeamGateway {
*/
public function listByName(string $name,int $id): array {
$result = $this->con->fetch(
- "SELECT t.* FROM Team t, Member m WHERE t.name LIKE '%' || :name || '%' AND t.id=m.id_team AND m.id_user=:id",
+ "SELECT t.* FROM team t, Member m WHERE t.name LIKE '%' || :name || '%' AND t.id=m.id_team AND m.id_user=:id",
[
":name" => [$name, PDO::PARAM_STR],
"id" => [$id, PDO::PARAM_INT]
@@ -56,7 +56,7 @@ class TeamGateway {
*/
public function getTeamById(int $id): ?TeamInfo {
$row = $this->con->fetch(
- "SELECT * FROM Team WHERE id = :id",
+ "SELECT * FROM team WHERE id = :id",
[
":id" => [$id, PDO::PARAM_INT],
]
@@ -73,7 +73,7 @@ class TeamGateway {
*/
public function getTeamIdByName(string $name): ?int {
return $this->con->fetch(
- "SELECT id FROM Team WHERE name = :name",
+ "SELECT id FROM team WHERE name = :name",
[
":name" => [$name, PDO::PARAM_INT],
]
@@ -98,4 +98,30 @@ class TeamGateway {
);
}
+ /**
+ * @param int $idTeam
+ * @param string $newName
+ * @param string $newPicture
+ * @param string $newMainColor
+ * @param string $newSecondColor
+ * @return void
+ */
+ public function editTeam(int $idTeam,string $newName,string $newPicture, string $newMainColor, string $newSecondColor){
+ $this->con->exec(
+ "UPDATE team
+ SET name = :newName,
+ picture = :newPicture,
+ main_color = :newMainColor,
+ second_color = :newSecondColor
+ WHERE id = :team",
+ [
+ "team" => [$idTeam, PDO::PARAM_INT],
+ "newName" => [$newName, PDO::PARAM_STR],
+ "newPicture" => [$newPicture, PDO::PARAM_STR],
+ "newMainColor" => [$newMainColor, PDO::PARAM_STR],
+ "newSecondColor" => [$newSecondColor, PDO::PARAM_STR],
+ ]
+ );
+ }
+
}
diff --git a/src/Core/Model/TeamModel.php b/src/Core/Model/TeamModel.php
index 2dc1162..6bdd615 100644
--- a/src/Core/Model/TeamModel.php
+++ b/src/Core/Model/TeamModel.php
@@ -26,6 +26,7 @@ class TeamModel {
}
/**
+ * Create a team
* @param string $name
* @param string $picture
* @param string $mainColor
@@ -37,7 +38,7 @@ class TeamModel {
}
/**
- * adds a member to a team
+ * add a member to a team
* @param string $mail
* @param int $teamId
* @param string $role
@@ -67,7 +68,7 @@ class TeamModel {
/**
* @param int $idTeam
* @param int $idCurrentUser
- * @return ?Team
+ * @return Team|null
*/
public function getTeam(int $idTeam, int $idCurrentUser): ?Team {
if(!$this->members->isMemberOfTeam($idTeam,$idCurrentUser)){
@@ -80,7 +81,7 @@ class TeamModel {
/**
* delete a member from given team identifier
- * @param string $mail
+ * @param int $idMember
* @param int $teamId
* @return int
*/
@@ -93,6 +94,12 @@ class TeamModel {
return $teamId;
}
+ /**
+ * Delete a team
+ * @param string $email
+ * @param int $idTeam
+ * @return int
+ */
public function deleteTeam(string $email, int $idTeam): int{
if($this->members->isCoach($email,$idTeam)){
$this->teams->deleteTeam($idTeam);
@@ -101,7 +108,27 @@ class TeamModel {
return -1;
}
+ /**
+ * Verify if the account associated to an email is in a specific team indicated with its id
+ * @param int $idTeam
+ * @param string $email
+ * @return bool
+ */
public function isCoach(int $idTeam, string $email): bool{
return $this->members->isCoach($email,$idTeam);
}
+
+ /**
+ * Edit a team with its id, and replace the current attributes with the new ones
+ * @param int $idTeam
+ * @param string $newName
+ * @param string $newPicture
+ * @param string $newMainColor
+ * @param string $newSecondColor
+ * @return void
+ */
+ public function editTeam(int $idTeam,string $newName,string $newPicture, string $newMainColor, string $newSecondColor){
+ $this->teams->editTeam($idTeam,$newName,$newPicture, $newMainColor, $newSecondColor);
+ }
+
}