$

src/components/global/api/Controller.js

@@ -9,11 +9,6 @@ export default class Controller {
         this.model = model
         this.view = view
 
-        /**
-         * TODO: Tej ca avant de rendre le projet
-         * */
-        localStorage.clear()
-
         this.getData(0).then()
 
         /**

src/components/global/api/Model.js

@@ -190,7 +190,7 @@ export default class Model {
             `&refine.${encodeURIComponent(this.state.api.facet.formation)}=${encodeURIComponent(this.state.page.scat)}`
 
             /**
-             * TODO: (Bilal prends la responsabilite de ce massacre)
+             * (Bilal prends la responsabilite de ce massacre)
              * */
             if(this.state.page.scat === "Formations des écoles d'ingénieurs") {
                 link = `${this.state.api.link}&rows=0` +
@@ -239,10 +239,10 @@ export default class Model {
                     `&refine.${encodeURIComponent(this.state.api.facet.spec)}=${encodeURIComponent(this.state.page.tcat)}`
 
                 /**
-                 * TODO: (Bilal prends la responsabilite de ce massacre)
+                 * (Bilal prends la responsabilite de ce massacre)
                  * */
                 if(this.state.page.tcat === "Formation d'ingénieur Bac + 5") {
-                    link = `https://data.enseignementsup-recherche.gouv.fr/explore/embed/dataset/fr-esr-parcoursup/map/?timezone=Europe%2FBerlin&sort=tri&facet=fili&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20d%27ing%C3%A9nieur%20Bac%20%2B%205&location=9,49.4599,2.06824&basemap=e69ab1`
+                    link = `https://data.enseignementsup-recherche.gouv.fr/explore/embed/dataset/fr-esr-parcoursup/map/?timezone=Europe%2FBerlin&sort=tri&facet=fili&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20d%27ing%C3%A9nieur%20Bac%20%2B%205`
                 } else if(this.state.page.tcat === "Formation Bac + 3") {
                     link = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&lang=fr&sort=tri&rows=10000&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20Bac%20%2B%203`
                 }
@@ -292,10 +292,13 @@ export default class Model {
 
         console.log(link)
 
+        /**
+         * (Bilal prends la responsabilite de ce massacre)
+         * */
         if(this.state.page.tcat === "Formation d'ingénieur Bac + 5") {
-            link = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&lang=fr&sort=tri&rows=10000&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20d%27ing%C3%A9nieur%20Bac%20%2B%205`
+            link = `https://data.enseignementsup-recherche.gouv.fr/api/records/1.0/search/?dataset=fr-esr-parcoursup&q=&lang=fr&sort=tri&rows=10000&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20d%27ing%C3%A9nieur%20Bac%20%2B%205&location=6,48.04137,1.74683&basemap=e69ab1`
         } else if(this.state.page.tcat === "Formation Bac + 3") {
-            link = `https://data.enseignementsup-recherche.gouv.fr/explore/embed/dataset/fr-esr-parcoursup/map/?timezone=Europe%2FBerlin&sort=tri&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20Bac%20%2B%203&location=6,47.0088,2.09656&basemap=e69ab1`
+            link = `https://data.enseignementsup-recherche.gouv.fr/explore/embed/dataset/fr-esr-parcoursup/map/?timezone=Europe%2FBerlin&sort=tri&facet=fili&facet=form_lib_voe_acc&facet=fil_lib_voe_acc&refine.fili=Ecole%20d%27Ing%C3%A9nieur&refine.form_lib_voe_acc=Formations%20%20des%20%C3%A9coles%20d%27ing%C3%A9nieurs&refine.fil_lib_voe_acc=Formation%20Bac%20%2B%203&location=6,47.0088,2.09656&basemap=e69ab1&location=6,48.04137,1.74683&basemap=e69ab1`
         }
 
         return new Promise((resolve, reject) => {

src/components/global/api/View.js

@@ -166,6 +166,11 @@ export default class View {
                 let dept = `${e.fields.dep_lib} (${e.fields.dep})`
                 let city = e.fields.ville_etab
 
+                let textder = e.fields.lib_grp1
+                let textder2 = e.fields.lib_grp2
+                let numder = e.fields.ran_grp1
+                let numder2 = e.fields.ran_grp2
+
                 let smmoy = (e.fields.pct_sansmention * 11) / 20
                 let abmoy = (e.fields.pct_ab * 13) / 20
                 let bmoy = (e.fields.pct_b * 15) / 20
@@ -244,8 +249,14 @@ export default class View {
                     }
 
                     riot.mount(modal, {
+                        textder: textder,
+                        textder2: textder2,
+                        numder: numder,
+                        numder2: numder2,
+
                         close : close,
                         etabname: etab,
+
                         formation: form,
                         city: city,
                         acad: acad,

src/components/global/map/map.riot

@@ -6,7 +6,6 @@
             display: flex;
             justify-content: center;
         }
-
         #map-container
         #map-map  {
             width: 100%;

src/components/global/modal/modal.riot

@@ -92,7 +92,14 @@
             <span class="modal-info-text">Academie : { this.props.acad }</span>
             <span class="modal-info-text">{ this.props.type }</span>
             <span class="modal-info-text">Capacite : { this.props.capacity }</span>
-            <span class="modal-info-text">Nombre de voeux : { this.props.wish }</span>
+            <span class="modal-info-text">Nombre de voeux : { this.props.wish }</span><br/>
+
+            <ul>
+                <span class="modal-info-text">Rang dernier admis :</span>
+                <li>{ this.props.textder } : { this.props.numder }</li>
+                <li if={ this.props.textder2 }>{ this.props.textder2 } : { this.props.numder2 }</li>
+            </ul>
+
             <span class="modal-info-text">Admis hors academie : { this.props.nhacad }%</span>
 
             <generalysticsfragment
@@ -127,6 +134,11 @@
     <script>
         export default {
             props: [
+                "textder",
+                "textder2",
+                "numder2",
+                "numder2",
+
                 "close",
                 "etabname",
                 "formation",

src/index.html

@@ -6,6 +6,7 @@
         <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,300italic,700,700italic">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/8.0.1/normalize.css">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/milligram/1.4.0/milligram.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.7.1/leaflet.css" integrity="sha512-zJq3FiOjWT4O4yGm+4s1JmKj8ng/6Uf7VU/UCYXb7eUJjh/HxN7VJVVQ2KjwC0tpLZzmfMQJqvL2+X9G1c+fKw==" crossorigin=""/>
     </head>
 
     <body>