From 8dc18ab1545ad91e928c32f46971b6857e058426 Mon Sep 17 00:00:00 2001 From: cherif Date: Sun, 21 Apr 2024 13:54:04 +0200 Subject: [PATCH] dd --- src/App.js | 12 +- src/components/DisplayPartnerSession.js | 5 +- src/components/UpdateAttendeeList.js | 533 +++++++++--------------- 3 files changed, 214 insertions(+), 336 deletions(-) diff --git a/src/App.js b/src/App.js index 0812ff2..e7b4150 100644 --- a/src/App.js +++ b/src/App.js @@ -5,13 +5,13 @@ import NotFound from './pages/NotFound' import Contact from './pages/Contact' import Connexion from './pages/Connexion' import Login from './pages/Login'; -import Recherche from "./pages/recherche_new"; + import Recherche_new_v2 from "./pages/recherche_new_v2"; import TestUrl from "./pages/testurl"; import Account from "./pages/account"; -import DisplayDetailClass from "./pages/displaydetailclass"; + import DisplayDetailClass_new_v2 from "./pages/displaydetailclass_new_v2"; -import DisplayDetailClassAction from "./pages/displaydetailclassaction"; + import DisplayDetailArticle from "./pages/displaydetailarticle"; import Acceuil from "./pages/acceuil"; import Partner from "./pages/partner"; @@ -19,17 +19,17 @@ import CreateAccount from "./pages/createaccount"; import PartnerLogin from "./pages/partnerlogin"; import PartnerLogin0 from "./pages/partnerlogin0"; import PartnerLogin1 from "./pages/partnerlogin1"; -import Footer from "./pages/footer"; + import RechecheArticles from "./pages/recherchearticles"; import AddArticle from "./pages/addarticle"; import ResetUserPwd from "./pages/resetuserpwd"; import DeleteUserAccount from "./pages/deleteuseraccount"; -import QuiSommesNous from "./pages/quisommesnous"; + import ContactezNous from "./pages/contactez_nous"; import CoupDeCoeur from "./pages/coupdecoeur"; import AccountUserActivated from "./pages/accountuseractivated"; import ProduitsService from "./pages/produitservice"; -import scrollToTop from "react-scroll-to-top"; + import Recherche_new from "./pages/recherche_new"; import Recherche_old from "./pages/recherche"; import UserSignFirst from "./pages/usersigninfirst"; diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 3b18c1f..bdfcae1 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -1914,8 +1914,6 @@ const DisplayPartnerSession = (props) => { } - - if (String(actionmass_preinsc_val) === String("valide_inscr")) { Accept_List_Inscritpion(tab_mongo_preins_ids); @@ -9740,9 +9738,10 @@ const DisplayPartnerSession = (props) => { ] const New_Option_PreInscription = [ + + { "id": "update_client", "label": "Demande MAJ Client", "value": "update_client" }, { "id": "valide_inscr", "label": "Valider Inscription", "value": "valide_inscr" }, { "id": "refuse_inscr", "label": "Refuser Inscription", "value": "refuse_inscr" }, - { "id": "update_client", "label": "Demande MAJ Client", "value": "update_client" }, ] diff --git a/src/components/UpdateAttendeeList.js b/src/components/UpdateAttendeeList.js index 8cea195..4293d0e 100644 --- a/src/components/UpdateAttendeeList.js +++ b/src/components/UpdateAttendeeList.js @@ -1,18 +1,17 @@ import React, { useRef, useState, useEffect } from "react"; -import TextField from '@mui/material/TextField'; -import MenuItem from '@mui/material/MenuItem'; + import 'react-confirm-alert/src/react-confirm-alert.css'; // Import css import Button from '@mui/material/Button'; import axios from "axios"; import { getCookie, setCookie } from 'react-use-cookie'; import { useHistory } from "react-router-dom"; -import Rating from '@mui/material/Rating'; + import { gridClasses } from '@mui/x-data-grid'; import "react-draft-wysiwyg/dist/react-draft-wysiwyg.css"; import Box from '@mui/material/Box'; -import { FcViewDetails, FcDisapprove } from "react-icons/fc"; + import 'react-tooltip/dist/react-tooltip.css' -import { FcCancel, FcApproval, FcAcceptDatabase, FcPrint, FcAlarmClock, FcMultipleSmartphones, FcWorkflow } from "react-icons/fc"; +import { FcCancel, FcApproval, FcAcceptDatabase, } from "react-icons/fc"; import 'reactjs-popup/dist/index.css'; import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif"; import { CiTrash } from "react-icons/ci"; @@ -21,15 +20,7 @@ import { DataGrid, GridToolbar, frFR } from '@mui/x-data-grid'; import { useParams } from 'react-router-dom' import Header from "./Header"; import Footer from "./Fotter"; -import { FcInfo } from "react-icons/fc"; -import { Document, Page } from 'react-pdf'; -import RadioGroup from '@mui/material/RadioGroup'; -import FormControlLabel from '@mui/material/FormControlLabel'; -import FormControl from '@mui/material/FormControl'; -import FormLabel from '@mui/material/FormLabel'; -import Radio from '@mui/material/Radio'; -import { daDK } from "@mui/material/locale"; -import Checkbox from '@mui/material/Checkbox'; + import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; import Popup from 'reactjs-popup'; @@ -82,259 +73,84 @@ function UpdateAttendeeList() { const columns_preinscrit = [ { field: 'id', headerName: 'id', hide: true }, { field: '_id', headerName: '_id', hide: true }, - { field: 'civilite', headerName: 'Civ.', minWidth: 100, flex: 1, maxWidth: 100, hide: false, editable: true, editable: false, renderCell: (params) => , }, + { + field: 'civilite', headerName: 'Civ.', minWidth: 100, flex: 1, maxWidth: 100, hide: false, editable: true, + type: "singleSelect", + valueOptions: [ + { value: 'm', label: 'M' }, + { value: 'mme', label: 'Mme' }, + { value: 'neutre', label: 'Neutre' } + ], + renderCell: (params) => { + return ( + +
+ + {params.value && String(params.value) === "m" && "M"} + {params.value && String(params.value) === "mme" && "Mme"} + {params.value && String(params.value) === "neutre" && "Neutre"} + +
+ + ); + } + }, + { field: 'nom', headerName: 'nom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , }, { field: 'prenom', headerName: 'prenom', minWidth: 150, flex: 1, hide: false, editable: true, renderCell: (params) => , }, - { field: 'email', headerName: 'email', minWidth: 150, flex: 1, flex: 1, renderCell: (params) => , }, - { - field: "update", headerName: 'Mise à jour', - renderCell: (cellValues) => { - return ( + { field: 'email', headerName: 'email', minWidth: 150, flex: 1, editable: true, renderCell: (params) => , }, - { - // handleClick_accept(event, cellValues); - }} - > - - - } - modal - nested - position="center center" - > - {close => ( -
- -
MySy Information
-
- {' '} - - Confirmer la mise à jour des informations du stagiaire -
-
-
- - -
-
- -
-
-
- )} -
- - ); - } - }, - - { - field: "valide", headerName: 'Valider', - renderCell: (cellValues) => { - return ( - - { - // handleClick_accept(event, cellValues); - }} - > - - - } - modal - nested - position="center center" - > - {close => ( -
- -
MySy Information
-
- {' '} - - En confirmant cette opération, l'inscription du stagiaire sera définitivement validée.
- Il (le stagiaire) sera automatiquement notifié par email de la validation de son inscription.
- Le stagiaire passera de l'onglet "préinscrit" vers l'onglet "inscription".
-
-
-
- - -
-
- -
-
-
- )} -
- - ); - } - }, - - { - field: "refuse", headerName: 'Refuser', - renderCell: (cellValues) => { - return ( - - { - // handleClick_refuse(event, cellValues); - }} - > - - - } - modal - nested - position="center center" - > - {close => ( -
- -
MySy Information
-
- {' '} - - En confirmant cette opération, l'inscription du stagiaire sera refusée.
- Il (le stagiaire) sera automatiquement notifié par email du refus de son inscription.
-
Motif du refus :
-