From 057f5d33be98aef91fb1bf3dad19f7200b29ce6d Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sun, 29 Nov 2015 17:46:50 +0100 Subject: [PATCH] =?UTF-8?q?Affinage=20pour=20les=20pages=20import/export?= =?UTF-8?q?=20corrig=C3=A9=20mais=20fonction=20g=C3=A9n=C3=A9rique=20?= =?UTF-8?q?=C3=A0=20d=C3=A9velopper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correction refactor et révision conceptuelle de l'affinage global --- js/pageManager.js | 2 +- page/_JS/groups.js | 5 ++--- page/_JS/modules.js | 7 ++++--- page/settings.php | 2 +- test.php | 2 -- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/js/pageManager.js b/js/pageManager.js index 998c1f6..1d40bd9 100755 --- a/js/pageManager.js +++ b/js/pageManager.js @@ -81,7 +81,7 @@ pageManager.prototype = { explodeURL: function(url_data){ url_data = (arguments.length >= 1) ? url_data : document.URL; // si pageList est correct et que l'URL correspond à un schéma de page => continue [sinon] return null - if( this.pagelist != null && /^(?:.+)\/#\/([a-z0-9_]+)\/?(?:\/((?:[a-z0-9:_]+\/)+)\/?)?$/i.test(url_data) ){ + if( this.pagelist != null && /^(?:.+)\/#\/([a-z0-9_]+)\/?(?:\/((?:.+\/)+)\/?)?$/i.test(url_data) ){ // si la page récupérée dans l'url est dans la liste => renvoi de l'objet [sinon] null var vars = RegExp.$2.split('/'); while( vars[vars.length-1] == '' ) // on supprime les dernières entrées vides diff --git a/page/_JS/groups.js b/page/_JS/groups.js index 8a40682..a1f504d 100755 --- a/page/_JS/groups.js +++ b/page/_JS/groups.js @@ -94,7 +94,7 @@ if( document.querySelector('#CONTAINER section[name=movestudents]') != null ){ / var selectList = document.querySelectorAll("#CONTAINER > section[name] > select[name=groupe], #CONTAINER > section[name] > .p > select[name=annee]"); var partList = document.querySelectorAll("#CONTAINER > section[name] > table.partlist[name=semestre], "+ "#CONTAINER > section[name] > table.partlist[name=formation], "+ - "#CONTAINER > section[name] > .p > div.partlist[name=semestre] > span[data-stre][data-frm]"); + "#CONTAINER > section[name] > .p > div.partlist[name=semestre] > span[data-stre]"); // GESTION DE L'AFFINAGE PAR FORMATION/SEMESTRE // for( var i = 0 ; i < partList.length ; i++ ){ @@ -117,8 +117,7 @@ for( var i = 0 ; i < partList.length ; i++ ){ pageM.vars[2] = 's:'+e.target.dataset.value; // affinage par semestre (exportation) - }else if( e.target.parentNode.getAttribute('name') == 'semestre' && e.target.dataset.hasOwnProperty('stre') && e.target.dataset.hasOwnProperty('frm') ){ - pageM.vars[1] = 'f:'+e.target.dataset.frm; + }else if( e.target.parentNode.getAttribute('name') == 'semestre' && e.target.dataset.hasOwnProperty('stre') ){ pageM.vars[2] = 's:'+e.target.dataset.stre; } diff --git a/page/_JS/modules.js b/page/_JS/modules.js index 3c7a9e9..8a03f86 100755 --- a/page/_JS/modules.js +++ b/page/_JS/modules.js @@ -9,11 +9,13 @@ var selectList = document.querySelectorAll("#CONTAINER > section[name] > .p > se var partList = document.querySelectorAll("#CONTAINER > section[name] > table.partlist[name=UE], "+ "#CONTAINER > section[name] > table.partlist[name=semestre], "+ "#CONTAINER > section[name] > table.partlist[name=formation], "+ - "#CONTAINER > section[name] > .p > div.partlist[name=semestre] > span[data-stre][data-frm]"); + "#CONTAINER > section[name] > .p > div.partlist[name=semestre] > span[data-stre]"); for( var i = 0 ; i < partList.length ; i++ ){ + partList[i].addEventListener('click', function(e){ + var tableauParent = e.target.parentNode.parentNode.parentNode; if( tableauParent.tagName == 'TABLE' && e.target.dataset.hasOwnProperty('value') ){ @@ -33,8 +35,7 @@ for( var i = 0 ; i < partList.length ; i++ ){ if( tableauParent.getAttribute('name') == 'UE' ) pageM.vars[2] = 'u:'+e.target.dataset.value; - }else if( e.target.parentNode.getAttribute('name') == 'semestre' && e.target.dataset.hasOwnProperty('stre') && e.target.dataset.hasOwnProperty('frm') ){ - pageM.vars[1] = 'f:'+e.target.dataset.frm; + }else if( e.target.parentNode.getAttribute('name') == 'semestre' && e.target.dataset.hasOwnProperty('stre')){ pageM.vars[2] = 's:'+e.target.dataset.stre; } diff --git a/page/settings.php b/page/settings.php index 32b652b..86a6fba 100755 --- a/page/settings.php +++ b/page/settings.php @@ -46,7 +46,7 @@ require_once __ROOT__.'/manager/modules.php'; /***************/ /*** PROFILE ***/ /***************/ -if( false && connected() ){ // si l'utilisateur est connecté +if( connected() ){ // si l'utilisateur est connecté echo "
"; echo 'profil'; echo '
'; diff --git a/test.php b/test.php index 89cb4d4..72ce93a 100755 --- a/test.php +++ b/test.php @@ -46,8 +46,6 @@ require_once __ROOT__.'/manager/security.php'; debug(); -var_dump( explode(',', '') ); - var_dump($_SESSION); // $_SESSION['annee'] = 2015;