From 9fe46de3b018c26a85e9e001cb5c0e6c973f3648 Mon Sep 17 00:00:00 2001
From: lehmann <sebastien.lehmann@uha.fr>
Date: Wed, 14 Dec 2022 16:54:28 +0100
Subject: [PATCH] =?UTF-8?q?Correctif=20relev=C3=A9=20tri=20UEs=20capitalis?=
 =?UTF-8?q?=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/static/css/releve-but.css | 14 +++++-
 app/static/js/releve-but.js   | 82 +++++++++++++----------------------
 2 files changed, 41 insertions(+), 55 deletions(-)

diff --git a/app/static/css/releve-but.css b/app/static/css/releve-but.css
index 021c83f59..1f7a492c9 100644
--- a/app/static/css/releve-but.css
+++ b/app/static/css/releve-but.css
@@ -279,6 +279,17 @@ section>div:nth-child(1) {
     background: var(--couleurFondTitresSAE) !important;
     color: #000 !important;
 }
+/* UE Capitalisée */
+.synthese .ue.capitalisee, 
+.ue.capitalisee>h3{
+	background: var(--couleurFondTitresUECapitalisee);;
+}
+.synthese .ue.capitalisee>h3::before{
+	content: "Capitalisée : ";
+}
+.synthese .ue.capitalisee .ue_rang{
+	display: none;
+}
 
 /***************/
 /* Evaluations */
@@ -294,6 +305,7 @@ section>div:nth-child(1) {
     padding: 4px 32px;
     border-radius: 4px;
     display: flex;
+	align-items: center;
     gap: 16px;
     margin: 4px 0 2px 0;
     overflow-x: auto;
@@ -337,8 +349,6 @@ section>div:nth-child(1) {
 }
 
 h3 {
-    display: flex;
-    align-items: center;
     margin: 0 auto 0 0;
     position: sticky;
     left: -32px;
diff --git a/app/static/js/releve-but.js b/app/static/js/releve-but.js
index dfa0fa92b..64d54662d 100644
--- a/app/static/js/releve-but.js
+++ b/app/static/js/releve-but.js
@@ -305,7 +305,16 @@ class releveBUT extends HTMLElement {
 	/*******************************/
 	showSynthese(data) {
 		let output = ``;
-		Object.entries(data.ues).forEach(([ue, dataUE]) => {
+		/* Fusion et tri des UE et UE capitalisées */
+		let fusionUE = [
+			...Object.entries(data.ues),
+			...Object.entries(data.ues_capitalisees)
+		].sort((a, b) => {
+			return a[1].numero - b[1].numero
+		});
+
+		/* Affichage */
+		fusionUE.forEach(([ue, dataUE]) => {
 			if (dataUE.type == 1) {		// UE Sport / Bonus
 				output += `
 					<div>
@@ -319,17 +328,22 @@ class releveBUT extends HTMLElement {
 			} else {
 				output += `
 					<div>
-						<div class=ue>
+						<div class="ue ${dataUE.date_capitalisation?"capitalisee":""}">
 							<h3>
 								${ue}${(dataUE.titre) ? " - " + dataUE.titre : ""}
 							</h3>
 							<div>
-								<div class=moyenne>Moyenne&nbsp;:&nbsp;${dataUE.moyenne?.value ?? "-"}</div>
+								<div class=moyenne>Moyenne&nbsp;:&nbsp;${dataUE.moyenne?.value || dataUE.moyenne || "-"}</div>
 								<div class=ue_rang>Rang&nbsp;:&nbsp;${dataUE.moyenne?.rang}&nbsp;/&nbsp;${dataUE.moyenne?.total}</div>
-								<div class=info>
-									Bonus&nbsp;:&nbsp;${dataUE.bonus || 0}&nbsp;- 
-									Malus&nbsp;:&nbsp;${dataUE.malus || 0}
-									<span class=ects>&nbsp;-
+								<div class=info>`;
+				if(!dataUE.date_capitalisation){		
+					output += `		Bonus&nbsp;:&nbsp;${dataUE.bonus || 0}&nbsp;- 
+									Malus&nbsp;:&nbsp;${dataUE.malus || 0}`;
+				} else {
+					output += `		le ${this.ISOToDate(dataUE.date_capitalisation.split("T")[0])} <a href="${dataUE.bul_orig_url}">dans ce semestre</a>`;
+				}
+
+				output += `			<span class=ects>&nbsp;-
 										ECTS&nbsp;:&nbsp;${dataUE.ECTS?.acquis ?? "-"}&nbsp;/&nbsp;${dataUE.ECTS?.total ?? "-"}
 									</span>
 								</div>
@@ -338,57 +352,19 @@ class releveBUT extends HTMLElement {
 					<div>Abs&nbsp;N.J.</div><div>${dataUE.absences?.injustifie || 0}</div>
 					<div>Total</div><div>${dataUE.absences?.total || 0}</div>
 				</div>*/
-				output += `
-						</div>
-						${this.synthese(data, dataUE.ressources)}
-						${this.synthese(data, dataUE.saes)}
-					</div>
-				`;
-				/* UE capitalisées */
-				if (data.ues_capitalisees !== undefined) {
-					if (ue in data.ues_capitalisees) {
-						output += this.show_ue_capitalisee(ue, data.ues_capitalisees[ue]);
-						delete data.ues_capitalisees[ue];
-					}
+				output += "</div>";
+
+				if(!dataUE.date_capitalisation){
+					output += 
+						this.synthese(data, dataUE.ressources) +
+						this.synthese(data, dataUE.saes);
 				}
+						
+				output += "</div>";
 			}
 		});
-		/* UE capitalisées seulement (non déjà vues) */
-		if (data.ues_capitalisees !== undefined) {
-			Object.entries(data.ues_capitalisees).forEach(([ue, ue_cap]) => {
-				output += this.show_ue_capitalisee(ue, data.ues_capitalisees[ue]);
-			});
-		}
 		this.shadow.querySelector(".synthese").innerHTML = output;
 	}
-
-	show_ue_capitalisee(ue, ue_cap) {
-		let date_capitalisation = new Date(ue_cap.date_capitalisation).toLocaleString("fr-FR");
-		let link_sem = "";
-		if (ue_cap.bul_orig_url != null) {
-			link_sem = `<a href="${ue_cap.bul_orig_url}">dans ce semestre</a>`;
-		}
-		return `
-		<div>
-			<div class="ue ue_capitalisee">
-				<h3>
-					Capitalisée : ${ue}${(ue_cap.titre) ? " - " + ue_cap.titre : ""}
-				</h3>
-				<div>
-					<div class=moyenne>Moyenne&nbsp;:&nbsp;${ue_cap.moyenne ?? "-"}</div>
-					
-					<div class=info>
-					le ${date_capitalisation} ${link_sem}
-						<span class=ects>&nbsp;
-							ECTS&nbsp;:&nbsp;${ue_cap.ECTS?.acquis ?? "-"}&nbsp;/&nbsp;${ue_cap.ECTS?.total ?? "-"}
-						</span>
-					</div>
-				</div>
-			</div>
-		</div>`;
-	}
-
-
 	synthese(data, modules) {
 		let output = "";
 		Object.entries(modules).forEach(([module, dataModule]) => {