23/05/2025 - 12h
parent
f7912c8353
commit
19c460f833
|
@ -230,6 +230,9 @@ const Jury = (props) => {
|
|||
|
||||
{ field: 'code', headerName: 'Code', flex: 1, hide: false, minWidth: 180, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'description', headerName: 'Description', flex: 1, hide: false, minWidth: 180, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{ field: 'cible', headerName: 'Cible', flex: 1, hide: false, minWidth: 180, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{ field: 'email_jury', headerName: 'Mail Diff.', flex: 1, hide: false, minWidth: 180, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'chef_jury_nom_prenom', headerName: 'Responsable', flex: 1, hide: false, minWidth: 180, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'nb_membre', headerName: 'Nb membres', flex: 1, hide: false, minWidth: 180, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
@ -6423,10 +6426,8 @@ const Jury = (props) => {
|
|||
nb_membre: JSON.parse(item).nb_membre,
|
||||
ue_id: JSON.parse(item).ue_id,
|
||||
cible: JSON.parse(item).cible,
|
||||
|
||||
code_session: JSON.parse(item).code_session,
|
||||
ue_code: JSON.parse(item).ue_code,
|
||||
|
||||
}
|
||||
))}
|
||||
|
||||
|
|
|
@ -210,7 +210,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: 'rang_calculation_date', headerName: 'Date Calcul', minwidth: 100, flex: 1, hide: true, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{ field: 'jury_note', headerName: 'Note Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => <ExpandableCell_50_bg_hiligt_red_color {...params} />, align: "center", },
|
||||
{ field: 'jury_observation', headerName: 'Observ. Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => <ExpandableCell_50_bg_hiligt_red_color {...params} />, align: "center", },
|
||||
{ field: 'jury_observation', headerName: 'Observ. Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => <ExpandableCell_50_bg_hiligt_red_color {...params} />, align: "left", },
|
||||
{
|
||||
field: 'jury_validation', headerName: 'Validation Jury', width: 150, hide: false, editable: jury_cell_editable,
|
||||
renderCell: (cellValues) => {
|
||||
|
@ -276,6 +276,9 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
setp_detail_jury_note(cellValues.row.jury_note);
|
||||
setp_detail_jury_validation(cellValues.row.jury_validation);
|
||||
setselected_inscription_id_for_jury(cellValues.row._id);
|
||||
|
||||
setselected_jury_type_for_observation("classement_final");
|
||||
setsession_formation_final_note_classement_id('');
|
||||
}}
|
||||
|
||||
>
|
||||
|
@ -310,7 +313,6 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
|
||||
if (option && String(option) === "Jury Edit") {
|
||||
|
||||
|
||||
setDialog_JURY_INFO_open(true);
|
||||
}
|
||||
|
||||
|
@ -396,10 +398,92 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: 'note_td', headerName: 'note_td', hide: true },
|
||||
{ field: 'note_tp', headerName: 'note_tp', hide: true },
|
||||
{ field: 'note_examen', headerName: 'note_examen', hide: true },
|
||||
{ field: 'jury_note', headerName: 'Note Jury', hide: true},
|
||||
{ field: 'jury_observation', headerName: 'Observ. Jury', width: 200, editable: jury_cell_editable, renderCell: (params) => <ExpandableCell_50_bg_hiligt_red_color {...params} />, align: "left", },
|
||||
|
||||
|
||||
{ field: 'detail', headerName: 'Detail Note', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{
|
||||
field: 'gestion', headerName: 'Gestion', minWidth: 50, flex: 1, maxWidth: 100, hideable: true, hide: false, editable: false, align: "center",
|
||||
renderCell: (cellValues) => {
|
||||
return (
|
||||
<div>
|
||||
<nav style={{ width: '100%', 'textAlign': 'center' }}>
|
||||
<IconButton
|
||||
aria-label="more"
|
||||
id="long-button"
|
||||
aria-controls={open ? 'long-menu_p' : undefined}
|
||||
aria-expanded={open ? 'true' : undefined}
|
||||
aria-haspopup="true"
|
||||
// onClick={handleClick_option_button_vertical}
|
||||
onClick={(e) => {
|
||||
handleClick_option_button_vertical(e);
|
||||
setworking_cellValues(cellValues);
|
||||
|
||||
setselected_jury_type_for_observation("classement_ue");
|
||||
setsession_formation_final_note_classement_id(cellValues.row._id);
|
||||
|
||||
setp_detail_jury_observation(cellValues.row.jury_observation);
|
||||
setp_detail_jury_note(cellValues.row.jury_note);
|
||||
setp_detail_jury_validation(cellValues.row.jury_validation);
|
||||
setselected_inscription_id_for_jury(cellValues.row._id);
|
||||
}}
|
||||
|
||||
>
|
||||
<MoreVertIcon />
|
||||
</IconButton>
|
||||
<Menu
|
||||
id="long-menu_p"
|
||||
MenuListProps={{
|
||||
'aria-labelledby': 'long-button',
|
||||
}}
|
||||
anchorEl={anchorEl}
|
||||
open={open}
|
||||
onClose={handleClose_option_button_vertical}
|
||||
slotProps={{
|
||||
paper: {
|
||||
style: {
|
||||
maxHeight: ITEM_HEIGHT * 4.5,
|
||||
width: '20ch',
|
||||
boxShadow: "-3px 4px 0px -30px #000000",
|
||||
borderRadius: '0px !important',
|
||||
lineHeight: '3rem'
|
||||
},
|
||||
},
|
||||
}}
|
||||
>
|
||||
{options_menu_vertical.map((option) => (
|
||||
<MenuItem key={option}
|
||||
|
||||
onClick={(e) => {
|
||||
//handleClose_option_button_vertical(e, option);
|
||||
setAnchorEl(null);
|
||||
|
||||
if (option && String(option) === "Jury Edit") {
|
||||
|
||||
|
||||
setDialog_JURY_INFO_open(true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}}
|
||||
>
|
||||
{option}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Menu>
|
||||
|
||||
|
||||
|
||||
</nav>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
},
|
||||
|
||||
|
||||
{ field: 'type_eval', headerName: 'Type eval', hide: true },
|
||||
|
||||
{ field: 'regle_calcul', headerName: 'regle_calcul', hide: true },
|
||||
|
@ -1537,9 +1621,20 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
setp_detail_jury_observation("");
|
||||
setp_detail_jury_note("");
|
||||
setp_detail_jury_validation("");
|
||||
setsession_formation_final_note_classement_id("");
|
||||
setselected_jury_type_for_observation("");
|
||||
|
||||
};
|
||||
|
||||
|
||||
const [p_detail_jury_ue_observation, setp_detail_jury_ue_observation] = useState("");
|
||||
const [p_detail_jury_ue_note, setp_detail_jury_ue_note] = useState("");
|
||||
const [p_detail_jury_ue_validation, setp_detail_jury_ue_validation] = useState("");
|
||||
|
||||
const [selected_jury_type_for_observation, setselected_jury_type_for_observation] = useState("");
|
||||
|
||||
const [session_formation_final_note_classement_id, setsession_formation_final_note_classement_id] = useState("");
|
||||
|
||||
const [p_detail_jury_observation, setp_detail_jury_observation] = useState("");
|
||||
const [p_detail_jury_note, setp_detail_jury_note] = useState("");
|
||||
const [p_detail_jury_validation, setp_detail_jury_validation] = useState("");
|
||||
|
@ -1601,6 +1696,64 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
})
|
||||
}
|
||||
|
||||
const [Update_Jury_UE_List_Inscrit_api, setUpdate_Jury_UE_List_Inscrit_api] = useState();
|
||||
const [Update_Jury_UE_List_Inscrit_message, setUpdate_Jury_UE_List_Inscrit_message] = useState();
|
||||
const [Update_Jury_UE_List_Inscrit_result, setUpdate_Jury_UE_List_Inscrit_result] = useState([]);
|
||||
function Update_Jury_UE_List_Inscrit() {
|
||||
var form = new FormData();
|
||||
//form.append("token","K3cw63eKokKSbV4spjQ48SUNnfy80yrXfA");
|
||||
|
||||
|
||||
const stored_cookie = getCookie('tokenmysypart');
|
||||
form.append("token", stored_cookie);
|
||||
|
||||
form.append("tab_ids", session_formation_final_note_classement_id);
|
||||
form.append("jury_observation", p_detail_jury_observation);
|
||||
form.append("jury_note", p_detail_jury_note);
|
||||
form.append("jury_validation", p_detail_jury_validation);
|
||||
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Add_Update_UE_Jury_Observation/";
|
||||
|
||||
|
||||
setLoading(true);
|
||||
axios.post(myurl, form).then(res => {
|
||||
//console.log(" In Update_Jury_UE_List_Inscrit res.data.status = " + res.data.status);
|
||||
//console.log(" In Update_Jury_UE_List_Inscrit res.data.message r_class = " + res.data.message);
|
||||
|
||||
setLoading(false);
|
||||
|
||||
if (String(res.data.status) === String("true")) {
|
||||
setUpdate_Jury_UE_List_Inscrit_api("true");
|
||||
setUpdate_Jury_UE_List_Inscrit_result(res.data.message);
|
||||
|
||||
Getall_Session_UE_Final_Note_Classement();
|
||||
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(res.data.message);
|
||||
setalert_type("success");
|
||||
}
|
||||
else {
|
||||
setUpdate_Jury_UE_List_Inscrit_api("false");
|
||||
setUpdate_Jury_UE_List_Inscrit_message(res.data.message);
|
||||
// alert(res.data.message);
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(res.data.message);
|
||||
setalert_type("error");
|
||||
}
|
||||
|
||||
}).catch((error) => {
|
||||
setLoading(false);
|
||||
|
||||
console.log('UpdateStagiaireData : Not good man :( Update_Jury_UE_List_Inscrit = ' + error);
|
||||
setUpdate_Jury_UE_List_Inscrit_api("false");
|
||||
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(" Impossible d'ajouter ou mettre à jour la décision du jury ");
|
||||
setalert_type("error");
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const [vue_note, setvue_note] = useState("classement");
|
||||
|
||||
|
@ -1663,7 +1816,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
<DialogContentText>
|
||||
{Dialog_1_message}
|
||||
</DialogContentText>
|
||||
|
||||
|
||||
<div className="session_caract_Dialog" > <b> Observation </b> <br />
|
||||
|
||||
<TextareaAutosize
|
||||
|
@ -1748,7 +1901,12 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
<div className="div_row_gauche">
|
||||
<Button
|
||||
className="bton_enreg_dialog" onClick={(e) => {
|
||||
Update_Jury_Promo_List_Inscrit();
|
||||
|
||||
if (selected_jury_type_for_observation === "classement_final")
|
||||
Update_Jury_Promo_List_Inscrit();
|
||||
else if (selected_jury_type_for_observation === "classement_ue")
|
||||
Update_Jury_UE_List_Inscrit()
|
||||
|
||||
Dialog_JURY_INFO_handleClose_buton();
|
||||
}}
|
||||
>Mettre à jour </Button>
|
||||
|
@ -1815,14 +1973,6 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
border: "1px solid rgb(224, 224, 224)",
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
/*"& .MuiDataGrid-virtualScrollerRenderZone": {
|
||||
"& .MuiDataGrid-row": {
|
||||
"&:nth-child(2n)": { backgroundColor: "rgba(235, 235, 235, .7)" }
|
||||
}
|
||||
},*/
|
||||
"& .MuiDataGrid-columnHeaders": {
|
||||
backgroundColor: "#c8cfd5",
|
||||
color: "black",
|
||||
|
@ -2395,13 +2545,15 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
ue_coefficient: JSON.parse(item).ue_coefficient,
|
||||
ue_validation: JSON.parse(item).ue_validation,
|
||||
|
||||
|
||||
ue_id_code: JSON.parse(item).ue_id_code,
|
||||
class_id_external_code: JSON.parse(item).class_id_external_code,
|
||||
inscription_id_mail: JSON.parse(item).inscription_id_mail,
|
||||
inscription_id_nom: JSON.parse(item).inscription_id_nom,
|
||||
inscription_id_prenom: JSON.parse(item).inscription_id_prenom,
|
||||
|
||||
jury_note: JSON.parse(item).jury_note,
|
||||
jury_observation: JSON.parse(item).jury_observation,
|
||||
jury_validation: JSON.parse(item).jury_validation,
|
||||
}
|
||||
))}
|
||||
|
||||
|
|
|
@ -3,11 +3,11 @@ import { useForm } from "react-hook-form";
|
|||
import axios from "axios";
|
||||
import Formation_Partner_Catalog from "./Formation_Partner_Catalog";
|
||||
import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react-icons/fa';
|
||||
import { BsFillXCircleFill } from "react-icons/bs";
|
||||
|
||||
import { IoAppsSharp, IoListSharp } from "react-icons/io5";
|
||||
import Formation_Grid_2Col from "./Formation_Grid_2Col";
|
||||
import Pagination from "./TestPagination";
|
||||
import data from "./data/mock-data.json";
|
||||
|
||||
import { useHistory } from "react-router-dom";
|
||||
import { getCookie, removeCookie } from 'react-use-cookie';
|
||||
import { Helmet } from "react-helmet";
|
||||
|
@ -15,28 +15,16 @@ import { Helmet } from "react-helmet";
|
|||
import AideRecherche from "./AideRecherche"
|
||||
import { useParams } from 'react-router-dom'
|
||||
import Fotter_Catalog_Pub from "./Fotter_Catalog_Pub";
|
||||
import Footer from "./Fotter";
|
||||
import LogoutOutlinedIcon from '@mui/icons-material/LogoutOutlined';
|
||||
import Button from '@mui/material/Button';
|
||||
import MenuItem from "@material-ui/core/MenuItem";
|
||||
import Menu from "@material-ui/core/Menu";
|
||||
import Header from "./Header";
|
||||
|
||||
import connect_white from "../mysy_img/connect_white_v2.png";
|
||||
import connect_green from "../mysy_img/connect_green.png";
|
||||
|
||||
import { confirmAlert } from 'react-confirm-alert'; // Import
|
||||
import { useCookies } from "react-cookie";
|
||||
import InputRange from 'react-input-range';
|
||||
import 'react-input-range/lib/css/index.css';
|
||||
import tick_ko from "../mysy_img/tick_KO.png";
|
||||
|
||||
import img_header from "../mysy_img2/img_header.png"
|
||||
|
||||
|
||||
|
||||
|
||||
import { TbArrowsDownUp } from "react-icons/tb";
|
||||
import { CiCircleRemove, CiCircleMinus } from "react-icons/ci";
|
||||
|
||||
let PageSize = 10;
|
||||
const Mon_Catalogue_Public = (props) => {
|
||||
|
||||
|
@ -1588,6 +1576,8 @@ const Mon_Catalogue_Public = (props) => {
|
|||
|
||||
}
|
||||
|
||||
const [trier_par, settrier_par] = useState("1");
|
||||
|
||||
function trier(e) {
|
||||
|
||||
setistrier();
|
||||
|
@ -1603,15 +1593,22 @@ const Mon_Catalogue_Public = (props) => {
|
|||
|
||||
//console.log(" AVANT TRIE : [0].duration = " + JSON.parse(result[0]).duration + " - [1].duration = " + JSON.parse(result[1]).duration)
|
||||
result.sort(function (a, b) {
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
else
|
||||
return JSON.parse(b).duration - JSON.parse(a).duration;
|
||||
});
|
||||
|
||||
//console.log("APRES TRIE : [0].duration = " + JSON.parse(result[0]).duration + " - [1].duration = " + JSON.parse(result[1]).duration)
|
||||
|
||||
setistrier("1");
|
||||
}
|
||||
else if (typeof (newresult) !== "undefined" || newresult.length > 0) {
|
||||
newresult.sort(function (a, b) {
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
else
|
||||
return JSON.parse(b).duration - JSON.parse(a).duration;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1622,14 +1619,21 @@ const Mon_Catalogue_Public = (props) => {
|
|||
if (typeof (newresult) === "undefined" || String(newresult) === '') {
|
||||
//console.log(" AVANT TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
result.sort(function (a, b) {
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
else
|
||||
return JSON.parse(b).price - JSON.parse(a).price;
|
||||
});
|
||||
//console.log("APRES TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
setistrier("2");
|
||||
}
|
||||
else if (typeof (newresult) !== "undefined" || newresult.length > 0) {
|
||||
newresult.sort(function (a, b) {
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
else
|
||||
return JSON.parse(b).price - JSON.parse(a).price;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1640,18 +1644,29 @@ const Mon_Catalogue_Public = (props) => {
|
|||
if (typeof (newresult) === "undefined" || String(newresult) === '') {
|
||||
//console.log(" AVANT TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
result.sort(function (a, b) {
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
else
|
||||
return JSON.parse(a).note - JSON.parse(b).note;
|
||||
});
|
||||
//console.log("APRES TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
setistrier("2");
|
||||
}
|
||||
else if (typeof (newresult) !== "undefined" || newresult.length > 0) {
|
||||
newresult.sort(function (a, b) {
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
else
|
||||
return JSON.parse(a).note - JSON.parse(b).note;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (trier_par === "1")
|
||||
settrier_par("-1");
|
||||
else
|
||||
settrier_par("1");
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -2887,7 +2902,7 @@ const Mon_Catalogue_Public = (props) => {
|
|||
<link rel="canonical" href={`${process.env.REACT_APP_BASE_URL}` + "/recherche-formation"} />
|
||||
<meta name="title" content="Formation & Tutoriel Gratuit ou payant Excellente qualité" />
|
||||
</Helmet>
|
||||
|
||||
|
||||
{/******* Gestion du THEME "MySy_Theme2" */}
|
||||
{New_Get_Subdomain_Partner_Data_result && New_Get_Subdomain_Partner_Data_result.length > 0
|
||||
&& String(my_theme_code) === "MySy_Theme2" && <div>
|
||||
|
@ -3002,9 +3017,9 @@ const Mon_Catalogue_Public = (props) => {
|
|||
|
||||
|
||||
<div className="Header_Content">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div className="block_nos_formation">
|
||||
|
@ -3093,7 +3108,7 @@ const Mon_Catalogue_Public = (props) => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div className="sous_filter_txt_grp_filtre">
|
||||
<div className="sous_filter_txt_grp_filtre">
|
||||
<div className="tab_critere_espace">
|
||||
<div className="filter_valeur" onChange={TrainingTypeHandle}>
|
||||
<div className="filter_valeur_txt" > Type
|
||||
|
@ -3198,7 +3213,7 @@ const Mon_Catalogue_Public = (props) => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div className="sous_filter_txt_grp_filtre">
|
||||
<div className="sous_filter_txt_grp_filtre">
|
||||
|
||||
<div className="tab_critere_espace">
|
||||
|
||||
|
@ -3309,11 +3324,22 @@ const Mon_Catalogue_Public = (props) => {
|
|||
<select className="filter_val" style={{ "marginTop": '10px' }}
|
||||
id={"trierpar"} name={"trierpar"}
|
||||
onChange={trier}>
|
||||
<option selected value="price">Prix</option>
|
||||
<option value="price">Prix</option>
|
||||
|
||||
<option value="duration">Duree</option>
|
||||
<option value="note">Pertinence</option>
|
||||
<option selected value="note">Pertinence</option>
|
||||
</select>
|
||||
<span style={{ width: '10%' }}><TbArrowsDownUp style={{ height: '2rem', paddingTop: '5px', width: '40%' }}
|
||||
onClick={(e) => {
|
||||
if (trier_par === "1")
|
||||
settrier_par("-1");
|
||||
else
|
||||
settrier_par("1");
|
||||
|
||||
trier();
|
||||
}}
|
||||
|
||||
/> </span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -4433,11 +4459,22 @@ const Mon_Catalogue_Public = (props) => {
|
|||
<select className="filter_val"
|
||||
id={"trierpar"} name={"trierpar"}
|
||||
onChange={trier}>
|
||||
<option selected value="price">Prix</option>
|
||||
<option value="price">Prix</option>
|
||||
|
||||
<option value="duration">Duree</option>
|
||||
<option value="note">Pertinence</option>
|
||||
<option selected value="note">Pertinence</option>
|
||||
</select>
|
||||
<span style={{ width: '10%' }}><TbArrowsDownUp style={{ height: '2rem', paddingTop: '5px', width: '40%' }}
|
||||
onClick={(e) => {
|
||||
if (trier_par === "1")
|
||||
settrier_par("-1");
|
||||
else
|
||||
settrier_par("1");
|
||||
|
||||
trier();
|
||||
}}
|
||||
|
||||
/> </span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -4552,7 +4589,7 @@ const Mon_Catalogue_Public = (props) => {
|
|||
|
||||
<Fotter_Catalog_Pub partner_data={New_Get_Subdomain_Partner_Data_result[0]} />
|
||||
</div>
|
||||
|
||||
|
||||
</div>}
|
||||
{/******* FIN Gestion du THEME PAR DEFAULT " */}
|
||||
|
||||
|
|
|
@ -3364,10 +3364,10 @@ const Recherche_new_v4 = () => {
|
|||
<select className="filter_val" style={{ "marginTop": '10px' }}
|
||||
id={"trierpar"} name={"trierpar"}
|
||||
onChange={trier}>
|
||||
<option value="note">Pertinence</option>
|
||||
<option selected value="price">Prix</option>
|
||||
|
||||
<option value="duration">Duree</option>
|
||||
<option value="note">Pertinence</option>
|
||||
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -2862,7 +2862,7 @@ const Subdomain_Recherche_new_v2 = () => {
|
|||
<nav className="header_menu" onClick={handleQuisommesNousMenu}> A propos</nav>
|
||||
|
||||
<nav className="header_menu" onClick={handleProduitMenu}>
|
||||
Prix
|
||||
Prix
|
||||
|
||||
</nav>
|
||||
|
||||
|
@ -3823,10 +3823,10 @@ const Subdomain_Recherche_new_v2 = () => {
|
|||
<select className="filter_val"
|
||||
id={"trierpar"} name={"trierpar"}
|
||||
onChange={trier}>
|
||||
<option selected value="price">Prix</option>
|
||||
|
||||
<option selected value="note">Pertinence</option>
|
||||
<option value="price">Prix</option>
|
||||
<option value="duration">Duree</option>
|
||||
<option value="note">Pertinence</option>
|
||||
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -5,7 +5,7 @@ import axios from "axios";
|
|||
import New_C_Formation_2025 from "./../New_C_Formation_2025";
|
||||
import { FaSearch, FaRegArrowAltCircleDown, FaRegArrowAltCircleUp } from 'react-icons/fa';
|
||||
import { BsFillXCircleFill } from "react-icons/bs";
|
||||
|
||||
import { TbArrowsDownUp } from "react-icons/tb";
|
||||
|
||||
import SendIcon from '@mui/icons-material/Send';
|
||||
|
||||
|
@ -16,9 +16,6 @@ import { Helmet } from "react-helmet";
|
|||
|
||||
import AideRecherche from "./../AideRecherche"
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import Footer from "./../Fotter";
|
||||
|
||||
import Button from '@mui/material/Button';
|
||||
import MenuItem from "@material-ui/core/MenuItem";
|
||||
import Menu from "@material-ui/core/Menu";
|
||||
|
@ -510,7 +507,7 @@ const New_C_Marketplace_2025 = () => {
|
|||
setv11(filtre1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -1608,15 +1605,22 @@ const New_C_Marketplace_2025 = () => {
|
|||
|
||||
//console.log(" AVANT TRIE : [0].duration = " + JSON.parse(result[0]).duration + " - [1].duration = " + JSON.parse(result[1]).duration)
|
||||
result.sort(function (a, b) {
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
else
|
||||
return JSON.parse(b).duration - JSON.parse(a).duration;
|
||||
});
|
||||
|
||||
//console.log("APRES TRIE : [0].duration = " + JSON.parse(result[0]).duration + " - [1].duration = " + JSON.parse(result[1]).duration)
|
||||
|
||||
setistrier("1");
|
||||
}
|
||||
else if (typeof (newresult) !== "undefined" || newresult.length > 0) {
|
||||
newresult.sort(function (a, b) {
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).duration - JSON.parse(b).duration;
|
||||
else
|
||||
return JSON.parse(b).duration - JSON.parse(a).duration;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1627,14 +1631,21 @@ const New_C_Marketplace_2025 = () => {
|
|||
if (typeof (newresult) === "undefined" || String(newresult) === '') {
|
||||
//console.log(" AVANT TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
result.sort(function (a, b) {
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
else
|
||||
return JSON.parse(b).price - JSON.parse(a).price;
|
||||
});
|
||||
//console.log("APRES TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
setistrier("2");
|
||||
}
|
||||
else if (typeof (newresult) !== "undefined" || newresult.length > 0) {
|
||||
newresult.sort(function (a, b) {
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(a).price - JSON.parse(b).price;
|
||||
else
|
||||
return JSON.parse(b).price - JSON.parse(a).price;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1645,18 +1656,29 @@ const New_C_Marketplace_2025 = () => {
|
|||
if (typeof (newresult) === "undefined" || String(newresult) === '') {
|
||||
//console.log(" AVANT TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
result.sort(function (a, b) {
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
else
|
||||
return JSON.parse(a).note - JSON.parse(b).note;
|
||||
});
|
||||
//console.log("APRES TRIE : [0].price = " + JSON.parse(result[0]).price + " - [1].price = " + JSON.parse(result[1]).price);
|
||||
setistrier("2");
|
||||
}
|
||||
else if (typeof (newresult) !== "undefined" || newresult.length > 0) {
|
||||
newresult.sort(function (a, b) {
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
if (trier_par === "1")
|
||||
return JSON.parse(b).note - JSON.parse(a).note;
|
||||
else
|
||||
return JSON.parse(a).note - JSON.parse(b).note;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (trier_par === "1")
|
||||
settrier_par("-1");
|
||||
else
|
||||
settrier_par("1");
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -2729,6 +2751,8 @@ const New_C_Marketplace_2025 = () => {
|
|||
}
|
||||
|
||||
|
||||
const [trier_par, settrier_par] = useState("1");
|
||||
|
||||
return (
|
||||
<div className="new_marketplace_2025" >
|
||||
|
||||
|
@ -3680,11 +3704,23 @@ const New_C_Marketplace_2025 = () => {
|
|||
<select className="filter_val"
|
||||
id={"trierpar"} name={"trierpar"}
|
||||
onChange={trier}>
|
||||
<option selected value="price">Prix</option>
|
||||
|
||||
<option selected value="note" >Pertinence</option>
|
||||
<option value="price">Prix</option>
|
||||
<option value="duration">Duree</option>
|
||||
<option value="note">Pertinence</option>
|
||||
|
||||
</select>
|
||||
<span style={{ width: '10%' }}><TbArrowsDownUp style={{ height: '2rem', paddingTop: '5px', width: '40%' }}
|
||||
onClick={(e) => {
|
||||
if (trier_par === "1")
|
||||
settrier_par("-1");
|
||||
else
|
||||
settrier_par("1");
|
||||
|
||||
trier();
|
||||
}}
|
||||
|
||||
/> </span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -396,8 +396,8 @@
|
|||
color: #104277;
|
||||
font-size: 0.75rem;
|
||||
white-space: nowrap;
|
||||
width: 30%;
|
||||
margin-top: 0.3rem;
|
||||
width: 20%;
|
||||
|
||||
}
|
||||
|
||||
.filter_val {
|
||||
|
@ -410,8 +410,8 @@
|
|||
border: none;
|
||||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "verdana", "Quicksand", "Signika", sans-serif;
|
||||
border: 0.1rem solid black;
|
||||
font-family: "DM Sans", "verdana", "Quicksand", "Signika";
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -2572,8 +2572,8 @@
|
|||
color: #104277;
|
||||
font-size: 0.75rem;
|
||||
white-space: nowrap;
|
||||
width: 30%;
|
||||
margin-top: 0.3rem;
|
||||
width: 20%;
|
||||
|
||||
}
|
||||
|
||||
.filter_val {
|
||||
|
@ -2586,8 +2586,8 @@
|
|||
border: none;
|
||||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "verdana", "Quicksand", "Signika", sans-serif;
|
||||
border: 0.1rem solid black;
|
||||
font-family: "DM Sans", "verdana", "Quicksand", "Signika";
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -5625,8 +5625,8 @@
|
|||
color: #104277;
|
||||
font-size: 0.9rem;
|
||||
white-space: nowrap;
|
||||
width: 30%;
|
||||
margin-top: 0.6rem;
|
||||
width: 20%;
|
||||
|
||||
}
|
||||
|
||||
.filter_val {
|
||||
|
@ -5639,8 +5639,8 @@
|
|||
border: none;
|
||||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "verdana", "Quicksand", "Signika", sans-serif;
|
||||
border: 0.1rem solid black;
|
||||
font-family: "DM Sans", "verdana", "Quicksand", "Signika";
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -8692,8 +8692,8 @@
|
|||
color: #104277;
|
||||
font-size: 0.9rem;
|
||||
white-space: nowrap;
|
||||
width: 30%;
|
||||
margin-top: 0.5rem;
|
||||
width: 20%;
|
||||
|
||||
}
|
||||
|
||||
.filter_val {
|
||||
|
@ -8706,8 +8706,8 @@
|
|||
border: none;
|
||||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "verdana", "Quicksand", "Signika", sans-serif;
|
||||
border: 0.1rem solid black;
|
||||
font-family: "DM Sans", "verdana", "Quicksand", "Signika";
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -11776,8 +11776,8 @@
|
|||
color: #104277;
|
||||
font-size: 0.75rem;
|
||||
white-space: nowrap;
|
||||
width: 30%;
|
||||
margin-top: 0.3rem;
|
||||
width: 20%;
|
||||
|
||||
}
|
||||
|
||||
.filter_val {
|
||||
|
@ -11790,8 +11790,8 @@
|
|||
border: none;
|
||||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "verdana", "Quicksand", "Signika", sans-serif;
|
||||
border: 0.1rem solid black;
|
||||
font-family: "DM Sans", "verdana", "Quicksand", "Signika";
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
|
|
@ -392,7 +392,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -2900,7 +2900,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -9462,7 +9462,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -12775,7 +12775,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
|
|
@ -397,7 +397,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -2921,7 +2921,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -9480,7 +9480,7 @@
|
|||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 0.1rem solid black;
|
||||
border: 1px solid #C7C9CE;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
margin-top: 0.3rem;
|
||||
|
@ -12780,7 +12780,7 @@
|
|||
border: none;
|
||||
background: transparent;
|
||||
color: #3b3e40;
|
||||
font-family: "DM Sans", "sans-serif";
|
||||
border: 1px solid #C7C9CE;
|
||||
border: 0.1rem solid black;
|
||||
border-radius: 0.3rem !important;
|
||||
width: 65%;
|
||||
|
|
Loading…
Reference in New Issue