merge

2023-03-31 11:37:06 +02:00 · 2023-03-31 11:37:06 +02:00 · ac30b03c51
commit ac30b03c51
parent 9dce55c45f 507ff5fe50
9 changed files with 159 additions and 108 deletions
--- a/components/main-controller.riot
+++ b/components/main-controller.riot
@ -2,14 +2,14 @@
    <div class="columns">
 		<div class="column is-one-third">
            <div class="box p-3 m-2" style="display: flex">
-                <img class="m-auto" src="../resources/logo-parcoursup.svg"/>
+                <img class="m-auto" src="./resources/logo-parcoursup.svg"/>
            </div>
 			<search updateCourse={updateCourse}></search>
 		</div>

 		<div class="column">
 			<fili-info schoolList={state.schoolList} course={state.course} shouldShowInfos={state.shouldShowInfos}></fili-info>
-			<school sortList={sortList} schoolList={state.schoolList} sortFields={state.sortFields} course={state.course} shouldShowInfos={state.shouldShowInfos}></school>
+			<school sortList={sortList} schoolList={state.filteredSchoolList} sortFields={state.sortFields} course={state.course} shouldShowInfos={state.shouldShowInfos}></school>
 		</div>
 	</div>

@ -31,7 +31,7 @@
            sortList(sortBy) {
                //Si la liste est déjà triée par la bonne catégorie, on l'inverse
                if (sortBy == this.state.sortBy) {
-                    this.state.schoolList.reverse()
+                    this.state.filteredSchoolList.reverse()
                } 
                //Sinon on l'ordonne par la nouvelle catégorie (ascendant par défaut)
                else { 
@ -40,7 +40,7 @@
                    switch (sortBy) {
                        case SORT_TABLE[3].id:
                        case SORT_TABLE[4].id: {
-                            this.state.schoolList.sort((a, b) => {
+                            this.state.filteredSchoolList.sort((a, b) => {
                                if (a.fields[sortBy] > b.fields[sortBy]) return 1
                                else return -1
                            })
@ -48,7 +48,7 @@
                        }

                        default: {
-                            this.state.schoolList.sort((a, b) => {
+                            this.state.filteredSchoolList.sort((a, b) => {
                                return (a.fields[sortBy]).localeCompare(b.fields[sortBy])
                            })
                            break
@ -56,9 +56,7 @@
                    }
                }

-                this.update({
-                    schoolList: this.state.schoolList
-                })
+                this.update()
            },
            updateList(course) {
                course = course || this.state.course
@ -79,6 +77,7 @@
                    this.update({
                        schoolList: response
                    })    
+                    this.filterSearch()              
                })
            },
            updateCourse(course){
@ -97,8 +96,28 @@
                    sortBy: null,
                    schoolList: null,
                    sortFields: SORT_TABLE,
+                    filteredSchoolList: null,
 					shouldShowInfos: 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
+                })
            }
        }
    </script>
--- a/components/school.riot
+++ b/components/school.riot
@ -5,7 +5,7 @@
        style="border-radius: 5px;"></iframe>
        <br>
        <div class="block control has-icons-left is-inline-block is-pulled-right">
-            <input class="input" type="search" placeholder="Établissement">
+            <input class="input" onkeyup={props.filterSearch} type="search" placeholder="Établissement">
            <span class="icon is-small is-left">
                <i class="fas fa-search"></i>
            </span>
--- a/index.html
+++ b/index.html
@ -3,8 +3,9 @@
 	<head>
 		<title>Parcourplus | Accueil</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<link rel="stylesheet" href="style/parcoursup.css">
+		<link rel="stylesheet" href="./style/parcoursup.css">
 		<script src="riot.min.js"></script>
+		<link rel="icon" href="./favicon.ico" />
 		<link rel="stylesheet" href	="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.3/css/bulma.min.css">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css" integrity="sha512-q3eWabyZPc1XTCmF+8/LuE1ozpg5xxn7iO89yfSOd5/oKvyqLngoNGsx8jq92Y8eXJ/IRxQbEC+FGSYxtk2oiw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
