diff --git a/src/components/AddPartnerClient.js b/src/components/AddPartnerClient.js index 56f21d9..261980f 100644 --- a/src/components/AddPartnerClient.js +++ b/src/components/AddPartnerClient.js @@ -4654,7 +4654,7 @@ const AddParnerClient = (props) => { {String(submenu).trim() === "submenu_activite" &&
-
} diff --git a/src/components/Crm_Opportunite.js b/src/components/Crm_Opportunite.js index 3747ac1..516c921 100644 --- a/src/components/Crm_Opportunite.js +++ b/src/components/Crm_Opportunite.js @@ -43,7 +43,7 @@ import { TransitionProps } from '@mui/material/transitions'; import { IoAddCircleOutline, IoCloseCircleOutline } from "react-icons/io5"; import ToggleSwitch from "./ToggleSwitch"; import ToggleSwitch_v2_mysy from "./ToggleSwitch_v2_mysy"; - +import FileCopyIcon from '@mui/icons-material/FileCopy'; import Link from '@mui/material/Link'; import { PiDotsThree } from "react-icons/pi"; @@ -58,6 +58,9 @@ import Rating from '@mui/material/Rating'; import { CiBoxList } from "react-icons/ci"; import { FcPlanner } from "react-icons/fc"; +import AddCircleIcon from '@mui/icons-material/AddCircle'; + + const CRM_Opportunite = (props) => { const history = useHistory(); const [submenu, setsubmenu] = useState(""); @@ -753,6 +756,11 @@ const CRM_Opportunite = (props) => { const [p_detail_statut_id, setp_detail_statut_id] = useState(""); const [p_detail_date_fermeture, setp_detail_date_fermeture] = useState(); + + const [p_detail_statut_is_gagne, setp_detail_statut_is_gagne] = useState(""); + + + function clear_detail_fields() { setp_detail_titre(""); setp_detail_description(""); @@ -768,6 +776,7 @@ const CRM_Opportunite = (props) => { setp_detail_vendeur_id(''); setp_detail_statut(""); setp_detail_statut_id(''); + setp_detail_statut_is_gagne(''); setp_detail_date_fermeture(date_today_90j.toLocaleDateString('fr-FR')); } @@ -1234,23 +1243,44 @@ const CRM_Opportunite = (props) => { if (mylocal_opportunite.contact_email) setp_detail_contact_email(mylocal_opportunite.contact_email); + else + setp_detail_contact_email(""); if (mylocal_opportunite.contact_telephone) setp_detail_contact_telephone(mylocal_opportunite.contact_telephone); + else + setp_detail_contact_telephone(""); if (mylocal_opportunite.commentaire) setp_detail_commentaire(mylocal_opportunite.commentaire); + else + setp_detail_commentaire(""); if (mylocal_opportunite.vendeur_id) setp_detail_vendeur_id(mylocal_opportunite.vendeur_id); + else + setp_detail_vendeur_id(""); + if (mylocal_opportunite.statut) setp_detail_statut(mylocal_opportunite.statut); + else + setp_detail_statut(""); + if (mylocal_opportunite.statut_id) setp_detail_statut_id(mylocal_opportunite.statut_id); + else + setp_detail_statut_id(""); + + + if (mylocal_opportunite.is_gagne) + setp_detail_statut_is_gagne(mylocal_opportunite.is_gagne); + else + setp_detail_statut_is_gagne(""); + if (mylocal_opportunite.date_fermeture) setp_detail_date_fermeture(mylocal_opportunite.date_fermeture); @@ -1357,7 +1387,7 @@ const CRM_Opportunite = (props) => { const changeTaskStatus = useCallback( (id, status) => { - + let task = tasks.find(task => task._id === id); const taskIndex = tasks.indexOf(task); task = { ...task, status }; @@ -1569,6 +1599,20 @@ const CRM_Opportunite = (props) => { {Dialog_1_message} + + {p_detail_statut_is_gagne && String(p_detail_statut_is_gagne) === "1" && +
+ +
}
Titre
{
- +
} {/*** Affichage d'une UE */} + + + + + + {display_ue && String(display_ue) === "1" && String(add_one_ue) !== "1" && String(submenu) === "detail_ue" &&
@@ -2781,10 +2788,13 @@ const DisplayPartnerUnite_Enseignement = (props) => {
- {ue_data_edit_mode && String(ue_data_edit_mode) !== "1" &&
-
CM
+
+ + CM +
+
{ />
-
TD
+
+ + TD +
+
+ { />
-
TP
+
+ + TP +
+
{ />
-
TPG
+
+ + TPG +
+
{ {ue_data_edit_mode && String(ue_data_edit_mode) === "1" &&
-
CM
+
+ + CM +
+
{ />
-
TD
+
+ + TD +
+
{ />
-
TP
+
+ + TP +
+
{ />
-
TPG
+ -
CM
+ -
TD
+
+ + TD +
+
{ />
-
TP
+
+ + TP +
+
{ />
-
TPG
+ - +
diff --git a/src/components/Employes.js b/src/components/Employes.js index 01fb5fc..b77ec10 100644 --- a/src/components/Employes.js +++ b/src/components/Employes.js @@ -10350,7 +10350,7 @@ const Employes = (props) => {
-
Profil ee
+
Profil utilisateur
{ } {String(menu) === "monactivite" &&
- +
} diff --git a/src/components/UpdatePartnerInfo.js b/src/components/UpdatePartnerInfo.js index 967fc37..9475170 100644 --- a/src/components/UpdatePartnerInfo.js +++ b/src/components/UpdatePartnerInfo.js @@ -2443,7 +2443,7 @@ function UpdateParnterInfo(props) {
} {String(submenu).trim() === "submenu_donnee_catalog_pub" &&
-

Configuration du Catalog public

+

Configuration du Catalogue public

diff --git a/src/pages/mon_catalogue_public.js b/src/pages/mon_catalogue_public.js index e973dcb..bc3dddc 100644 --- a/src/pages/mon_catalogue_public.js +++ b/src/pages/mon_catalogue_public.js @@ -7,7 +7,7 @@ const mon_catalogue_public = () => { return (
- +