05/07/23 - 14h

recette2
cherif 2023-07-05 14:42:59 +02:00
parent 05345acd66
commit f69ca4838c
4 changed files with 104 additions and 46 deletions

View File

@ -2480,7 +2480,7 @@ function GestionAdministrative(props) {
GetListeEmargement(mysession); GetListeEmargement(mysession);
GetListeEvaluation(mysession); GetListeEvaluation(mysession);
submenu_inscrit(); submenu_inscrit();
}else if (String(result['status']) === String("Err_Connexion")) { } else if (String(result['status']) === String("Err_Connexion")) {
alert('Erreur: ' + result['message']); alert('Erreur: ' + result['message']);
history.push("/Connexion"); history.push("/Connexion");
} }
@ -2540,7 +2540,7 @@ function GestionAdministrative(props) {
setResend_LMS_Credentials_result(result['message']); setResend_LMS_Credentials_result(result['message']);
setResend_LMS_Credentials_api("true"); setResend_LMS_Credentials_api("true");
alert(" Les identifiants de connexion ont été correctement envoyés") alert(" Les identifiants de connexion ont été correctement envoyés")
}else if (String(result['status']) === String("Err_Connexion")) { } else if (String(result['status']) === String("Err_Connexion")) {
alert('Erreur: ' + result['message']); alert('Erreur: ' + result['message']);
history.push("/Connexion"); history.push("/Connexion");
} }
@ -2597,7 +2597,7 @@ function GestionAdministrative(props) {
//console.log('Success:', result['message']); //console.log('Success:', result['message']);
setResend_LMS_Credentials_With_Email_result(result['message']); setResend_LMS_Credentials_With_Email_result(result['message']);
setResend_LMS_Credentials_With_Email_api("true"); setResend_LMS_Credentials_With_Email_api("true");
}else if (String(result['status']) === String("Err_Connexion")) { } else if (String(result['status']) === String("Err_Connexion")) {
alert('Erreur: ' + result['message']); alert('Erreur: ' + result['message']);
history.push("/Connexion"); history.push("/Connexion");
} }
@ -4008,14 +4008,39 @@ function GestionAdministrative(props) {
{String(addOneSession) !== "1" && <div> {String(addOneSession) !== "1" && <div>
<div className="div_row_gauche" style={{ "textAlign": "left", "paddingLeft": "5px" }}> <div className="div_row_gauche" style={{ "textAlign": "left", "paddingLeft": "5px" }}>
Choisir une session <br />
Choisir une session <br />
<select id="session_liste" value={mysession} onChange={handleChangeSession} className="selectsession">
<option value="" className="select_option_css">Choisir</option>
{GetCurrentClass_trainingsession_result &&
GetCurrentClass_trainingsession_result.map((session) => (
<option value={(JSON.parse(session).formation_session_id)} className="select_option_css">
{(JSON.parse(session).session_ondemande) === "1" && " A la Demande - "}
{(!JSON.parse(session).session_ondemande || JSON.parse(session).session_ondemande === "0") &&
(JSON.parse(session).date_debut).substring(0, 10) + " au " + (JSON.parse(session).date_fin).substring(0, 10)}
{/*(JSON.parse(session).date_debut).substring(0, 10)} au {(JSON.parse(session).date_fin).substring(0, 10) */} -
{(JSON.parse(session).distantiel) === "1" && " A Distance - "}
{(JSON.parse(session).presentiel) === "1" && (JSON.parse(session).adresse) && " En Présentiel - " + (JSON.parse(session).adresse)}
{(JSON.parse(session).presentiel) === "1" && (!JSON.parse(session).adresse) && " En Présentiel - "}
{(JSON.parse(session).code_postal) && " " + (JSON.parse(session).code_postal)}
</option>
))}
</select>
</div> </div>
<div className="div_row_droite"> <div className="div_row_droite">
<div className="field_droite"> <div className="field_droite">
<select id="session_liste" value={mysession} onChange={handleChangeSession} className="selectsession"> {/* <select id="session_liste" value={mysession} onChange={handleChangeSession} className="selectsession">
<option value="" className="select_option_css">Choisir</option> <option value="" className="select_option_css">Choisir</option>
@ -4029,7 +4054,7 @@ function GestionAdministrative(props) {
(JSON.parse(session).date_debut).substring(0, 10) + " au " + (JSON.parse(session).date_fin).substring(0, 10)} (JSON.parse(session).date_debut).substring(0, 10) + " au " + (JSON.parse(session).date_fin).substring(0, 10)}
{/*(JSON.parse(session).date_debut).substring(0, 10)} au {(JSON.parse(session).date_fin).substring(0, 10) */} - {/*(JSON.parse(session).date_debut).substring(0, 10)} au {(JSON.parse(session).date_fin).substring(0, 10) * /} -
{(JSON.parse(session).distantiel) === "1" && " A Distance - "} {(JSON.parse(session).distantiel) === "1" && " A Distance - "}
{(JSON.parse(session).presentiel) === "1" && (JSON.parse(session).adresse) && " En Présentiel - " + (JSON.parse(session).adresse)} {(JSON.parse(session).presentiel) === "1" && (JSON.parse(session).adresse) && " En Présentiel - " + (JSON.parse(session).adresse)}
{(JSON.parse(session).presentiel) === "1" && (!JSON.parse(session).adresse) && " En Présentiel - "} {(JSON.parse(session).presentiel) === "1" && (!JSON.parse(session).adresse) && " En Présentiel - "}
@ -4037,7 +4062,7 @@ function GestionAdministrative(props) {
</option> </option>
))} ))}
</select> </select>*/}
</div> </div>
</div> </div>
@ -4060,19 +4085,21 @@ function GestionAdministrative(props) {
{mysession && <div className="div_row" style={{ "border": "None" }}> {mysession && <div className="div_row" style={{ "border": "None" }}>
<div className="session_caract" style={{ "float": "right" }}> <div className="session_caract" style={{ "float": "right", "fontSize":"12px", 'fontWeight':'bolder', }}>
<nav onChange={toggleSessionStatus} id="toggleSwitchNav" name="toggleSwitchNav"> <nav onChange={toggleSessionStatus} id="toggleSwitchNav" name="toggleSwitchNav">
<ToggleSwitch label="Activation Session " id="toggleSwitch" name="toggleSwitch" checked={sessionStatus} /> <ToggleSwitch label="Activation / Deactivation session? " id="toggleSwitch" name="toggleSwitch" checked={sessionStatus} />
</nav> </nav>
</div> </div>
<div className="session_caract" style={{ "float": "right" }}> <div className="session_caract" style={{ "float": "right", }}>
<Button className="bton_envoyer" onClick={PrintSesssionDetail}> Télécharger les détails </Button> <Button className="bton_envoyer" onClick={PrintSesssionDetail}> Télécharger les détails </Button>
</div> </div>
<div className="session_caract" style={{ "float": "right", }}> &nbsp; </div>
<div className="div_row" > <hr className="mysy_hr_text"/>
</div>
</div>} </div>}
<div className="session_caract"> Code Session<br /> <div className="session_caract"> Code Session<br />

View File

@ -53,7 +53,6 @@ function ResetUserPwd() {
// Verification de la valididé du token // Verification de la valididé du token
function IsTokenValide(e) { function IsTokenValide(e) {
var form = new FormData(); var form = new FormData();
form.append("token", token); form.append("token", token);
form.append("accounttype", accounttype); form.append("accounttype", accounttype);
@ -61,12 +60,16 @@ function ResetUserPwd() {
//alert("myurl = "+myurl); //alert("myurl = "+myurl);
axios.post(myurl, form).then(res => { axios.post(myurl, form).then(res => {
if (String(res.data.status) != String("false")) { console.log(" In test res.data.status = " + res.data.status);
//console.log(" In test res.data.status = " + res.data.status); console.log(" In test res.data.message = " + res.data.message);
//console.log(" In test res.data.message = " + res.data.message); if (String(res.data.status) === String("true")) {
setmyApiResponse("true"); setmyApiResponse("true");
setResult(res.data.message); setResult(res.data.message);
} else if (String(res.data.status) === String("Err_Connexion")) {
//alert("Erreur: La session n'est plus active");
history.push("/");
} }
else { else {
//console.log(" In test res.data.status = " + res.data.status); //console.log(" In test res.data.status = " + res.data.status);
@ -130,6 +133,9 @@ function ResetUserPwd() {
const [UpdateUserPwd_api, setUpdateUserPwd_api] = useState("");
const [UpdateUserPwd_result, setUpdateUserPwd_result] = useState("");
const [UpdateUserPwd_message, setUpdateUserPwd_message] = useState("");
function UpdateUserPwd() { function UpdateUserPwd() {
setupdatepwd(false); setupdatepwd(false);
@ -184,22 +190,24 @@ function ResetUserPwd() {
.then((result) => { .then((result) => {
//console.log('Success:', result['message'], "result['status'] = ", result['status']); //console.log('Success:', result['message'], "result['status'] = ", result['status']);
setResult(result['message']);
if (String(result['status']) == String("true")) { if (String(result['status']) === String("true")) {
setmyApiResponse("true"); setUpdateUserPwd_api("true")
setupdatepwd(true); setupdatepwd(true);
setfields1desabled(true); setfields1desabled(true);
alert(" le mot de passe à bien été mis à jour"); alert(" le mot de passe à bien été mis à jour");
history.push("/mysy-user-account"); // history.push("/Connexion");
} }
else { else {
setmyApiResponse("false"); setUpdateUserPwd_api("false");
setUpdateUserPwd_message(String(result['message']))
} }
}) })
.catch((error) => { .catch((error) => {
console.error('Error:', error); console.error('Error:', error);
setmyApiResponse("false"); setUpdateUserPwd_api("false");
setupdatepwd(false); setupdatepwd(false);
}); });
} }
@ -287,37 +295,42 @@ function ResetUserPwd() {
<Button variant="contained" color="success" className="div_row2 btn_modif" onClick={UpdateUserPwd}>Modifier</Button> <Button variant="contained" color="success" className="div_row2 btn_modif" onClick={UpdateUserPwd}>Modifier</Button>
{UpdateUserPwd_api && String(UpdateUserPwd_api) === "false" && <div className="koUpdateData">
{UpdateUserPwd_message} </div>
}
</div> </div>
</Box> </Box>
<div className="text_pwd_crit"> <div className="text_pwd_crit">
Créez un mot de passe contenant au moins : Créez un mot de passe contenant au moins :
<ul> <ul>
<li name="caractere"> <li name="caractere">
8 caractères 8 caractères
</li> </li>
<li name="nombre"> <li name="nombre">
1 nombre 1 nombre
</li> </li>
<li name="special"> <li name="special">
1 caractère spécial p. ex., $, !, @, %, & 1 caractère spécial p. ex., $, !, @, %, &
</li> </li>
<li name="identique"> <li name="identique">
Identiques Identiques
</li> </li>
</ul> </ul>
</div> </div>
{String(myApiResponse) === String("false") && <div className="koUpdateData"> {String(myApiResponse) === String("false") && <div className="koUpdateData">
{result} <br /> {result} <br />
Impossible de mettre à jour le mot de passe.<br /> Impossible de mettre à jour le mot de passe.<br />
</div>} </div>}
<div className="pieddepage"> <div className="pieddepage">
<Footer /> <Footer />
</div> </div>
</div> </div>
</div> </div>

View File

@ -1227,6 +1227,24 @@
text-wrap: nowrap; text-wrap: nowrap;
padding: 0px !important; padding: 0px !important;
} }
.mysy_hr_text {
border: none;
border-top: 3px double #333;
color: #333;
overflow: visible;
text-align: center;
height: 5px;
}
.mysy_hr_text:after {
background: #fff;
content: 'Détail';
padding: 0 4px;
position: relative;
top: -13px;
}
} }

View File

@ -4,7 +4,7 @@
} }
.toggle-switch { .toggle-switch {
position: relative; position: relative;
width: 100px; width: 80%;
display: inline-block; display: inline-block;
text-align: left; text-align: left;
top: 5px; top: 5px;