Skip to content

Fix : #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
T1gr0uu merged 1 commit into from
Sep 1, 2025
Merged

Fix : #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions backend/src/routes/permanences.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ const permanenceRouter = express.Router();
const upload = multer({ dest: "uploads/permcsv/" });

// Admin routes
permanenceRouter.post("/admin/permanence", checkRole("Admin",[]), permanenceController.createPermanence);
permanenceRouter.delete("/admin/permanence", checkRole("Admin",[]), permanenceController.deletePermanence);
permanenceRouter.post("/admin/updatepermanence", checkRole("Admin",[]), permanenceController.updatePermanence);
permanenceRouter.post("/admin/open", checkRole("Admin",[]), permanenceController.openPermanence);
permanenceRouter.post("/admin/close", checkRole("Admin",[]), permanenceController.closePermanence);
permanenceRouter.get("/admin/permanences", checkRole("Admin",[]), permanenceController.getAllPermanences);
permanenceRouter.get("/admin/users", checkRole("Admin",[]), permanenceController.getUsersInPermanence);
permanenceRouter.post("/admin/add", checkRole("Admin",[]), permanenceController.addUserToPermanence);
permanenceRouter.post("/admin/remove", checkRole("Admin",[]), permanenceController.removeUserToPermanence);
permanenceRouter.post("/admin/importpermanences",checkRole("Admin",[]), upload.single("file"), permanenceController.uploadPermanencesCSV);
permanenceRouter.post("/admin/permanence", checkRole("Admin",["Respo CE"]), permanenceController.createPermanence);
permanenceRouter.delete("/admin/permanence", checkRole("Admin",["Respo CE"]), permanenceController.deletePermanence);
permanenceRouter.post("/admin/updatepermanence", checkRole("Admin",["Respo CE"]), permanenceController.updatePermanence);
permanenceRouter.post("/admin/open", checkRole("Admin",["Respo CE"]), permanenceController.openPermanence);
permanenceRouter.post("/admin/close", checkRole("Admin",["Respo CE"]), permanenceController.closePermanence);
permanenceRouter.get("/admin/permanences", checkRole("Admin",["Respo CE"]), permanenceController.getAllPermanences);
permanenceRouter.get("/admin/users", checkRole("Admin",["Respo CE"]), permanenceController.getUsersInPermanence);
permanenceRouter.post("/admin/add", checkRole("Admin",["Respo CE"]), permanenceController.addUserToPermanence);
permanenceRouter.post("/admin/remove", checkRole("Admin",["Respo CE"]), permanenceController.removeUserToPermanence);
permanenceRouter.post("/admin/importpermanences",checkRole("Admin",["Respo CE"]), upload.single("file"), permanenceController.uploadPermanencesCSV);
permanenceRouter.post("/admin/claimedmember",checkRole("Admin",["Respo CE"]), permanenceController.claimMember);

//Respo de perm routes

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const App: React.FC = () => {
{/* ResposCE et Admin */}
<Route path="/admin/teams" element={<PrivateRoute permissionRequired="Admin" roleRequired="Respo CE"><AdminPageTeam /></PrivateRoute>} />
<Route path="/admin/factions" element={<PrivateRoute permissionRequired="Admin" roleRequired="Respo CE"><AdminPageFaction /></PrivateRoute>} />
<Route path="/admin/permanences" element={<PrivateRoute permissionRequired="Admin" roleRequired="Respo CE"><AdminPagePerm /></PrivateRoute>} />

{/* ResposCE et Admin */}
<Route path="/admin/news" element={<PrivateRoute permissionRequired="Admin" roleRequired="Communication"><AdminPageNews /></PrivateRoute>} />
Expand All @@ -96,7 +97,6 @@ const App: React.FC = () => {
<Route path="/admin/roles" element={<AdminRoute><AdminPageRole /></AdminRoute>} />
<Route path="/admin/events" element={<AdminRoute><AdminPageEvents /></AdminRoute>} />
<Route path="/admin/export-import" element={<AdminRoute><AdminPageExport /></AdminRoute>} />
<Route path="/admin/permanences" element={<AdminRoute><AdminPagePerm /></AdminRoute>} />
<Route path="/admin/email" element={<AdminRoute><AdminPageEmail /></AdminRoute>} />
<Route path="/admin/users" element={<AdminRoute><AdminPageUser /></AdminRoute>} />
<Route path="/admin/games" element={<AdminRoute><AdminPageGames /></AdminRoute>} />
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Admin/AdminPerm/adminPermMembers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
getUsersByPermanence,
addUserToPermanence,
removeUserFromPermanence,
claimedMember,
claimedMemberAdmin,
} from "../../../services/requests/permanence.service";
import { Permanence } from "../../../interfaces/permanence.interface";
import { User } from "../../../interfaces/user.interface";
Expand Down Expand Up @@ -105,7 +105,7 @@ const PermanenceMembers: React.FC<PermanenceMembersProps> = ({ perm, users, onRe
const handleToggleClaim = async (user: PermanenceMember): Promise<void> => {
try {
const newClaimedStatus = !user.claimed;
await claimedMember(user.userId, perm.id, newClaimedStatus);
await claimedMemberAdmin(user.userId, perm.id, newClaimedStatus);

await Swal.fire(
newClaimedStatus ? "Présence confirmée" : "Présence retirée",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const Navbar = () => {
{ label: "Teams", to: "/admin/teams", rolesAllowed: ["Admin", "Respo CE"] },
{ label: "Factions", to: "/admin/factions", rolesAllowed: ["Admin", "Respo CE"] },
{ label: "Events", to: "/admin/events", rolesAllowed: ["Admin"] },
{ label: "Permanences", to: "/admin/permanences", rolesAllowed: ["Admin"] },
{ label: "Permanences", to: "/admin/permanences", rolesAllowed: ["Admin", "Respo CE"] },
{ label: "Challenge", to: "/admin/challenge", rolesAllowed: ["Admin", "Arbitre"] },
{ label: "Export / Import", to: "/admin/export-import", rolesAllowed: ["Admin"] },
{ label: "Email", to: "/admin/email", rolesAllowed: ["Admin"] },
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const AdminPagePerm: React.FC = () => {
};

return (
<AdminLayout allowedRoles={["Admin"]}>
<AdminLayout allowedRoles={["Admin", "Respo CE"]}>
<div className="flex flex-col gap-10 px-4 py-6 max-w-7xl mx-auto">

{/* Formulaire (créer/éditer) */}
Expand Down
9 changes: 9 additions & 0 deletions frontend/src/services/requests/permanence.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,5 +171,14 @@ export const claimedMember = async (userId: number, permId: number, claimed : bo
return response.data;
};

export const claimedMemberAdmin = async (userId: number, permId: number, claimed : boolean) => {
const response = await api.post(`/permanence/admin/claimedmember`, {
userId,
permId,
claimed
});
return response.data;
};