diff --git a/src/components/DisplayDetailClass_new_Action.js b/src/components/DisplayDetailClass_new_Action.js index 8afcef8..4c2544c 100644 --- a/src/components/DisplayDetailClass_new_Action.js +++ b/src/components/DisplayDetailClass_new_Action.js @@ -92,14 +92,15 @@ const DisplayDetailClassAction = (props) => { var myurl = process.env.REACT_APP_API_URL + "myclass/api/MySyckeckEvaluationToken/"; axios.post(myurl, form).then(res => { - - if (res.data.status != "false") { + + if (String(res.data.status) !== "false") { console.log(" In tokenEval_trainingsession res.data.status = " + res.data.status); - console.log(" In tokenEval_trainingsession res.data.message r_class = " + res.data.message); + //console.log(" In tokenEval_trainingsession res.data.message r_class = " + res.data.message); settokenEval_api("true"); settokenEval_result(res.data.message); } else { + console.log(" In tokenEval_trainingsession res.data.status = " + res.data.status); settokenEval_api("false"); settokenEval_message(res.data.message); } @@ -584,8 +585,8 @@ const DisplayDetailClassAction = (props) => { {String(action).toLocaleLowerCase() !== "inscription" && String(action).toLocaleLowerCase() !== "information" && String(tokenEval_api) === "true" &&
Zone evaluation : -
- +
+
} diff --git a/src/components/Inscription_Information.js b/src/components/Inscription_Information.js index 18f85b4..fbef7bb 100644 --- a/src/components/Inscription_Information.js +++ b/src/components/Inscription_Information.js @@ -263,7 +263,7 @@ function Inscription_Information(props) { axios.post(myurl, form).then(res => { - if (res.data.status != "false") { + if (String(res.data.status) !== "false") { //console.log(" In GetCurrentClass_trainingsession res.data.status = " + res.data.status); //console.log(" In GetCurrentClass_trainingsession res.data.message r_class = " + res.data.message); setGetCurrentClass_api("true"); @@ -315,7 +315,7 @@ function Inscription_Information(props) { axios.post(myurl, form).then(res => { - if (res.data.status != "false") { + if (String(res.data.status) !== "false") { console.log(" In tokenEval_trainingsession res.data.status = " + res.data.status); console.log(" In tokenEval_trainingsession res.data.message r_class = " + res.data.message); settokenEval_api("true"); @@ -404,6 +404,16 @@ function Inscription_Information(props) { seteditor_tochange("1"); } + + const editorRef_evaluation = useRef(null); + const [field_evaluation, setfield_evaluation] = useState(""); + const [editor_evaluation_tochange, seteditor_evaluation_tochange] = useState(""); + function editor_evalution_keyup() { + seteditor_evaluation_tochange("1"); + } + + + const [datamodification, setdatamodification] = useState("0"); function DataUpdated() { setdatamodification("1"); @@ -494,9 +504,78 @@ function Inscription_Information(props) { }; - + + const [SendEvaluationClass_api, setSendEvaluationClass_api] = useState(""); + const [SendEvaluationClass_status, setSendEvaluationClass_status] = useState(""); + const [SendEvaluationClass_message, setSendEvaluationClass_message] = useState(""); + + function SendEvaluationClass() { + const formData = new FormData(); + const url = process.env.REACT_APP_API_URL + "myclass/api/Evaluation_Class/"; + + + var message = ""; + if (editorRef_evaluation.current) { + message = editorRef_evaluation.current.getContent(); + } + + + + var pedagogie = ""; + var ele = document.getElementsByName('pedagogie'); + + for (let i = 0; i < ele.length; i++) { + if (ele[i].checked) + pedagogie = ele[i].value; + } + + var logistique = ""; + ele = document.getElementsByName('log'); + + for (let i = 0; i < ele.length; i++) { + if (ele[i].checked) + logistique = ele[i].value; + } + + formData.append('inscription_id', props.eval_token); + formData.append('eval_note', RatingValue); + formData.append('eval_eval', message); + formData.append('eval_pedagogie', pedagogie); + + fetch( + url, + { + method: 'POST', + body: formData, + } + ) + .then((response) => response.json()) + .then((result) => { + //console.log('Success:', result['message'], "result['status'] = ", result['status']); + + if( String(result['status']) === "true"){ + setSendEvaluationClass_api("true"); + }else if( String(result['status']) === "false"){ + setSendEvaluationClass_api("false"); + setSendEvaluationClass_message(result['message']); + } + + + }) + .catch((error) => { + console.error('Error:', error); + setSendEvaluationClass_api("false"); + + }); + + + }; + + const [RatingValue, setRatingValue] = useState(); + return (
+ {String(RecordData_status) === "true" && String(action).toLocaleLowerCase() === "inscription" &&
@@ -706,16 +785,7 @@ function Inscription_Information(props) { }} onClick={RecordData}>Se prĂ©-inscrire     {}
- {/*
- -
*/} +
} @@ -726,60 +796,85 @@ function Inscription_Information(props) { {/* Gestion de la note/evaluation */} + {(String(RecordData_status) === "false" || String(RecordData_status).length === 0) && String(action).toLocaleLowerCase() === "evaluation" && - String(AnnulerFction_status) !== "1" &&
+ String(AnnulerFction_status) !== "1" && + String(SendEvaluationClass_api) === "true" &&
+
+ OKKKKK +
+ +
} + + + {(String(RecordData_status) === "false" || + String(RecordData_status).length === 0) && + String(action).toLocaleLowerCase() === "evaluation" && + String(AnnulerFction_status) !== "1" && + String(SendEvaluationClass_api) !== "true" &&
+ + {String(SendEvaluationClass_api) === "false" &&
+
+ {SendEvaluationClass_message} +
+ +
}

Demande d'evaluation

-
+ { + setRatingValue(newValue); + }} />
- +
- -    - -    - -    + +    + +    + +   
- +
- -    - -    - -    + +    + +    + +   
-
+
- + editorRef_description.current = editor} - initialValue={field_description} + onInit={(evt, editor) => editorRef_evaluation.current = editor} + initialValue={field_evaluation} onKeyUp={editor_keyup} onEditorChange={(newValue, editor) => { - if (String(editor_tochange) === "1") { - //alert(" change"); - DataUpdated() - seteditor_tochange(""); + if (String(editor_evaluation_tochange) === "1") { + + seteditor_evaluation_tochange(""); } }} @@ -802,8 +897,8 @@ function Inscription_Information(props) { {
+ onClick={SendEvaluationClass} + startIcon={}>Envoyer evaluation    {}