From a4e297a7dbe6ceeab3a1fcd0da9741f5dcd938ec Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 31 Dec 2024 12:48:46 +0100 Subject: [PATCH] 31/12/2024 - 12h30 --- public/sitemap.xml | 6 +++ src/components/Article.js | 29 +++++++++++---- src/components/Config_Document.js | 11 +++++- src/components/DisplayDetailArticle_new_v2.js | 2 +- src/components/RechercheArticles_new_v2.js | 37 ++++++++++++++++--- src/styles/components/_article.scss | 5 ++- .../components/_displaypartnersession.scss | 1 + 7 files changed, 75 insertions(+), 16 deletions(-) diff --git a/public/sitemap.xml b/public/sitemap.xml index 3a62f66..adc56b0 100644 --- a/public/sitemap.xml +++ b/public/sitemap.xml @@ -89,6 +89,12 @@ 1.0000 + + https://www.mysy-training.com/Display-Detail-Article/logiciel-gestion-organismes-formation-guide-complet + 2024-12-31T12:15:41+00:00 + daily + 1.0000 + diff --git a/src/components/Article.js b/src/components/Article.js index accfed0..f4949d9 100644 --- a/src/components/Article.js +++ b/src/components/Article.js @@ -380,7 +380,7 @@ const Article = (props) => { } form.append("meta_description", local_meta_description); - + setLoading(true); // console.log(" ## form = ", form); var myurl = ""; @@ -394,7 +394,7 @@ const Article = (props) => { axios.post(myurl, form).then(res => { - + setLoading(false); if (String(res.data.status) === String("false")) { alert(res.data.message); } @@ -409,6 +409,7 @@ const Article = (props) => { } }).catch((error) => { + setLoading(false); console.warn('contact-nous Not good man :( mysearchtext = '); @@ -477,7 +478,7 @@ const Article = (props) => { const handleSubmission_logo = event => { clear_message(); - + setis_data_changed("1"); const fileUploaded = event.target.files[0]; let file_size = event.target.files[0].size; @@ -681,6 +682,14 @@ const Article = (props) => { } /***** Fin gestion de l'image de l'article */ + + // Prevent Bootstrap dialog from blocking focusin + document.addEventListener('focusin', (e) => { + if (e.target.closest(".tox-tinymce-aux, .moxman-window, .tam-assetmanager-root") !== null) { + e.stopImmediatePropagation(); + } + }); + return (
@@ -875,8 +884,8 @@ const Article = (props) => { {
- Texte Article + Texte Article o
@@ -916,13 +925,13 @@ const Article = (props) => { value={field_texte_avis} onEditorChange={(newValue, editor) => { setfield_texte_avis(editorRef_texte_avis.current.getContent()); + setis_data_changed("1"); }} init={{ resize: false, height: 700, menubar: true, - plugins: [ 'advlist', 'autolink', 'lists', 'link', 'image', 'charmap', 'print', 'preview', 'anchor', 'searchreplace', 'visualblocks', 'code', 'fullscreen', 'insertdatetime', 'media', 'table', 'paste', 'code', 'help', 'wordcount', @@ -943,6 +952,12 @@ const Article = (props) => {
/!\ Pensez à enregistrer les modifications
} + +
diff --git a/src/components/Config_Document.js b/src/components/Config_Document.js index db2df23..fbaf13b 100644 --- a/src/components/Config_Document.js +++ b/src/components/Config_Document.js @@ -2107,6 +2107,13 @@ const Config_Documents = (props) => { { "id": "1", "label": "", "value": "1" }, // Cette ligne pour couvrir l'ajout d'une ligne de filter. C'est fait expres. ] + // Prevent Bootstrap dialog from blocking focusin + document.addEventListener('focusin', (e) => { + if (e.target.closest(".tox-tinymce-aux, .moxman-window, .tam-assetmanager-root") !== null) { + e.stopImmediatePropagation(); + } + }); + return (
{isLoading &&
@@ -2691,7 +2698,7 @@ const Config_Documents = (props) => {
} @@ -3006,7 +3013,7 @@ const Config_Documents = (props) => {
} } - + {String(partner_document_data_edit_mode) === "1" &&
diff --git a/src/components/DisplayDetailArticle_new_v2.js b/src/components/DisplayDetailArticle_new_v2.js index b12eb88..b098eee 100644 --- a/src/components/DisplayDetailArticle_new_v2.js +++ b/src/components/DisplayDetailArticle_new_v2.js @@ -323,7 +323,7 @@ const DisplayDetailArticle_new_v2 = (props) => { axios.post(myurl, form).then(res => { // console.log(" In test res.data.status = " + res.data.status); - //console.log(" In test res.data.message = " + res.data.message); + console.log(" In Display iiii res.data.message = " + res.data.message); if (String(res.data.status) === "true") { setmyApiResponse("True"); diff --git a/src/components/RechercheArticles_new_v2.js b/src/components/RechercheArticles_new_v2.js index 577aa44..a988d56 100644 --- a/src/components/RechercheArticles_new_v2.js +++ b/src/components/RechercheArticles_new_v2.js @@ -779,6 +779,7 @@ const RechercheArticles_new_v2 = (props) => { setarticle_avis_sujet(""); setarticle_avis_avis(""); setis_data_changed(""); + setarticle_avis_internal_url(""); } const [article_avis_date_publication, setarticle_avis_date_publication] = useState(new Date().toLocaleDateString('fr-FR')); @@ -807,6 +808,10 @@ const RechercheArticles_new_v2 = (props) => { form.append("qualite", " --- "); form.append("note", "---"); + if( article_avis_internal_url && String(article_avis_internal_url).trim().length > 5 ){ + form.append("internal_url", article_avis_internal_url); + } + if (img_img_article_file2) { form.append('File', img_img_article_file2); form.append('img_file_name', img_img_article_file2.name); @@ -855,8 +860,10 @@ const RechercheArticles_new_v2 = (props) => { // console.log(" ## form = ", form); var myurl = process.env.REACT_APP_API_URL + "myclass/api/add_articles_avis/"; - axios.post(myurl, form).then(res => { + setLoading(true); + axios.post(myurl, form).then(res => { + setLoading(false); if (String(res.data.status) === String("false")) { alert(res.data.message); } @@ -871,9 +878,8 @@ const RechercheArticles_new_v2 = (props) => { } }).catch((error) => { + setLoading(false); console.warn('contact-nous Not good man :( mysearchtext = '); - - }) @@ -1191,6 +1197,27 @@ const RechercheArticles_new_v2 = (props) => {
+
+
+ Url souhaitée +
+
+
+ { + setarticle_avis_internal_url(e.target.value); + setis_data_changed("1"); + }} + className='disabled_style_width_100_percent' + + > +
+
+
+
@@ -1322,8 +1349,8 @@ const RechercheArticles_new_v2 = (props) => {