diff --git a/.env b/.env
index b184f72..88f0d7d 100644
--- a/.env
+++ b/.env
@@ -8,4 +8,5 @@ REACT_APP_API_URL=http://localhost:5001/
REACT_APP_BASE_URL=http://localhost:3009/recherche-formation
REACT_APP_FRONT_URL=http://localhost:3009/
REACT_APP_ENV=DEV
-GENERATE_SOURCEMAP=false
\ No newline at end of file
+GENERATE_SOURCEMAP=false
+REACT_APP_MAINTENANCE=1
\ No newline at end of file
diff --git a/src/App.js b/src/App.js
index 49e7e6b..fb24cdc 100644
--- a/src/App.js
+++ b/src/App.js
@@ -52,6 +52,8 @@ import UpdateAttendeeList from "./pages/updateattendeelist";
import AutomaticQuotation from "./pages/automaticquotation";
+import Maintenance from "./pages/maintenance_page"
+
function App() {
const [screenSizeh, getDimension] = useState({
@@ -66,13 +68,18 @@ function App() {
API REC = {process.env.REACT_APP_API_URL_REC}
API URL = {process.env.REACT_APP_API_URL}
*/}
+
+
-
+
+
+
+
@@ -135,6 +142,7 @@ function App() {
+
diff --git a/src/components/Apprenant.js b/src/components/Apprenant.js
index f9b6335..13ecef4 100644
--- a/src/components/Apprenant.js
+++ b/src/components/Apprenant.js
@@ -131,7 +131,7 @@ const Apprenant = (props) => {
{' '}
- En confirmant cette opération, la session de formation sera définitivement supprimée .
+ En confirmant cette opération, l'apprenant sera définitivement supprimé .
@@ -1764,6 +1764,7 @@ const Apprenant = (props) => {
if (String(res.data) === String("false")) {
alert("Impossible d'exporter les apprenants (2) ");
} else {
+ setSelectionModel([]);
fileDownload(res.data, nom_fichier_cmd)
}
@@ -2998,6 +2999,8 @@ const Apprenant = (props) => {
setDelete_Apprenant_Data_api("true");
setDelete_Apprenant_Data_result(res.data.message);
+ setSelectionModel([]);
+
setadd_One_Apprenant('');
setdisplay_detail_apprenant('');
Clear_Detail_Apprenant_Fields();
@@ -3054,6 +3057,8 @@ const Apprenant = (props) => {
setDelete_LIST_Apprenant_api("true");
setDelete_LIST_Apprenant_result(res.data.message);
+ setSelectionModel([]);
+
setadd_One_Apprenant('');
setdisplay_detail_apprenant('');
Clear_Detail_Apprenant_Fields();
@@ -4790,23 +4795,7 @@ const Apprenant = (props) => {
/>
}
/>
- {/*
- Action
- Supprimer
- Inscrire
- */}
+
{actionmass_ftion_val &&
diff --git a/src/components/Partner_Commande.js b/src/components/Partner_Commande.js
index d64ba41..143c580 100644
--- a/src/components/Partner_Commande.js
+++ b/src/components/Partner_Commande.js
@@ -1034,20 +1034,45 @@ const Partner_Commande = (props) => {
//document.getElementsByName("detail_header_status")[0].value = "";
if (mylocal_order.order_header_status) {
setp_detail_header_statut(mylocal_order.order_header_status);
- if (String(mylocal_order.order_header_status) === "0") {
- setp_detail_header_statut_label("Brouillon");
+
+ if (mylocal_order.order_header_type === "commande") {
+ if (String(mylocal_order.order_header_status) === "0") {
+ setp_detail_header_statut_label("Brouillon");
+ }
+ else if (String(mylocal_order.order_header_status) === "1") {
+ setp_detail_header_statut_label("En cours");
+ }
+ else if (String(mylocal_order.order_header_status) === "2") {
+ setp_detail_header_statut_label("Traité");
+ }
+ else if (String(mylocal_order.order_header_status) === "3") {
+ setp_detail_header_statut_label("Facturé");
+ }
+ else if (String(mylocal_order.order_header_status) === "-1") {
+ setp_detail_header_statut_label("Annulé");
+ }
}
- else if (String(mylocal_order.order_header_status) === "1") {
- setp_detail_header_statut_label("En cours");
- }
- else if (String(mylocal_order.order_header_status) === "2") {
- setp_detail_header_statut_label("Traité");
- }
- else if (String(mylocal_order.order_header_status) === "3") {
- setp_detail_header_statut_label("Facturé");
- }
- else if (String(mylocal_order.order_header_status) === "-1") {
- setp_detail_header_statut_label("Annulé");
+ if (mylocal_order.order_header_type === "devis") {
+ if (String(mylocal_order.order_header_status) === "0") {
+ setp_detail_header_statut_label("Brouillon");
+ }
+ else if (String(mylocal_order.order_header_status) === "1") {
+ setp_detail_header_statut_label("En cours");
+ }
+ else if (String(mylocal_order.order_header_status) === "2") {
+ setp_detail_header_statut_label("Fermé");
+ }
+ else if (String(mylocal_order.order_header_status) === "3") {
+ setp_detail_header_statut_label("Gagné");
+ }
+
+ else if (String(mylocal_order.order_header_status) === "4") {
+ setp_detail_header_statut_label("Perdu");
+ }
+
+ else if (String(mylocal_order.order_header_status) === "-1") {
+ setp_detail_header_statut_label("Annulé");
+ }
}
}
@@ -1068,6 +1093,13 @@ const Partner_Commande = (props) => {
setp_detail_header_devis_date_envoi("");
}
+ if (mylocal_order.related_order_internal_ref) {
+ setp_detail_header_order_header_ref_interne(mylocal_order.related_order_internal_ref);
+ console.log(" ### mylocal_order.related_order_internal_ref = ", mylocal_order.related_order_internal_ref);
+ } else {
+ setp_detail_header_order_header_ref_interne("");
+ }
+
//document.getElementsByName("detail_header_ref_interne")[0].value = "";
if (mylocal_order.order_header_ref_interne) {
setp_detail_header_ref_interne(mylocal_order.order_header_ref_interne);
@@ -1468,7 +1500,7 @@ const Partner_Commande = (props) => {
if (new_data2.length > 0) {
setNew_Getall_TrainingSession_result(new_data2);
- console.log(" ### setNew_Getall_TrainingSession_result = ", new_data2);
+ //console.log(" ### setNew_Getall_TrainingSession_result = ", new_data2);
}
@@ -1854,6 +1886,9 @@ const Partner_Commande = (props) => {
const [p_detail_header_client_id, setp_detail_header_client_id] = useState();
const [p_detail_header_statut_label, setp_detail_header_statut_label] = useState();
+ const [p_detail_header_order_header_ref_interne, setp_detail_header_order_header_ref_interne] = useState();
+
+
const [p_detail_header_date_cmd_val, setp_detail_header_date_cmd_val] = useState(new Date().toLocaleDateString('fr-FR'));
const [p_detail_header_date_expiration_val, setp_detail_header_date_expiration_val] = useState(date_today_90j.toLocaleDateString('fr-FR'));
const [p_detail_header_fact_adr, setp_detail_header_fact_adr] = useState();
@@ -3923,8 +3958,8 @@ const Partner_Commande = (props) => {
{New_GetCurrentPartnerClass_result && New_GetCurrentPartnerClass_result.length > 0 &&
(p_add_line_item || String(p_add_line_item) === "") && String(p_detail_header_statut_label).toLowerCase() !== "facturé" && Formation
-
-
+
+
{
{(p_add_line_item || String(p_add_line_item) === "") && String(p_detail_header_statut_label).toLowerCase() !== "facturé"
&& New_Getall_TrainingSession_result && New_Getall_TrainingSession_result.length > 0 &&
-
+
@@ -5122,7 +5157,15 @@ const Partner_Commande = (props) => {
/>
- {String(order_data_edit_mode) !== "1" && Statut
+ {String(order_data_edit_mode) !== "1" &&
Statut
+ {p_detail_header_order_header_ref_interne && String(p_detail_header_order_header_ref_interne).length > 2 &&
+
+
+
+ }
+
+
+
{
setOrder_data_changed("1");
}
}
-
/>
+
}
{String(order_data_edit_mode) === "1" && String(p_detail_header_type) === "commande" &&
Statut
diff --git a/src/mysy_img/mysy_maintenance_img.png b/src/mysy_img/mysy_maintenance_img.png
new file mode 100644
index 0000000..db5663f
Binary files /dev/null and b/src/mysy_img/mysy_maintenance_img.png differ
diff --git a/src/pages/maintenance_page.js b/src/pages/maintenance_page.js
new file mode 100644
index 0000000..d314569
--- /dev/null
+++ b/src/pages/maintenance_page.js
@@ -0,0 +1,117 @@
+import React from "react";
+import Navigation from "../components/Navigation";
+import bannerimg2 from "./../mysy_img/MYSY-LOGO-BLUE.png";
+
+import maintenance_img from "./../mysy_img/mysy_maintenance_img.png";
+import logowhite from "../mysy_img/MYSY-LOGO-WHITE.png";
+
+import { Helmet } from "react-helmet";
+import Footer from "../components/Fotter";
+import Header from "../components/Header";
+
+
+const Maintenance_Page = () => {
+
+ return (
+
+
+
+
+
+ MySy Training, Maintenance
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Connexion MySy Training Technogy
+
+
+
+
+
+
+
+
+
Connexion MySy Training Technogy
+
+
+
+
+
+ {/*
+ Le blog
+
*/}
+
+
+
+
+
+
+
+
+
+
+
+ Recherche de Formations & Tutoriels
+
+
+
+
+
+
+
+
+
+
Nous revenons dans 5 min !
+
+
+ Nous sommes désolés pour le désagrément, mais nous effectuons actuellement des travaux de maintenance.
+
+
+
+
+
+
+ - L'équipe MySy Training Technology
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default Maintenance_Page;
\ No newline at end of file