diff --git a/src/components/AccountUserActivated.js b/src/components/AccountUserActivated.js index 4b6b97a..acef442 100644 --- a/src/components/AccountUserActivated.js +++ b/src/components/AccountUserActivated.js @@ -57,7 +57,7 @@ function Account() {

- Vous allez etre redirigé vers le moteur de recherche dans quelques secondes. {tempo} + Vous allez être redirigé vers le moteur de recherche dans quelques secondes. {tempo}
+ +
Agenda + { + + setp_detail_sequence_agenda(e.target.value); + } + } + multiline + minRows={2} + maxRows={2} + rows={2} + + /> + +
+ +
Objectif + { + + setp_detail_sequence_objectif(e.target.value); + } + } + multiline + minRows={2} + maxRows={2} + rows={2} + + /> + +
+
Commentaire { onRowDoubleClick={(newSelectionModel) => { setgridline_id(newSelectionModel.row.id); + + setsequence_gridline_id(""); + setaddOneSession("0"); setEdite_session("0"); setsessionChanged(false); @@ -9884,7 +10007,10 @@ const DisplayPartnerSession = (props) => { "& .MuiDataGrid-cellContent": { minHeight: 50, - } + }, + [`& .${gridClasses.cell}`]: { + py: 1, + }, }} @@ -11909,7 +12035,7 @@ const DisplayPartnerSession = (props) => { {String(submenu) === String("sequence_session") &&
-
Gestion séquences
+
@@ -11919,24 +12045,29 @@ const DisplayPartnerSession = (props) => {
  { setselectionModel_sequence(newSelectionModel); - /*if (newSelectionModel.length === 1) - handleClick_edit_session_From_Line(newSelectionModel);*/ - if (newSelectionModel.length !== 1) { - } }} selectionModel={selectionModel_sequence} @@ -11951,7 +12082,9 @@ const DisplayPartnerSession = (props) => { session_id: JSON.parse(item).session_id, sequence_title: JSON.parse(item).sequence_title, - + agenda: JSON.parse(item).agenda, + objectif: JSON.parse(item).objectif, + commentaire: JSON.parse(item).commentaire, } ))} @@ -11960,11 +12093,16 @@ const DisplayPartnerSession = (props) => { className="datagridclass" onRowDoubleClick={(newSelectionModel) => { - + setsequence_gridline_id(newSelectionModel.row.id); setselected_detail_sequence_title(newSelectionModel.row.sequence_title); setselected_sequence_startDate(newSelectionModel.row.sequence_start); setselected_sequence_endDate(newSelectionModel.row.sequence_end); + setp_detail_sequence_agenda(newSelectionModel.row.agenda); + setp_detail_sequence_objectif(newSelectionModel.row.objectif); + setp_detail_sequence_comment(newSelectionModel.row.commentaire); + + Getall_List_Sequence_Ressource(newSelectionModel.row._id); setselected_sequence_id(newSelectionModel.row._id); @@ -11987,7 +12125,7 @@ const DisplayPartnerSession = (props) => { components={{ Toolbar: GridToolbar, }} - sx={datagridSx} + //sx={datagridSx} getCellClassName={(params) => { //field === 'distantiel' if (params.field === 'distantiel' && String(params.value) === "1") { @@ -12024,7 +12162,16 @@ const DisplayPartnerSession = (props) => { } }} + getRowClassName={(params) => { + // Pour la gestion de la couleur de zone double cliquée + if (String(params.row.id) === String(sequence_gridline_id)) { + return 'line--statut--selected'; + } + + + + }} /> @@ -12250,13 +12397,9 @@ const DisplayPartnerSession = (props) => { checkboxSelection onSelectionModelChange={(newSelectionModel) => { setselectionModel_sequence(newSelectionModel); - /*if (newSelectionModel.length === 1) - handleClick_edit_session_From_Line(newSelectionModel);*/ - if (newSelectionModel.length !== 1) { - } }} - selectionModel={selectionModel} + //selectionModel={selectionModel_sequence} localeText={frFR.components.MuiDataGrid.defaultProps.localeText} rows={Getall_List_Sequence_Ressource_result.map((item, index) => ( @@ -13382,10 +13525,7 @@ const DisplayPartnerSession = (props) => { getEstimatedRowHeight={() => 200} getRowHeight={() => "auto"} sx={{ - "& .MuiDataGrid-cellContent": { - minHeight: 50, - }, [`& .${gridClasses.cell}`]: { py: 1, }, @@ -14511,7 +14651,9 @@ const DisplayPartnerSession = (props) => { -
+
@@ -14618,7 +14760,9 @@ const DisplayPartnerSession = (props) => {
{' '} - Confirmer l'action {actionmass_emarg_val} en masse. + {String(actionmass_emarg_val) === "demande emargement" && + Confirmer l'envoi de {selectionModel_emarg.length} demande(s) d'émargement. + }
diff --git a/src/components/DisplayPartnerTrainingsPagination.js b/src/components/DisplayPartnerTrainingsPagination.js index bdaeee0..42e275d 100644 --- a/src/components/DisplayPartnerTrainingsPagination.js +++ b/src/components/DisplayPartnerTrainingsPagination.js @@ -341,6 +341,17 @@ const DistplayPartnerTraningsPage = (props) => { } + + function Display_Colunm_text({ value }) { + + return ( +
+ {value}  + +
+ ); + } + function ExpandableCell_50({ value }) { const [expanded, setExpanded] = React.useState(false); @@ -385,22 +396,27 @@ const DistplayPartnerTraningsPage = (props) => { { field: 'internal_url', headerName: 'internal_url', hide: true, editable: false, }, { field: 'external_code', headerName: 'Code Formation', hideable: false, minWidth: 150, flex: 1, maxWidth: 250, editable: false, renderCell: (params) => , }, { field: 'title', headerName: 'Titre', hideable: false, minWidth: 300, flex: 1, editable: false, renderCell: (params) => , }, - { field: 'domain', headerName: 'Domaine', minWidth: 50, flex: 1, maxWidth: 150, hideable: true, editable: false, }, - { field: 'metier', headerName: 'Métier', minWidth: 50, flex: 1, maxWidth: 150, hideable: true, hide: true, editable: false, }, - { field: 'nb_session_formation', headerName: 'Nb Session', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", }, + { field: 'domain', headerName: 'Domaine', minWidth: 50, flex: 1, maxWidth: 150, hideable: true, editable: false, renderCell: (params) => , }, + { field: 'metier', headerName: 'Métier', minWidth: 50, flex: 1, maxWidth: 150, hideable: true, hide: true, editable: false, renderCell: (params) => , }, + { field: 'nb_session_formation', headerName: 'Nb Session', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center", renderCell: (params) => , }, { field: 'url', headerName: 'lien', minWidth: 20, hideable: true, hide: true, editable: false, }, { field: 'description', headerName: 'Description', hide: true, resizable: true, minWidth: 250, maxWidth: 300, flex: 1, renderCell: (params) => , }, - { field: 'price', headerName: 'Prix', minWidth: 50, flex: 1, maxWidth: 100, align: "center", resizable: true, hide: ismobilephone_columns_hide, editable: false, }, + { field: 'price', headerName: 'Prix', minWidth: 50, flex: 1, maxWidth: 100, align: "center", resizable: true, hide: ismobilephone_columns_hide, editable: false, + renderCell: (params) => , }, { field: 'published', headerName: 'Publié', minWidth: 50, flex: 1, maxWidth: 100, align: "center", resizable: true, editable: false, - valueFormatter: (params) => { - if (String(params.value) === "0") - return "Non"; - else if (String(params.value) === "1") - return "Oui"; - else - return "?"; + + renderCell: (cellValues) => { + return ( + +
+ {String(cellValues.row.published) === "1" && "Oui"}  + {String(cellValues.row.published) !== "1" && "Non"}  + +
+ + ); }, }, { @@ -1264,10 +1280,11 @@ const DistplayPartnerTraningsPage = (props) => { color: "black", fontSize: 16 }, - "& .MuiDataGrid-cellContent": { - minHeight: 50, - - } + + [`& .${gridClasses.cell}`]: { + py: 1, + }, + }; @@ -1982,9 +1999,10 @@ const DistplayPartnerTraningsPage = (props) => { }} getEstimatedRowHeight={() => 200} getRowHeight={() => "auto"} + sx={datagridSx} - - + + />
diff --git a/src/components/Employes.js b/src/components/Employes.js index c613a14..4bdbab8 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -4841,7 +4841,7 @@ const Employes = (props) => { - +
diff --git a/src/components/Module_Editique.js b/src/components/Module_Editique.js index ef2022c..473b26b 100644 --- a/src/components/Module_Editique.js +++ b/src/components/Module_Editique.js @@ -995,9 +995,15 @@ const Module_Editique = (props) => { > MySy Information - + - {Dialog_1_message} - {action_server_type_doc} + + +
+ Cliquez sur l'onglet 'PREINSCRIPT.' pour confirmer les inscriptions. + +
+
@@ -1006,13 +1012,10 @@ const Module_Editique = (props) => {
- +  
- -
@@ -1032,19 +1035,24 @@ const Module_Editique = (props) => { > MySy Information - + - {Dialog_1_message} - {action_server_type_doc} +
+ Cliquez sur l'onglet 'EMARGEMENT' pour la gestion des émargements :
+
    +
  • Initialisation
  • +
  • Envoyer les demandes d'émargements
  • +
  • Mettre à jour les émargements
  • +
  • etc
  • +
+
- -
- +  
diff --git a/src/pages/emargementOk.js b/src/pages/emargementOk.js index 949e4a6..fcdde8e 100644 --- a/src/pages/emargementOk.js +++ b/src/pages/emargementOk.js @@ -44,7 +44,7 @@ const EmargementOk = () => {
Votre demande d'emargement a bien été prise en compte
- Vous allez etre redirigé vers le moteur de recherche dans quelques secondes. {tempo} + Vous allez être redirigé vers le moteur de recherche dans quelques secondes. {tempo}
diff --git a/src/styles/components/_displaypartnersession.scss b/src/styles/components/_displaypartnersession.scss index 6600135..59e588c 100644 --- a/src/styles/components/_displaypartnersession.scss +++ b/src/styles/components/_displaypartnersession.scss @@ -2257,6 +2257,8 @@ margin-left: 5px; margin-right: 5px; color: white; + cursor: pointer; + box-shadow: 5px 1px 5px 1px rgb(0 0 0 / 25%); } .bton_emarge:hover { @@ -2267,6 +2269,9 @@ margin-left: 5px; margin-right: 5px; color: white; + cursor: pointer; + + box-shadow: 5px 1px 5px 1px rgb(0 0 0 / 25%); } .css-1x5jdm {