From 0ee0b0913cdec5a53a2eecd31677f230de5b27f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=C3=AFssous?= <kayyissa.haissous@etu.u-pec.fr>
Date: Fri, 31 Mar 2023 17:20:19 +0200
Subject: [PATCH] =?UTF-8?q?dernier=20appel=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/main-controller.riot | 34 +++------------------------------
 components/school-info.riot     | 30 +++++++++++++++--------------
 components/title-progress.riot  |  8 ++++----
 3 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/components/main-controller.riot b/components/main-controller.riot
index b629701..3d1ed82 100644
--- a/components/main-controller.riot
+++ b/components/main-controller.riot
@@ -59,33 +59,10 @@
             onMounted(props, state) {
                 this.update({
                     course: null,
-<<<<<<< HEAD
-                    sortBy: null,
-                    schoolList: null,
-                    sortFields: SORT_TABLE,
-                    filteredSchoolList: null,
-					shouldShowInfos: false,
                     school: null,
-                    popupEnabled: false
-                })
-            },
-            filterSearch() {
-                let input = this.$("input")
-                if (!input) return
-
-                let finalArray = []
-                
-                //On évite de trier avant d'avoir plus de 1 lettres.
-                if (input.value.length > 1) { 
-                    finalArray = this.state.schoolList.filter((item) => {
-                        return item.name.toLowerCase().includes(input.value.toLowerCase())
-                    })
-                } else {
-                    finalArray = this.state.schoolList
-                }
-                
-                this.update({
-                    filteredSchoolList: finalArray
+                    schoolList: null,
+                    popupEnabled: false,
+					shouldShowInfos: false
                 })
             },
             popup(school){
@@ -100,11 +77,6 @@
                     popupEnabled: false
                 })
                 console.log("closed!")
-=======
-                    schoolList: [],
-					shouldShowInfos: false
-                })
->>>>>>> 6ed22586179f7de1d23fd1ebd68d111298170226
             }
         }
     </script>
diff --git a/components/school-info.riot b/components/school-info.riot
index cc1e9d8..938e242 100644
--- a/components/school-info.riot
+++ b/components/school-info.riot
@@ -6,9 +6,6 @@
                 <p>
                     <h1 class="title is-4 m-2" style="color: #485FC7;">{props.school.fields.g_ea_lib_vx}</h1>
                 </p>
-                <p>
-                    <h2></h2>
-                </p>
                 <div class="columns m-2">
                     <div class="column">
                         <p>Ville : {props.school.fields.ville_etab}</p>
@@ -17,9 +14,15 @@
                         <p>{props.school.fields.contrat_etab}</p>
                         <p>Capacité : {props.school.fields.capa_fin}</p>
                         <p>Nombre de voeux : {props.school.fields.voe_tot}</p>
-                        <p>Rang dernier admis : </p>
+                        <p>Rang dernier appelé : </p>
+                        <ul>
+                            <li if={props.school.fields.lib_grp1}>{props.school.fields.lib_grp1} : {props.school.fields.ran_grp1}</li>
+                            <li if={props.school.fields.lib_grp2}>{props.school.fields.lib_grp2} : {props.school.fields.ran_grp2}</li>
+                            <li if={props.school.fields.lib_grp3}>{props.school.fields.lib_grp3} : {props.school.fields.ran_grp3}</li>
+                        </ul>
+                        <p>Admis hors académie : {100-props.school.fields.pct_aca_orig}%</p>
                     </div>
-                    <div class="column is-one-fifth">
+                    <div class="column">
                         <p>Vitesse de remplissage :</p>
                     </div>
                 </div>
@@ -67,17 +70,17 @@
                     {
                         name: "Général",
                         short: "Gen.",
-                        value: school.part_acces_gen
+                        value: Math.round(school.part_acces_gen)
                     },
                     {
                         name: "Technologique",
                         short: "Tech.",
-                        value: school.part_acces_tec
+                        value: Math.round(school.part_acces_tec)
                     },
                     {
                         name: "Professionnel",
                         short: "Pro.",
-                        value: school.part_acces_pro
+                        value: Math.round(school.part_acces_pro)
                     },
                     {
                         name: "Autre",
@@ -90,27 +93,27 @@
                     {
                         name: "Sans Mention",
                         short: "SM",
-                        value: school.pct_sansmention
+                        value: Math.round(school.pct_sansmention)
                     },
                     {
                         name: "Assez Bien",
                         short: "AB",
-                        value: school.pct_ab
+                        value: Math.round(school.pct_ab)
                     },
                     {
                         name: "Bien",
                         short: "B",
-                        value: school.pct_b
+                        value: Math.round(school.pct_b)
                     },
                     {
                         name: "Très Bien",
                         short: "TB",
-                        value: school.pct_tb
+                        value: Math.round(school.pct_tb)
                     },
                     {
                         name: "Très Bien + Félicitations",
                         short: "TBF",
-                        value: school.pct_tbf
+                        value: Math.round(school.pct_tbf)
                     },
                     {
                         name: "Non Spécifié",
@@ -118,7 +121,6 @@
                         value: 100 - (school.pct_sansmention + school.pct_ab + school.pct_b + school.pct_tb + school.pct_tbf)
                     }
                 ]
-
             }
         }
     </script>
diff --git a/components/title-progress.riot b/components/title-progress.riot
index a7000a8..4d05895 100644
--- a/components/title-progress.riot
+++ b/components/title-progress.riot
@@ -9,11 +9,11 @@
 <script>
     const DEFAULT_CLASSES = "progress is-small m-2 mt-auto mb-auto"
     const COLOR_CLASSES = [
-        "is-danger",
-        "is-warning",
-        "is-success",
+        "is-link",
         "is-info",
-        "is-link"
+        "is-success",
+        "is-warning",
+        "is-danger"
     ]