Merge branch 'release/1.2.8'

calendz · Dec 12, 2019 · fdcbe3f · fdcbe3f
2 parents 5681d45 + eca19c2
commit fdcbe3f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "calendz-front",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/src/components/Inputs/custom/GradeSelect.vue b/src/components/Inputs/custom/GradeSelect.vue
@@ -19,8 +19,7 @@
         <option
           v-for="(option, index) in options"
           :key="index"
-          :label="option.value"
-          :value="option.value"/>
+          :value="option.value">{{ option.value }}</option>
       </select>
     </base-input>
   </div>

diff --git a/src/plugins/veeCustom/customValidators.js b/src/plugins/veeCustom/customValidators.js
@@ -1,7 +1,7 @@
 import { Validator } from 'vee-validate'
 
 Validator.extend('email_valid_school', {
-  validate: value => value.includes('@epsi.fr') || value.includes('@wis.fr')
+  validate: value => value.includes('@epsi.fr') || value.includes('@wis.fr') || value.includes('@etudes-wis.net')
 })
 
 Validator.extend('contains_one_number', {

diff --git a/src/views/Pages/Auth/Register.vue b/src/views/Pages/Auth/Register.vue
@@ -73,7 +73,7 @@
 
                 <GradeSelect
                   v-model="registerForm.grade"
-                  :school="registerForm.email.includes('@epsi.fr') ? 'EPSI' : registerForm.email.includes('@wis.fr') ? 'WIS' : ''"
+                  :school="registerForm.email ? guessSchoolFromEmail(registerForm.email) : ''"
                   :disabled="!registerForm.email"/>
 
                 <GroupsSelect
@@ -227,6 +227,10 @@ export default {
         }
       })
     },
+    guessSchoolFromEmail (email) {
+      if (email.includes('@epsi.fr')) return 'EPSI'
+      if (email.includes('@wis.fr') || email.includes('@etudes-wis.net')) return 'WIS'
+    },
     showAlert (title) {
       swal({
         title,

diff --git a/src/views/Pages/Dashboard/Admin/UserManagement.vue b/src/views/Pages/Dashboard/Admin/UserManagement.vue
@@ -282,7 +282,7 @@
                 <div class="col-md-6">
                   <GradeSelect
                     v-model="modifyForm.grade"
-                    :school="modifyForm.email && modifyForm.email.includes('@epsi.fr') ? 'EPSI' : modifyForm.email && modifyForm.email.includes('@wis.fr') ? 'WIS' : ''"
+                    :school="modifyForm.email ? guessSchoolFromEmail(modifyForm.email) : ''"
                     :disabled="false"
                     label="Classe"/>
                 </div>
@@ -525,6 +525,10 @@ export default {
           })
         }
       })
+    },
+    guessSchoolFromEmail (email) {
+      if (email.includes('@epsi.fr')) return 'EPSI'
+      if (email.includes('@wis.fr') || email.includes('@etudes-wis.net')) return 'WIS'
     }
   }
 }