wcwx
parent
ad041ae4dd
commit
58f2e023e6
|
@ -1819,7 +1819,7 @@ const Equipe_Team = (props) => {
|
|||
form.append("tab_ids", local_tab_ids);
|
||||
|
||||
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_Groupe_Equipe_Team_Membre/";
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Delete_Equipe_Team_Membre/";
|
||||
setLoading(true);
|
||||
|
||||
axios.post(myurl, form).then(res => {
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -134,24 +134,17 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: '_id', headerName: '_id', hide: true },
|
||||
{ field: 'inscription_id', headerName: 'inscription_id', hide: true },
|
||||
{ field: 'session_id', headerName: 'session_id', hide: true },
|
||||
{ field: 'ue_id', headerName: 'ue_id', hide: true },
|
||||
{ field: 'class_id', headerName: 'class_id', hide: true },
|
||||
{ field: 'class_id_external_code', headerName: 'Code Formation', hide: true },
|
||||
{ field: 'ue_id_code', headerName: 'UE Code', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_nom', headerName: 'Nom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_prenom', headerName: 'Prenom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{ field: 'type_eval', headerName: 'Type eval', minwidth: 100, flex: 1, hide: false, editable: true, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'nom', headerName: 'Nom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'prenom', headerName: 'Prenom', minwidth: 200, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'rang', headerName: 'Rang', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'note_finale', headerName: 'Noete finale', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{ field: 'credit_acquis', headerName: 'Credit acquis', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'rang_calculation_date', headerName: 'Date Calcul', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
|
||||
{ field: 'moyenne', headerName: 'moyenne', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'somme', headerName: 'somme', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'nb_evaluation', headerName: 'nb_evaluation', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'inscription_id_mail', headerName: 'Email', minwidth: 300, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
{ field: 'detail', headerName: 'Detail Note', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
]
|
||||
|
||||
const columns_list_evaluation_detail_note_classement_final = [
|
||||
|
@ -196,18 +189,22 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
{ field: 'rang', headerName: 'rang', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'seuil_validation', headerName: 'Seuil val.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'ue_coefficient', headerName: 'Coeff.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
{ field: 'ue_validation', headerName: 'Validé', minwidth: 100, flex: 1, hide: false, editable: false,
|
||||
|
||||
{ field: 'credit', headerName: 'Credit.', minwidth: 100, flex: 1, hide: false, editable: false, renderCell: (params) => <ExpandableCell_50 {...params} />, },
|
||||
|
||||
|
||||
{
|
||||
field: 'ue_validation', headerName: 'Validé', minwidth: 100, flex: 1, hide: false, editable: false,
|
||||
|
||||
renderCell: (cellValues) => {
|
||||
return (
|
||||
<div style={{ paddingLeft: "5px", paddingRight: "15px", "display": "block", wordBreak: "break-all" }}>
|
||||
{cellValues.row.ue_validation && String(cellValues.row.ue_validation) === "1" && "Oui"}
|
||||
{cellValues.row.ue_validation && String(cellValues.row.ue_validation) === "0" && "Non"}
|
||||
|
||||
</div>
|
||||
|
||||
<div style={{ paddingLeft: "5px", paddingRight: "15px", "display": "block", wordBreak: "break-all" }}>
|
||||
{cellValues.row.ue_validation && String(cellValues.row.ue_validation) === "1" && "Oui"}
|
||||
{cellValues.row.ue_validation && String(cellValues.row.ue_validation) === "0" && "Non"}
|
||||
|
||||
</div>
|
||||
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
{ field: 'note_td', headerName: 'note_td', hide: true },
|
||||
|
@ -344,12 +341,67 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
}
|
||||
|
||||
|
||||
const [New_Getall_Session_Final_Note_Classement_result, setNew_Getall_Session_Final_Note_Classement_result] = useState([]);
|
||||
const [Calcul_Note_Classement_Session_api, setCalcul_Note_Classement_Session_api] = useState();
|
||||
const [Calcul_Note_Classement_Session_message, setCalcul_Note_Classement_Session_message] = useState();
|
||||
const [Calcul_Note_Classement_Session_result, setCalcul_Note_Classement_Session_result] = useState([]);
|
||||
function Calcul_Note_Classement_Session(event) {
|
||||
|
||||
const [Getall_Session_Final_Note_Classement_api, setGetall_Session_Final_Note_Classement_api] = useState();
|
||||
const [Getall_Session_Final_Note_Classement_message, setGetall_Session_Final_Note_Classement_message] = useState();
|
||||
const [Getall_Session_Final_Note_Classement_result, setGetall_Session_Final_Note_Classement_result] = useState([]);
|
||||
function Getall_Session_Final_Note_Classement(event) {
|
||||
var form = new FormData();
|
||||
|
||||
|
||||
const stored_cookie = getCookie('tokenmysypart');
|
||||
form.append("token", stored_cookie);
|
||||
form.append("session_id", props.related_collection_recid);
|
||||
|
||||
setLoading(false);
|
||||
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Calcul_Note_Classement_Session";
|
||||
|
||||
axios.post(myurl, form).then(res => {
|
||||
setLoading(false);
|
||||
if (String(res.data.status) === String("true")) {
|
||||
// console.log(" In Calcul_Note_Classement_Session res.data.status = " + res.data.status);
|
||||
// console.log(" In Calcul_Note_Classement_Session res.data.message r_class = " + res.data.message);
|
||||
setCalcul_Note_Classement_Session_api("true");
|
||||
setCalcul_Note_Classement_Session_result(res.data.message);
|
||||
|
||||
Getall_Session_Detail_Final_Note_Classement();
|
||||
Getall_Session_UE_Final_Note_Classement();
|
||||
Getall_Session_Final_Note_Classement();
|
||||
|
||||
// alert(res.data.message);
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(res.data.message);
|
||||
setalert_type("success");
|
||||
|
||||
}
|
||||
else {
|
||||
setCalcul_Note_Classement_Session_api("false");
|
||||
setCalcul_Note_Classement_Session_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.warn('Not good man :( Calcul_Note_Classement_Session = ', error);
|
||||
setCalcul_Note_Classement_Session_api("false");
|
||||
// alert(" Impossible de recuperer la liste des évaluations");
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(" Impossible de recuperer la liste des évaluations");
|
||||
setalert_type("error");
|
||||
//setmyApimyApiMessage("")
|
||||
})
|
||||
}
|
||||
|
||||
const [New_Getall_Session_UE_Final_Note_Classement_result, setNew_Getall_Session_UE_Final_Note_Classement_result] = useState([]);
|
||||
|
||||
const [Getall_Session_UE_Final_Note_Classement_api, setGetall_Session_UE_Final_Note_Classement_api] = useState();
|
||||
const [Getall_Session_UE_Final_Note_Classement_message, setGetall_Session_UE_Final_Note_Classement_message] = useState();
|
||||
const [Getall_Session_UE_Final_Note_Classement_result, setGetall_Session_UE_Final_Note_Classement_result] = useState([]);
|
||||
function Getall_Session_UE_Final_Note_Classement(event) {
|
||||
|
||||
var form = new FormData();
|
||||
|
||||
|
@ -359,15 +411,15 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
form.append("tab_session_id", props.related_collection_recid);
|
||||
|
||||
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Evaluation_Final_Note_Classement_With_Filter";
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Evaluation_UE_Note_Classement_With_Filter";
|
||||
|
||||
axios.post(myurl, form).then(res => {
|
||||
|
||||
if (String(res.data.status) === String("true")) {
|
||||
// console.log(" In Getall_Session_Final_Note_Classement res.data.status = " + res.data.status);
|
||||
//console.log(" In Getall_Session_Final_Note_Classement res.data.message r_class = " + res.data.message);
|
||||
setGetall_Session_Final_Note_Classement_api("true");
|
||||
setGetall_Session_Final_Note_Classement_result(res.data.message);
|
||||
// console.log(" In Getall_Session_UE_Final_Note_Classement res.data.status = " + res.data.status);
|
||||
//console.log(" In Getall_Session_UE_Final_Note_Classement res.data.message r_class = " + res.data.message);
|
||||
setGetall_Session_UE_Final_Note_Classement_api("true");
|
||||
setGetall_Session_UE_Final_Note_Classement_result(res.data.message);
|
||||
|
||||
|
||||
var new_data2 = [];
|
||||
|
@ -460,6 +512,113 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
};
|
||||
new_data2.push(node);
|
||||
|
||||
if (new_data2.length > 0)
|
||||
setNew_Getall_Session_UE_Final_Note_Classement_result(new_data2);
|
||||
|
||||
}
|
||||
else {
|
||||
setGetall_Session_UE_Final_Note_Classement_api("false");
|
||||
setGetall_Session_UE_Final_Note_Classement_message(res.data.message);
|
||||
// alert(res.data.message)
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(res.data.message);
|
||||
setalert_type("error");
|
||||
}
|
||||
|
||||
}).catch((error) => {
|
||||
console.warn('Not good man :( Getall_Session_UE_Final_Note_Classement = ', error);
|
||||
setGetall_Session_UE_Final_Note_Classement_api("false");
|
||||
// alert(" Impossible de recuperer la liste des évaluations");
|
||||
setdisplay_alert_mysy("1");
|
||||
setalert_message(" Impossible de recuperer la liste des évaluations");
|
||||
setalert_type("error");
|
||||
//setmyApimyApiMessage("")
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
const [New_Getall_Session_Final_Note_Classement_result, setNew_Getall_Session_Final_Note_Classement_result] = useState([]);
|
||||
|
||||
const [Getall_Session_Final_Note_Classement_api, setGetall_Session_Final_Note_Classement_api] = useState();
|
||||
const [Getall_Session_Final_Note_Classement_message, setGetall_Session_Final_Note_Classement_message] = useState();
|
||||
const [Getall_Session_Final_Note_Classement_result, setGetall_Session_Final_Note_Classement_result] = useState([]);
|
||||
function Getall_Session_Final_Note_Classement(event) {
|
||||
|
||||
var form = new FormData();
|
||||
|
||||
|
||||
const stored_cookie = getCookie('tokenmysypart');
|
||||
form.append("token", stored_cookie);
|
||||
form.append("session_id", props.related_collection_recid);
|
||||
|
||||
|
||||
var myurl = process.env.REACT_APP_API_URL + "myclass/api/Get_List_Evaluation_Inscriptio_Note_Classement_With_Filter";
|
||||
|
||||
axios.post(myurl, form).then(res => {
|
||||
|
||||
if (String(res.data.status) === String("true")) {
|
||||
// console.log(" In Getall_Session_Final_Note_Classement res.data.status = " + res.data.status);
|
||||
//console.log(" In Getall_Session_Final_Note_Classement res.data.message r_class = " + res.data.message);
|
||||
setGetall_Session_Final_Note_Classement_api("true");
|
||||
setGetall_Session_Final_Note_Classement_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 inscription_id = JSON.parse(x).inscription_id;
|
||||
var session_id = JSON.parse(x).session_id;
|
||||
|
||||
var class_id = JSON.parse(x).class_id;
|
||||
var nom = JSON.parse(x).nom;
|
||||
var prenom = JSON.parse(x).prenom;
|
||||
var rang = JSON.parse(x).rang;
|
||||
var note_finale = JSON.parse(x).note_finale;
|
||||
var rang_calculation_date = JSON.parse(x).rang_calculation_date;
|
||||
var credit_acquis = JSON.parse(x).credit_acquis;
|
||||
|
||||
//---
|
||||
var node = {
|
||||
"_id": local_id,
|
||||
"id": localid,
|
||||
"label": local_id,
|
||||
"inscription_id": inscription_id,
|
||||
"session_id": session_id,
|
||||
|
||||
"class_id": class_id,
|
||||
"nom": nom,
|
||||
"prenom": prenom,
|
||||
"rang": rang,
|
||||
"note_finale": note_finale,
|
||||
"rang_calculation_date": rang_calculation_date,
|
||||
"credit_acquis": credit_acquis,
|
||||
|
||||
};
|
||||
new_data2.push(node);
|
||||
});
|
||||
|
||||
//---
|
||||
var node = {
|
||||
"_id": "",
|
||||
"id": "",
|
||||
"label": "",
|
||||
"inscription_id": "",
|
||||
"session_id": "",
|
||||
"class_id": "",
|
||||
"nom": "",
|
||||
"prenom": "",
|
||||
"rang": "",
|
||||
"note_finale": "",
|
||||
"rang_calculation_date": "",
|
||||
"credit_acquis": "",
|
||||
|
||||
};
|
||||
new_data2.push(node);
|
||||
|
||||
if (new_data2.length > 0)
|
||||
setNew_Getall_Session_Final_Note_Classement_result(new_data2);
|
||||
|
||||
|
@ -483,17 +642,23 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
//setmyApimyApiMessage("")
|
||||
})
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
Getall_Session_Detail_Final_Note_Classement();
|
||||
Getall_Session_UE_Final_Note_Classement();
|
||||
Getall_Session_Final_Note_Classement();
|
||||
|
||||
|
||||
}, [])
|
||||
|
||||
|
||||
|
||||
const [gridline_session_inscrit_id, setgridline_session_inscrit_id] = useState("");
|
||||
const [selectionModel_note_Session_classement, setselectionModel_note_Session_classement] = React.useState([]);
|
||||
|
||||
|
||||
const [gridline_id, setgridline_id] = useState("");
|
||||
const [selectionModel_note_finale_classement, setselectionModel_note_finale_classement] = React.useState([]);
|
||||
const [selectionModel_note_UE_classement, setselectionModel_note_UE_classement] = React.useState([]);
|
||||
|
||||
|
||||
const [gridline_detail_id, setgridline_detail_id] = useState("");
|
||||
|
@ -531,6 +696,194 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
/>
|
||||
}
|
||||
{/*** FIN Affichage des messages d'alerte*/}
|
||||
|
||||
<div style={{ "border": "None" }}>
|
||||
|
||||
<div className="div_row" style={{ paddingRight: '10px' }}>
|
||||
|
||||
<div className="session_data">
|
||||
<div style={{ "border": "None" }}>
|
||||
|
||||
<div style={{ height: 550, width: '100%', paddingRight: '5px' }}>
|
||||
|
||||
|
||||
<div style={{ width: '100%', float: 'left' }}>
|
||||
<nav style={{ textAlign: 'center', width: '70%', float: 'left' }}> Notes & Rang Final (session)</nav>
|
||||
|
||||
<nav style={{ textAlign: 'right', width: '30%', float: 'left' }}>
|
||||
|
||||
<Button variant="outlined" onClick={Calcul_Note_Classement_Session} className="detail_class_submenu" id='calcul_moyenne' name='calcul_moyenne'> Calcul Moyenne </Button>
|
||||
</nav>
|
||||
|
||||
|
||||
</div>
|
||||
<Box
|
||||
sx={{
|
||||
height: 500,
|
||||
width: '100%',
|
||||
paddingRight: '1px',
|
||||
|
||||
// Gestion des cellule a distance ou presentiel
|
||||
'& .cell--distantiel': {
|
||||
backgroundColor: '#AFE1AF',
|
||||
color: 'black',
|
||||
},
|
||||
|
||||
'& .cell--presentiel': {
|
||||
backgroundColor: '#AFE1AF',
|
||||
color: 'black',
|
||||
},
|
||||
|
||||
|
||||
// gestion couleur des lignes avec le statut d'inscription
|
||||
'& .line--statut--annule': {
|
||||
backgroundColor: '#D8D8D8',
|
||||
color: 'white',
|
||||
},
|
||||
|
||||
'& .line--statut--inscrit': {
|
||||
backgroundColor: '#CEF6D8',
|
||||
color: 'black',
|
||||
},
|
||||
'& .line--statut--preinscrit': {
|
||||
backgroundColor: '#F7F2E0',
|
||||
color: 'black',
|
||||
},
|
||||
|
||||
|
||||
/*"& .MuiDataGrid-virtualScrollerRenderZone": {
|
||||
"& .MuiDataGrid-row": {
|
||||
"&:nth-child(2n)": { backgroundColor: "rgba(235, 235, 235, .7)" }
|
||||
}
|
||||
},*/
|
||||
"& .MuiDataGrid-columnHeaders": {
|
||||
backgroundColor: "#c8cfd5",
|
||||
color: "black",
|
||||
fontSize: 14
|
||||
},
|
||||
|
||||
'& .line--statut--selected': {
|
||||
backgroundColor: '#FBF2EF',
|
||||
color: 'black',
|
||||
},
|
||||
'& .line--statut--pair': {
|
||||
backgroundColor: 'rgba(235, 235, 235, .7)',
|
||||
color: 'black',
|
||||
},
|
||||
'& .line--statut--impair': {
|
||||
backgroundColor: '#FFFFFF',
|
||||
color: 'black',
|
||||
},
|
||||
'& .line--statut--isvalide': {
|
||||
backgroundColor: '#ABEBC6',
|
||||
color: 'black',
|
||||
fontWeight: '600',
|
||||
},
|
||||
|
||||
[`& .${gridClasses.cell}`]: {
|
||||
py: 1,
|
||||
},
|
||||
|
||||
|
||||
}}
|
||||
>
|
||||
<DataGrid
|
||||
checkboxSelection
|
||||
onSelectionModelChange={(newSelectionModel) => {
|
||||
setselectionModel_note_Session_classement(newSelectionModel);
|
||||
/*if (newSelectionModel.length === 1)
|
||||
handleClick_edit_employee_From_Line(newSelectionModel);*/
|
||||
if (newSelectionModel.length !== 1) {
|
||||
/* setsubmenu();
|
||||
setdisplay_detail_employe();
|
||||
setadd_One_Employee();*/
|
||||
}
|
||||
}}
|
||||
selectionModel={selectionModel_note_Session_classement}
|
||||
|
||||
localeText={frFR.components.MuiDataGrid.defaultProps.localeText}
|
||||
rows={Getall_Session_Final_Note_Classement_result.map((item, index) => (
|
||||
{
|
||||
id: index,
|
||||
_id: JSON.parse(item)._id,
|
||||
inscription_id: JSON.parse(item).inscription_id,
|
||||
session_id: JSON.parse(item).session_id,
|
||||
|
||||
class_id: JSON.parse(item).class_id,
|
||||
nom: JSON.parse(item).nom,
|
||||
prenom: JSON.parse(item).prenom,
|
||||
rang: JSON.parse(item).rang,
|
||||
note_finale: JSON.parse(item).note_finale,
|
||||
rang_calculation_date: JSON.parse(item).rang_calculation_date.substring(0, 10),
|
||||
credit_acquis: JSON.parse(item).credit_acquis,
|
||||
|
||||
|
||||
|
||||
}
|
||||
))}
|
||||
|
||||
columns={columns_list_session_note_classement_final}
|
||||
pageSize={10}
|
||||
className="datagridclass"
|
||||
|
||||
onRowDoubleClick={(newSelectionModel) => {
|
||||
|
||||
}}
|
||||
|
||||
rowsPerPageOptions={[10]}
|
||||
disableSelectionOnClick
|
||||
components={{
|
||||
Toolbar: GridToolbar,
|
||||
}}
|
||||
//sx={datagridSx}
|
||||
getCellClassName={(params) => {
|
||||
|
||||
|
||||
|
||||
}}
|
||||
getRowClassName={(params) => {
|
||||
// Pour la gestion de la couleur de zone double cliquée
|
||||
if (String(params.row.ue_validation) === "1") {
|
||||
return 'line--statut--isvalide';
|
||||
}
|
||||
|
||||
if (String(params.row.id) === String(gridline_id)) {
|
||||
return 'line--statut--selected';
|
||||
}
|
||||
else if (parseInt(String(params.row.id)) % 2 === 0) {
|
||||
return 'line--statut--pair';
|
||||
}
|
||||
else if (parseInt(String(params.row.id)) % 2 !== 0) {
|
||||
return 'line--statut--impair';
|
||||
}
|
||||
|
||||
|
||||
}}
|
||||
getEstimatedRowHeight={() => 200}
|
||||
getRowHeight={() => "auto"}
|
||||
sx={{
|
||||
"& .MuiDataGrid-cellContent": {
|
||||
minHeight: 50,
|
||||
|
||||
}
|
||||
}}
|
||||
|
||||
/>
|
||||
</Box>
|
||||
<br />
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div style={{ "border": "None" }}>
|
||||
|
||||
<div className="div_row" style={{ paddingRight: '10px' }}>
|
||||
|
@ -615,7 +968,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
<DataGrid
|
||||
checkboxSelection
|
||||
onSelectionModelChange={(newSelectionModel) => {
|
||||
setselectionModel_note_finale_classement(newSelectionModel);
|
||||
setselectionModel_note_UE_classement(newSelectionModel);
|
||||
/*if (newSelectionModel.length === 1)
|
||||
handleClick_edit_employee_From_Line(newSelectionModel);*/
|
||||
if (newSelectionModel.length !== 1) {
|
||||
|
@ -624,10 +977,10 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
setadd_One_Employee();*/
|
||||
}
|
||||
}}
|
||||
selectionModel={selectionModel_note_finale_classement}
|
||||
selectionModel={selectionModel_note_UE_classement}
|
||||
|
||||
localeText={frFR.components.MuiDataGrid.defaultProps.localeText}
|
||||
rows={Getall_Session_Final_Note_Classement_result.map((item, index) => (
|
||||
rows={Getall_Session_UE_Final_Note_Classement_result.map((item, index) => (
|
||||
{
|
||||
id: index,
|
||||
_id: JSON.parse(item)._id,
|
||||
|
@ -641,6 +994,7 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
note_examen: JSON.parse(item).note_examen,
|
||||
note_finale: JSON.parse(item).note_finale,
|
||||
rang: JSON.parse(item).rang,
|
||||
credit: JSON.parse(item).credit,
|
||||
|
||||
regle_calcul: JSON.parse(item).regle_calcul,
|
||||
seuil_validation: JSON.parse(item).seuil_validation,
|
||||
|
@ -654,8 +1008,6 @@ const Module_Session_Notes_Classement = (props) => {
|
|||
inscription_id_nom: JSON.parse(item).inscription_id_nom,
|
||||
inscription_id_prenom: JSON.parse(item).inscription_id_prenom,
|
||||
|
||||
|
||||
|
||||
}
|
||||
))}
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ import { useHistory } from "react-router-dom";
|
|||
import PartnerInfo from "./UpdatePartnerInfo";
|
||||
import PartenairStat from "./PartenairStat";
|
||||
import { Helmet } from "react-helmet";
|
||||
|
||||
import RocketIcon from '@mui/icons-material/Rocket';
|
||||
import img_loading_spin from "./../mysy_img/mysy_spin_loading.gif";
|
||||
import { GiTeacher } from "react-icons/gi";
|
||||
import Footer from "./Fotter";
|
||||
|
@ -73,7 +73,7 @@ import CRM_Opportunite from "./Crm_Opportunite";
|
|||
import Partner_Config_Formulaires from "./Partner_Config_Formulaires";
|
||||
import { AiOutlineUserAdd } from "react-icons/ai";
|
||||
import PartnerClientActivite from "./PartnerClient_Activite";
|
||||
|
||||
import Jury from "./Jurys";
|
||||
|
||||
|
||||
|
||||
|
@ -486,7 +486,8 @@ const Partner = (props) => {
|
|||
"dashbord_session", "mon_tableau_de_bord", "prix_achat", "mes_apprenants", "dashbord_ressources_humaines",
|
||||
"dashbord_inscriptions", "mes_salles", "mes_opportunites", "config_formulaires", "dashbord_factures", "mes_ue",
|
||||
"domaine_categorie_metier", "config_formation_initiale", "note_evaluation", "groupe_apprenant",
|
||||
"part_produit_service", "config_document_super_admin", "tous_mes_document", "equipe_team"]
|
||||
"part_produit_service", "config_document_super_admin", "tous_mes_document", "equipe_team",
|
||||
"jurys"]
|
||||
|
||||
|
||||
if (action && list_menu.includes(action)) {
|
||||
|
@ -969,6 +970,22 @@ const Partner = (props) => {
|
|||
}
|
||||
}
|
||||
|
||||
function Display_jurys_func(event) {
|
||||
var security_retval = check_user_acces_right("jury", "read");
|
||||
|
||||
if (security_retval === 1) {
|
||||
setmenu("jurys");
|
||||
setapiexcelimportmessage();
|
||||
setformation_file_name();
|
||||
history.push("/Partner/jurys");
|
||||
document.body.style.backgroundColor = "#ffffff";
|
||||
|
||||
inactive_active_menu_header("jurys");
|
||||
} else {
|
||||
Dialog_1_handle_acces_insuffisant("Vos droits ne sont pas suffisants pour accéder à la gestion des sessions");
|
||||
}
|
||||
}
|
||||
|
||||
function DiplayStagiaireList(event) {
|
||||
var security_retval = check_user_acces_right("stagiaire", "read");
|
||||
if (security_retval === 1) {
|
||||
|
@ -1967,6 +1984,14 @@ const Partner = (props) => {
|
|||
</Sidebar>
|
||||
</div>}
|
||||
|
||||
{String(formation_initiale) === "1" &&
|
||||
<div>
|
||||
<Sidebar className="my_sidebar">
|
||||
{String(menu) !== "jurys" && <Menu className="my_menu bck_menu_seul" id="jurys" name="jurys" onClick={Display_jurys_func} > <RocketIcon className="icone_menu" color={"secondary"} /> JURYS </Menu>}
|
||||
{String(menu) === "jurys" && <Menu className="my_menu bck_menu_seul_selected" id="jurys" name="jurys" onClick={Display_jurys_func} > <RocketIcon className="icone_menu" color={"secondary"} /> JURYS </Menu>}
|
||||
</Sidebar>
|
||||
</div>}
|
||||
|
||||
|
||||
<div>
|
||||
<Sidebar className="my_sidebar">
|
||||
|
@ -2050,7 +2075,7 @@ const Partner = (props) => {
|
|||
</Sidebar>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div>
|
||||
<Sidebar className="my_sidebar">
|
||||
{String(menu) !== "equipe_team" && <Menu className="my_menu bck_menu_seul" id="my_equipe_team" name="my_equipe_team" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" color={"tercier"} /> EQUIPE </Menu>}
|
||||
|
@ -2085,7 +2110,7 @@ const Partner = (props) => {
|
|||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="separator"></div>
|
||||
|
||||
|
@ -2307,6 +2332,17 @@ const Partner = (props) => {
|
|||
</div>
|
||||
}
|
||||
|
||||
{String(menu) === "jurys" &&
|
||||
<div className="div_droite">
|
||||
|
||||
<Jury ispending={partnerstatus} currentpack={partnerPackService} conntected_employee_id={conntected_employee_id}
|
||||
class_external_code={orderid} class_internal_url={packs} formation_initiale={formation_initiale}
|
||||
check_user_acces_right={check_user_acces_right}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
{String(menu) === "groupe_apprenant" &&
|
||||
<div className="div_droite">
|
||||
|
||||
|
@ -2835,6 +2871,21 @@ const Partner = (props) => {
|
|||
</a>
|
||||
<hr className="my_hr" />
|
||||
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_906" />
|
||||
{String(formation_initiale) === "1" && <a data-tooltip-id="tooltip_id_906" data-tooltip-html="JURYS">
|
||||
{String(menu) !== "jurys" && <div className="sousmenu" onClick={Display_jurys_func} > <RocketIcon className="icone_menu" /> </div>}
|
||||
{String(menu) === "jurys" && <div className="sousmenu_selected" onClick={Display_jurys_func} ><RocketIcon className="icone_menu" /> </div>}
|
||||
</a>}
|
||||
<hr className="my_hr" />
|
||||
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_907" />
|
||||
{String(formation_initiale) === "1" && <a data-tooltip-id="tooltip_id_907" data-tooltip-html="NOTES & EVALUATIONS">
|
||||
{String(menu) !== "note_evaluation" && <div className="sousmenu" onClick={Display_note_evaluation_func} > <FcFlowChart className="icone_menu" /> </div>}
|
||||
{String(menu) === "note_evaluation" && <div className="sousmenu_selected" onClick={Display_note_evaluation_func} ><FcFlowChart className="icone_menu" /> </div>}
|
||||
</a>}
|
||||
<hr className="my_hr" />
|
||||
|
||||
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_10" />
|
||||
<a data-tooltip-id="tooltip_id_10" data-tooltip-html="STAGIAIRES">
|
||||
{String(menu) !== "mes_stagiaires" && <div className="sousmenu" onClick={DiplayStagiaireList} > <FcReading className="icone_menu" /> </div>}
|
||||
|
@ -2904,10 +2955,10 @@ const Partner = (props) => {
|
|||
<hr className="my_hr" />
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_16aa" />
|
||||
<a data-tooltip-id="tooltip_id_16aa" data-tooltip-html="EQUIPEz">
|
||||
|
||||
{String(menu) !== "equipe_team" && <Menu className="sousmenu" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" style={{color:'#dbff75'}}/> </Menu>}
|
||||
{String(menu) === "equipe_team" && <Menu className="sousmenu_selected" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" style={{color:'#dbff75'}}/> </Menu>}
|
||||
|
||||
|
||||
{String(menu) !== "equipe_team" && <Menu className="sousmenu" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" style={{ color: '#dbff75' }} /> </Menu>}
|
||||
{String(menu) === "equipe_team" && <Menu className="sousmenu_selected" onClick={equipe_team_func} > <Diversity3Icon className="icone_menu" style={{ color: '#dbff75' }} /> </Menu>}
|
||||
|
||||
|
||||
</a>
|
||||
</div>
|
||||
|
@ -2917,8 +2968,8 @@ const Partner = (props) => {
|
|||
<hr className="my_hr" />
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_16a" />
|
||||
<a data-tooltip-id="tooltip_id_16a" data-tooltip-html="OPPORTUNITES">
|
||||
{String(menu) !== "mes_opportunites" && <div className="sousmenu" onClick={Display_mes_opportunites_func}><MdAddShoppingCart className="icone_menu" style={{color:'#dbff75'}} /> </div>}
|
||||
{String(menu) === "mes_opportunites" && <div className="sousmenu_selected" onClick={Display_mes_opportunites_func}> <MdAddShoppingCart className="icone_menu" style={{color:'#dbff75'}} /> </div>}
|
||||
{String(menu) !== "mes_opportunites" && <div className="sousmenu" onClick={Display_mes_opportunites_func}><MdAddShoppingCart className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
{String(menu) === "mes_opportunites" && <div className="sousmenu_selected" onClick={Display_mes_opportunites_func}> <MdAddShoppingCart className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
@ -2926,8 +2977,8 @@ const Partner = (props) => {
|
|||
<hr className="my_hr" />
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_16" />
|
||||
<a data-tooltip-id="tooltip_id_16" data-tooltip-html=" PRIX CLIENT">
|
||||
{String(menu) !== "pricing" && <div className="sousmenu" onClick={pricing_func} ><FcCurrencyExchange className="icone_menu" style={{color:'#dbff75'}} /> </div>}
|
||||
{String(menu) === "pricing" && <div className="sousmenu_selected" onClick={pricing_func} > <FcCurrencyExchange className="icone_menu" style={{color:'#dbff75'}} /> </div>}
|
||||
{String(menu) !== "pricing" && <div className="sousmenu" onClick={pricing_func} ><FcCurrencyExchange className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
{String(menu) === "pricing" && <div className="sousmenu_selected" onClick={pricing_func} > <FcCurrencyExchange className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
@ -2935,8 +2986,8 @@ const Partner = (props) => {
|
|||
<hr className="my_hr" />
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_17" />
|
||||
<a data-tooltip-id="tooltip_id_17" data-tooltip-html="COMMANDES & DEVIS">
|
||||
{String(menu) !== "mes_cmd" && <div className="sousmenu" onClick={mes_cmd_func}><FcCollect className="icone_menu" style={{color:'#dbff75'}}/> </div>}
|
||||
{String(menu) === "mes_cmd" && <div className="sousmenu_selected" onClick={mes_cmd_func}> <FcCollect className="icone_menu" style={{color:'#dbff75'}}/> </div>}
|
||||
{String(menu) !== "mes_cmd" && <div className="sousmenu" onClick={mes_cmd_func}><FcCollect className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
{String(menu) === "mes_cmd" && <div className="sousmenu_selected" onClick={mes_cmd_func}> <FcCollect className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
@ -2944,8 +2995,8 @@ const Partner = (props) => {
|
|||
<hr className="my_hr" />
|
||||
<Tooltip className="tooltip_css" id="tooltip_id_18" />
|
||||
<a data-tooltip-id="tooltip_id_18" data-tooltip-html="FACTURES & AVOIRS">
|
||||
{String(menu) !== "factures_client" && <div className="sousmenu" onClick={mes_factures_client_func}><FcKindle className="icone_menu" style={{color:'#dbff75'}}/> </div>}
|
||||
{String(menu) === "factures_client" && <div className="sousmenu_selected" onClick={mes_factures_client_func}> <FcCollect FcKindle="icone_menu" style={{color:'#dbff75'}}/> </div>}
|
||||
{String(menu) !== "factures_client" && <div className="sousmenu" onClick={mes_factures_client_func}><FcKindle className="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
{String(menu) === "factures_client" && <div className="sousmenu_selected" onClick={mes_factures_client_func}> <FcCollect FcKindle="icone_menu" style={{ color: '#dbff75' }} /> </div>}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
@ -3075,6 +3126,15 @@ const Partner = (props) => {
|
|||
</div>
|
||||
}
|
||||
|
||||
{String(menu) === "jurys" &&
|
||||
<div className="div_droite div_droite_ralonge">
|
||||
|
||||
<Jury ispending={partnerstatus} currentpack={partnerPackService} conntected_employee_id={conntected_employee_id}
|
||||
class_external_code={orderid} class_internal_url={packs} formation_initiale={formation_initiale}
|
||||
check_user_acces_right={check_user_acces_right} />
|
||||
</div>
|
||||
}
|
||||
|
||||
{String(menu) === "groupe_apprenant" &&
|
||||
<div className="div_droite div_droite_ralonge">
|
||||
|
||||
|
@ -3290,19 +3350,19 @@ const Partner = (props) => {
|
|||
{String(menu) === "mes_opportunites" &&
|
||||
<div className="div_droite div_droite_ralonge">
|
||||
<CRM_Opportunite conntected_employee_id={conntected_employee_id} read_access={check_user_acces_right("materiel", "read")}
|
||||
write_access={check_user_acces_right("materiel", "write")}
|
||||
check_user_acces_right={check_user_acces_right}
|
||||
/>
|
||||
write_access={check_user_acces_right("materiel", "write")}
|
||||
check_user_acces_right={check_user_acces_right}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
{String(menu) === "equipe_team" &&
|
||||
<div className="div_droite div_droite_ralonge">
|
||||
<Equipe_Team conntected_employee_id={conntected_employee_id}
|
||||
read_access={check_user_acces_right("equipe", "read")}
|
||||
write_access={check_user_acces_right("equipe", "write")}
|
||||
<Equipe_Team conntected_employee_id={conntected_employee_id}
|
||||
read_access={check_user_acces_right("equipe", "read")}
|
||||
write_access={check_user_acces_right("equipe", "write")}
|
||||
check_user_acces_right={check_user_acces_right}
|
||||
/>
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
@ -3311,8 +3371,8 @@ const Partner = (props) => {
|
|||
<div className="div_droite div_droite_ralonge">
|
||||
<Partner_Commande conntected_employee_id={conntected_employee_id} read_access={check_user_acces_right("commande", "read")}
|
||||
write_access={check_user_acces_right("commande", "write")}
|
||||
check_user_acces_right={check_user_acces_right}
|
||||
/>
|
||||
check_user_acces_right={check_user_acces_right}
|
||||
/>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -197,6 +197,7 @@
|
|||
@import "./components/module_alert_confirmation";
|
||||
@import "./components/equipe_team";
|
||||
@import "./components/module_session_note_classement";
|
||||
@import "./components/jurys";
|
||||
|
||||
|
||||
// New Design 2025
|
||||
|
|
Loading…
Reference in New Issue