From 52c787493f70876bdab7e3c98d0c3a2522d2b9a2 Mon Sep 17 00:00:00 2001
From: nicrausaz <n.crausaz99@gmail.com>
Date: Mon, 25 Feb 2019 11:18:16 +0100
Subject: [PATCH] un-collapse infos by default
---
canapEPFL/script.js | 21 ++++++++++++-------
.../viewPostulationTables/filesTables.php | 4 ++--
.../personnalInfosTable.php | 5 +++--
.../practicesInfosTable.php | 4 ++--
.../proActivitiesInfosTable.php | 4 ++--
.../responsiblesInfosTable.php | 4 ++--
.../scolaritiesInfosTable.php | 4 ++--
7 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/canapEPFL/script.js b/canapEPFL/script.js
index 9146b0a..3260d8f 100644
--- a/canapEPFL/script.js
+++ b/canapEPFL/script.js
@@ -11,10 +11,11 @@ $(document).ready(function () {
}
if (location.pathname.split("/").slice(-1)[0] == "viewpostulation.php") {
initPostulationChange();
+ initEdits();
}
});
-function checkDate () {
+function checkDate() {
var birthdate = $("#birthApp").val();
var birthdate_year = birthdate.split('/')[2];
var current_year = new Date().getFullYear();
@@ -69,7 +70,7 @@ function checkFileFormat(obj) {
var allowedExtensions = ['pdf', 'jpeg', 'png', 'jpg'];
var fileExtension = obj.value.split('.').pop().toLowerCase();
- allowedExtensions.indexOf(fileExtension) != -1 || !obj.value ? errorZone.innerHTML = '' : errorZone.innerHTML = 'Format invalide';
+ allowedExtensions.indexOf(fileExtension) != -1 || !obj.value ? errorZone.innerHTML = '' : errorZone.innerHTML = 'Format invalide';
}
function checkYearDate(toCheckValue, errorZone, coefficiantYear) {
@@ -138,10 +139,10 @@ function initAddChildButtons() {
$('#addInputFile').click(function () {
var nextIndex = $('#newCertifZone > tbody').children().length + 1;
if (nextIndex < 10) {
- $('#newCertifZone').append('<tr><td><label for="certifs'+ nextIndex +'">Annexe supplémentaire</label><br>'
- + '<input type="file" name="certifs'+ nextIndex +'" class="upload-input" id="certifs'+ nextIndex +'" onchange="changeTitleFile(this)"/>'
- + '<label for="certifs'+ nextIndex +'" class="btn btn-secondary btn-sm icon-right">Choisir...</label><br>'
- + '<small class="error" class="form-text text-muted"></small></td></tr>');
+ $('#newCertifZone').append('<tr><td><label for="certifs' + nextIndex + '">Annexe supplémentaire</label><br>'
+ + '<input type="file" name="certifs' + nextIndex + '" class="upload-input" id="certifs' + nextIndex + '" onchange="changeTitleFile(this)"/>'
+ + '<label for="certifs' + nextIndex + '" class="btn btn-secondary btn-sm icon-right">Choisir...</label><br>'
+ + '<small class="error" class="form-text text-muted"></small></td></tr>');
if (nextIndex == 9) {
$('#addInputFile').hide(750);
}
@@ -252,13 +253,17 @@ function showPolyAndInfoDivs(selectedFormation) {
}
}
-function initPostulationChange () {
+function initPostulationChange() {
$('#selectPost').on('change', function () {
document.forms['postSelector'].submit();
});
}
-function checkRequired () {
+function initEdits() {
+
+}
+
+function checkRequired() {
$("form").submit(function (e) {
let errsNumber = 0;
diff --git a/canapEPFL/templates/viewPostulationTables/filesTables.php b/canapEPFL/templates/viewPostulationTables/filesTables.php
index df70994..1396619 100644
--- a/canapEPFL/templates/viewPostulationTables/filesTables.php
+++ b/canapEPFL/templates/viewPostulationTables/filesTables.php
@@ -1,10 +1,10 @@
<?php
$files = getFilesById($pdo, $postulation['applicant_id']);
?>
-<button class="collapse-title collapse-title-desktop collapsed" type="button" data-toggle="collapse" data-target="#collapse-files" aria-expanded="true" aria-controls="collapse-files">
+<button class="collapse-title collapse-title-desktop" type="button" data-toggle="collapse" data-target="#collapse-files" aria-expanded="false" aria-controls="collapse-files">
Annexes
</button>
-<div class="collapse collapse-item collapse-item-desktop" id="collapse-files">
+<div class="collapse collapse-item show collapse-item-desktop" id="collapse-files">
<table class="table table-boxed mb-5">
<thead>
<tr>
diff --git a/canapEPFL/templates/viewPostulationTables/personnalInfosTable.php b/canapEPFL/templates/viewPostulationTables/personnalInfosTable.php
index 6f4717b..5eca63d 100644
--- a/canapEPFL/templates/viewPostulationTables/personnalInfosTable.php
+++ b/canapEPFL/templates/viewPostulationTables/personnalInfosTable.php
@@ -1,7 +1,8 @@
-<button class="collapse-title collapse-title-desktop collapsed" type="button" data-toggle="collapse" data-target="#collapse-infosperso" aria-expanded="true" aria-controls="collapse-infosperso">
+<button class="collapse-title collapse-title-desktop" type="button" data-toggle="collapse" data-target="#collapse-infosperso" aria-expanded="false" aria-controls="collapse-infosperso">
Informations personnelles
</button>
-<div class="collapse collapse-item collapse-item-desktop" id="collapse-infosperso">
+
+<div class="collapse collapse-item show collapse-item-desktop" id="collapse-infosperso">
<table class="table table-boxed mb-5">
<thead>
<tr>
diff --git a/canapEPFL/templates/viewPostulationTables/practicesInfosTable.php b/canapEPFL/templates/viewPostulationTables/practicesInfosTable.php
index 55e6566..5fd95f5 100644
--- a/canapEPFL/templates/viewPostulationTables/practicesInfosTable.php
+++ b/canapEPFL/templates/viewPostulationTables/practicesInfosTable.php
@@ -1,10 +1,10 @@
<?php
$trainings = getTrainingById($pdo, $postulation['applicant_id']);
?>
-<button class="collapse-title collapse-title-desktop collapsed" type="button" data-toggle="collapse" data-target="#collapse-practices" aria-expanded="true" aria-controls="collapse-practices">
+<button class="collapse-title collapse-title-desktop" type="button" data-toggle="collapse" data-target="#collapse-practices" aria-expanded="false" aria-controls="collapse-practices">
Stages
</button>
-<div class="collapse collapse-item collapse-item-desktop" id="collapse-practices">
+<div class="collapse collapse-item show collapse-item-desktop" id="collapse-practices">
<?php if (count($trainings) < 1) { ?>
<p style="text-align: center;">Aucune donnée fournie</p>
<?php } ?>
diff --git a/canapEPFL/templates/viewPostulationTables/proActivitiesInfosTable.php b/canapEPFL/templates/viewPostulationTables/proActivitiesInfosTable.php
index 1f5b502..3523157 100644
--- a/canapEPFL/templates/viewPostulationTables/proActivitiesInfosTable.php
+++ b/canapEPFL/templates/viewPostulationTables/proActivitiesInfosTable.php
@@ -1,10 +1,10 @@
<?php
$proactivities = getProActivitiesById($pdo, $postulation['applicant_id']);
?>
-<button class="collapse-title collapse-title-desktop collapsed" type="button" data-toggle="collapse" data-target="#collapse-pro" aria-expanded="true" aria-controls="collapse-pro">
+<button class="collapse-title collapse-title-desktop" type="button" data-toggle="collapse" data-target="#collapse-pro" aria-expanded="false" aria-controls="collapse-pro">
Activités professionnelles
</button>
-<div class="collapse collapse-item collapse-item-desktop" id="collapse-pro">
+<div class="collapse collapse-item show collapse-item-desktop" id="collapse-pro">
<?php if (count($proactivities) < 1) { ?>
<p style="text-align: center;">Aucune donnée fournie</p>
<?php } ?>
diff --git a/canapEPFL/templates/viewPostulationTables/responsiblesInfosTable.php b/canapEPFL/templates/viewPostulationTables/responsiblesInfosTable.php
index fbac2d5..33b3084 100644
--- a/canapEPFL/templates/viewPostulationTables/responsiblesInfosTable.php
+++ b/canapEPFL/templates/viewPostulationTables/responsiblesInfosTable.php
@@ -2,10 +2,10 @@
$main_resp = getResponsibleById($pdo, $postulation['fk_applicant_main_responsible'])[0];
$sec_resp = getResponsibleById($pdo, $postulation['fk_applicant_sec_responsible'])[0];
?>
-<button class="collapse-title collapse-title-desktop collapsed" type="button" data-toggle="collapse" data-target="#collapse-responsibles" aria-expanded="true" aria-controls="collapse-responsibles">
+<button class="collapse-title collapse-title-desktop" type="button" data-toggle="collapse" data-target="#collapse-responsibles" aria-expanded="false" aria-controls="collapse-responsibles">
Représentants
</button>
-<div class="collapse collapse-item collapse-item-desktop" id="collapse-responsibles">
+<div class="collapse collapse-item show collapse-item-desktop" id="collapse-responsibles">
<?php if (!$main_resp) { ?>
<p style="text-align: center;">Aucune donnée fournie</p>
<?php } ?>
diff --git a/canapEPFL/templates/viewPostulationTables/scolaritiesInfosTable.php b/canapEPFL/templates/viewPostulationTables/scolaritiesInfosTable.php
index 61c8a00..84742c2 100644
--- a/canapEPFL/templates/viewPostulationTables/scolaritiesInfosTable.php
+++ b/canapEPFL/templates/viewPostulationTables/scolaritiesInfosTable.php
@@ -1,10 +1,10 @@
<?php
$scolarites = getScolaritiesById($pdo, $postulation['applicant_id']);
?>
-<button class="collapse-title collapse-title-desktop collapsed" type="button" data-toggle="collapse" data-target="#collapse-scolarite" aria-expanded="true" aria-controls="collapse-scolarite">
+<button class="collapse-title collapse-title-desktop" type="button" data-toggle="collapse" data-target="#collapse-scolarite" aria-expanded="false" aria-controls="collapse-scolarite">
Scolarité
</button>
-<div class="collapse collapse-item collapse-item-desktop" id="collapse-scolarite">
+<div class="collapse collapse-item show collapse-item-desktop" id="collapse-scolarite">
<?php if (count($scolarites) < 1) { ?>
<p style="text-align: center;">Aucune donnée fournie</p>
<?php } ?>
--
GitLab