From 20787900761a32f0aa0758af4a2bc75a1f97c340 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Thu, 4 Feb 2021 23:26:28 +0100
Subject: [PATCH 1/9] Mobile friendly

---
 fiches/static/fiches/css/annuaire.css   | 115 ++++++++++++++----------
 fiches/static/fiches/scss/_common.scss  |  37 ++++++--
 fiches/static/fiches/scss/annuaire.scss |   2 +-
 3 files changed, 95 insertions(+), 59 deletions(-)

diff --git a/fiches/static/fiches/css/annuaire.css b/fiches/static/fiches/css/annuaire.css
index e05b3b8..b1c4783 100644
--- a/fiches/static/fiches/css/annuaire.css
+++ b/fiches/static/fiches/css/annuaire.css
@@ -28,65 +28,21 @@
   font-weight: 400;
   src: local("Source Code Pro Regular"), local("SourceCodePro-Regular"), url("../fonts/source-code-pro/source-code-pro-v12-latin-regular.woff2") format("woff2"), url("../fonts/source-code-pro/source-code-pro-v12-latin-regular.woff") format("woff");
 }
-#main-menu a a, #account-area a, a {
+a, #main-menu a a, #account-area a {
   text-decoration: none;
   color: #FFDC00;
 }
 
-#main-menu a a:hover, #account-area a:hover, a:hover,
+a:hover, #main-menu a a:hover, #account-area a:hover,
+a:active,
 #main-menu a a:active,
 #account-area a:active,
-a:active,
+a:focus,
 #main-menu a a:focus,
-#account-area a:focus,
-a:focus {
+#account-area a:focus {
   color: #ffbb00;
 }
 
-* {
-  box-sizing: border-box;
-}
-
-body, html {
-  height: 100%;
-}
-
-body {
-  display: grid;
-  grid-template-columns: auto auto;
-  grid-template-areas: "aside main";
-  background-color: #301827;
-  color: #FFFFFF;
-  font-family: "Fira Sans", "Roboto", sans-serif;
-}
-
-#aside {
-  grid-area: aside;
-  padding: 0 0 0 10vw;
-  background-color: #1f0e19;
-  box-shadow: 4px 0 0 rgba(31, 14, 25, 0.3);
-  z-index: 10;
-}
-
-#main {
-  grid-area: main;
-  padding: 0 10vw 0 0;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  background-color: #301827;
-  z-index: 5;
-}
-
-@media only screen and (max-width: 1200px) {
-  #header {
-    margin: 0;
-  }
-
-  #main {
-    margin: 0;
-  }
-}
 #menu {
   display: grid;
   float: right;
@@ -545,4 +501,65 @@ body {
   text-align: center;
 }
 
+* {
+  box-sizing: border-box;
+}
+
+body, html {
+  height: 100%;
+}
+
+body {
+  display: grid;
+  grid-template-areas: "aside main";
+  background-color: #301827;
+  color: #FFFFFF;
+  font-family: "Fira Sans", "Roboto", sans-serif;
+}
+
+#aside {
+  grid-area: aside;
+  padding: 0 0 0 10vw;
+  background-color: #1f0e19;
+  box-shadow: 4px 0 0 rgba(31, 14, 25, 0.3);
+  z-index: 10;
+}
+
+#main {
+  grid-area: main;
+  padding: 0 10vw 0 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  background-color: #301827;
+  z-index: 5;
+}
+
+@media only screen and (max-width: 900px) {
+  body {
+    grid-template-areas: "aside" "main";
+  }
+
+  #aside,
+#main {
+    padding: 0;
+  }
+
+  #content-home,
+#content-birthdays,
+#content-view-profile,
+#content-edit-profile {
+    width: auto;
+  }
+
+  #menu {
+    width: auto;
+    float: none;
+  }
+
+  #search-area {
+    width: auto;
+  }
+}
+
 /*# sourceMappingURL=annuaire.css.map */
diff --git a/fiches/static/fiches/scss/_common.scss b/fiches/static/fiches/scss/_common.scss
index 4149a58..5471ad0 100644
--- a/fiches/static/fiches/scss/_common.scss
+++ b/fiches/static/fiches/scss/_common.scss
@@ -15,7 +15,6 @@ body, html {
 
 body {
     display: grid;
-    grid-template-columns: auto auto;
     grid-template-areas:
         "aside main";
 
@@ -42,13 +41,33 @@ body {
     z-index: 5;
 }
 
-@media only screen and (max-width: 1200px) {
-    #header {
-        margin: 0;
-    }
+// Pour les vues mobile
+@media only screen and (max-width: 900px) {
+  body {
+    grid-template-areas:
+        "aside"
+        "main";
+  }
+
+  #aside,
+  #main {
+    padding: 0;
+  }
+
+  #content-home,
+  #content-birthdays,
+  #content-view-profile,
+  #content-edit-profile {
+    width: auto;
+  }
+
+  #menu {
+    width: auto;
+    float: none;
+  }
+
+  #search-area {
+    width: auto;
+  }
 
-    #main {
-        margin: 0;
-    }
 }
-
diff --git a/fiches/static/fiches/scss/annuaire.scss b/fiches/static/fiches/scss/annuaire.scss
index 09cfe85..69bffcb 100644
--- a/fiches/static/fiches/scss/annuaire.scss
+++ b/fiches/static/fiches/scss/annuaire.scss
@@ -1,4 +1,4 @@
-@use "common";
 @use "header";
 @use "content";
 @use "footer";
+@use "common";

From fcabe88016065870e69d3d2e9fdc5cc97923df52 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Fri, 5 Feb 2021 17:36:10 +0100
Subject: [PATCH 2/9] =?UTF-8?q?On=20rajoute=20un=20menu=20d=C3=A9roulant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fiches/static/fiches/css/annuaire.css  | 30 +++++++++++++++++++++++-
 fiches/static/fiches/scss/_common.scss | 32 +++++++++++++++++++++++++-
 fiches/static/fiches/scss/_footer.scss |  2 +-
 fiches/static/fiches/scss/_header.scss | 10 ++++++++
 fiches/templates/fiches/base.html      | 24 +++++++++++++++----
 5 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/fiches/static/fiches/css/annuaire.css b/fiches/static/fiches/css/annuaire.css
index b1c4783..13eda0d 100644
--- a/fiches/static/fiches/css/annuaire.css
+++ b/fiches/static/fiches/css/annuaire.css
@@ -51,6 +51,15 @@ a:focus,
   grid-template-rows: auto auto auto auto 120px;
   grid-template-areas: "title" "language" "search" "menu" "account";
 }
+#menu #hamburger {
+  display: none;
+  grid-area: hamburger;
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9TS1VaHOwg4pChOlkoKuKoVShChVIrtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APEzc1J0UVK/F9SaBHjwXE/3t173L0DhGaVqWZPHFA1y8gkE2IuvyoGXyEggD6EEZeYqc+l0yl4jq97+Ph6F+NZ3uf+HGGlYDLAJxLPMt2wiDeIpzctnfM+cYSVJYX4nHjcoAsSP3JddvmNc8lhgWdGjGxmnjhCLJa6WO5iVjZU4iniqKJqlC/kXFY4b3FWq3XWvid/YaigrSxzneYIkljEEtIQIaOOCqqwEKNVI8VEhvYTHv5hx58ml0yuChg5FlCDCsnxg//B727N4uSEmxRKAIEX2/4YBYK7QKth29/Htt06AfzPwJXW8deawMwn6Y2OFj0CBraBi+uOJu8BlzvA0JMuGZIj+WkKxSLwfkbflAcGb4H+Nbe39j5OH4AsdZW6AQ4OgbESZa97vLu3u7d/z7T7+wEsq3KLN3ZkxAAAAAlwSFlzAAAA7AAAAOwBeShxvQAAADNJREFUWMPt1EERAEAIA7Ee/h0hjpPBg0RBp49NrnvTmc0Btf2AARVAipVQikGKpdgArvsZZAhH7c55ywAAAABJRU5ErkJggg==");
+  height: 30px;
+  width: 30px;
+  float: right;
+  margin-top: 20px;
+}
 
 #title {
   grid-area: title;
@@ -535,8 +544,9 @@ body {
   z-index: 5;
 }
 