--- a/javascript/fili-info.js
+++ b/javascript/fili-info.js
@ -76,54 +76,54 @@ var filiInfo = {
      }];
    }
  },
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div expr0="expr0" class="box p-1 m-2"></div>', [{
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div expr26="expr26" class="box p-1 m-2"></div>', [{
    type: bindingTypes.IF,
    evaluate: _scope => _scope.props.shouldShowInfos,
-    redundantAttribute: 'expr0',
-    selector: '[expr0]',
-    template: template('<h1 class="title is-4 m-2"><span expr1="expr1" style="color: #485FC7;"> </span>  /  \r\n            <span expr2="expr2" style="color: #485FC7;"> </span>  /  \r\n            <span expr3="expr3" style="color: #485FC7;"> </span></h1><div class="box mt-2" style="background-color: #EAEAEA; margin: auto; width: 60%;"><p>Moyenne des admis<span expr4="expr4" class="is-pulled-right"> </span></p><p>Nombre de formations<span expr5="expr5" class="is-pulled-right"> </span></p><p>Capacité<span expr6="expr6" class="is-pulled-right"> </span></p><title-progress expr7="expr7" max="100"></title-progress></div><div class="m-4"><line-graph expr8="expr8" title="Répartition par genre" style="height: 6rem;"></line-graph></div><div class="m-4"><line-graph expr9="expr9" title="Répartition par bac" style="height: 6rem;"></line-graph></div><div class="m-4"><line-graph expr10="expr10" title="Répartition par mention au bac" style="height: 6rem;"></line-graph></div>', [{
-      redundantAttribute: 'expr1',
-      selector: '[expr1]',
+    redundantAttribute: 'expr26',
+    selector: '[expr26]',
+    template: template('<h1 class="title is-4 m-2"><span expr27="expr27" style="color: #485FC7;"> </span>  /  \n            <span expr28="expr28" style="color: #485FC7;"> </span>  /  \n            <span expr29="expr29" style="color: #485FC7;"> </span></h1><div class="box mt-2" style="background-color: #EAEAEA; margin: auto; width: 60%;"><p>Moyenne des admis<span expr30="expr30" class="is-pulled-right"> </span></p><p>Nombre de formations<span expr31="expr31" class="is-pulled-right"> </span></p><p>Capacité<span expr32="expr32" class="is-pulled-right"> </span></p><title-progress expr33="expr33" max="100"></title-progress></div><div class="m-4"><line-graph expr34="expr34" title="Répartition par genre" style="height: 6rem;"></line-graph></div><div class="m-4"><line-graph expr35="expr35" title="Répartition par bac" style="height: 6rem;"></line-graph></div><div class="m-4"><line-graph expr36="expr36" title="Répartition par mention au bac" style="height: 6rem;"></line-graph></div>', [{
+      redundantAttribute: 'expr27',
+      selector: '[expr27]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.props.course.fili
      }]
    }, {
-      redundantAttribute: 'expr2',
-      selector: '[expr2]',
+      redundantAttribute: 'expr28',
+      selector: '[expr28]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.props.course.sousfili
      }]
    }, {
-      redundantAttribute: 'expr3',
-      selector: '[expr3]',
+      redundantAttribute: 'expr29',
+      selector: '[expr29]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.props.course.soussousfili
      }]
    }, {
-      redundantAttribute: 'expr4',
-      selector: '[expr4]',
+      redundantAttribute: 'expr30',
+      selector: '[expr30]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.state.average
      }]
    }, {
-      redundantAttribute: 'expr5',
-      selector: '[expr5]',
+      redundantAttribute: 'expr31',
+      selector: '[expr31]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.state.courseNumber
      }]
    }, {
-      redundantAttribute: 'expr6',
-      selector: '[expr6]',
+      redundantAttribute: 'expr32',
+      selector: '[expr32]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
@ -143,8 +143,8 @@ var filiInfo = {
        name: 'value',
        evaluate: _scope => _scope.state.selectivity
      }],
-      redundantAttribute: 'expr7',
-      selector: '[expr7]'
+      redundantAttribute: 'expr33',
+      selector: '[expr33]'
    }, {
      type: bindingTypes.TAG,
      getComponent: getComponent,
@ -155,8 +155,8 @@ var filiInfo = {
        name: 'data',
        evaluate: _scope => _scope.state.genreStats
      }],
