diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index da6f1e9..8af5c3a 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -30,6 +30,12 @@ import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; +import Radio from '@mui/material/Radio'; +import RadioGroup from '@mui/material/RadioGroup'; +import FormControlLabel from '@mui/material/FormControlLabel'; +import FormControl from '@mui/material/FormControl'; +import FormLabel from '@mui/material/FormLabel'; + const AddParnerClient = (props) => { const history = useHistory(); const [submenu, setsubmenu] = useState(""); @@ -52,6 +58,10 @@ const AddParnerClient = (props) => { const [p_client_type_label, setp_client_type_label] = useState(""); const [p_client_raison_sociale, setclient_raison_sociale] = useState(""); + + const [p_client_is_company, setp_client_is_company] = useState(""); + + const [p_client_siret, setclient_siret] = useState(""); const [p_client_tva, setclient_tva] = useState(""); const [p_client_adresse, setclient_adresse] = useState(""); @@ -677,6 +687,11 @@ const AddParnerClient = (props) => { setclient_raison_sociale(""); } + setp_client_is_company("0"); + if (mylocalclient.is_company) { + setp_client_is_company(mylocalclient.is_company); + } + if (String(mylocalclient.is_financeur) === "1") setp_client_is_financeur(true); @@ -956,6 +971,11 @@ const AddParnerClient = (props) => { setclient_raison_sociale(""); } + setp_client_is_company("0"); + if (mylocalclient.is_company ) { + setp_client_is_company(mylocalclient.is_company); + } + if (mylocalclient.adr_adresse) setclient_adresse(mylocalclient.adr_adresse); else @@ -1447,6 +1467,7 @@ const AddParnerClient = (props) => { } form.append("raison_sociale", client_raison_sociale); + form.append("is_company", p_client_is_company); var client_adresse = "" if (document.getElementsByName("client_adresse")) { @@ -1608,6 +1629,10 @@ const AddParnerClient = (props) => { } form.append("raison_sociale", client_raison_sociale); + + form.append("is_company", p_client_is_company); + + var client_adresse = "" if (document.getElementsByName("client_adresse")) { client_adresse = document.getElementsByName("client_adresse")[0].value; @@ -2460,10 +2485,43 @@ const AddParnerClient = (props) => { {String(props.new_customer) === "1" &&
- +
+
+  

+ +
Raison sociale
{ {String(props.new_customer) !== "1" &&
- - - - + + + + {/* @@ -2840,6 +2898,40 @@ const AddParnerClient = (props) => { {String(submenu).trim() === "submenu_donnee_client" &&
+
+  

+ +
Raison sociale
{ />
-
Site web 1
+
Site web
{ />
+ +
diff --git a/src/components/DisplayPartnerSession.js b/src/components/DisplayPartnerSession.js index 8efa537..3ba2bc8 100644 --- a/src/components/DisplayPartnerSession.js +++ b/src/components/DisplayPartnerSession.js @@ -2488,7 +2488,12 @@ const DisplayPartnerSession = (props) => { const [addOneParticipant, setaddOneParticipant] = useState(); function submenu_add_one_participant() { - Get_List_Partner_Financeurs(); + Getall_Training_Employee_No_Filter(); + Getall_Training_Materiel_No_Filter(); + Get_List_Partner_Financeurs(); + Get_List_Partner_Clients(); + Getall_Partner_Site_Formation(); + setaddOneParticipant("1"); var myelement; diff --git a/src/components/Partner_Client.js b/src/components/Partner_Client.js index bb236d7..9883a28 100644 --- a/src/components/Partner_Client.js +++ b/src/components/Partner_Client.js @@ -65,6 +65,7 @@ import Popup from 'reactjs-popup'; import 'reactjs-popup/dist/index.css'; import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; +import { FcOrganization, FcBusinessman } from "react-icons/fc"; const Partner_Client = (props) => { @@ -132,6 +133,8 @@ const Partner_Client = (props) => { { field: 'siret', headerName: 'Siret', width: 100, hide: true, editable: false, renderCell: (params) => , }, { field: 'website', headerName: 'Siteweb', width: 100, hide: true, editable: false, renderCell: (params) => , }, + { field: 'is_company', headerName: 'Société', width: 100, hide: true, editable: false, renderCell: (params) => , }, + { field: "detail", headerName: 'Voir détail', @@ -139,7 +142,7 @@ const Partner_Client = (props) => { return (
{ - + setgridline_id(cellValues.row.id) handleClick_edit_session_From_Line(cellValues.row.id); }}> @@ -583,6 +586,21 @@ const Partner_Client = (props) => { client +
+
+ Type +
+ {Get_List_Partner_Clients_result && selected_id && + String(selected_id).length > 0 &&
+ {String(JSON.parse(Get_List_Partner_Clients_result[gridline_id]).is_company) === "1" && } + {String(JSON.parse(Get_List_Partner_Clients_result[gridline_id]).is_company) === "0" && } + {String(JSON.parse(Get_List_Partner_Clients_result[gridline_id]).is_company) !== "0" && + String(JSON.parse(Get_List_Partner_Clients_result[gridline_id]).is_company) !== "1" && + ""} + +
} +
+
Raison Sociale @@ -888,6 +906,7 @@ const Partner_Client = (props) => { adr_pays: JSON.parse(item).adr_pays, siret: JSON.parse(item).siret, website: JSON.parse(item).website, + is_company: JSON.parse(item).is_company, } ))} diff --git a/src/components/ToggleSwitch.js b/src/components/ToggleSwitch.js index 291cd58..0d79406 100644 --- a/src/components/ToggleSwitch.js +++ b/src/components/ToggleSwitch.js @@ -1,5 +1,5 @@ import React from "react"; - + const ToggleSwitch = ({ label, checked }) => { return ( diff --git a/src/styles/components/_addpartnerclient.scss b/src/styles/components/_addpartnerclient.scss index 98731cc..d885590 100644 --- a/src/styles/components/_addpartnerclient.scss +++ b/src/styles/components/_addpartnerclient.scss @@ -679,6 +679,8 @@ margin-right: 10px; } + + .detail_submenu { background: #d8edfc; border-radius: 15px; @@ -696,6 +698,7 @@ } + .detail_submenu:hover, .detail_submenu:focus, .detail_submenu:active, @@ -714,11 +717,19 @@ } // end media + + .client_menu { + font-size: 12px !important; + min-width: 15rem !important; + height: 2rem !important; + } + + .hr_break { border: 5px solid grey; } - .switch{ + .switch { max-height: 1.5rem !important; }