diff --git a/backend/server.ts b/backend/server.ts
index 2530fe2..5f5b6dc 100644
--- a/backend/server.ts
+++ b/backend/server.ts
@@ -73,6 +73,7 @@ async function startServer() {
app.use('/api/uploads/notebooks', express.static(path.join(__dirname, '/uploads/notebooks')));
app.use('/api/uploads/foodmenu', express.static(path.join(__dirname, '/uploads/foodmenu')));
app.use('/api/uploads/plannings', express.static(path.join(__dirname, '/uploads/plannings')));
+ app.use('/api/uploads/other', express.static(path.join(__dirname, '/uploads/other')));
app.use('/api/exports/bus', express.static(path.join(__dirname, '/exports/bus')));
app.use('/api/exports/teammembers', express.static(path.join(__dirname, '/exports/teammembers')));
diff --git a/backend/src/middlewares/multer.middleware.ts b/backend/src/middlewares/multer.middleware.ts
index 193ab05..4528876 100644
--- a/backend/src/middlewares/multer.middleware.ts
+++ b/backend/src/middlewares/multer.middleware.ts
@@ -30,6 +30,9 @@ const acceptedMIMETypesByItem: Record> = {
fisea: [MIMEType.PDF],
master: [MIMEType.PDF],
},
+ other: {
+ parental_authorization: [MIMEType.PDF],
+ },
};
export const createUploadMiddleware = () => {
diff --git a/frontend/src/components/Admin/adminExportImport.tsx b/frontend/src/components/Admin/adminExportImport.tsx
index 5f155e8..e59f204 100644
--- a/frontend/src/components/Admin/adminExportImport.tsx
+++ b/frontend/src/components/Admin/adminExportImport.tsx
@@ -155,3 +155,16 @@ export const AdminImportNotebooks = () => {
);
};
+
+export const AdminImportOther = () => {
+ return (
+
+
+ Autres imports
+
+
+
+
+
+ );
+};
diff --git a/frontend/src/components/WEI_SDI_Food/foodSection.tsx b/frontend/src/components/WEI_SDI_Food/foodSection.tsx
index 6c11a73..ccd4fb0 100644
--- a/frontend/src/components/WEI_SDI_Food/foodSection.tsx
+++ b/frontend/src/components/WEI_SDI_Food/foodSection.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
import { checkFoodStatus } from '../../services/requests/event.service';
-import { getPermission } from '../../services/requests/user.service';
+// import { getPermission } from '../../services/requests/user.service';
import { checkUploadAvailability } from '../../utils/utils';
import { Card, CardContent, CardHeader, CardTitle } from '../ui/card';
@@ -10,7 +10,7 @@ export const FoodSection = () => {
const [isMenuAvailable, setIsMenuAvailable] = useState(false);
const [isAllergensAvailable, setIsAllergensAvailable] = useState(false);
- const permission = getPermission();
+ // const permission = getPermission();
const menuUrl = `${import.meta.env.VITE_API_URL}/uploads/foodmenu/menu.pdf`;
const allergensUrl = `${import.meta.env.VITE_API_URL}/uploads/foodmenu/allergens.pdf`;
@@ -103,11 +103,18 @@ export const FoodSection = () => {
- {(permission === 'Student' || permission === 'Admin') && (
+
+
+
+ {/* {(permission === 'Student' || permission === 'Admin') && (
La billetterie du repas test est réservée aux Chefs d'Equipe et Organisateurs de
@@ -119,7 +126,7 @@ export const FoodSection = () => {
className="w-full h-[600px] border-none"
/>
- )}
+ )} */}
>
)}
diff --git a/frontend/src/components/WEI_SDI_Food/sdiSection.tsx b/frontend/src/components/WEI_SDI_Food/sdiSection.tsx
index 7711c83..572359d 100644
--- a/frontend/src/components/WEI_SDI_Food/sdiSection.tsx
+++ b/frontend/src/components/WEI_SDI_Food/sdiSection.tsx
@@ -94,7 +94,7 @@ export const SdiSection = () => {
diff --git a/frontend/src/components/WEI_SDI_Food/weiSection.tsx b/frontend/src/components/WEI_SDI_Food/weiSection.tsx
index 0ad9bbb..c728b01 100644
--- a/frontend/src/components/WEI_SDI_Food/weiSection.tsx
+++ b/frontend/src/components/WEI_SDI_Food/weiSection.tsx
@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react';
import { useOnboarding } from '../../contexts/onboarding';
+import { useUser } from '../../contexts/user';
import { decodeToken, getToken } from '../../services/requests/auth.service';
import { checkWEIStatus } from '../../services/requests/event.service';
import { Card, CardContent, CardHeader, CardTitle } from '../ui/card';
@@ -18,6 +19,8 @@ export const WeiSection = () => {
const { status: onboardingStatus, loading: onboardingLoading } = useOnboarding();
+ const { user, loading: userLoading } = useUser();
+
useEffect(() => {
const script = document.createElement('script');
script.src = 'https://www.billetweb.fr/js/export.js';
@@ -30,10 +33,11 @@ export const WeiSection = () => {
useEffect(() => {
if (!roles.includes('Nouveau')) return;
if (onboardingLoading) return;
+ if (userLoading) return;
setHasContactInformation(onboardingStatus?.hasemergencyContactInformation ?? true);
setHasVssForm(onboardingStatus ? onboardingStatus.vss_form == 'validated' : true);
setNeedsVssForm(onboardingStatus?.needsVssForm ?? false);
- }, [roles, onboardingLoading, onboardingStatus]);
+ }, [roles, onboardingLoading, onboardingStatus, userLoading]);
const fetchStatus = async () => {
try {
@@ -55,6 +59,30 @@ export const WeiSection = () => {
d'Intégration 2025 !
+ {!user?.majeur && (
+
+
+
+ )}
{!isWEIOpen ? (
@@ -93,7 +121,7 @@ export const WeiSection = () => {
diff --git a/frontend/src/pages/admin/adminExport.tsx b/frontend/src/pages/admin/adminExport.tsx
index a44d62c..f372843 100644
--- a/frontend/src/pages/admin/adminExport.tsx
+++ b/frontend/src/pages/admin/adminExport.tsx
@@ -2,6 +2,7 @@ import {
AdminExportConnect,
AdminImportFoodMenu,
AdminImportNotebooks,
+ AdminImportOther,
AdminImportPlannings,
} from '../../components/Admin/adminExportImport';
import { AdminLayout } from '../../components/Admin/adminLayout';
@@ -25,6 +26,10 @@ const AdminPageExport: React.FC = () => (
+
+
+
+
);