diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 903a6be..e8b6fdf 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -882,7 +882,7 @@ const DisplayPartnerSession = (props) => { const columns_sequence_ressources_affectation = [ { field: 'id', headerName: 'id', hide: true }, - { field: '_id', headerName: '_id', hide: true }, + { field: '_id', headerName: '_id', hide: true, minWidth: 200, }, { field: 'related_target_collection_id', headerName: 'related_target_collection_id', minWidth: 200, hide: true, flex: 1, minWidth: 150, maxWidth: 300 }, { field: 'related_target_collection', headerName: 'related_target_collection', minWidth: 150, hide: true, editable: false, resizable: true }, { field: 'type_ressource', headerName: 'Type', minWidth: 150, hide: true, editable: false }, @@ -926,7 +926,7 @@ const DisplayPartnerSession = (props) => { @@ -6848,6 +6848,11 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair form.append("related_target_collection", new_ressource_type); form.append("related_target_collection_id", new_ressource_id); + if(String("new_ressource_type") === "ressource_humaine" && String(new_ressource_poste).trim() === ""){ + alert(" Vous devez préciser le poste occupé pour cette ressrouce"); + return; + } + //console.log(" form == ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Sequence_Affectation_Ressource_Poste/"; @@ -7236,6 +7241,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair setCreateListEmargement_api("true"); setCreateListEmargement_result(res.data.message); GetListeEmargement(selected_session_id, selected_internal_url); + alert(res.data.message); } else if (String(res.data.status) === String("Err_Connexion")) { alert('Erreur: ' + res.data.message); @@ -7244,7 +7250,7 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair else { setCreateListEmargement_api("false"); setCreateListEmargement_message(res.data.message); - alert(res.data.messag); + alert(res.data.message); } }).catch((error) => { @@ -10034,8 +10040,8 @@ Update du 22/10/2023 - Gestion des champs spécifiques ajoutés par le partenair Création automatique   + className="detail_class_submenu bton_add_session" style={{"width":"40%"}} + id='menu_import_participant' name='menu_import_participant'>Création automatique diff --git a/src/components/Partner.js b/src/components/Partner.js index 808033d..b8fccc9 100644 --- a/src/components/Partner.js +++ b/src/components/Partner.js @@ -65,7 +65,7 @@ import { ImWarning } from "react-icons/im"; //import { FcHome} from "react-icons/fc"; import Dropdown from 'rsuite/Dropdown'; -import 'rsuite/dist/rsuite.min.css'; +//import 'rsuite/dist/rsuite.min.css'; const Partner = (props) => { const { commingmenu, commingpack } = useParams(); @@ -1136,7 +1136,7 @@ const Partner = (props) => { {String(menu) === "statistique" &&
    CONFIGURATION
} } -
Ma config
+
Configuration
{/*
@@ -1175,18 +1175,18 @@ const Partner = (props) => { - { - document.getElementById('div_gauche').style.height = "1500px"; + //document.getElementById('div_gauche').style.height = "1500px"; //document.getElementById('div_gauche').height = "1500px"; }} onClose={(event) => { - document.getElementById('div_gauche').style.height = "auto"; + //document.getElementById('div_gauche').style.height = "auto"; // document.getElementById('div_gauche').height = "auto"; }} diff --git a/src/styles/components/_partner.scss b/src/styles/components/_partner.scss index 3193436..0920051 100644 --- a/src/styles/components/_partner.scss +++ b/src/styles/components/_partner.scss @@ -1966,8 +1966,8 @@ height: 1.5rem; } - - .rs-dropdown-menu{ + + .rs-dropdown-menu { background: transparent !important; background-color: #104277 !important; color: white !important; @@ -1981,17 +1981,23 @@ color: white !important; } - .rs-dropdown-toggle.rs-btn{ + .rs-dropdown-toggle.rs-btn { background: transparent !important; color: white !important; + margin-bottom: 1rem !important; + list-style-type: none !important; + border: none !important; } - .rs-dropdown-menu{ + .rs-dropdown-menu { width: 100% !important; - box-shadow :none !important + box-shadow: none !important; + border: none !important; + margin-bottom: 1rem !important; + list-style-type: none !important; } - -/* + + /* .rs-btn { background: transparent !important; }