-      redundantAttribute: 'expr8',
-      selector: '[expr8]'
+      redundantAttribute: 'expr34',
+      selector: '[expr34]'
    }, {
      type: bindingTypes.TAG,
      getComponent: getComponent,
@ -167,8 +167,8 @@ var filiInfo = {
        name: 'data',
        evaluate: _scope => _scope.state.bacStats
      }],
-      redundantAttribute: 'expr9',
-      selector: '[expr9]'
+      redundantAttribute: 'expr35',
+      selector: '[expr35]'
    }, {
      type: bindingTypes.TAG,
      getComponent: getComponent,
@ -179,8 +179,8 @@ var filiInfo = {
        name: 'data',
        evaluate: _scope => _scope.state.mentionStats
      }],
-      redundantAttribute: 'expr10',
-      selector: '[expr10]'
+      redundantAttribute: 'expr36',
+      selector: '[expr36]'
    }])
  }]),
  name: 'fili-info'
--- a/javascript/main-controller.js
+++ b/javascript/main-controller.js
@ -17,7 +17,9 @@ class PAPI {
  }
  static async fetchFiliere(filiere) {
    if (localStorage.getItem("fili." + filiere)) return JSON.parse(localStorage.getItem("fili." + filiere));
-    let request = await fetch(`${PAPI.searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`);
+    let url = `${PAPI.searchURL}&rows=0&sort=tri&facet=form_lib_voe_acc&refine.fili=${filiere}`;
+    url = url.replace("+", "%2B");
+    let request = await fetch(url);
    let result = await request.json();
    let response = result["facet_groups"][0]["facets"];
    localStorage.setItem("fili." + filiere, JSON.stringify(response));
@ -25,7 +27,9 @@ class PAPI {
  }
  static async fetchSpecialites(filiere, specialite) {
    if (localStorage.getItem(`spe.${filiere}.${specialite}`)) return JSON.parse(localStorage.getItem(`spe.${filiere}.${specialite}`));
-    let request = await fetch(`${PAPI.searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${specialite}&refine.fili=${filiere}`);
+    let url = `${PAPI.searchURL}&rows=0&sort=tri&facet=fil_lib_voe_acc&refine.form_lib_voe_acc=${specialite}&refine.fili=${filiere}`;
+    url = url.replace("+", "%2B");
+    let request = await fetch(url);
    let result = await request.json();
    let response = result["facet_groups"][0]["facets"];
    localStorage.setItem(`spe.${filiere}.${specialite}`, JSON.stringify(response));
@ -33,7 +37,9 @@ class PAPI {
  }
  static async fetchEtablissement(filiere, sousfiliere, soussousfiliere) {
    if (localStorage.getItem(`eta.${filiere}.${sousfiliere}.${soussousfiliere}`)) return JSON.parse(localStorage.getItem(`eta.${filiere}.${sousfiliere}.${soussousfiliere}`));
-    let request = await fetch(`${PAPI.searchURL}&rows=10000&refine.fil_lib_voe_acc=${soussousfiliere}&refine.form_lib_voe_acc=${sousfiliere}&refine.fili=${filiere}`);
+    let url = `${PAPI.searchURL}&rows=10000&refine.fil_lib_voe_acc=${soussousfiliere}&refine.form_lib_voe_acc=${sousfiliere}&refine.fili=${filiere}`;
+    url = url.replace("+", "%2B");
+    let request = await fetch(url);
    let result = await request.json();
    let response = result["records"];
    localStorage.setItem(`eta.${filiere}.${sousfiliere}.${soussousfiliere}`, JSON.stringify(response));
@ -63,7 +69,7 @@ var mainController = {
    sortList(sortBy) {
      //Si la liste est déjà triée par la bonne catégorie, on l'inverse
      if (sortBy == this.state.sortBy) {
-        this.state.schoolList.reverse();
+        this.state.filteredSchoolList.reverse();
      }
      //Sinon on l'ordonne par la nouvelle catégorie (ascendant par défaut)
      else {
@ -72,23 +78,21 @@ var mainController = {
          case SORT_TABLE[3].id:
          case SORT_TABLE[4].id:
            {
-              this.state.schoolList.sort((a, b) => {
+              this.state.filteredSchoolList.sort((a, b) => {
                if (a.fields[sortBy] > b.fields[sortBy]) return 1;else return -1;
              });
              break;
            }
          default:
            {
-              this.state.schoolList.sort((a, b) => {
+              this.state.filteredSchoolList.sort((a, b) => {
                return a.fields[sortBy].localeCompare(b.fields[sortBy]);
              });
              break;
            }
        }
      }
-      this.update({
-        schoolList: this.state.schoolList
-      });
+      this.update();
    },
    updateList(course) {
      course = course || this.state.course;
@ -108,6 +112,7 @@ var mainController = {
        this.update({
          schoolList: response
        });
+        this.filterSearch();
      });
    },
    updateCourse(course) {
@ -124,11 +129,29 @@ var mainController = {
        sortBy: null,
        schoolList: null,
        sortFields: SORT_TABLE,
+        filteredSchoolList: null,
        shouldShowInfos: 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
+      });
    }
  },
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div class="columns"><div class="column is-one-third"><div class="box p-3 m-2"><img class="mt-1 ml-5 mr-auto" style="margin: auto;" src="../resources/logo-parcoursup.svg"/></div><search expr11="expr11"></search></div><div class="column"><fili-info expr12="expr12"></fili-info><school expr13="expr13"></school></div></div><school-info expr14="expr14"></school-info>', [{
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div class="columns"><div class="column is-one-third"><div class="box p-3 m-2" style="display: flex"><img class="m-auto" src="./resources/logo-parcoursup.svg"/></div><search expr59="expr59"></search></div><div class="column"><fili-info expr60="expr60"></fili-info><school expr61="expr61"></school></div></div><school-info expr62="expr62"></school-info>', [{
    type: bindingTypes.TAG,
    getComponent: getComponent,
    evaluate: _scope => 'search',
@ -138,8 +161,8 @@ var mainController = {
      name: 'updateCourse',
      evaluate: _scope => _scope.updateCourse
    }],
-    redundantAttribute: 'expr11',
-    selector: '[expr11]'
+    redundantAttribute: 'expr59',
+    selector: '[expr59]'
  }, {
    type: bindingTypes.TAG,
    getComponent: getComponent,
@ -158,8 +181,8 @@ var mainController = {
      name: 'shouldShowInfos',
      evaluate: _scope => _scope.state.shouldShowInfos
    }],
-    redundantAttribute: 'expr12',
-    selector: '[expr12]'
+    redundantAttribute: 'expr60',
+    selector: '[expr60]'
  }, {
    type: bindingTypes.TAG,
    getComponent: getComponent,
@ -172,7 +195,7 @@ var mainController = {
    }, {
      type: expressionTypes.ATTRIBUTE,
      name: 'schoolList',
-      evaluate: _scope => _scope.state.schoolList
+      evaluate: _scope => _scope.state.filteredSchoolList
    }, {
      type: expressionTypes.ATTRIBUTE,
      name: 'sortFields',
@ -186,16 +209,16 @@ var mainController = {
      name: 'shouldShowInfos',
      evaluate: _scope => _scope.state.shouldShowInfos
    }],
-    redundantAttribute: 'expr13',
-    selector: '[expr13]'
+    redundantAttribute: 'expr61',
+    selector: '[expr61]'
  }, {
    type: bindingTypes.TAG,
    getComponent: getComponent,
    evaluate: _scope => 'school-info',
    slots: [],
    attributes: [],
-    redundantAttribute: 'expr14',
-    selector: '[expr14]'
+    redundantAttribute: 'expr62',
+    selector: '[expr62]'
  }]),
  name: 'main-controller'
 };