-@media only screen and (max-width: 900px) {
+@media screen and (max-width: 900px), (orientation: portrait) {
   body {
+    grid-template-rows: max-content auto;
     grid-template-areas: "aside" "main";
   }
 
@@ -552,9 +562,27 @@ body {
     width: auto;
   }
 
+  #content-home form input[type=submit] {
+    grid-column: 1/3;
+  }
+
+  #footer,
+.content {
+    max-width: 100%;
+  }
+
   #menu {
     width: auto;
     float: none;
+    grid-template-columns: auto 50px;
+    grid-template-areas: "title hamburger" "language language" "search search" "menu menu" "account account";
+  }
+  #menu #hamburger {
+    display: grid;
+  }
+  #menu #main-menu,
+#menu #account-area {
+    display: none;
   }
 
   #search-area {
diff --git a/fiches/static/fiches/scss/_common.scss b/fiches/static/fiches/scss/_common.scss
index 5471ad0..e011dde 100644
--- a/fiches/static/fiches/scss/_common.scss
+++ b/fiches/static/fiches/scss/_common.scss
@@ -42,8 +42,9 @@ body {
 }
 
 // Pour les vues mobile
-@media only screen and (max-width: 900px) {
+@media screen and (max-width: 900px), (orientation: portrait) {
   body {
+    grid-template-rows: max-content auto;
     grid-template-areas:
         "aside"
         "main";
@@ -61,9 +62,38 @@ body {
     width: auto;
   }
 
+  #content-home {
+    form {
+      input[type="submit"] {
+        grid-column: 1/3;
+      }
+    }
+  }
+
+  #footer,
+  .content {
+    max-width: 100%;
+  }
+
   #menu {
     width: auto;
     float: none;
+    grid-template-columns: auto 50px;
+    grid-template-areas:
+      "title hamburger"
+      "language language"
+      "search search"
+      "menu menu"
+      "account account";
+
+    #hamburger {
+      display: grid;
+    }
+
+    #main-menu,
+    #account-area {
+      display: none;
+    }
   }
 
   #search-area {
diff --git a/fiches/static/fiches/scss/_footer.scss b/fiches/static/fiches/scss/_footer.scss
index 7c6513a..08eaffb 100644
--- a/fiches/static/fiches/scss/_footer.scss
+++ b/fiches/static/fiches/scss/_footer.scss
@@ -5,7 +5,7 @@
     padding: 20px;
     color: colors.$page-text-secondary;
     text-align: center;
-    
+
     .thanks {
         display: block;
         text-align: center;
diff --git a/fiches/static/fiches/scss/_header.scss b/fiches/static/fiches/scss/_header.scss
index d701a21..efc8e01 100644
--- a/fiches/static/fiches/scss/_header.scss
+++ b/fiches/static/fiches/scss/_header.scss
@@ -19,6 +19,16 @@ $account-area-height: 120px;
         "search"
         "menu"
         "account";
+
+    #hamburger {
+      display: none;
+      grid-area: hamburger;
+      background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9TS1VaHOwg4pChOlkoKuKoVShChVIrtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APEzc1J0UVK/F9SaBHjwXE/3t173L0DhGaVqWZPHFA1y8gkE2IuvyoGXyEggD6EEZeYqc+l0yl4jq97+Ph6F+NZ3uf+HGGlYDLAJxLPMt2wiDeIpzctnfM+cYSVJYX4nHjcoAsSP3JddvmNc8lhgWdGjGxmnjhCLJa6WO5iVjZU4iniqKJqlC/kXFY4b3FWq3XWvid/YaigrSxzneYIkljEEtIQIaOOCqqwEKNVI8VEhvYTHv5hx58ml0yuChg5FlCDCsnxg//B727N4uSEmxRKAIEX2/4YBYK7QKth29/Htt06AfzPwJXW8deawMwn6Y2OFj0CBraBi+uOJu8BlzvA0JMuGZIj+WkKxSLwfkbflAcGb4H+Nbe39j5OH4AsdZW6AQ4OgbESZa97vLu3u7d/z7T7+wEsq3KLN3ZkxAAAAAlwSFlzAAAA7AAAAOwBeShxvQAAADNJREFUWMPt1EERAEAIA7Ee/h0hjpPBg0RBp49NrnvTmc0Btf2AARVAipVQikGKpdgArvsZZAhH7c55ywAAAABJRU5ErkJggg==');
+      height: 30px;
+      width: 30px;
+      float: right;
+      margin-top: 20px;
+    }
 }
 
 #title {
diff --git a/fiches/templates/fiches/base.html b/fiches/templates/fiches/base.html
index fbb4a95..6bdd893 100644
--- a/fiches/templates/fiches/base.html
+++ b/fiches/templates/fiches/base.html
@@ -17,6 +17,11 @@
 <body>
   <div id="aside">
     <div id="menu">
+      <h1 id="title">
+        {% block title %} <a href='{% url "home" %}'>{% trans "Annuaire des élèves de l'ENS" %}</a>{% endblock %}
+      </h1>
+      <a id="hamburger" href="javascript:void(0);" onclick="toggleMenu()"></a>
+
       <div id="language_switch">
         <form action="{% url 'set_language' %}" method="post">
           {% csrf_token %}
@@ -32,11 +37,6 @@
         <button type="submit">{% trans "Rechercher" %}</button>
       </form>
 
-      <h1 id="title">
-        {% block title %} <a href='{% url "home" %}'>{% trans "Annuaire des élèves de l'ENS" %}</a>{% endblock %}
-      </h1>
-
-
       <div id="main-menu">
         <nav>
           <a href='{% url "home" %}'>{% trans "Accueil" %}</a>
@@ -78,6 +78,20 @@
       {% endblock %}
     </div>
   </div>
+  <script>
+    function toggleMenu() {
+      var menu = document.getElementById("main-menu");
+      var account = document.getElementById("account-area");
+      if (menu.style.display === "none") {
+        menu.style.display = "grid"
+        account.style.display = "grid"
+      } else {
+        menu.style.display = "none"
+        account.style.display = "none"
+      }
+    }
+
+  </script>
   {% block extra_js %}{% endblock %}
 </body>
 

From e2d3fe5fbf131c56615dd40e72881cfef4d6b429 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Sat, 6 Feb 2021 12:34:02 +0100
Subject: [PATCH 3/9] =?UTF-8?q?R=C3=A9initialisation=20du=20profil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fiches/static/fiches/css/annuaire.css   |  5 ++-
 fiches/static/fiches/scss/_buttons.scss |  5 ++-
 fiches/static/fiches/scss/_common.scss  |  2 +-
 fiches/static/fiches/scss/_content.scss |  1 +
 fiches/static/fiches/scss/_header.scss  |  1 +
 fiches/templates/fiches/base.html       |  5 ++-
 fiches/templates/fiches/reset.html      | 19 +++++++++
 fiches/urls.py                          |  1 +
 fiches/utils.py                         | 56 +++++++++++++++++++++++++
 fiches/views.py                         | 52 +++++++++++++++++++++--
 10 files changed, 137 insertions(+), 10 deletions(-)
 create mode 100644 fiches/templates/fiches/reset.html
 create mode 100644 fiches/utils.py

diff --git a/fiches/static/fiches/css/annuaire.css b/fiches/static/fiches/css/annuaire.css
index 13eda0d..f1c2682 100644
--- a/fiches/static/fiches/css/annuaire.css
+++ b/fiches/static/fiches/css/annuaire.css
@@ -101,6 +101,7 @@ a:focus,
   background-position: center;
   border: none;
   transition: 25ms ease-in-out;
+  cursor: pointer;
 }
 #search-area button:hover {
   background-color: #FFDC00;
@@ -187,6 +188,7 @@ a:focus,
   color: #FFFFFF;
   box-shadow: 2px 2px 0 rgba(31, 14, 25, 0.3);
   transition: 25ms ease-in-out;
+  cursor: pointer;
 }
 
 .content button:hover,
@@ -469,6 +471,7 @@ a:focus,
 }
 #content-edit-profile #free-text-edit-form textarea {
   width: 100%;
+  height: 100px;
   padding: 5px;
   resize: none;
 }
@@ -544,7 +547,7 @@ body {
   z-index: 5;
 }
 
