From e700617747f72844ff3d050e9561e57bb29a5efb Mon Sep 17 00:00:00 2001
From: nicrausaz <n.crausaz99@gmail.com>
Date: Fri, 9 Nov 2018 10:31:25 +0100
Subject: [PATCH] script update
---
canapEPFL/conditions.php | 1 +
canapEPFL/form.php | 18 +++++++++---------
canapEPFL/script.js | 17 +++++++++++++----
3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/canapEPFL/conditions.php b/canapEPFL/conditions.php
index 559ea2f..5068c10 100644
--- a/canapEPFL/conditions.php
+++ b/canapEPFL/conditions.php
@@ -10,6 +10,7 @@
<?php include('templates/header.php') ?>
<main id="main" role="main" class="content container-grid">
<h3>Protection des données</h3>
+ <p>Vos données seront exclusivement utilisées dans le cadre du processus de recrutement.</p>
<p>Tout usager peut exiger que ses données personnelles soient effacées de la banque de données. Merci de nous adresser un email.</p>
<h3>Renseignements</h3>
diff --git a/canapEPFL/form.php b/canapEPFL/form.php
index fc13213..935f921 100644
--- a/canapEPFL/form.php
+++ b/canapEPFL/form.php
@@ -106,16 +106,16 @@
<input type="text" name="surnameApp" id="surnameApp" class="form-control" placeholder="Prénom" value="<?php echo $firstname;?>" readonly />
<label for="adrApp">Rue *</label>
- <input type="text" name="adrApp" placeholder="Rue" class="form-control" value="<?php echo $_SESSION['postedForm']['adrApp'] != '' ? $_SESSION['postedForm']['adrApp'] : ''; ?>" minlength="2" maxlength="40" data-required/>
+ <input type="text" name="adrApp" id="adrApp" placeholder="Rue" class="form-control" value="<?php echo $_SESSION['postedForm']['adrApp'] != '' ? $_SESSION['postedForm']['adrApp'] : ''; ?>" minlength="2" maxlength="40" data-required/>
<label for="nameApp">NPA\Domicile *</label>
- <input type="text" name="NPAApp" placeholder="NPA\Domicile" class="form-control" value="<?php echo $_SESSION['postedForm']['NPAApp'] != '' ? $_SESSION['postedForm']['NPAApp'] : ''; ?>" minlength="2" maxlength="40" data-required/>
+ <input type="text" name="NPAApp" id="NPAApp" placeholder="NPA\Domicile" class="form-control" value="<?php echo $_SESSION['postedForm']['NPAApp'] != '' ? $_SESSION['postedForm']['NPAApp'] : ''; ?>" minlength="2" maxlength="40" data-required/>
<label for="telApp">Téléphone *</label>
- <input type="tel" name="telApp" placeholder="+41 21 123 45 67" class="form-control" value="<?php echo $_SESSION['postedForm']['telApp'] != '' ? $_SESSION['postedForm']['telApp'] : ''; ?>" minlength="2" maxlength="20" data-required/>
+ <input type="tel" name="telApp" id="telApp" placeholder="+41 21 123 45 67" class="form-control" value="<?php echo $_SESSION['postedForm']['telApp'] != '' ? $_SESSION['postedForm']['telApp'] : ''; ?>" minlength="2" maxlength="20" data-required/>
<label for="telApp">Mobile *</label>
- <input type="tel" name="phoneApp" placeholder="+41 79 123 45 67" class="form-control" value="<?php echo $_SESSION['postedForm']['phoneApp'] != '' ? $_SESSION['postedForm']['phoneApp'] : ''; ?>" minlength="2" maxlength="20" data-required/>
+ <input type="tel" name="phoneApp" id="phoneApp" placeholder="+41 79 123 45 67" class="form-control" value="<?php echo $_SESSION['postedForm']['phoneApp'] != '' ? $_SESSION['postedForm']['phoneApp'] : ''; ?>" minlength="2" maxlength="20" data-required/>
<label for="mailApp">Email *</label>
<input type="email" name="mailApp" id="mailApp" value="<?php echo $user;?>" class="form-control" readonly />
@@ -125,19 +125,19 @@
<small id="errorBirthdate" class="error" class="form-text text-muted"></small>
<label for="originApp">Lieu d'origine *</label>
- <input type="text" name="originApp" placeholder="Lieu d'origine" class="form-control" value="<?php echo $_SESSION['postedForm']['originApp'] != '' ? $_SESSION['postedForm']['originApp'] : ''; ?>" minlength="2" maxlength="35" data-required />
+ <input type="text" name="originApp" id="originApp" placeholder="Lieu d'origine" class="form-control" value="<?php echo $_SESSION['postedForm']['originApp'] != '' ? $_SESSION['postedForm']['originApp'] : ''; ?>" minlength="2" maxlength="35" data-required />
<label for="nationApp">Nationalité *</label>
- <input type="text" name="nationApp" placeholder="Nationalité" class="form-control" value="<?php echo $_SESSION['postedForm']['nationApp'] != '' ? $_SESSION['postedForm']['nationApp'] : ''; ?>" minlength="2" maxlength="30" data-required />
+ <input type="text" name="nationApp" id="nationApp" placeholder="Nationalité" class="form-control" value="<?php echo $_SESSION['postedForm']['nationApp'] != '' ? $_SESSION['postedForm']['nationApp'] : ''; ?>" minlength="2" maxlength="30" data-required />
<label for="permisEtrangerApp">Catégorie de permis pour étrangers</label>
- <input type="text" name="permisEtrangerApp" class="form-control" placeholder="Catégorie de permis pour étrangers" value="<?php echo $_SESSION['postedForm']['permisEtrangerApp'] != '' ? $_SESSION['postedForm']['permisEtrangerApp'] : ''; ?>" maxlength="1" />
+ <input type="text" name="permisEtrangerApp" id="permisEtrangerApp" class="form-control" placeholder="Catégorie de permis pour étrangers" value="<?php echo $_SESSION['postedForm']['permisEtrangerApp'] != '' ? $_SESSION['postedForm']['permisEtrangerApp'] : ''; ?>" maxlength="1" />
<label for="langApp">Langue maternelle *</label>
- <input type="text" name="langApp" placeholder="Langue maternelle" class="form-control" value="<?php echo $_SESSION['postedForm']['langApp'] != '' ? $_SESSION['postedForm']['langApp'] : ''; ?>" minlength="2" maxlength="20" data-required />
+ <input type="text" name="langApp" id="langApp" placeholder="Langue maternelle" class="form-control" value="<?php echo $_SESSION['postedForm']['langApp'] != '' ? $_SESSION['postedForm']['langApp'] : ''; ?>" minlength="2" maxlength="20" data-required />
<label for="avsNumber">Numéro AVS*</label>
- <input type="text" name="avsNumber" placeholder="Numéro AVS *" class="form-control" value="<?php echo $_SESSION['postedForm']['avsNumber'] != '' ? $_SESSION['postedForm']['avsNumber'] : ''; ?>" minlength="2" maxlength="20" data-required />
+ <input type="text" name="avsNumber" id="avsNumber" placeholder="Numéro AVS *" class="form-control" value="<?php echo $_SESSION['postedForm']['avsNumber'] != '' ? $_SESSION['postedForm']['avsNumber'] : ''; ?>" minlength="2" maxlength="20" data-required />
<div class="form-group">
<label>Connaissances linguistiques *</label>
diff --git a/canapEPFL/script.js b/canapEPFL/script.js
index 8262eac..8ee5187 100644
--- a/canapEPFL/script.js
+++ b/canapEPFL/script.js
@@ -17,10 +17,12 @@ function checkDate () {
var diff = cur - birthdate; // This is the difference in milliseconds
var age = Math.floor(diff / 31536000000); // Divide by 1000*60*60*24*365
- if (age <= 12 || birthdate.getFullYear() < 1910 || age > 60) {
+ if (birthdate == "Invalid Date" || age <= 12 || birthdate.getFullYear() < 1910 || age > 60) {
+ $('#birthApp').addClass("is-invalid");
document.getElementById('errorBirthdate').innerHTML = 'Date invalide';
}
else {
+ $('#birthApp').removeClass("is-invalid");
document.getElementById('errorBirthdate').innerHTML = '';
}
}
@@ -235,14 +237,21 @@ function showPolyAndInfoDivs(selectedFormation) {
function checkRequired() {
$("form").submit(function (e) {
+ let errsNumber = 0;
$($(this).find("[data-required]")).each(function () {
if ($(this).val() == '') {
- alert("Certains champs requis n'ont pas été remplis.");
+ $(this).addClass('is-invalid')
e.preventDefault();
- return false;
+ errsNumber++;
+ } else {
+ $(this).removeClass('is-invalid')
}
});
- return true;
+ // no error
+ if (errsNumber) {
+ alert('Certains champs requis n\'ont pas été remplis')
+ }
+ return errsNumber === 0;
});
}
\ No newline at end of file
--
GitLab