--- a/javascript/school-info.js
+++ b/javascript/school-info.js
@ -10,14 +10,14 @@ var schoolInfo = {
      this.update();
    }
  },
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div expr24="expr24" style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; background: #000000DD;"></div>', [{
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div expr23="expr23" style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; background: #000000DD;"></div>', [{
    type: bindingTypes.IF,
    evaluate: _scope => _scope.state.enabled,
+    redundantAttribute: 'expr23',
+    selector: '[expr23]',
+    template: template('<div style="position: absolute; top: 10%; left: 10%; width: 80%; height: 80%; background: #FFFFFF"><button expr24="expr24" class="delete is-medium">X</button><p><h2></h2></p><line-graph expr25="expr25" style="height: 90px; margin: 10px;"></line-graph></div>', [{
      redundantAttribute: 'expr24',
      selector: '[expr24]',
-    template: template('<div style="position: absolute; top: 10%; left: 10%; width: 80%; height: 80%; background: #FFFFFF"><button expr25="expr25" class="delete is-medium">X</button><p><h2></h2></p><line-graph expr26="expr26" style="height: 90px; margin: 10px;"></line-graph></div>', [{
-      redundantAttribute: 'expr25',
-      selector: '[expr25]',
      expressions: [{
        type: expressionTypes.EVENT,
        name: 'onclick',
@ -29,8 +29,8 @@ var schoolInfo = {
      evaluate: _scope => 'line-graph',
      slots: [],
      attributes: [],
-      redundantAttribute: 'expr26',
-      selector: '[expr26]'
+      redundantAttribute: 'expr25',
+      selector: '[expr25]'
    }])
  }]),
  name: 'school-info'
--- a/javascript/school.js
+++ b/javascript/school.js
@ -1,30 +1,38 @@
 var school = {
  css: null,
  exports: null,
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div expr27="expr27" class="box p-2 m-2" disabled></div>', [{
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div expr44="expr44" class="box p-2 m-2" disabled></div>', [{
    type: bindingTypes.IF,
    evaluate: _scope => _scope.props.shouldShowInfos,
-    redundantAttribute: 'expr27',
-    selector: '[expr27]',
-    template: template('<iframe expr28="expr28" width="100%" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://www.openstreetmap.org/export/embed.html?bbox=-14.655761718750002%2C40.56389453066509%2C13.601074218750002%2C51.754240074033525&amp;layer=mapnik" style="border-radius: 5px;"></iframe><br/><div class="block control has-icons-left is-inline-block is-pulled-right"><input class="input" type="search" placeholder="Établissement"/><span class="icon is-small is-left"><i class="fas fa-search"></i></span></div><table class="table is-fullwidth is-hoverable"><thead><tr><th expr29="expr29"></th></tr></thead><tbody><tr expr31="expr31"></tr></tbody></table>', [{
+    redundantAttribute: 'expr44',
+    selector: '[expr44]',
+    template: template('<iframe expr45="expr45" width="100%" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://www.openstreetmap.org/export/embed.html?bbox=-14.655761718750002%2C40.56389453066509%2C13.601074218750002%2C51.754240074033525&amp;layer=mapnik" style="border-radius: 5px;"></iframe><br/><div class="block control has-icons-left is-inline-block is-pulled-right"><input expr46="expr46" class="input" type="search" placeholder="Établissement"/><span class="icon is-small is-left"><i class="fas fa-search"></i></span></div><table class="table is-fullwidth is-hoverable"><thead><tr><th expr47="expr47"></th></tr></thead><tbody><tr expr49="expr49"></tr></tbody></table>', [{
      type: bindingTypes.IF,
      evaluate: _scope => false,
-      redundantAttribute: 'expr28',
-      selector: '[expr28]',
+      redundantAttribute: 'expr45',
+      selector: '[expr45]',
      template: template(null, [])
+    }, {
+      redundantAttribute: 'expr46',
+      selector: '[expr46]',
+      expressions: [{
+        type: expressionTypes.EVENT,
+        name: 'onkeyup',
+        evaluate: _scope => _scope.props.filterSearch
+      }]
    }, {
      type: bindingTypes.EACH,
      getKey: null,
      condition: null,
-      template: template(' <a expr30="expr30"><span class="icon"><i class="fas fa-sort"></i></span></a>', [{
+      template: template(' <a expr48="expr48"><span class="icon"><i class="fas fa-sort"></i></span></a>', [{
        expressions: [{
          type: expressionTypes.TEXT,
          childNodeIndex: 0,
          evaluate: _scope => [_scope.sortField.name].join('')
        }]
      }, {
-        redundantAttribute: 'expr30',
-        selector: '[expr30]',
+        redundantAttribute: 'expr48',
+        selector: '[expr48]',
        expressions: [{
          type: expressionTypes.ATTRIBUTE,
          name: 'id',
@ -35,8 +43,8 @@ var school = {
          evaluate: _scope => () => _scope.props.sortList(_scope.sortField.id)
        }]
      }]),
-      redundantAttribute: 'expr29',
-      selector: '[expr29]',
+      redundantAttribute: 'expr47',
+      selector: '[expr47]',
      itemName: 'sortField',
      indexName: null,
      evaluate: _scope => _scope.props.sortFields
@ -44,33 +52,33 @@ var school = {
      type: bindingTypes.EACH,
      getKey: null,
      condition: null,
-      template: template('<td expr32="expr32"> </td><td expr33="expr33"> </td><td expr34="expr34"> </td><td expr35="expr35"> </td><td><title-progress expr36="expr36" max="100" style="margin: auto"></title-progress></td>', [{
-        redundantAttribute: 'expr32',
-        selector: '[expr32]',
+      template: template('<td expr50="expr50"> </td><td expr51="expr51"> </td><td expr52="expr52"> </td><td expr53="expr53"> </td><td><title-progress expr54="expr54" max="100" style="margin: auto"></title-progress></td>', [{
+        redundantAttribute: 'expr50',
+        selector: '[expr50]',
        expressions: [{
          type: expressionTypes.TEXT,
          childNodeIndex: 0,
          evaluate: _scope => _scope.school.fields.g_ea_lib_vx
        }]
      }, {
-        redundantAttribute: 'expr33',
-        selector: '[expr33]',
+        redundantAttribute: 'expr51',
+        selector: '[expr51]',
        expressions: [{
          type: expressionTypes.TEXT,
          childNodeIndex: 0,
          evaluate: _scope => _scope.school.fields.ville_etab
        }]
      }, {
-        redundantAttribute: 'expr34',
-        selector: '[expr34]',
+        redundantAttribute: 'expr52',
+        selector: '[expr52]',
        expressions: [{
          type: expressionTypes.TEXT,
          childNodeIndex: 0,
          evaluate: _scope => _scope.school.fields.dep
        }]
      }, {
-        redundantAttribute: 'expr35',
-        selector: '[expr35]',
+        redundantAttribute: 'expr53',
+        selector: '[expr53]',
        expressions: [{
          type: expressionTypes.TEXT,
          childNodeIndex: 0,
@ -86,11 +94,11 @@ var school = {
          name: 'value',
          evaluate: _scope => _scope.school.fields.taux_acces_ens
        }],
-        redundantAttribute: 'expr36',
-        selector: '[expr36]'
+        redundantAttribute: 'expr54',
+        selector: '[expr54]'
      }]),
-      redundantAttribute: 'expr31',
-      selector: '[expr31]',
+      redundantAttribute: 'expr49',
+      selector: '[expr49]',
      itemName: 'school',
      indexName: null,
      evaluate: _scope => _scope.props.schoolList
--- a/javascript/search.js
+++ b/javascript/search.js
@ -144,9 +144,9 @@ var search = {
      this.updateList();
    }
  },
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div class="box p-1 m-2"><div class="columns m-1"><input expr18="expr18" class="input" type="input"/><button expr19="expr19" class="button ml-1">&lt;</button></div><div id="list-formations"><ul><li expr20="expr20" class="m-1"></li></ul></div></div>', [{
-    redundantAttribute: 'expr18',
-    selector: '[expr18]',
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div class="box p-1 m-2"><div class="columns m-1"><input expr14="expr14" class="input" type="input"/><button expr15="expr15" class="button ml-1">&lt;</button></div><div id="list-formations"><ul><li expr16="expr16" class="m-1"></li></ul></div></div>', [{
+    redundantAttribute: 'expr14',
+    selector: '[expr14]',
    expressions: [{
      type: expressionTypes.EVENT,
      name: 'onkeyup',
@ -157,8 +157,8 @@ var search = {
      evaluate: _scope => _scope.state.placeholder
    }]
  }, {
-    redundantAttribute: 'expr19',
-    selector: '[expr19]',
+    redundantAttribute: 'expr15',
+    selector: '[expr15]',
    expressions: [{
      type: expressionTypes.ATTRIBUTE,
      name: 'disabled',
@ -172,9 +172,9 @@ var search = {
    type: bindingTypes.EACH,
    getKey: null,
    condition: null,
-    template: template('<button expr21="expr21" class="button is-fullwidth p-2" style="white-space: unset"><div style="display: flex; width: 100%"><span class="mt-auto mb-auto" style="font-size: 0.75em; text-align: left;   "><strong expr22="expr22"> </strong></span><div style="margin-left: auto;"></div><span expr23="expr23" class="tag is-primary mt-auto mb-auto"> </span></div></button>', [{
-      redundantAttribute: 'expr21',
-      selector: '[expr21]',
+    template: template('<button expr17="expr17" class="button is-fullwidth p-2" style="white-space: unset"><div style="display: flex; width: 100%"><span class="mt-auto mb-auto" style="font-size: 0.75em; text-align: left;   "><strong expr18="expr18"> </strong></span><div style="margin-left: auto;"></div><span expr19="expr19" class="tag is-primary mt-auto mb-auto"> </span></div></button>', [{
+      redundantAttribute: 'expr17',
+      selector: '[expr17]',
      expressions: [{
        type: expressionTypes.ATTRIBUTE,
        name: 'disabled',
@ -185,24 +185,24 @@ var search = {
        evaluate: _scope => () => _scope.cruiseForward(_scope.item.name)
      }]
    }, {
-      redundantAttribute: 'expr22',
-      selector: '[expr22]',
+      redundantAttribute: 'expr18',
+      selector: '[expr18]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.item.name
      }]
    }, {
-      redundantAttribute: 'expr23',
-      selector: '[expr23]',
+      redundantAttribute: 'expr19',
+      selector: '[expr19]',
      expressions: [{
        type: expressionTypes.TEXT,
        childNodeIndex: 0,
        evaluate: _scope => _scope.item.count
      }]
    }]),
-    redundantAttribute: 'expr20',
-    selector: '[expr20]',
+    redundantAttribute: 'expr16',
+    selector: '[expr16]',
    itemName: 'item',
    indexName: null,
    evaluate: _scope => _scope.state.items
--- a/javascript/title-progress.js
+++ b/javascript/title-progress.js
@ -25,11 +25,11 @@ var titleProgress = {
      state.class = this.computeClasses();
    }
  },
-  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div style="display: flex;"><span expr15="expr15"></span><span expr16="expr16" class="ml-1"> </span><progress expr17="expr17" style="box-shadow: 0 0.5em 1em -0.125em rgb(10 10 10 / 10%), 0 0 0 1px rgb(10 10 10 / 2%);"></progress></div>', [{
+  template: (template, expressionTypes, bindingTypes, getComponent) => template('<div style="display: flex;"><span expr20="expr20"></span><span expr21="expr21" class="ml-1"> </span><progress expr22="expr22" style="box-shadow: 0 0.5em 1em -0.125em rgb(10 10 10 / 10%), 0 0 0 1px rgb(10 10 10 / 2%);"></progress></div>', [{
    type: bindingTypes.IF,
    evaluate: _scope => _scope.props.title,
-    redundantAttribute: 'expr15',
-    selector: '[expr15]',
+    redundantAttribute: 'expr20',
+    selector: '[expr20]',
    template: template(' ', [{
      expressions: [{
        type: expressionTypes.TEXT,
@ -38,16 +38,16 @@ var titleProgress = {
      }]
    }])
  }, {
-    redundantAttribute: 'expr16',
-    selector: '[expr16]',
+    redundantAttribute: 'expr21',
+    selector: '[expr21]',
    expressions: [{
      type: expressionTypes.TEXT,
      childNodeIndex: 0,
      evaluate: _scope => _scope.calcPct()
    }]
  }, {
-    redundantAttribute: 'expr17',
-    selector: '[expr17]',
+    redundantAttribute: 'expr22',
+    selector: '[expr22]',
    expressions: [{
      type: expressionTypes.ATTRIBUTE,
      name: 'value',