-@media screen and (max-width: 900px), (orientation: portrait) {
+@media screen and (max-width: 900px) {
   body {
     grid-template-rows: max-content auto;
     grid-template-areas: "aside" "main";
diff --git a/fiches/static/fiches/scss/_buttons.scss b/fiches/static/fiches/scss/_buttons.scss
index a0f5526..0014900 100644
--- a/fiches/static/fiches/scss/_buttons.scss
+++ b/fiches/static/fiches/scss/_buttons.scss
@@ -7,9 +7,10 @@
     font-size: 1.2rem;
     color: colors.$page-button-text;
     box-shadow: 2px 2px 0 colors.$shadow;
-    transition: 25ms ease-in-out;    
+    transition: 25ms ease-in-out;
+    cursor: pointer;
 }
 
 %button:hover {
     background-color: colors.$page-button-background-hover;
-}
\ No newline at end of file
+}
diff --git a/fiches/static/fiches/scss/_common.scss b/fiches/static/fiches/scss/_common.scss
index e011dde..2c45430 100644
--- a/fiches/static/fiches/scss/_common.scss
+++ b/fiches/static/fiches/scss/_common.scss
@@ -42,7 +42,7 @@ body {
 }
 
 // Pour les vues mobile
-@media screen and (max-width: 900px), (orientation: portrait) {
+@media screen and (max-width: 900px) {
   body {
     grid-template-rows: max-content auto;
     grid-template-areas:
diff --git a/fiches/static/fiches/scss/_content.scss b/fiches/static/fiches/scss/_content.scss
index e80c8b6..00645be 100644
--- a/fiches/static/fiches/scss/_content.scss
+++ b/fiches/static/fiches/scss/_content.scss
@@ -338,6 +338,7 @@
     #free-text-edit-form {
         textarea {
             width: 100%;
+            height: 100px;
             padding: 5px;
             resize: none;
         }
diff --git a/fiches/static/fiches/scss/_header.scss b/fiches/static/fiches/scss/_header.scss
index efc8e01..e00864e 100644
--- a/fiches/static/fiches/scss/_header.scss
+++ b/fiches/static/fiches/scss/_header.scss
@@ -78,6 +78,7 @@ $account-area-height: 120px;
         background-position: center;
         border: none;
         transition: 25ms ease-in-out;
+        cursor: pointer;
     }
 
     button:hover {
diff --git a/fiches/templates/fiches/base.html b/fiches/templates/fiches/base.html
index 6bdd893..8ce629e 100644
--- a/fiches/templates/fiches/base.html
+++ b/fiches/templates/fiches/base.html
@@ -5,7 +5,7 @@
 
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <meta charset="UTF-8">
+  <meta content="width=device-width, initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0;" name="viewport">
   <title>
     {% block title_onglet %}{% trans "Annuaire des élèves de l'ENS" %}{% endblock %}
   </title>
@@ -40,9 +40,10 @@
       <div id="main-menu">
         <nav>
           <a href='{% url "home" %}'>{% trans "Accueil" %}</a>
-          <a href='{% url "fiche_modif" %}'>{% trans "Modifier sa fiche d'annuaire" %}</a>
           {% if user.is_authenticated %}
           <a href='{% url "fiche" request.user.profile.user %}'>{% trans "Consulter sa fiche d'annuaire" %}</a>
+          <a href='{% url "fiche_modif" %}'>{% trans "Modifier sa fiche d'annuaire" %}</a>
+          <a href='{% url "fiche_reset" %}'>{% trans "Réinitialiser sa fiche d'annuaire" %}</a>
           {% endif %}
           <a href='{% url "birthday" %}'>{% trans "Anniversaires à venir" %}</a>
         </nav>
diff --git a/fiches/templates/fiches/reset.html b/fiches/templates/fiches/reset.html
new file mode 100644
index 0000000..4ddbf11
--- /dev/null
+++ b/fiches/templates/fiches/reset.html
@@ -0,0 +1,19 @@
+{% extends "fiches/base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+
+<div class="content" id="content-reset">
+  <h2>{% trans "Réinitialiser ma fiche annuaire" %}</h2>
+  <p id="warning">{% trans "Votre fiche annuaire sera réinitialisée, les seules informations gardées seront votre nom ainsi que votre promotion et département d'entrée." %}</p>
+
+  <form method="post" action="">
+    {% csrf_token %}
+    <input type="submit" name="reset" id="reset" value="{% trans "Réinitialiser" %}">
+    <input type="submit" name="abort" id="abort" value="{% trans "Annuler" %}">
+  </form>
+</div>
+
+
+{% endblock %}
diff --git a/fiches/urls.py b/fiches/urls.py
index b88b23b..c25c6ea 100644
--- a/fiches/urls.py
+++ b/fiches/urls.py
@@ -4,6 +4,7 @@ from . import views
 urlpatterns = [
     path("", views.HomeView.as_view(), name="home"),
     path("fiche/edit", views.EditView.as_view(), name="fiche_modif"),
+    path("fiche/reset", views.ResetView.as_view(), name="fiche_reset"),
     path("fiche/<user>", views.FicheView.as_view(), name="fiche"),
     path("birthday", views.BirthdayView.as_view(), name="birthday"),
 ]
diff --git a/fiches/utils.py b/fiches/utils.py
new file mode 100644
index 0000000..7b3e84f
--- /dev/null
+++ b/fiches/utils.py
@@ -0,0 +1,56 @@
+import ldap
+
+from django.conf import settings
+
+verbose_depts = {
+    "bio": "Biologie",
+    "chimie": "Chimie",
+    "dec": "Études Cognitives",
+    "geol": "Géosciences",
+    "guests": "Invité·e",
+    "info": "Informatique",
+    "litt": "Lettres",
+    "maths": "Mathématiques",
+    "pei": "PEI",
+    "phy": "Physique",
+}
+
+
+def parse_dept(home_dir):
+    """Extrait le département d'entrée d'un·e élève à partir de son dossier.
+    Le dossier a le format `/users/<promo>/<dept>/<login>`.
+    """
+    users, promo, dept, login = home_dir.split("/")[1:]
+
+    if users != "users":
+        raise ValueError("Invalid home directory")
+
+    # Ça casse en 2100, mais le système de naming de sas aussi...
+    promo = 2000 + int(promo)
+
+    return promo, verbose_depts.get(dept, None)
+
+
+def extract_ldap_info(entry, field):
+    return entry[1].get(field, [b""])[0].decode("utf-8")
+
+
+def get_ldap_infos(clipper_login):
+    ldap_server = settings.LDAP["SPI"]
+    ldap_obj = ldap.initialize("{PROTOCOL}://{URL}:{PORT}".format(**ldap_server))
+    res = ldap_obj.search_s(
+        "dc=spi,dc=ens,dc=fr",
+        ldap.SCOPE_SUBTREE,
+        "(uid={})".format(clipper_login),
+        ["uid", "cn", "homeDirectory"],
+    )
+
+    if not res:
+        return None
+
+    if len(res) != 1:
+        raise RuntimeError("LDAP returned too many results: {}".format(res))
+    (res,) = res
+    promo, dept = parse_dept(extract_ldap_info(res, "homeDirectory"))
+
+    return {"name": extract_ldap_info(res, "cn"), "promo": promo, "dept": dept}
diff --git a/fiches/views.py b/fiches/views.py
index 3e321a5..e506055 100644
--- a/fiches/views.py
+++ b/fiches/views.py
@@ -1,4 +1,4 @@
-from datetime import date
+from datetime import date, timedelta
 
 from django.contrib.auth.decorators import login_required
 from django.core.mail import send_mail
@@ -8,7 +8,7 @@ from django.forms.models import model_to_dict
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.loader import render_to_string
-from django.urls import reverse
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.generic.detail import DetailView
@@ -23,7 +23,8 @@ from fiches.forms import (
     SearchForm,
     SocialFormSet,
 )
-from fiches.models import Address, Mail, Phone, Profile, Social
+from fiches.models import Address, Department, Mail, Phone, Profile, Social
+from fiches.utils import get_ldap_infos
 
 
 @method_decorator(login_required, name="dispatch")
@@ -113,7 +114,9 @@ class EditView(UpdateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         today = date.today()
-        context["default_birth_date"] = today.replace(year=(today.year - 20)).isoformat()
+        context["default_birth_date"] = today.replace(
+            year=(today.year - 20)
+        ).isoformat()
         return context
 
     def get_object(self):
@@ -158,3 +161,44 @@ class BirthdayView(ListView):
                 )
             )
         return context
+
+
+@method_decorator(login_required, name="dispatch")
+class ResetView(UpdateView):
+    model = Profile
+    template_name = "fiches/reset.html"
+    fields = []
+    success_url = reverse_lazy("fiche_modif")
+
+    def get_object(self):
+        return self.request.user.profile
+
+    def post(self, request, *args, **kwargs):
+        if "reset" in request.POST:
+            # On réinitialise le profil
+            profile = self.get_object()
+            base_infos = get_ldap_infos(profile.user.cas_account.cas_login)
+
+            # On supprime les trucs inutiles
+            profile.phone_set.all().delete()
+            profile.social_set.all().delete()
+            profile.mail_set.all().delete()
+            profile.address_set.all().delete()
+            profile.nickname = ""
+            profile.pronoun = ""
+            profile.birth_date = None
+            profile.past_studies = ""
+            profile.experiences = ""
+            profile.thurne = ""
+            profile.text_field = ""
+            profile.picture.delete()
+
+            # On réinitialise avec les infos du LDAP
+            if base_infos is not None:
+                profile.full_name = base_infos["name"]
+                profile.department.clear()
+                profile.department.add(Department.objects.get(name=base_infos["dept"]))
+                profile.promotion = base_infos["promo"]
+            profile.save()
+
+        return HttpResponseRedirect(self.success_url)

From 30a6220c5ee53471cae7267bfdae83d8a51e8738 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Sat, 6 Feb 2021 17:04:24 +0100
Subject: [PATCH 4/9] Si on ne peut pas contacter le LDAP on ne plante pas

---
 fiches/utils.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/fiches/utils.py b/fiches/utils.py
index 7b3e84f..1d19112 100644
--- a/fiches/utils.py
+++ b/fiches/utils.py
@@ -38,12 +38,15 @@ def extract_ldap_info(entry, field):
 def get_ldap_infos(clipper_login):
     ldap_server = settings.LDAP["SPI"]
     ldap_obj = ldap.initialize("{PROTOCOL}://{URL}:{PORT}".format(**ldap_server))
-    res = ldap_obj.search_s(
-        "dc=spi,dc=ens,dc=fr",
-        ldap.SCOPE_SUBTREE,
-        "(uid={})".format(clipper_login),
-        ["uid", "cn", "homeDirectory"],
-    )
+    try:
+        res = ldap_obj.search_s(
+            "dc=spi,dc=ens,dc=fr",
+            ldap.SCOPE_SUBTREE,
+            "(uid={})".format(clipper_login),
+            ["uid", "cn", "homeDirectory"],
+        )
+    except ldap.SERVER_DOWN:
+        return None
 
     if not res:
         return None

From a00dd80850775d31b85e0f25e86f47e69fa129dd Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Sun, 7 Feb 2021 01:27:15 +0100
Subject: [PATCH 5/9] Traduction & small css change

---
 fiches/static/fiches/css/annuaire.css  |   1 +
 fiches/static/fiches/scss/_common.scss |   1 +
 locale/en/LC_MESSAGES/django.mo        | Bin 4990 -> 5500 bytes
 locale/en/LC_MESSAGES/django.po        | 150 ++++++++++++++-----------
 4 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/fiches/static/fiches/css/annuaire.css b/fiches/static/fiches/css/annuaire.css
index f1c2682..ed7c9d6 100644
--- a/fiches/static/fiches/css/annuaire.css
+++ b/fiches/static/fiches/css/annuaire.css
@@ -527,6 +527,7 @@ body {
   background-color: #301827;
   color: #FFFFFF;
   font-family: "Fira Sans", "Roboto", sans-serif;
+  overflow-y: scroll;
 }
 
 #aside {
diff --git a/fiches/static/fiches/scss/_common.scss b/fiches/static/fiches/scss/_common.scss
index 2c45430..8e4b097 100644
--- a/fiches/static/fiches/scss/_common.scss
+++ b/fiches/static/fiches/scss/_common.scss
@@ -21,6 +21,7 @@ body {
     background-color: colors.$page-background;
     color: colors.$page-text;
     font-family: fonts.$regular-fonts;
+    overflow-y: scroll;
 }
 
 #aside {
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 62eb4ceed6f3db918855b623c1d4f6e63307cafe..84a7e63c5b91d36e1c60dc49c73bdf12693f862b 100644
GIT binary patch
delta 2472
zcmZ9NS!@+m7{|}8T`153tz}W6r&L;&7FrfTKm`getyrlPTNcg09boi!rp&#C+-h<q
zCYTUhNJEsDKDY%m2Bq?1;EAF!F&gyA7#b6!X(KTvn(!c^zyIZw5Kj7^-}%m*<y+3&
z-l)62FgH?Bc*4+jq5DwbUB=|#)gm6W(Gp`O!ZA1*{tfvvi3vCDQaBZRx??@8z+MGs
z!8TY4eOLywa5{Vq&e2hWbhP0GSPL(~VmJmT!9SrEUWfDG#8P9{z$Q2wrW}t#1#k*B
z!b@-({0qu~BBD?LvtT)_gJlYJ1)X~sXn{KLIXB@2ScRR1oNeBO>}B48{F!%o+zUT}
zI{0g-r2Pi@Ggo=&z-v$$Dr9rbuYz){8I~&5Ep(KD%}}0o>IF<f{!GY2j`YJB@GYqK
zr=T`I3w7W{sP*4M3$MVr@CK}gHF%@atcP-JE05e1IvyQGcmOK({mwoNm6@ZEJ<JF2
zIQ$IC;TGyb*R(;djp>3a;ZCUeuRxXP7}WfapdvpDwQgAXSLZSVieLn)R%1{b{_E@n
zVQGUZs1(nJa<mpI6APg-wA_uiI&Oi5jCVmfv<oU@0aPaX%gMh6UT0uq!k9rQM}8qK
za_kSN4gPVqCM$w6h;ODEYNJMYH(UqV!gRuX3Ele;%E7}>j=v4L{bn%d1};DyJPhUO
zcTlPP2`+{IL6u@Dr;D2%_rpcluR^Uq1GWAOXMgGJ%Z^u|?$8)iV7UbDE7D@9g_Tfu
zp&Dw#`A`upgEQd<C<k^xmEs^&CSHb`cNA*fNr=zpeK&p%s)WN(8TbZrZqEEbM+<(2
za^QDoUvqW=7eWilp&YGp_FO0j7C?PgOB~yvQo9ezfg>=VawrD|p-S^1EY$b^she;P
zs)pyG4!R6qf+J81xARgP?S?uyfI29G3g8W>%$$Up|G67K@Awr|fZszoFaj&}{g2X7
zEv`d-jtOpx4w?pa&`hWe=Rh4)=hzHYs<lw-H#xRCwnGK76{<v@vm?k|&$rx8u-X}$
zU>BN)3f$Pk5Wn(~X-L1_t56fFM{4?!QF{U@09{;?W)`AtXft{cb)$AP-ncKhd;~3w
zG@?gQC(=cG0NsyPp!sMcT8kDSHG;^u$9SsFTo>~=T94GWqVa!f&(c@s)aq`+biiuW
zUu_+F2r1poNKL<7PooAIu5EB^gSvE!oV^3CbbUePQ`>@;B9&*n)zDdt9zjnI)Ra_u
ze2c~+wKX@9|M^q*DQ64%a8=0dGHAMeYRgb7(j`$_j-ElfWlPYkffFS^P6)%klpmY*
z19o!l(D4bQ1?@o?WCAZ0q#5qGc=|Te_IP%0uxGz-J(hVv?B6*dJw72>KR#ukZ_@GH
zwkQ+(cdWG>;Mw@L6E2?i8*Iu?^9HBVHVF4dagUb?qA+dud2x~ndKpJy#vaUX8Ad(U
z3&M0@5A^wNtT&E&A}z9h#<Hf@tB5mxkI$lHJx`AG7Y`LpelJn7(l#}(Zdx&PrtITH
zaf=u3@l!+HQ;ro(>hRNk#^j#^Wm9Jq-RceeI_*%dJL-#VlKA&zqBv_|6esPWAeFMa
zeN5Ii*bI4!!c_M5FzkzdZ|2s-thNcg9`c#ChkRDU{Ghzd+N|%zq&jJney<m26v1NS
MC6hzXS5znd2VqP%ApigX

delta 2001
zcmZA2OKenC9DwmNZS8=z727G)7D_4Q{Sc<bmMZ1Z3JORIS|p7o5=mS@6J`N~)etwB
z7<^<<A&?LaN(i{XNk|B3<0~Yv08NZSlt+jd6cIMY1hwJ&W{w+9=6`?ZoO|wh-kJG#
z=E&6SmFlwh18D;>p7^;Wge)F>hzn_7GK7b5KUUyj<P%QB@+llc`AqajtfqVuAIE>N
z25U!!P>C~eEVg5#L#-h*nTkOy$M^6N+=o7J7^mRp_!M5m378sPG>uNY59i<@K86R-
zfj>hh{v}r7d9>flSnpDAk#WFsmT7}(ti?&lSfL$h5|$vJu#!sy_M-!5(9L=q`Gmb(
z9PkjjGsn^PL+HdVq5a*$q+9(L83+C^-l$+UPG~F_C(?}LumgRt5AApWc_eJciMSoz
z`VY_v9K}cRB)X6@=nh|q<sUFxPsLR-e8N3099JmkX*;OmQi=`e5luwfb)!eni?$y`
zSGEoLgx%4-=mbAPkK#Dm-xsm`O$GaJ2N$Vu3$LLw{1sj4ZFC3zj`fusocB{$h7IV1
zn$R7YjqbprSnk7~L<k$viG0d7(^WWuK0jQ={#)@i6|Uf0q;0s4c61k0Sjs+<4Rz?m
zrlI%eqZ8~w-sUiXPH-nW;4XB6Z=pN*A*S&(y7PZ#V`endx1t4S;bJVDE!x5MSbigx
z_eA%j@5U$SiiXeyeHHItK+pasw7*}_h1|h9%#M(8;BhS9BS@n=(1A8wjy~9rG!3uD
z`V4w>yU-QCi4Ob@+WsIq@guREkL6*s{W+w4HhdQ=uAp0Z10AT0{k35&I?#A@>s!#3
z&W-n5(Ie_aC(w(we>vXYgf46|+J6R};JaA({vROY11IB+;pka(1>d6sUqj#G-_Z$-
zAg32fsdS<>=s@*oe@*B>)1$5EQFNituTa1Lt7FAlbOr0tBX}*AGssI^NH1}HGUk^=
zTaaJvLh9s7^TJQB6~3H(#1q6+!ZfK!=)tUK+)S{TFoRf2JWH5fBvux3#f#s0SI|$)
zCYBQG317ekgl~8oF^yPEbP&@ClSgD)M!0L7a_IK_7m+db68;JKQ@M_C>r7LMgy+%o
zGd)c#B;4+Kgvp=cRm3a{F?B_kqc8c)Se6$GdH03n`I%M|^9j%A|I|cg4&k5Aid-gH
zv(eYnA6!#=k;3nq+2>+e{Gan6A53W~o*{foOs&Kk!nbTLQJ1@syp(&Ta&rE+Q8!C+
uEfst6-IX6Fl5I`t*3Pzt`9G?TB@#<>TT_ksp)p%Za<A9y$Pc8N6ZZkbIh;fQ

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c57ebdb..24a609b 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-28 00:03+0000\n"
-"PO-Revision-Date: 2021-02-04 23:49+0100\n"
+"POT-Creation-Date: 2021-02-06 12:02+0000\n"
+"PO-Revision-Date: 2021-02-07 01:05+0100\n"
 "Last-Translator: Tom Hubrecht <tom.hubrecht@ens.fr>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
-#: fiches/forms.py:15
+#: fiches/forms.py:20
 msgid "Nom/Surnom"
 msgstr "Name/Nickname"
 
-#: fiches/forms.py:16
+#: fiches/forms.py:21
 msgid "Promotion"
 msgstr "Entry year"
 
-#: fiches/forms.py:28
+#: fiches/forms.py:33
 msgid "Tous les champs sont vides"
 msgstr "All fields are empty"
 
@@ -116,56 +116,60 @@ msgstr "e-mail"
 msgid "adresse"
 msgstr "address"
 
-#: fiches/templates/fiches/base.html:10 fiches/templates/fiches/base.html:35
+#: fiches/templates/fiches/base.html:10 fiches/templates/fiches/base.html:21
 msgid "Annuaire des élèves de l'ENS"
 msgstr "ENS student directory"
 
-#: fiches/templates/fiches/base.html:30
+#: fiches/templates/fiches/base.html:36
 msgid "Recherche Rapide"
 msgstr "Quick Search"
 
-#: fiches/templates/fiches/base.html:31
+#: fiches/templates/fiches/base.html:37
 msgid "Rechercher"
 msgstr "Search"
 
-#: fiches/templates/fiches/base.html:41
+#: fiches/templates/fiches/base.html:42
 msgid "Accueil"
 msgstr "Home"
 
-#: fiches/templates/fiches/base.html:42
-msgid "Modifier sa fiche d'annuaire"
-msgstr "Edit your directory record"
-
 #: fiches/templates/fiches/base.html:44
 msgid "Consulter sa fiche d'annuaire"
 msgstr "View your directory record"
 
+#: fiches/templates/fiches/base.html:45
+msgid "Modifier sa fiche d'annuaire"
+msgstr "Edit your directory record"
+
 #: fiches/templates/fiches/base.html:46
+msgid "Réinitialiser sa fiche d'annuaire"
+msgstr "Reset your directory record"
+
+#: fiches/templates/fiches/base.html:48
 msgid "Anniversaires à venir"
 msgstr "Upcoming birthdays"
 
-#: fiches/templates/fiches/base.html:52
+#: fiches/templates/fiches/base.html:54
 #, python-format
 msgid "Connecté en tant que <span class=\"clipper\">%(user)s</span>"
 msgstr "Connected as <span class=\"clipper\">%(user)s</span>"
 
-#: fiches/templates/fiches/base.html:53
+#: fiches/templates/fiches/base.html:55
 msgid "Se déconnecter"
 msgstr "Log out"
 
-#: fiches/templates/fiches/base.html:55
+#: fiches/templates/fiches/base.html:57
 msgid "Se connecter"
 msgstr "Log in"
 
-#: fiches/templates/fiches/base.html:71
+#: fiches/templates/fiches/base.html:73
 msgid "Crée par KDENS &middot; Propulsé par Django"
 msgstr "Created by KDENS &middot; Powered by Django"
 
-#: fiches/templates/fiches/base.html:75
+#: fiches/templates/fiches/base.html:77
 msgid "Page des élèves"
 msgstr "Students' page"
 
-#: fiches/templates/fiches/base.html:76
+#: fiches/templates/fiches/base.html:78
 msgid "Contacter l'équipe annuaire"
 msgstr "Contact the directory team"
 
@@ -189,168 +193,168 @@ msgstr "Department"
 msgid "Date de naissance"
 msgstr "Birth date"
 
-#: fiches/templates/fiches/fiche.html:49
+#: fiches/templates/fiches/fiche.html:51
 msgid "Thurne"
 msgstr "Room"
 
-#: fiches/templates/fiches/fiche.html:57
+#: fiches/templates/fiches/fiche.html:59
 msgid "Téléphone"
 msgstr "Phone number"
 
-#: fiches/templates/fiches/fiche.html:69
+#: fiches/templates/fiches/fiche.html:71
 msgid "Réseau social,Réseaux sociaux"
 msgstr "Social network,Social networks"
 
-#: fiches/templates/fiches/fiche.html:81
+#: fiches/templates/fiches/fiche.html:83
 msgid "Mail,Mails"
 msgstr "E-mail,E-mails"
 
-#: fiches/templates/fiches/fiche.html:93
+#: fiches/templates/fiches/fiche.html:95
 msgid "Adresse,Adresses"
 msgstr "Address,Addresses"
 
-#: fiches/templates/fiches/fiche.html:105
+#: fiches/templates/fiches/fiche.html:107
 msgid "Études passées"
 msgstr "Past studies"
 
-#: fiches/templates/fiches/fiche.html:113
+#: fiches/templates/fiches/fiche.html:115
 msgid "Expériences passées"
 msgstr "Experiences"
 
-#: fiches/templates/fiches/fiche.html:122
+#: fiches/templates/fiches/fiche.html:124
 msgid "Champ libre"
 msgstr "Free space"
 
-#: fiches/templates/fiches/fiches_modif.html:8
+#: fiches/templates/fiches/fiches_modif.html:7
 msgid "Modifier ma page d'annuaire"
 msgstr "Edit my directory record"
 
-#: fiches/templates/fiches/fiches_modif.html:13
+#: fiches/templates/fiches/fiches_modif.html:12
 msgid "Nom :"
 msgstr "Name:"
 
-#: fiches/templates/fiches/fiches_modif.html:17
+#: fiches/templates/fiches/fiches_modif.html:16
 msgid "Surnom :"
 msgstr "Nickname:"
 
-#: fiches/templates/fiches/fiches_modif.html:21
+#: fiches/templates/fiches/fiches_modif.html:20
 msgid "Pronom(s) utilisé(s) :"
 msgstr "Pronoun(s):"
 
-#: fiches/templates/fiches/fiches_modif.html:25
+#: fiches/templates/fiches/fiches_modif.html:24
+msgid "Date de naissance :"
+msgstr "Birth date:"
+
+#: fiches/templates/fiches/fiches_modif.html:28
 msgid "Photo :"
 msgstr "Photo:"
 
-#: fiches/templates/fiches/fiches_modif.html:39
+#: fiches/templates/fiches/fiches_modif.html:40
 msgid "Effacer (cochez la case) :"
 msgstr "Delete (check the box):"
 
-#: fiches/templates/fiches/fiches_modif.html:44
+#: fiches/templates/fiches/fiches_modif.html:45
 msgid "Nouvelle photo :"
 msgstr "New photo:"
 
-#: fiches/templates/fiches/fiches_modif.html:51
+#: fiches/templates/fiches/fiches_modif.html:52
 msgid "Département :"
 msgstr "Department:"
 
-#: fiches/templates/fiches/fiches_modif.html:55
+#: fiches/templates/fiches/fiches_modif.html:56
 #: fiches/templates/fiches/home.html:14
 msgid "Promotion :"
 msgstr "Entry year:"
 
-#: fiches/templates/fiches/fiches_modif.html:59
+#: fiches/templates/fiches/fiches_modif.html:60
 msgid "Études passées :"
 msgstr "Past studies:"
 
-#: fiches/templates/fiches/fiches_modif.html:65
+#: fiches/templates/fiches/fiches_modif.html:66
 msgid "Expériences :"
 msgstr "Experiences:"
 
-#: fiches/templates/fiches/fiches_modif.html:71
-msgid "Date de naissance :"
-msgstr "Birth date:"
-
-#: fiches/templates/fiches/fiches_modif.html:75
+#: fiches/templates/fiches/fiches_modif.html:72
 msgid "Thurne :"
 msgstr "Room :"
 
-#: fiches/templates/fiches/fiches_modif.html:78
+#: fiches/templates/fiches/fiches_modif.html:75
 msgid "Personnel"
 msgstr "Private"
 
-#: fiches/templates/fiches/fiches_modif.html:78
+#: fiches/templates/fiches/fiches_modif.html:75
 msgid "0612345678"
 msgstr "0612345678"
 
-#: fiches/templates/fiches/fiches_modif.html:79
+#: fiches/templates/fiches/fiches_modif.html:76
 msgid "Numéro(s) de téléphone :"
 msgstr "Phone number(s):"
 
-#: fiches/templates/fiches/fiches_modif.html:80
+#: fiches/templates/fiches/fiches_modif.html:77
 msgid "Ajouter un numéro"
 msgstr "Add a phone number"
 
-#: fiches/templates/fiches/fiches_modif.html:83
+#: fiches/templates/fiches/fiches_modif.html:80
 msgid "InstaTok"
 msgstr "InstaTok"
 
-#: fiches/templates/fiches/fiches_modif.html:83
+#: fiches/templates/fiches/fiches_modif.html:80
 msgid "mon_profil_instatok"
 msgstr "my_instatok_profile"
 
-#: fiches/templates/fiches/fiches_modif.html:84
+#: fiches/templates/fiches/fiches_modif.html:81
 msgid "Réseaux sociaux :"
 msgstr "Social networks:"
 
-#: fiches/templates/fiches/fiches_modif.html:85
+#: fiches/templates/fiches/fiches_modif.html:82
 msgid "Ajouter un réseau social"
 msgstr "Add a social network"
 
-#: fiches/templates/fiches/fiches_modif.html:88
+#: fiches/templates/fiches/fiches_modif.html:85
 msgid "Professionelle"
 msgstr "Professional"
 
-#: fiches/templates/fiches/fiches_modif.html:88
+#: fiches/templates/fiches/fiches_modif.html:85
 msgid "moi@ens.fr"
 msgstr "me@ens.fr"
 
-#: fiches/templates/fiches/fiches_modif.html:89
+#: fiches/templates/fiches/fiches_modif.html:86
 msgid "Mail(s) :"
 msgstr "E-mail(s):"
 
-#: fiches/templates/fiches/fiches_modif.html:90
+#: fiches/templates/fiches/fiches_modif.html:87
 msgid "Ajouter un email"
 msgstr "Add an e-mail"
 
-#: fiches/templates/fiches/fiches_modif.html:93
+#: fiches/templates/fiches/fiches_modif.html:90
 msgid "Bureau"
 msgstr "Office"
 
-#: fiches/templates/fiches/fiches_modif.html:93
+#: fiches/templates/fiches/fiches_modif.html:90
 msgid "45 rue d'Ulm"
 msgstr "45 rue d'Ulm"
 
-#: fiches/templates/fiches/fiches_modif.html:94
+#: fiches/templates/fiches/fiches_modif.html:91
 msgid "Adresse(s) :"
 msgstr "Address(es):"
 
-#: fiches/templates/fiches/fiches_modif.html:95
+#: fiches/templates/fiches/fiches_modif.html:92
 msgid "Ajouter une adresse"
 msgstr "Add an address"
 
-#: fiches/templates/fiches/fiches_modif.html:99
+#: fiches/templates/fiches/fiches_modif.html:96
 msgid "Champ libre :"
 msgstr "Free space:"
 
-#: fiches/templates/fiches/fiches_modif.html:105
+#: fiches/templates/fiches/fiches_modif.html:102
 msgid "Apparaître sur l'annuaire papier ?"
 msgstr "Appear on the paper directory?"
 
-#: fiches/templates/fiches/fiches_modif.html:109
+#: fiches/templates/fiches/fiches_modif.html:106
 msgid "Conserver la fiche annuaire ?"
 msgstr "Keep the directory record?"
 
-#: fiches/templates/fiches/fiches_modif.html:112
+#: fiches/templates/fiches/fiches_modif.html:109
 msgid "Enregistrer"
 msgstr "Save"
 
@@ -370,5 +374,25 @@ msgstr "Department:"
 msgid "Recherche"
 msgstr "Search"
 
+#: fiches/templates/fiches/reset.html:8
+msgid "Réinitialiser ma fiche annuaire"
+msgstr "Reset your directory record"
+
+#: fiches/templates/fiches/reset.html:9
+msgid ""
+"Votre fiche annuaire sera réinitialisée, les seules informations gardées "
+"seront votre nom ainsi que votre promotion et département d'entrée."
+msgstr ""
+"Your directory record will be reset, the only information kept will be "
+"your name as well as your entry year and department."
+
+#: fiches/templates/fiches/reset.html:13
+msgid "Réinitialiser"
+msgstr "Reset"
+
+#: fiches/templates/fiches/reset.html:14
+msgid "Annuler"
+msgstr "Cancel"
+
 #~ msgid "Department :"
 #~ msgstr "Department:"

From ef0d42a9c7b9680dc5f795b0bb332822af944621 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Tue, 23 Feb 2021 22:19:04 +0100
Subject: [PATCH 6/9] Update

---
 fiches/templates/fiches/reset.html |   2 +-
 locale/en/LC_MESSAGES/django.mo    | Bin 5500 -> 5483 bytes
 locale/en/LC_MESSAGES/django.po    |  12 ++++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fiches/templates/fiches/reset.html b/fiches/templates/fiches/reset.html
index 4ddbf11..52f3be8 100644
--- a/fiches/templates/fiches/reset.html
+++ b/fiches/templates/fiches/reset.html
@@ -6,7 +6,7 @@
 
 <div class="content" id="content-reset">
   <h2>{% trans "Réinitialiser ma fiche annuaire" %}</h2>
-  <p id="warning">{% trans "Votre fiche annuaire sera réinitialisée, les seules informations gardées seront votre nom ainsi que votre promotion et département d'entrée." %}</p>
+  <p id="warning">{% trans "Votre fiche annuaire sera réinitialisée. Votre nom, département et promotion seront extraits de l'annuaire de l'administration." %}</p>
 
   <form method="post" action="">
     {% csrf_token %}
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 84a7e63c5b91d36e1c60dc49c73bdf12693f862b..11940d68049f126cf0d171c43db990beae2738cc 100644
GIT binary patch
delta 1195
zcmY+?Pe_zO7{~G1bXT)nEtN`122=tS!Byy=2&Du<MIDUQgR!-5wdlTU>nkQ<3!S9P
z9wa(+DFh*;NS3WrP}Z@MAP6MrS|nk1=n~cUr*o*&XP$Xyp68jF_gCxJ*2nGJayN}J
zOFNAz!|qCB7@8g|!2xW-Q@8`K;(nY#t-p)Aa2~a<=v>AM;uWmHRaCxjF5W=xk3>z*
zgc(Gm1XzpPu>tF_#myge9>-GV2T%>2#%dhK-8kyv8`vK*CXZ_5ebrWjpHTbPT>QN%
zw{?QwOwg36CYus9Vl8$eIm`)EV}tJdc~pa0RO7SQh<O)3LKQBe8hwts$=4Xeb*#sx
z9QUU|uX707hyzrDd#D79E`I9bW#?Pm!}nFx$u>|=@zZ@T<uv8Q)u?>?PzP$py_oA_
zpaxE&p5ij<Ceo;d*HIg9Ax)dxZhisvhDFp3JVO<Jg<Ag()%Zsje|GT?)cQZj`kaaI
zhiIY()j&Nqpmp}3t~QQpU<x;{9MwP`^)z=-H*nv5UqC(KLsVnSIE^c)eFJ=qP~V(o
zpu%xfp%K&xW>7aXi`p>n<`<n$P$ztWYTyl$+k8MZ@)h~5%sQ%J{V=LihRRoo75$pm
z04?gR+E59)orj&hsFU=ep6HB=N9MkS^P%Cn>BzxQUtuXy5(=3@v8*K=@37}GLDsW=
zCf#n6FCUC2vVoWO{J?sF9nWUcnIM(%?Sz-jXzp5&O{9VeoAm71frRf*CQ@wPijwJ+
zpPFESb`*|P&WFllT{adw(s`(`7Oe{pcG#iJWY+qLv_~yZr8X-i{Nz8Srcz^L_JU`F
e#Hi=nOSE8vE1pgKm)<6+dojplrwj4g=Fnf)e4q*d

delta 1236
zcmYk)O-PhM9LMo_v|Y_|({xD+b;w@LO05v0L!=QX5kZky9Uj?9AKHB$d-hS;3Z5e9
z&@15~ym*SBE@_*Wuv1c(Agp63L6=16+99L9f1RMqe&#>(%*=0QcBy%}d9tM>ex#I|
zTCY?Yc2+7yQ}tje_F@xWz;$>7>+v4S_s_8!U!u&Lwa#G$^#a!5BFcKdZSAC1=ciLD
zRtW~`=}2M|uEl0d<3ZcsZ9R=^=<h`dbP=o2!;N^=*7vc?QECDu$hQrv0e_&(|7B}c
z6|bJ4l2r(&8c`P7i?w(ZSwo#g36`<rK1#rwD8V0N15Vib4a&x|C_z7>+~gN*$3M6k
z+hgue8YiuTxQF@{$^tJ?7I<yzceb9h&f_M=7g0{;kY1i5i88MS%drt<y<I2=I)HT;
zAEO}w&Z9iV2+B=dNBQs$%EWObw0dIur&0a`vnV(40cGRQDBpiY39w}ApSCXH4<X;D
zkndxawjEnh0_?^uxZm1?a<u~}0dC{Um7@fhKzW*{C^s-^$EQ)Aa0VsV9A3i(lzDv&
zCfQ&0(~ylll#K$E6Ffk<nQ@c}uWbK}^*zc7KcNIzK-N~@QGzTZ|1;(AN0GqQDEri*
ztk-}QT{Lz`1KUvE>IljL$F1GgQz$1ngYrbKt%I?}#6zcZtdQ(*RB<X<>NtJH>9XyK
zxJ748UgyoQ;Q5z=Fy}^I;OF&#8)n`<TNw-kKhh&X6dLUZIqiCW-qTlxjqMu>gIpk!
zw23rxhTJeRIm4XHPJTmH*{9r0X!3dUPn~nUta6Lpm3N);)(+j;cDVIWaXyt!oNLk1
zpwWS!E&LxyUp7OL9`&+W-EVXu7!I}X=8SgpdeqQ~E1j}oK^Kf0YS+)`jFB`Frg)-u
GoAVdUTCVv3

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 24a609b..7bd00d7 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-06 12:02+0000\n"
-"PO-Revision-Date: 2021-02-07 01:05+0100\n"
+"POT-Creation-Date: 2021-02-23 22:18+0100\n"
+"PO-Revision-Date: 2021-02-23 22:18+0100\n"
 "Last-Translator: Tom Hubrecht <tom.hubrecht@ens.fr>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -380,11 +380,11 @@ msgstr "Reset your directory record"
 
 #: fiches/templates/fiches/reset.html:9
 msgid ""
-"Votre fiche annuaire sera réinitialisée, les seules informations gardées "
-"seront votre nom ainsi que votre promotion et département d'entrée."
+"Votre fiche annuaire sera réinitialisée. Votre nom, département et promotion "
+"seront extraits de l'annuaire de l'administration."
 msgstr ""
-"Your directory record will be reset, the only information kept will be "
-"your name as well as your entry year and department."
+"Your directory record will be reset. Your name, department and promotion "
+"will be taken from the administration directory."
 
 #: fiches/templates/fiches/reset.html:13
 msgid "Réinitialiser"

From 939c18f45f7dda1d268ee640a4bbcdb8f1fc02c3 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Tue, 23 Feb 2021 22:32:52 +0100
Subject: [PATCH 7/9] =?UTF-8?q?On=20utilise=20les=20fonctions=20d=C3=A9j?=
 =?UTF-8?q?=C3=A0=20pr=C3=A9sentes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fiches/utils.py | 56 +++++++++----------------------------------------
 1 file changed, 10 insertions(+), 46 deletions(-)

diff --git a/fiches/utils.py b/fiches/utils.py
index 1d19112..e6c1cac 100644
--- a/fiches/utils.py
+++ b/fiches/utils.py
@@ -1,51 +1,11 @@
-import ldap
-
-from django.conf import settings
-
-verbose_depts = {
-    "bio": "Biologie",
-    "chimie": "Chimie",
-    "dec": "Études Cognitives",
-    "geol": "Géosciences",
-    "guests": "Invité·e",
-    "info": "Informatique",
-    "litt": "Lettres",
-    "maths": "Mathématiques",
-    "pei": "PEI",
-    "phy": "Physique",
-}
-
-
-def parse_dept(home_dir):
-    """Extrait le département d'entrée d'un·e élève à partir de son dossier.
-    Le dossier a le format `/users/<promo>/<dept>/<login>`.
-    """
-    users, promo, dept, login = home_dir.split("/")[1:]
-
-    if users != "users":
-        raise ValueError("Invalid home directory")
-
-    # Ça casse en 2100, mais le système de naming de sas aussi...
-    promo = 2000 + int(promo)
-
-    return promo, verbose_depts.get(dept, None)
-
-
-def extract_ldap_info(entry, field):
-    return entry[1].get(field, [b""])[0].decode("utf-8")
+from .management.commands._ldap import ClipperLDAP
 
 
 def get_ldap_infos(clipper_login):
-    ldap_server = settings.LDAP["SPI"]
-    ldap_obj = ldap.initialize("{PROTOCOL}://{URL}:{PORT}".format(**ldap_server))
+    ldap = ClipperLDAP()
     try:
-        res = ldap_obj.search_s(
-            "dc=spi,dc=ens,dc=fr",
-            ldap.SCOPE_SUBTREE,
-            "(uid={})".format(clipper_login),
-            ["uid", "cn", "homeDirectory"],
-        )
-    except ldap.SERVER_DOWN:
+        res = ldap.search("(uid={})".format(clipper_login))
+    except Exception:
         return None
 
     if not res:
@@ -54,6 +14,10 @@ def get_ldap_infos(clipper_login):
     if len(res) != 1:
         raise RuntimeError("LDAP returned too many results: {}".format(res))
     (res,) = res
-    promo, dept = parse_dept(extract_ldap_info(res, "homeDirectory"))
+    promo, dept = ldap.parse_dept(ldap.extract_ldap_info(res, "homeDirectory"))
 
-    return {"name": extract_ldap_info(res, "cn"), "promo": promo, "dept": dept}
+    return {
+        "name": ldap.extract_ldap_info(res, "cn"),
+        "promo": promo,
+        "dept": dept,
+    }

From 1586b3e18577e9fcaf3377ecfc7b7336bb01dd61 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Tue, 23 Feb 2021 22:39:31 +0100
Subject: [PATCH 8/9] Entry -> Entrance

---
 locale/en/LC_MESSAGES/django.mo | Bin 5483 -> 5492 bytes
 locale/en/LC_MESSAGES/django.po |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 11940d68049f126cf0d171c43db990beae2738cc..69f75eba38b6120b7446e45b70a5138332ee86d1 100644
GIT binary patch
delta 437
zcmXZYF-QV&6vy$G-I<kI-07e~I0d=ZkU@(OEkQIzAcCa0IY^68+|ce4jm;4>B)7WP
z8qz3HYY+qxx%K_!|KRxi-@E_+z5lz9%6H}A+>0`1_8gdH@fDZw6PIy{N%TXrG^SB;
z0eviE3D=!9TqADaDqf)W4{!mmaS?CO!`slJ{|)yfawK9@qbKa+3+mt@A64iW)wqFb
z)IweO5{o!M?Z0#Rp>u>9=n-{+F;dzlxoCEiFA^&xeo&2)`B|e3s$huvQzcZx4NTz{
zYLZ=N&AE>n<N$T<#Kj$)Bi2*r-HE6Edn&P6jVIaP`JmZ7ZI}D)X3zGzXFWynTd<w*
Kw7M$hkNyBG#xgem

delta 428
zcmXZXFGxdC6vy$ixqs@WV{flakO#Jz1j7_r83vnc3o<ZR4MUI%%ByPzgINTN2*QJP
z?INZXEtUx@f(A|c{rT>L%ZJ~2_nvd_S999DJITd!X7*e&o5vSae)stk3*=ucV<AX$
zfO&EQmoV~f;WD|0RXj$WA7T;Da278xhnIoH{~N9;)G6Ge20fs|C)B|meyULyHMoZw
z)JI+T6dO21?Z5K%8}A79z<bmM9+B2IuE*(3rW6(_e4qwdm<}qU8dgw)LT`j6@+#^j
z>)s7-8}*P5R&dwnK4!@J_E?+APyVfxU27$;3*R$k7rBG|fo&fi4O}v*wXzv^z7lr-
E0POHCvj6}9

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 7bd00d7..8cdf0e5 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-23 22:18+0100\n"
-"PO-Revision-Date: 2021-02-23 22:18+0100\n"
+"PO-Revision-Date: 2021-02-23 22:39+0100\n"
 "Last-Translator: Tom Hubrecht <tom.hubrecht@ens.fr>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -24,7 +24,7 @@ msgstr "Name/Nickname"
 
 #: fiches/forms.py:21
 msgid "Promotion"
-msgstr "Entry year"
+msgstr "Entrance year"
 
 #: fiches/forms.py:33
 msgid "Tous les champs sont vides"
@@ -56,7 +56,7 @@ msgstr "department"
 
 #: fiches/models.py:24
 msgid "promotion"
-msgstr "entry year"
+msgstr "entrance year"
 
 #: fiches/models.py:27
 msgid "date de naissance"
@@ -264,7 +264,7 @@ msgstr "Department:"
 #: fiches/templates/fiches/fiches_modif.html:56
 #: fiches/templates/fiches/home.html:14
 msgid "Promotion :"
-msgstr "Entry year:"
+msgstr "Entrance year:"
 
 #: fiches/templates/fiches/fiches_modif.html:60
 msgid "Études passées :"

From d1046d80d63c637dcc0d8948319bee82f8598859 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Tue, 23 Feb 2021 22:53:51 +0100
Subject: [PATCH 9/9] Pinaillage

---
 fiches/templates/fiches/reset.html |   2 +-
 locale/en/LC_MESSAGES/django.mo    | Bin 5492 -> 5497 bytes
 locale/en/LC_MESSAGES/django.po    |   8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fiches/templates/fiches/reset.html b/fiches/templates/fiches/reset.html
index 52f3be8..a841c02 100644
--- a/fiches/templates/fiches/reset.html
+++ b/fiches/templates/fiches/reset.html
@@ -6,7 +6,7 @@
 
 <div class="content" id="content-reset">
   <h2>{% trans "Réinitialiser ma fiche annuaire" %}</h2>
-  <p id="warning">{% trans "Votre fiche annuaire sera réinitialisée. Votre nom, département et promotion seront extraits de l'annuaire de l'administration." %}</p>
+  <p id="warning">{% trans "Votre fiche annuaire sera réinitialisée. Votre nom, département et promotion seront récupérés de l'annuaire de l'administration." %}</p>
 
   <form method="post" action="">
     {% csrf_token %}
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 69f75eba38b6120b7446e45b70a5138332ee86d1..f0263c19147e6293107be57ae79ac53bc21f4ad2 100644
GIT binary patch
delta 1012
zcmXZaPe@cz6vy%NCg1pHni<mxhhj=9$i`?<NVO^|1S27%jZi{OEhIq;jA-+)MYM<(
zy_Ks70#PBgfn;zs7}jDIQ3STgg|6I%m=F^5{pneK?zw-?J@?OM@o#bVWFmTQW^;SZ
z>hWCKjHX@0J=lv!u@6%?iUk})&3}XYa00ci;x1tm@po*+6;!?rkGD|kn=%$zNTVfV
zmc%?Z;$hs6C%pfH+l_Vf_o52Afz3F8EjaA)GrSU*#i&A-v%3YZq1ONQ_)j+4Jwbvj
z6lFP7q9d5YE+mItMHSZX<0Vvqk5Prc#6uW+`~kIb1y$%L)J=ZH)3}KT@OZ@isd34@
zjh)0#Pzm0l63lqK;PI0C4ci!BL7i+1^%UDa-oR-Zh;yiX1=N8$Fptq$8Y<vA>M0(e
zZsH+oVuV`w3Mtygy?+Yzh85HeR8bp$L9PFRTEB)`zkxc)Kh*q2J_hq6Yo?)&0;+&x
zco2(jH|lEdq6!#8&3}z5U>x-{Z&5ce?c=kkC!9wWR>P<G6SeLpgGu(cTQszB3ANE6
zs^S-@n~6~i-h2N?w~9JZ4OPH0lG|2s=P8hXX4|NOQ+$}6&yLEM$24QsPD2}>LcP`b
zxEi(=l;Rpas=ZHBalqrDcs=|aSUi`U2`-oK)K7$|M~joC(UHYTEN9cTAklTE{43KF
QCQHL3gZJ;1J99n3e+Nlt6951J

delta 1021
zcmXZaPe@cz6vy%N)HkE$j8ijFHY9-+WG$+36a86CQVf`_By6D!Bob1P%%TW;P@8Zu
zF2q#?L6AgI4UeHsfrwxWQKH-kAuWTD6e-+9-yfdU=bn4tIrrRq-*(ql*ZY$V(IYdf
zwVEZdJ7vbu&SN8%uoJK1ZoG?!a2)mhQ{00uP<eHC4tEhRV-{CY_0~P!MCB*a7Foz3
zohHB>wqPFj;ZdJI=N7Sv`4Xz3KFr_^+>4_gKg6EEY!cPTx3--I*HHPtJl<%Fc24k*
z37WDD)l{ehb9fr5VV6;j_51n|s=+Z-<4>>yCp~_P+PIEtbQX1!i+Bcq<3a3<xIYap
zx&wHExPmJ1997`8#~(bNbC+;G>#L}fZK9syudg?8nr7k*s$M(lKu7QZMg<0HpcnNN
zBdD9Wjr#BbDscj7+NOQ}CF%|9s2li%+ISw7{{@x5hRR<@9b_BzeaMf&_mQ<S&_p|`
zfy0=`V{Q?3wS%Yz#!=r_Q4LI^p5__q24;Ny4eAMFRAZm<KCYnhuCbV4f4j~=8xNv3
zx{2!eG3sWjsDxKOUvodAPPBk(;44zwzM~r1Kz=LxgK9Xz52JljsCrpU^)SdY(1yoR
zZ`F+|aKSCQS5PPEMP2cL$0Jie!-e3|R4wr?u(+I@36sP3Dr4nal{lMP3>pe&;~(i#
P7*@)o!*}9Sxl-^S0dir=

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 8cdf0e5..79b583e 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-23 22:18+0100\n"
-"PO-Revision-Date: 2021-02-23 22:39+0100\n"
+"POT-Creation-Date: 2021-02-23 22:53+0100\n"
+"PO-Revision-Date: 2021-02-23 22:53+0100\n"
 "Last-Translator: Tom Hubrecht <tom.hubrecht@ens.fr>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -381,10 +381,10 @@ msgstr "Reset your directory record"
 #: fiches/templates/fiches/reset.html:9
 msgid ""
 "Votre fiche annuaire sera réinitialisée. Votre nom, département et promotion "
-"seront extraits de l'annuaire de l'administration."
+"seront récupérés de l'annuaire de l'administration."
 msgstr ""
 "Your directory record will be reset. Your name, department and promotion "
-"will be taken from the administration directory."
+"will be copied from the administration directory."
 
 #: fiches/templates/fiches/reset.html:13
 msgid "Réinitialiser"