diff --git a/application/controllers/ArborescenceController.php b/application/controllers/ArborescenceController.php index 9e488930..5c03dd9c 100644 --- a/application/controllers/ArborescenceController.php +++ b/application/controllers/ArborescenceController.php @@ -8,15 +8,15 @@ class ArborescenceController extends Zend_Controller_Action { $this->_helper->layout()->disableLayout(); - $request = $this->getRequest(); - $key = $request->getParam('key'); + $request = $this->getRequest(); + $key = $request->getParam('key'); $this->view->assign('key', $key); //Récupération des valeurs enregistrées en session require_once 'Scores/SessionCiblage.php'; - $sessionCiblage = new SessionCiblage(); - $val = $sessionCiblage->getCritere($key); - $valuesChecked = array(); + $sessionCiblage = new SessionCiblage(); + $val = $sessionCiblage->getCritere($key); + $valuesChecked = array(); $valuesUndetermined = array(); if ($val != null){ $valuesChecked = explode(',',$val); @@ -26,17 +26,17 @@ class ArborescenceController extends Zend_Controller_Action } $niveau = $request->getParam('niveau', 1); - $nafM = new Application_Model_Naf(); - $sql = $nafM->select()->where('niveau = ?', $niveau)->order('code ASC'); + $nafM = new Application_Model_Naf(); + $sql = $nafM->select()->where('niveau = ?', $niveau)->order('code ASC'); $result = $nafM->fetchAll($sql)->toArray(); $tabNaf = array(); foreach($result as $item) { $structure = array( - 'data' => $item['code'].' - '.$item['lib'], - 'attr' => array('id' => $item['code'], 'niveau' => $item['niveau']), - 'state' => 'closed', - 'children' => array(), + 'data' => $item['code'].' - '.$item['lib'], + 'attr' => array('id' => $item['code'], 'niveau' => $item['niveau']), + 'state' => 'closed', + 'children' => array(), ); if (in_array($item['code'], $valuesChecked)){ $structure['attr']['class'] = 'jstree-checked'; @@ -57,14 +57,15 @@ class ArborescenceController extends Zend_Controller_Action $this->_helper->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $request = $this->getRequest(); - $key = $request->getParam('key'); + $request = $this->getRequest(); + $key = $request->getParam('key'); //Récupération des valeurs enregistrées en session require_once 'Scores/SessionCiblage.php'; $sessionCiblage = new SessionCiblage(); - $val = $sessionCiblage->getCritere($key); - $valuesChecked = array(); + $val = $sessionCiblage->getCritere($key); + $valuesChecked = array(); + $valuesUndetermined = array(); if ($val != null){ $valuesChecked = explode(',',$val); @@ -73,12 +74,12 @@ class ArborescenceController extends Zend_Controller_Action } } - $request = $this->getRequest(); - $niveau = $request->getParam('niveau', 1); + $request = $this->getRequest(); + $niveau = $request->getParam('niveau', 1); $niveau++; - $parent = $request->getParam('parent', ''); - $nafM = new Application_Model_Naf(); - $sql = $nafM->select(); + $parent = $request->getParam('parent', ''); + $nafM = new Application_Model_Naf(); + $sql = $nafM->select(); if (!empty($parent) && $niveau==2) { $sql->where('parent = ?', $parent); } elseif (!empty($parent) && $niveau>2) { @@ -113,15 +114,15 @@ class ArborescenceController extends Zend_Controller_Action $out = array(); if (strlen($value)>2) { $niveau = strlen($value)-1; - $new = substr($value,0,$niveau); - $out = array_merge($out, array($new), $this->getNafParent($new, $niveau1)); + $new = substr($value,0,$niveau); + $out = array_merge($out, array($new), $this->getNafParent($new, $niveau1)); } elseif (strlen($value)==2 && $niveau1 === true) { - $nafM = new Application_Model_Naf(); - $sql = $nafM->select() + $nafM = new Application_Model_Naf(); + $sql = $nafM->select() ->from($nafM, array('parent')) ->where('code = ?', $value); $result = $nafM->fetchRow($sql); - $out[] = $result->parent; + $out[] = $result->parent; } return $out; } @@ -137,8 +138,9 @@ class ArborescenceController extends Zend_Controller_Action $this->view->inlineScript()->appendFile('/themes/default/scripts/jquery.jstree.js'); require_once 'Scores/SessionCiblage.php'; - $session = new SessionCiblage(); - $val = $session->getCritere('adr_cp'); + $session = new SessionCiblage(); + $val = $session->getCritere('adr_cp'); + $valuesCheckeds = explode(',', $val); if(count($valuesCheckeds) > 0) { for($i=0;count($valuesCheckeds) > $i;$i++) { @@ -151,10 +153,10 @@ class ArborescenceController extends Zend_Controller_Action $values = explode(',', $val); foreach($values as $valuesChecked) { if(strlen($valuesChecked) == 5) { - $dept = substr($valuesChecked, 0, 2); - $table = new Application_Model_Departements(); - $sql = $table->select()->from('departements', array('codeRegionInsee'))->where('numdep = ?',$dept); - $results = $table->fetchAll($sql)->toArray(); + $dept = substr($valuesChecked, 0, 2); + $table = new Application_Model_Departements(); + $sql = $table->select()->from('departements', array('codeRegionInsee'))->where('numdep = ?',$dept); + $results = $table->fetchAll($sql)->toArray(); foreach($results as $result) { $valuesUndetermined[] = $result['codeRegionInsee']; } @@ -162,8 +164,8 @@ class ArborescenceController extends Zend_Controller_Action if(substr($valuesChecked, 0, 1) == 'R') { $valuesCheckeds[] = substr($valuesChecked, 1); } else if (substr($valuesChecked, 0, 1) == 'D') { - $table = new Application_Model_Departements(); - $sql = $table->select()->from('departements', array('codeRegionInsee'))->where('numdep = ?', substr($valuesChecked, 1)); + $table = new Application_Model_Departements(); + $sql = $table->select()->from('departements', array('codeRegionInsee'))->where('numdep = ?', substr($valuesChecked, 1)); $result = $table->fetchAll($sql)->toArray(); foreach($result as $item) { $valuesUndetermined[] = $item['codeRegionInsee']; @@ -175,17 +177,17 @@ class ArborescenceController extends Zend_Controller_Action $key = $this->getRequest()->getParam('key'); $this->view->assign('key', $key); - $regionsM = new Application_Model_Regions(); - $sql = $regionsM->select()->from('regions'); - $regions = $regionsM->fetchAll()->toArray(); + $regionsM = new Application_Model_Regions(); + $sql = $regionsM->select()->from('regions'); + $regions = $regionsM->fetchAll()->toArray(); - $structure = array(); + $structure = array(); foreach($regions as $region) { $structure = array( - 'data' => $region['NCCENR'], - 'attr' => array('id' => 'R'.$region['REGION'], 'niveau' => 0), - 'state' => 'closed', - 'children' => array() + 'data' => $region['NCCENR'], + 'attr' => array('id' => 'R'.$region['REGION'], 'niveau' => 0), + 'state' => 'closed', + 'children' => array() ); if(in_array($region['REGION'], $valuesCheckeds)) { $structure['attr']['class'] = 'jstree-checked'; @@ -203,16 +205,17 @@ class ArborescenceController extends Zend_Controller_Action $this->_helper->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $request = $this->getRequest(); - $key = $request->getParam('key'); - $id = $request->getParam('id'); + $request = $this->getRequest(); + $key = $request->getParam('key'); + $id = $request->getParam('id'); if($id[0] == 'R') { require_once 'Scores/SessionCiblage.php'; - $session = new SessionCiblage(); - $val = $session->getCritere('adr_cp'); - $valuesCheckeds = array(); + $session = new SessionCiblage(); + $val = $session->getCritere('adr_cp'); + $valuesCheckeds = array(); $valuesUndetermined = array(); + if($val != null) { $values = explode(',', $val); @@ -234,8 +237,8 @@ class ArborescenceController extends Zend_Controller_Action } } $region = substr($request->getParam('id'), 1); - $deps = new Application_Model_Departements(); - $sql = $deps->select() + $deps = new Application_Model_Departements(); + $sql = $deps->select() ->from('departements') ->where('codeRegionInsee = ?', $region); $departements = $deps->fetchAll($sql)->toArray(); @@ -255,35 +258,35 @@ class ArborescenceController extends Zend_Controller_Action $departementTab[] = $structure; } echo json_encode($departementTab); - } else if($id[0] == 'D') { + } else if ($id[0] == 'D') + { require_once 'Scores/SessionCiblage.php'; - $session = new SessionCiblage(); - $val = $session->getCritere('adr_cp'); + $session = new SessionCiblage(); + $val = $session->getCritere('adr_cp'); $valuesCheckeds = array(); if($val != null) { $values = explode(',', $val); - //print_r($values); foreach($values as $valuesChecked) { if(strlen($valuesChecked) == 5) { $valuesCheckeds[] = $valuesChecked; } else if(substr($valuesChecked, 0, 1) == 'D') { - $table = new Application_Model_Codepostaux(); - $sql = $table->select()->from('codepostaux', array('Codepos'))->where('Codepos LIKE "'.substr($valuesChecked, 1).'%"'); - $results = $table->fetchAll($sql)->toArray(); + $table = new Application_Model_Codepostaux(); + $sql = $table->select()->from('codepostaux', array('Codepos'))->where('Codepos LIKE "'.substr($valuesChecked, 1).'%"'); + $results = $table->fetchAll($sql)->toArray(); foreach($results as $result) { if(!in_array($result['Codepos'], $values)) $valuesCheckeds[] = $result['Codepos']; } } else if (substr($valuesChecked, 0, 1) == 'R') { - $Departements= new Application_Model_Departements(); - $sql = $Departements->select()->from('departements', array('numdep'))->where('codeRegionInsee = ?', substr($valuesChecked, 1)); - $results = $Departements->fetchAll($sql)->toArray(); + $Departements = new Application_Model_Departements(); + $sql = $Departements->select()->from('departements', array('numdep'))->where('codeRegionInsee = ?', substr($valuesChecked, 1)); + $results = $Departements->fetchAll($sql)->toArray(); foreach($results as $result) { - $table = new Application_Model_Codepostaux(); - $sql = $table->select()->from('codepostaux', array('Codepos'))->where('Codepos LIKE "'.$result['numdep'].'%"'); - $codes = $table->fetchAll($sql)->toArray(); + $table = new Application_Model_Codepostaux(); + $sql = $table->select()->from('codepostaux', array('Codepos'))->where('Codepos LIKE "'.$result['numdep'].'%"'); + $codes = $table->fetchAll($sql)->toArray(); foreach($codes as $code) { if(!in_array($result['Codepos'], $values)) $valuesCheckeds[] = $code['Codepos']; @@ -293,12 +296,12 @@ class ArborescenceController extends Zend_Controller_Action } } $numdep = substr($request->getParam('id'), 1); - $code = new Application_Model_Codepostaux(); - $sql = $code->select() + $code = new Application_Model_Codepostaux(); + $sql = $code->select() ->from('codepostaux') ->where('Codepos LIKE "'.$numdep.'%"'); $codePostaux = $code->fetchAll($sql)->toArray(); - + foreach($codePostaux as $codePostau) { $structure = array( 'data' => '[ '.$codePostau['Codepos'].' ]'.ucfirst(strtolower($codePostau['Commune'])), @@ -319,7 +322,7 @@ class ArborescenceController extends Zend_Controller_Action */ public function juridqueAction() { - + $valeurs = $this>getRequest()->getParam(''); } diff --git a/application/controllers/CriteresController.php b/application/controllers/CriteresController.php index dd5fc55c..a5d0c417 100644 --- a/application/controllers/CriteresController.php +++ b/application/controllers/CriteresController.php @@ -19,14 +19,24 @@ class CriteresController extends Zend_Controller_Action } } - public function entrepriseAction(){} + public function entrepriseAction(){ + $this->view->headLink()->appendStylesheet('/themes/default/styles/criteres/'.$this->getRequest()->getActionName().'.css', 'all'); + } - public function economiqueAction(){} + public function economiqueAction(){ + $this->view->headLink()->appendStylesheet('/themes/default/styles/criteres/'.$this->getRequest()->getActionName().'.css', 'all'); + } - public function geographiqueAction(){} + public function geographiqueAction(){ + $this->view->headLink()->appendStylesheet('/themes/default/styles/criteres/'.$this->getRequest()->getActionName().'.css', 'all'); + } - public function juridiqueAction(){} + public function juridiqueAction(){ + $this->view->headLink()->appendStylesheet('/themes/default/styles/criteres/'.$this->getRequest()->getActionName().'.css', 'all'); + } - public function financiereAction(){} + public function financiereAction(){ + $this->view->headLink()->appendStylesheet('/themes/default/styles/criteres/'.$this->getRequest()->getActionName().'.css', 'all'); + } } diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index d93275c0..a022f9fe 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -22,11 +22,12 @@ class IndexController extends Zend_Controller_Action $auth = Zend_Auth::getInstance(); $user = $auth->getIdentity(); - + $session = new SessionCiblage(); //Chargement de la structure des champs et des préférences utilisateurs require_once 'Scores/Field.php'; $fields = new Fields($user->username); - $this->view->fields = $fields; + $this->view->fields = $fields; + $this->view->criteres = $session->getCriteres(); } public function resetAction()