@@ -2056,13 +2446,153 @@ const Module_Ent_Mes_Formations = (props) => {
}
- {
- String(submenu) === "piece_jointe" && Get_Given_Class_Data_result && Get_Given_Class_Data_result.length > 0 &&
-
-
-
+ {String(submenu) === "piece_jointe" && Get_Given_Class_Data_result && Get_Given_Class_Data_result.length > 0 &&
+
+
+
+
+
+
+
+ Pièces jointes
+
+
+
+
+
+
+
+
+ {file_1_name && file_1_name.name &&
+
}
+
+ {Record_All_PJ_api && String(Record_All_PJ_api) === "true" &&
Pièce jointe enregistrée
}
+
+ {Record_All_PJ_api && String(Record_All_PJ_api) === "false" &&
{Record_All_PJ_message}
}
+
+
+
+
+
+ {file_1_name && file_1_name.name &&
+
+
+ } className="bton_enreg">ENREGISTRER LA PIECE
+
+
+
+
}
+
+ {Get_List_Of_All_PJ_result &&
+
+ Liste des pièces jointes
+
+ {Get_List_Of_All_PJ_result && Get_List_Of_All_PJ_result.map((val) => (
+
+
+
Supprimer
+
+
+ }
+ modal
+ nested
+ position="center center"
+ >
+ {close => (
+
+
+
MySy Information
+
+ {' '}
+
+ En confirmant cette opération, la pièce jointe sera définitivement supprimée.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+
+
+ ))}
+
+
+
}
+
+
- }
+
}
diff --git a/src/components/Partner_header_automatic_files/Partner_Header.css b/src/components/Partner_header_automatic_files/Partner_Header.css
new file mode 100644
index 0000000..3c68de6
--- /dev/null
+++ b/src/components/Partner_header_automatic_files/Partner_Header.css
@@ -0,0 +1,428 @@
+.partner_header_automatic_files {
+
+ @media only screen and (max-width: 600px) {
+
+ position: fixed;
+ /* margin-top: 22px;*/
+ width: 100%;
+ opacity: 1;
+ background: #FFF;
+
+ .header_new_2025 {
+ border-bottom: 1px solid #dcdcdc;
+ width: 100%;
+ padding-left: 50px;
+ padding-top: 15px;
+ padding-bottom: 10px;
+ }
+
+ .header-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ margin: 0 auto;
+ }
+
+ .logo-menu {
+ display: flex;
+ align-items: center;
+ gap: 40px;
+ margin-left: 2rem;
+ }
+
+ .logo {
+ width: 96px;
+ height: 32px;
+ }
+
+ .menu-list {
+ display: none;
+ }
+
+ .menu-link {
+ display: none;
+ }
+
+ .cta-login {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+ }
+
+ .cta-buttons {
+ display: flex;
+ gap: 12px;
+ }
+
+ .hide_on_mobile {
+ display: none;
+ }
+
+ .btn {
+ padding: 10px 15px;
+ border-radius: 200px;
+ font-family: 'DM Sans', sans-serif;
+ font-size: 12px;
+ font-weight: 600;
+ line-height: 126%;
+ cursor: pointer;
+ }
+
+ .btn-primary {
+ background-color: #3e6ee3;
+ color: #ffffff;
+ border: none;
+ }
+
+ .btn-secondary {
+ background-color: transparent;
+ color: #4b5162;
+ border: 1px solid #c7c9ce;
+ }
+
+ .separator {
+ width: 1px;
+ height: 12px;
+ background-color: rgba(23, 23, 23, 0.1);
+ border-radius: 30px;
+ }
+
+ .login-link {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ cursor: pointer;
+ }
+
+ .user-icon {
+ width: 18px;
+ height: 18px;
+ }
+
+ .login-link span {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #171717;
+ line-height: 122%;
+ }
+
+ }
+
+ @media only screen and (min-width: 601px) and (max-width: 991px) {
+ .header_new_2025 {
+ border-bottom: 1px solid #dcdcdc;
+ padding: 14px 48px;
+ width: 100%;
+ }
+
+ .header-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ margin: 0 auto;
+ }
+
+ .logo-menu {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ max-width: 60%;
+ flex-direction: row;
+ }
+
+ .logo {
+ width: 96px;
+ height: 32px;
+ }
+
+ .menu-list {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+ flex-direction: row;
+ flex-wrap: wrap;
+ }
+
+ .menu-link {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #4b5162;
+ text-decoration: none;
+ line-height: 122%;
+ }
+
+ .cta-login {
+ display: flex;
+ align-items: center;
+ gap: 3px;
+ }
+
+ .cta-buttons {
+ display: flex;
+ gap: 1px;
+ }
+
+ .btn {
+ padding: 5px 8px;
+ border-radius: 200px;
+ font-family: 'DM Sans', sans-serif;
+ font-size: 12px;
+ font-weight: 700;
+ line-height: 126%;
+ cursor: pointer;
+ }
+
+ .btn-primary {
+ background-color: #3e6ee3;
+ color: #ffffff;
+ border: none;
+ }
+
+ .btn-secondary {
+ background-color: transparent;
+ color: #4b5162;
+ border: 1px solid #c7c9ce;
+ }
+
+ .separator {
+ width: 1px;
+ height: 12px;
+ background-color: rgba(23, 23, 23, 0.1);
+ border-radius: 30px;
+ }
+
+ .login-link {
+ display: flex;
+ align-items: center;
+ gap: 2px;
+ cursor: pointer;
+ }
+
+ .user-icon {
+ width: 18px;
+ height: 18px;
+ }
+
+ .login-link span {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #171717;
+ line-height: 122%;
+ }
+ }
+
+ @media only screen and (min-width: 992px) and (max-width: 1199px) {
+ .header_new_2025 {
+ border-bottom: 1px solid #dcdcdc;
+ padding: 14px 48px;
+ width: 100%;
+ }
+
+ .header-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ margin: 0 auto;
+ }
+
+ .logo-menu {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ width: 70%;
+ flex-direction: row;
+ }
+
+ .logo {
+ width: 96px;
+ height: 32px;
+ }
+
+ .menu-list {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+ flex-direction: row;
+ flex-wrap: wrap;
+ }
+
+ .menu-link {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #4b5162;
+ text-decoration: none;
+ line-height: 122%;
+ }
+
+ .cta-login {
+ display: flex;
+ align-items: center;
+ gap: 5px;
+ }
+
+ .cta-buttons {
+ display: flex;
+ gap: 5px;
+ }
+
+ .btn {
+ padding: 3px 10px;
+ border-radius: 200px;
+ font-family: 'DM Sans', sans-serif;
+ font-size: 14px;
+ font-weight: 700;
+ line-height: 126%;
+ cursor: pointer;
+ }
+
+ .btn-primary {
+ background-color: #3e6ee3;
+ color: #ffffff;
+ border: none;
+ }
+
+ .btn-secondary {
+ background-color: transparent;
+ color: #4b5162;
+ border: 1px solid #c7c9ce;
+ }
+
+ .separator {
+ width: 1px;
+ height: 5px;
+ background-color: rgba(23, 23, 23, 0.1);
+ border-radius: 30px;
+ }
+
+ .login-link {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ cursor: pointer;
+ }
+
+ .user-icon {
+ width: 18px;
+ height: 18px;
+ }
+
+ .login-link span {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #171717;
+ line-height: 122%;
+ }
+ }
+
+
+ @media only screen and (min-width: 1200px) {
+ .header_new_2025 {
+ border-bottom: 1px solid #dcdcdc;
+ padding: 14px 48px;
+ width: 100%;
+ }
+
+ .header-content {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 100%;
+ margin: 0 auto;
+ }
+
+ .logo-menu {
+ display: flex;
+ align-items: center;
+ gap: 40px;
+ }
+
+ .logo {
+ width: 96px;
+ height: 32px;
+ }
+
+ .menu-list {
+ display: flex;
+ align-items: center;
+ gap: 24px;
+ }
+
+ .menu-link {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #4b5162;
+ text-decoration: none;
+ line-height: 122%;
+ }
+
+ .cta-login {
+ display: flex;
+ align-items: center;
+ gap: 12px;
+ }
+
+ .cta-buttons {
+ display: flex;
+ gap: 12px;
+ }
+
+ .btn {
+ padding: 12px 24px;
+ border-radius: 200px;
+ font-family: 'DM Sans', sans-serif;
+ font-size: 14px;
+ font-weight: 700;
+ line-height: 126%;
+ cursor: pointer;
+ }
+
+ .btn-primary {
+ background-color: #3e6ee3;
+ color: #ffffff;
+ border: none;
+ }
+
+ .btn-secondary {
+ background-color: transparent;
+ color: #4b5162;
+ border: 1px solid #c7c9ce;
+ }
+
+ .separator {
+ width: 1px;
+ height: 12px;
+ background-color: rgba(23, 23, 23, 0.1);
+ border-radius: 30px;
+ }
+
+ .login-link {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ cursor: pointer;
+ }
+
+ .user-icon {
+ width: 18px;
+ height: 18px;
+ }
+
+ .login-link span {
+ font-family: 'DM Sans', sans-serif;
+ font-size: 16px;
+ font-weight: 500;
+ color: #171717;
+ line-height: 122%;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/components/Partner_header_automatic_files/Partner_Header.jsx b/src/components/Partner_header_automatic_files/Partner_Header.jsx
new file mode 100644
index 0000000..ce65088
--- /dev/null
+++ b/src/components/Partner_header_automatic_files/Partner_Header.jsx
@@ -0,0 +1,322 @@
+import React, { useState, useEffect } from 'react';
+import './Partner_Header.css';
+import moment from "moment";
+import { getCookie } from 'react-use-cookie';
+import { useHistory } from "react-router-dom";
+
+import Header_MySy_Logo from '../../img_new_design_2025/header_mysy_logo.png';
+import Header_User from '../../img_new_design_2025/header_user.png';
+import Dialog from '@mui/material/Dialog';
+import DialogActions from '@mui/material/DialogActions';
+import DialogContent from '@mui/material/DialogContent';
+import DialogContentText from '@mui/material/DialogContentText';
+import DialogTitle from '@mui/material/DialogTitle';
+import Button from '@mui/material/Button';
+import { useCookies } from "react-cookie";
+
+
+import CancelPresentationIcon from '@mui/icons-material/CancelPresentation';
+import { makeStyles } from "@material-ui/core/styles";
+import Paper from '@material-ui/core/Paper';
+import Draggable from 'react-draggable';
+import { IconButton } from '@material-ui/core';
+
+
+function PaperComponent(props) {
+ return (
+
+
+
+ );
+}
+
+const useStyles = makeStyles((theme) => ({
+
+ dialog: {
+ position: 'absolute',
+ // left: 10,
+ top: 400
+ },
+
+ paper: {
+ overflowY: 'unset',
+ },
+ customizedButton: {
+ position: 'absolute',
+ left: '98%',
+ top: '-3%',
+ backgroundColor: 'lightgray',
+ color: 'gray',
+ },
+}));
+
+const Partner_Header = () => {
+ const history = useHistory();
+ const classes = useStyles();
+ const [userconnected, setuserconnected] = useState("0");
+ const [someoneconnected, setsomeoneconnected] = useState("0");
+ const [partnerconnected, setpartnerconnected] = useState("0");
+ const stored_user = getCookie('tokenmysych');
+ const stored_part = getCookie('tokenmysypart');
+ const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych'], { path: '/' });
+ const [partcookie, setpartCookie, removepartCookie] = useCookies(['tokenmysypart'], { path: '/' });
+ const [PartnerMenu, setPartnerMenu] = React.useState(null);
+ const [AccountMenu, setAccountMenu] = React.useState(null);
+ const [ProduitMenu, setproduitMenu] = React.useState(null);
+
+ useEffect(() => {
+ var local_user_connect = 0;
+ var local_part_connect = 0;
+
+ if (typeof (stored_user) === "undefined" || String(stored_user) === '') {
+ setuserconnected("0");
+ local_user_connect = 0;
+ } else {
+ setuserconnected("1");
+ setsomeoneconnected("1");
+ local_user_connect = 1;
+ //alert(" user connected OK");
+ }
+
+ if (typeof (stored_part) === "undefined" || String(stored_part) === '') {
+ setpartnerconnected("0");
+ local_part_connect = 0;
+ } else {
+ setpartnerconnected("1");
+ setsomeoneconnected("1");
+ local_part_connect = 1;
+ //alert(" partner connected OK");
+ }
+
+ }, []);
+
+ const handleAccountCreation = () => {
+ setAccountMenu(null);
+ history.push("/signup/")
+ };
+
+
+ const handleMyAccount = () => {
+ setAccountMenu(null);
+ history.push("/mysy-user-account")
+ };
+
+ const handleAccountConnexion = () => {
+ setAccountMenu(null);
+ history.push("/signin/")
+ };
+
+
+ const handleMyPartnerAccount = () => {
+ setAccountMenu(null);
+ history.push("/Partner")
+ };
+
+
+ function handleAccountConnexion_v2() {
+
+ if (String(userconnected) === String("1")) {
+ handleMyAccount();
+ }
+ else if (String(partnerconnected) === String("1")) {
+ handleMyPartnerAccount();
+ }
+ }
+
+ const [Dialog_1_open, setDialog_1_open] = React.useState(false);
+ const Dialog_1_handleClose = () => {
+ };
+
+ const Dialog_1_handleClose_buton = () => {
+ setDialog_1_open(false);
+ };
+
+ function part_logout_confirmation() {
+ /* si c'est une connexion partner qui est active */
+
+ if (typeof (stored_part) != "undefined") {
+ const stored_cookie = getCookie('tokenmysypart');
+ var acces_right_token_name = stored_cookie + "_uar";
+
+ setpartCookie("tokenmysypart", "", { path: '/' });
+ setpartCookie(acces_right_token_name, "", { path: '/' });
+ removeCookie(acces_right_token_name, { path: '/' });
+
+
+ setpartCookie("mysy_session_display_view", "", { path: '/' });
+ setpartCookie("mysy_menu_gauche_reduit", "", { path: '/' });
+ setpartCookie("mysy_catalog_data_row_grouped_by", "", { path: '/' });
+
+ removeCookie("tokenmysypart", { path: '/' });
+ removeCookie("mysy_session_display_view", { path: '/' });
+ removeCookie("mysy_menu_gauche_reduit", { path: '/' });
+ removeCookie("mysy_catalog_data_row_grouped_by", { path: '/' });
+
+
+ }
+ setsomeoneconnected("0");
+ setDialog_1_open(false);
+ history.push("/recherche-formation");
+ }
+
+ function user_logout_confirmation() {
+ /* si c'est une connexion partner qui est active */
+ if (typeof (stored_user) != "undefined") {
+ const stored_cookie = getCookie('tokenmysych');
+ var acces_right_token_name = stored_cookie + "_uar";
+
+ setpartCookie("tokenmysych", "", { path: '/' });
+ setpartCookie(acces_right_token_name, "", { path: '/' });
+ removeCookie(acces_right_token_name, { path: '/' });
+
+ removeCookie("tokenmysych", { path: '/' });
+
+
+ }
+ history.push("/intranet");
+ }
+
+ return (
+
+
+ {/*** GESTION Deconnexion */}
+
+
+ {/*** Fin GESTION Deconnexion */}
+
+
+
+
+
+
+
+
+
+
+
+ {String(someoneconnected) !== String("1") && }
+
+ {String(someoneconnected) === String("1") && }
+
+
+
+ {String(someoneconnected) !== String("1") &&
+

+
Connexion
+
}
+
+ {String(someoneconnected) === String("1") &&
setDialog_1_open(true)}>
+

+
Deconnexion
+
}
+
+
+
+
+
+ );
+};
+
+export default Partner_Header;
+
diff --git a/src/components/Student_Account.js b/src/components/Student_Account.js
index 917589b..a5d6d73 100644
--- a/src/components/Student_Account.js
+++ b/src/components/Student_Account.js
@@ -27,7 +27,7 @@ import Module_Ent_Mes_Formations from "./Module_Ent_Mes_Formations";
import Module_Ent_Mes_Notes from "./Module_Ent_Mes_Notes";
function Student_Account() {
- const [menu, setmenu] = useState("mes_stagiaires");
+ const [menu, setmenu] = useState("mes_formations");
const [cookie, setCookie, removeCookie] = useCookies(['tokenmysych']);
const [result, setResult] = useState("");
const [myApiResponse, setmyApiResponse] = useState("");
@@ -192,8 +192,8 @@ function Student_Account() {
var myurl = process.env.REACT_APP_API_URL + "myclass/api/get_user_account/";
axios.post(myurl, form).then(res => {
- // console.log(" In GetUserNameFromToken res.data.status = " + res.data.status);
- // console.log(" In GetUserNameFromToken res.data.message = " + res.data.message);
+ // console.log(" In GetUserNameFromToken res.data.status = " + res.data.status);
+ // console.log(" In GetUserNameFromToken res.data.message = " + res.data.message);
if (String(res.data.status) === String("true")) {
setusername(JSON.parse(res.data.message).email);
@@ -341,7 +341,7 @@ function Student_Account() {
return (
-
+
Création compte MySy Trainig Technology
@@ -444,75 +444,6 @@ function Student_Account() {
}
-
-
-
- {String(menu) === String("modules_mes_documents") && connected_user_data && connected_user_data.partner_owner_recid &&
- connected_user_data.partner_client_id &&
- }
-
- {String(menu) === String("mes_devis") && connected_user_data && connected_user_data.partner_owner_recid &&
- connected_user_data.partner_client_id &&
- }
-
- {String(menu) === String("mes_conventions") && connected_user_data && connected_user_data.partner_owner_recid &&
- connected_user_data.partner_client_id &&
- }
-
-
- {String(menu) === String("mes_convocations") && connected_user_data && connected_user_data.partner_owner_recid &&
- connected_user_data.partner_client_id &&
- }
-
- {String(menu) === String("mes_attestations") && connected_user_data && connected_user_data.partner_owner_recid &&
- connected_user_data.partner_client_id &&
- }
-
-
- {String(menu) === String("mes_stagiaires") && connected_user_data && connected_user_data.partner_owner_recid &&
- connected_user_data.partner_client_id &&
- }
-
-
-
-
- {String(menu) === String("mes_documents") && }
-
-
diff --git a/src/mysy_img/ent_studend_img.jpg b/src/mysy_img/ent_studend_img.jpg
new file mode 100644
index 0000000..26ba3ef
Binary files /dev/null and b/src/mysy_img/ent_studend_img.jpg differ
diff --git a/src/pages/student_account.js b/src/pages/student_account.js
index 0381b2e..d7a9f2b 100644
--- a/src/pages/student_account.js
+++ b/src/pages/student_account.js
@@ -1,6 +1,6 @@
import Navigation from "../components/Navigation";
import Ent_Intranet from "./../components/Ent_Intranet";
-import New_C_Header_2025_V2 from "../components/header_automatic_files/Header";
+import Partner_New_C_Header_2025_V2 from "../components/Partner_header_automatic_files/Partner_Header";
import New_C_Footer_Without_Testimony_2025_V2 from "../components/footer_automatic_files/Layout_Without_Testimony";
import New_Navigation_2025 from "../components/New_Navigation_2025";
import Student_Account from "./../components/Student_Account";
@@ -9,7 +9,7 @@ const student_account = () => {
return (
diff --git a/src/styles/components/_module_connexion_intranet_client.scss b/src/styles/components/_module_connexion_intranet_client.scss
index 9d2ca2b..4bf00db 100644
--- a/src/styles/components/_module_connexion_intranet_client.scss
+++ b/src/styles/components/_module_connexion_intranet_client.scss
@@ -2105,7 +2105,7 @@
}
.div_centre_master {
- width: 40%;
+ width: 80%;
background-color: white;
margin-left: auto;
margin-right: auto;
@@ -2261,7 +2261,7 @@
.display_screen_600_901 {
width: 95%;
- margin-left: 5%;
+ // margin-left: 5%;
float: left;
padding: 10px;
min-height: 50vh;
diff --git a/src/styles/components/_module_email_management.scss b/src/styles/components/_module_email_management.scss
index 8ee5b7b..12ec171 100644
--- a/src/styles/components/_module_email_management.scss
+++ b/src/styles/components/_module_email_management.scss
@@ -1829,7 +1829,7 @@
text-align: center;
margin-bottom: 0.8rem;
color: white;
- cursor: pointer;
+ cursor: normal;
font-style: italic;
background-color: gray;
font-weight: normal;
@@ -2477,7 +2477,7 @@
text-align: center;
margin-bottom: 0.8rem;
color: white;
- cursor: pointer;
+ cursor: normal;
font-style: italic;
background-color: gray;
font-weight: normal;