From 86e1566a06e1ba867d0519b0b49c77f03020c1cf Mon Sep 17 00:00:00 2001 From: cherif Date: Tue, 14 Feb 2023 21:34:09 +0100 Subject: [PATCH] 14/02/23 - 21h --- src/components/AddClassManual.js | 4 +- src/components/DisplayDetailClass_new_v2.js | 18 ++--- src/components/Formation.js | 11 +++- src/components/GestionAdministrative.js | 65 +++++++++++++++---- .../components/_gestionadministrative.scss | 24 +++++++ 5 files changed, 97 insertions(+), 25 deletions(-) diff --git a/src/components/AddClassManual.js b/src/components/AddClassManual.js index df04bf8..9b743da 100644 --- a/src/components/AddClassManual.js +++ b/src/components/AddClassManual.js @@ -459,7 +459,7 @@ const AddClassManual = (props) => { - const [title_limite, settitle_limite] = useState(70); + const [title_limite, settitle_limite] = useState(90); const editorRef_description = useRef(null); const [editorRef_description_limite, seteditorRef_description_limite] = useState(1000); @@ -1028,7 +1028,7 @@ const AddClassManual = (props) => { {
- {DetailTraining["duration"]}   {DetailTraining["duration_unit"]}(s) + {DetailTraining["duration"]}   {DetailTraining["duration_unit"]} (s)
@@ -1316,11 +1316,11 @@ const DisplayDetailClass_new_v2 = (props) => { {partnair_name && } @@ -1508,7 +1508,7 @@ const DisplayDetailClass_new_v2 = (props) => { {String(iscertifvoltaire) === "1" &&
- Certitrace + Certitrace
} @@ -2036,7 +2036,7 @@ const DisplayDetailClass_new_v2 = (props) => {
- {DetailTraining["duration"]}   {DetailTraining["duration_unit"]}(s) + {DetailTraining["duration"]}   {DetailTraining["duration_unit"]} (s)
@@ -2206,7 +2206,7 @@ const DisplayDetailClass_new_v2 = (props) => { } {String(iscertifvoltaire) === "1" &&
- Certitrace + Certitrace
} @@ -2234,7 +2234,7 @@ const DisplayDetailClass_new_v2 = (props) => {
- Organisme de formation : + Organisme de formation :
@@ -2242,11 +2242,11 @@ const DisplayDetailClass_new_v2 = (props) => { {partnair_name && } diff --git a/src/components/Formation.js b/src/components/Formation.js index 76416d4..8bed898 100644 --- a/src/components/Formation.js +++ b/src/components/Formation.js @@ -321,8 +321,8 @@ const Formation = (props) => {

- - {String(parse(String(props.formation.title).replace(/(<([^>]+)>)/ig, ''))).substring(0, 60)} + + {String(parse(String(props.formation.title).replace(/(<([^>]+)>)/ig, ''))).substring(0, 100)}

@@ -367,7 +367,7 @@ const Formation = (props) => { {props.formation.duration_unit &&
-
Durée +
Durée
{String(props.formation.duration_unit) === "heure" && @@ -386,6 +386,11 @@ const Formation = (props) => { {props.formation.duration} jr(s)  
} + {String(props.formation.duration_unit) === "mois" && +
+ {props.formation.duration} mois(s) +
} +
} diff --git a/src/components/GestionAdministrative.js b/src/components/GestionAdministrative.js index feccee8..1049314 100644 --- a/src/components/GestionAdministrative.js +++ b/src/components/GestionAdministrative.js @@ -1691,7 +1691,7 @@ function GestionAdministrative(props) { var nom_fiche_detaillee = "Attestation.pdf"; - var url = process.env.REACT_APP_API_URL + "myclass/api/PrintAttendeeCertification/" + stored_cookie + "/" + mysession + "/" + selectedattendeeemail; + var url = process.env.REACT_APP_API_URL + "myclass/api/PrintAttendeeCertification/" + stored_cookie + "/" + mysession + "/" + selectedattendeeemail + "/" + internal_url; @@ -2898,7 +2898,22 @@ function GestionAdministrative(props) { /> +
+ {selectionModel && selectionModel.length >= 1 &&
+ +   +
+
+ }
{/* */} @@ -2912,13 +2927,11 @@ function GestionAdministrative(props) { { - setSelectionModel(newSelectionModel_insc); + setSelectionModel_insc(newSelectionModel_insc); //console.log("ch selected--" + newSelectionModel); }} selectionModel={selectionModel_insc} - - localeText={frFR.components.MuiDataGrid.defaultProps.localeText} rows={rowss_insc.map((item, index) => ( { @@ -2947,7 +2960,21 @@ function GestionAdministrative(props) { /> +
+ {selectionModel_insc && selectionModel_insc.length >= 1 &&
+ +   +
+ }
{/* */} @@ -3047,7 +3074,7 @@ function GestionAdministrative(props) { { - setSelectionModel_emarg(newSelectionModel_evaluation); + setSelectionModel_evaluation(newSelectionModel_evaluation); //console.log("ch selected--" + newSelectionModel_emarg); }} @@ -3415,8 +3442,8 @@ function GestionAdministrative(props) {
-
- Date attestation + {detailuser_date_certification &&
+ Attestation delivrée le -
+
} + + {!detailuser_date_certification &&
+ Attestation NON délivrée encore + +
}
@@ -3466,13 +3509,13 @@ function GestionAdministrative(props) {
} - + {!detailuser_date_certification && }
- diff --git a/src/styles/components/_gestionadministrative.scss b/src/styles/components/_gestionadministrative.scss index 8b8cbfc..334c7f7 100644 --- a/src/styles/components/_gestionadministrative.scss +++ b/src/styles/components/_gestionadministrative.scss @@ -869,8 +869,32 @@ margin-left: 10rem; } + .action_mass { + font-family: "Roboto", "Helvetica", "Arial", sans-serif; + font-weight: 500; + text-align: left; + font-size: small; + line-height: 1.75; + letter-spacing: 0.02857em; + text-transform: uppercase; + min-width: 64px; + transition: background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms, + box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms, + border-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms, + color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; + color: #fff; + background-color: #81bc3a; + margin-bottom: 1rem; + width: 10rem; + box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), + 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12); + + } + } + // end media + .css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input:invalid { padding-top: 5px !important; padding-bottom: 5px !important;