From 48db31afe1d268d52a77a57a54a303d109da99ce Mon Sep 17 00:00:00 2001 From: cherif Date: Fri, 10 Nov 2023 23:12:38 +0100 Subject: [PATCH] sds --- src/components/DisplayPartnerSession.js | 27 +++- src/components/DisplayPartnerStagiaires.js | 71 ++++----- src/components/Employes.js | 13 +- src/components/TestUrl_new.js | 167 ++++++++++++++++++++- 4 files changed, 225 insertions(+), 53 deletions(-) diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index cfd8d43..e7579f2 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -203,6 +203,25 @@ const DisplayPartnerSession = (props) => { { field: 'domaine', headerName: 'Domaine', width: datagrid_columns_size_model1, align: "center", hide: true, hideable: true, }, { field: 'duration', headerName: 'Durée', width: datagrid_columns_size_model2, align: "center", }, + { + field: "Detail", headerName: 'Voir detail', + renderCell: (cellValues) => { + return ( + + + + ); + } + }, + { field: "delete", headerName: 'Supprimer', renderCell: (cellValues) => { @@ -5798,8 +5817,8 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair checkboxSelection onSelectionModelChange={(newSelectionModel) => { setSelectionModel(newSelectionModel); - if (newSelectionModel.length === 1) - handleClick_edit_session_From_Line(newSelectionModel); + /*if (newSelectionModel.length === 1) + handleClick_edit_session_From_Line(newSelectionModel);*/ if (newSelectionModel.length !== 1) { setaddOneParticipant(); setdisplay_detail_insc(); @@ -5841,7 +5860,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair className="datagridclass" rowsPerPageOptions={[10]} - //disableSelectionOnClick + disableSelectionOnClick components={{ Toolbar: GridToolbar, }} @@ -6032,7 +6051,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair
 
- {selectionModel && selectionModel.length === 1 &&
+ {selected_code_session && String(selected_code_session).length > 0 &&
diff --git a/src/components/DisplayPartnerStagiaires.js b/src/components/DisplayPartnerStagiaires.js index 303c2de..e84b333 100644 --- a/src/components/DisplayPartnerStagiaires.js +++ b/src/components/DisplayPartnerStagiaires.js @@ -77,15 +77,15 @@ const DisplayPartnerStagiaires = (props) => { const [datagrid_columns_size_model2, setdatagrid_columns_size_model2] = useState(80); const columns = [ - { field: '_id', headerName: '_id', hide: true }, - { field: 'session_id', headerName: 'session_id', hide: true }, + { field: '_id', headerName: '_id', hide: true, editable: false}, + { field: 'session_id', headerName: 'session_id', hide: true, editable: false}, { field: 'id', headerName: 'id', hide: true }, - { field: 'class_internal_url', headerName: 'class_internal_url', hide: true }, + { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, editable: false}, - { field: 'email', headerName: 'email', width: 150, hideable: false, }, - { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: true }, - { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: true }, - { field: 'employeur', headerName: 'Employeur', width: 150, hide: false, editable: true }, + { field: 'email', headerName: 'email', width: 150, hideable: false,editable: false }, + { field: 'nom', headerName: 'nom', width: 150, hide: false, editable: false, editable: false }, + { field: 'prenom', headerName: 'prenom', width: 150, hide: false, editable: false }, + { field: 'employeur', headerName: 'Employeur', width: 150, hide: true, editable: false }, { field: 'status', headerName: 'Statut', hide: false, width: datagrid_columns_size_model2, valueFormatter: (params) => { @@ -101,8 +101,8 @@ const DisplayPartnerStagiaires = (props) => { return "???"; }, }, - { field: 'code_session', headerName: 'Code session', hideable: true, }, - { field: 'title', headerName: 'Formation', width: datagrid_columns_size_model1, align: "center", hideable: true, }, + { field: 'code_session', headerName: 'Code session', hideable: true, editable: false}, + { field: 'title', headerName: 'Formation', width: datagrid_columns_size_model1, align: "center", hideable: true, editable: false}, { field: 'distantiel', headerName: 'Distantiel', hideable: false, width: datagrid_columns_size_model2, valueFormatter: (params) => { @@ -126,10 +126,28 @@ const DisplayPartnerStagiaires = (props) => { }, }, - { field: 'domaine', headerName: 'Domaine', width: datagrid_columns_size_model2, align: "center", hide: true, hideable: true, }, - { field: 'date_debut', headerName: 'Du', width: datagrid_columns_size_model1, hideable: true, }, - { field: 'date_fin', headerName: 'Au', width: datagrid_columns_size_model1, hideable: true, }, - { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, }, + { field: 'domaine', headerName: 'Domaine', width: datagrid_columns_size_model2, align: "center", hide: true, hideable: true, editable: false}, + { field: 'date_debut', headerName: 'Du', width: datagrid_columns_size_model1, hideable: true, editable: false}, + { field: 'date_fin', headerName: 'Au', width: datagrid_columns_size_model1, hideable: true, editable: false}, + { field: 'class_internal_url', headerName: 'class_internal_url', hide: true, editable: false}, + { + field: "Detail", headerName: 'Voir detail', + renderCell: (cellValues) => { + return ( + + + + ); + } + }, { field: 'Action', headerName: 'Action', hide: false, width: 200, renderCell: (cellValues) => { @@ -307,24 +325,7 @@ const DisplayPartnerStagiaires = (props) => { } }, - /* { - field: "Detail", headerName: 'Voir detail', - renderCell: (cellValues) => { - return ( - - - - ); - } - },*/ + { field: "Imprimer", headerName: 'Imprimer detail', renderCell: (cellValues) => { @@ -4229,8 +4230,8 @@ const DisplayPartnerStagiaires = (props) => { checkboxSelection onSelectionModelChange={(newSelectionModel) => { setSelectionModel(newSelectionModel); - if (newSelectionModel.length === 1) - handleClick_edit_session_From_Line(newSelectionModel); + /*if (newSelectionModel.length === 1) + handleClick_edit_session_From_Line(newSelectionModel);*/ if (newSelectionModel.length !== 1) { setaddOneParticipant(); setdisplay_detail_stagiaire(); @@ -4269,7 +4270,7 @@ const DisplayPartnerStagiaires = (props) => { className="datagridclass" rowsPerPageOptions={[10]} - //disableSelectionOnClick + disableSelectionOnClick components={{ Toolbar: GridToolbar, }} @@ -4872,7 +4873,7 @@ const DisplayPartnerStagiaires = (props) => {
- {String(participant_data_edit_mode) !== "1" &&
Session aa
+ {String(participant_data_edit_mode) !== "1" &&
Session
{ { field: 'profil', headerName: 'profil', width: 150, hide: false, }, { field: 'fonction', headerName: 'Fonction', width: 150, hide: false, }, - /* { + { field: "Detail", headerName: 'Voir detail', renderCell: (cellValues) => { return ( @@ -123,7 +123,8 @@ const Employes = (props) => { + + + + +

Page de test * testurl_new

parametres courseid = {courseid}, tabid = {tabid} @@ -490,6 +618,24 @@ const TestUrl_New = (props) => {
+
+ liste des events = + {Get_List_Agenda_Events_result &&
{Get_List_Agenda_Events_result}
} + +
+ +
+ local events = + + +
+
{ editable selectable events={events} + //events={mysy_events} + select={handleSelect} headerToolbar={{ start: "today prev next", end: "dayGridMonth dayGridWeek dayGridDay", }} - eventContent={(info) => } + //eventContent={(info) => } //plugins={[timeGridPlugin]} plugins={[timeGridPlugin, daygridPlugin, interactionPlugin]} views={["dayGridMonth", "dayGridWeek", "dayGridDay"]} slotMinTime="07:00" slotMaxTime="20:00" scrollTime='08:00' + displayEventEnd={true} + eventContent={renderEventContent} + eventClick={handleEventClick} />;