diff --git a/src/components/Crm_Opportunite.js b/src/components/Crm_Opportunite.js
index 0e246d9..8e61448 100644
--- a/src/components/Crm_Opportunite.js
+++ b/src/components/Crm_Opportunite.js
@@ -493,6 +493,20 @@ const CRM_Opportunite = (props) => {
if (new_data2.length > 0) {
setNew_Getall_Partner_CRM_Opport_Step_result(new_data2);
setOpportunite_chanel(local_opport_chanel);
+
+ if (String(props.reduce) === "0") {
+ var tmp = 80 / new_data2.length;
+ var tmp_val = tmp + "vw";
+
+ setkanban_colonne_width(tmp_val);
+ } else {
+ var tmp = 95 / new_data2.length;
+ var tmp_val = tmp + "vw";
+
+ setkanban_colonne_width(tmp_val);
+ }
+
+
} else {
setNew_Getall_Partner_CRM_Opport_Step_result([]);
setOpportunite_chanel([]);
@@ -533,6 +547,145 @@ const CRM_Opportunite = (props) => {
}
+ const [Getall_Partner_CRM_Opportunite_with_Filter_api, setGetall_Partner_CRM_Opportunite_with_Filter_api] = useState();
+ const [Getall_Partner_CRM_Opportunite_with_Filter_message, setGetall_Partner_CRM_Opportunite_with_Filter_message] = useState();
+ const [Getall_Partner_CRM_Opportunite_with_Filter_result, setGetall_Partner_CRM_Opportunite_with_Filter_result] = useState();
+ function Getall_Partner_CRM_Opportunite_with_Filter(event) {
+
+ var form = new FormData();
+
+
+ // Recuperation des parametres
+ var filtre1 = p_filtre1;
+ var filtre2 = p_filtre2;
+ var filtre3 = p_filtre3;
+ var filtre4 = p_filtre4;
+
+ var filtre1_value = "";
+ var filtre2_value = "";
+ var filtre3_value = "";
+ var filtre4_value = "";
+ // Recuperation des valeurs de filtres
+
+ if (p_filtre1_value) {
+ filtre1_value = p_filtre1_value;
+ form.append(filtre1, filtre1_value);
+ }
+
+ if (p_filtre2_value) {
+ filtre2_value = p_filtre2_value;
+ form.append(filtre2, filtre2_value);
+ }
+
+ if (p_filtre3_value) {
+ filtre3_value = p_filtre3_value;
+ form.append(filtre3, p_filtre3_value);
+ }
+
+ if (p_filtre4_value) {
+ filtre4_value = p_filtre4_value;
+ form.append(filtre4, p_filtre4_value);
+ }
+
+
+ const stored_cookie = getCookie('tokenmysypart');
+ form.append("token", stored_cookie);
+
+ var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_CRM_Opportunite_with_filter/";
+
+
+
+ setSelectionModel([]);
+ setGetall_Partner_CRM_Opportunite_result([]);
+ setTaskStatus([]);
+
+ axios.post(myurl, form).then(res => {
+
+ if (String(res.data.status) === String("true")) {
+ //console.log(" In Getall_Partner_CRM_Opportunite_with_Filter res.data.status = " + res.data.status);
+ //console.log(" In Getall_Partner_CRM_Opportunite_with_Filter res.data.message r_class = " + res.data.message);
+ setGetall_Partner_CRM_Opportunite_with_Filter_api("true");
+ setGetall_Partner_CRM_Opportunite_with_Filter_result(res.data.message);
+
+
+ setGetall_Partner_CRM_Opportunite_result(res.data.message);
+
+
+ var new_data2 = [];
+ const new_data = res.data.message.map((x) => {
+
+ //---
+ var localid = JSON.parse(x).id;
+ var local_id = JSON.parse(x)._id;
+ var local_titre = JSON.parse(x).titre;
+ var local_description = JSON.parse(x).description;
+ var local_statut = JSON.parse(x).statut;
+ var local_priorite = JSON.parse(x).priorite;
+ var local_revenu_cible = JSON.parse(x).revenu_cible;
+ var local_client_nom = JSON.parse(x).client_nom;
+ var local_client_id = JSON.parse(x).partner_client_id;
+
+ var local_contact_nom = JSON.parse(x).contact_nom;
+
+ //---
+ var node = {
+ "_id": local_id,
+ "id": localid,
+ "label": local_titre,
+ "titre": local_titre,
+ "title": local_titre,
+ "description": local_description,
+ "status": local_statut,
+ "priorite": local_priorite,
+ "revenu_cible": local_revenu_cible,
+ "client_nom": local_client_nom,
+ "client_id": local_client_id,
+ "contact_nom": local_contact_nom,
+
+ };
+ new_data2.push(node);
+ setTaskStatus(new_data2);
+
+ var node = {
+ "_id": "",
+ "id": "",
+ "label": "",
+ "titre": "",
+ "title": "",
+ "description": "",
+ "status": "",
+ "priorite": "",
+ "revenu_cible": "",
+ "client_nom": "",
+ "client_id": "",
+ "contact_nom": "",
+ };
+ new_data2.push(node);
+
+ });
+
+
+ if (new_data2.length > 0) {
+ setNew_Getall_Partner_CRM_Opportunite_result(new_data2);
+
+ }
+
+ }
+ else {
+ setGetall_Partner_CRM_Opportunite_with_Filter_api("false");
+ setGetall_Partner_CRM_Opportunite_with_Filter_message(res.data.message);
+ }
+
+ }).catch((error) => {
+ console.warn('Not good man :( Getall_Partner_CRM_Opportunite_with_Filter = ', error);
+ setGetall_Partner_CRM_Opportunite_with_Filter_api("false");
+ //setmyApimyApiMessage("")
+ })
+ }
+
+
+
+
useEffect(() => {
@@ -899,7 +1052,7 @@ const CRM_Opportunite = (props) => {
Getall_Partner_CRM_Opport_Step();
Getall_Partner_CRM_Opportunite();
-
+
Dialog_OPPORTUNITE_handleClose_buton();
alert(res.data.message);
@@ -1018,6 +1171,9 @@ const CRM_Opportunite = (props) => {
})
}
+
+ const [kanban_colonne_width, setkanban_colonne_width] = useState("16vw");
+
const [Get_Given_Opportunite_Data_api, setGet_Given_Opportunite_Data_api] = useState();
const [Get_Given_Opportunite_Data_message, setGet_Given_Opportunite_Data_message] = useState();
const [Get_Given_Opportunite_Data_result, setGet_Given_Opportunite_Data_result] = useState();
@@ -1135,8 +1291,9 @@ const CRM_Opportunite = (props) => {
fontFamily: 'Arial, "Helvetica Neue", sans-serif'
},
column: {
- minWidth: 200,
- width: "16vw",
+ // minWidth: 200,
+ //width: "16vw",
+ width: kanban_colonne_width,
height: "80vh",
margin: "0 auto",
backgroundColor: "#212F3D",
@@ -1211,9 +1368,6 @@ const CRM_Opportunite = (props) => {
if (New_Option_Status.length > 0 && status) {
var local_status_id = New_Option_Status.filter((data) => (data).value === String(status))[0]._id;
-
- console.log(" #### local_status_id = ", local_status_id)
-
Add_Update_Crm_Opportunite_Status(id, local_status_id);
}
//eeeee */
@@ -1357,8 +1511,21 @@ const CRM_Opportunite = (props) => {
clear_detail_fields();
setselected_id("");
setDialog_OPPORTUNITE_open(true);
-
}
+
+ const New_Option_Filter = [
+ { "id": "titre", "label": "Titre ", "value": "titre" },
+ // { "id": "vendeur_id", "label": "Vendeur ", "value": "vendeur_id" }, ==> a faire plus tard
+ { "id": "revenu_cible_superieur", "label": "Revenu (Supérieur à ) ", "value": "revenu_cible_superieur" },
+ { "id": "revenu_cible_inferieur", "label": "Revenu (Inférieur à ) ", "value": "revenu_cible_inferieur" },
+ { "id": "date_fermeture_avant", "label": "Date fermeture (avant) ", "value": "date_fermeture_avant" },
+ { "id": "date_fermeture_apres", "label": "Date fermeture (après) ", "value": "date_fermeture_apres" },
+ { "id": "partner_client_nom", "label": "Nom Client", "value": "partner_client_nom" },
+ { "id": "", "label": "", "value": "" },
+ { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres.
+ ]
+
+
return (
@@ -1765,7 +1932,7 @@ const CRM_Opportunite = (props) => {
-
+