scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction filtrage surveillance

Browse Source
This commit is contained in:
Michael RICOIS 2011-09-09 14:54:05 +00:00
parent 155337fc0a
commit f7af25aa74
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
application/controllers/SurveillanceController.php
View File

@ -223,7 +223,6 @@ class SurveillanceController extends Zend_Controller_Action
->appendStylesheet('/themes/default/styles/surveillance.css', 'all');
$this->view->headScript()
->appendFile('/themes/default/scripts/jquery.qtip.js', 'text/javascript')
->appendFile('/themes/default/scripts/jquery.tablesorter.js', 'text/javascript')
->appendFile('/themes/default/scripts/surveillance.js', 'text/javascript');
@ -318,24 +317,35 @@ class SurveillanceController extends Zend_Controller_Action
}
}
} else {
$permSource = array();
$permSource[] = $source;
$listTrier = array();
if (count($surveillances)>0) {
foreach ($surveillances as $item) {
$listTrier[]['source'] = $item->source;
$listTrier[]['email'] = $item->email;
$listTrier[]['siren'] = $item->siren;
$listTrier[]['nic'] = $item->nic;
$listTrier[]['ref'] = $item->ref;
$listTrier[]['dateAjout'] = $item->dateAjout;
$listTrier[]['encoursClient'] = $item->encoursClient;
$listTrier[]['rs'] = $item->rs;
$listTrier[]['cp'] = $item->cp;
$listTrier[]['ville'] = $item->ville;
$listTrier[]['dateDerEnvoi'] = $item->dateDerEnvoi;
$data = array();
$data['sources'][$item->source][0] = array(
'email' => $item->email,
'ref' => $item->ref,
'dateAjout' => $item->dateAjout,
'dateDerEnvoi' => $item->dateDerEnvoi,
);
$data['email'] = $item->email;
$data['siren'] = $item->siren;
$data['nic'] = $item->nic;
$data['ref'] = $item->ref;
$data['dateAjout'] = $item->dateAjout;
$data['encoursClient'] = $item->encoursClient;
$data['rs'] = $item->rs;
$data['cp'] = $item->cp;
$data['ville'] = $item->ville;
$data['dateDerEnvoi'] = $item->dateDerEnvoi;
$listTrier[] = $data;
}
}
}
Zend_Registry::get('firebug')->info($listTrier);
//Calcul pagination
$nbReponses = $infos->nbReponses;
$nbSurveillances = $infos->nbReponsesTotal;

3
application/views/default/scripts/surveillance/liste.phtml
View File

@ -31,7 +31,6 @@ if ( empty($this->source) ){
<h2>Extraction des surveillances</h2>
<?=$this->action('surveillancecsv', 'surveillance')?>
<h2>Options de tri</h2>
<div class="paragraph">
<label>Afficher uniquement les suveillances de type</label>
@ -229,7 +228,7 @@ if ( empty($this->source) ){
$(document).ready(function() {
$('select[name=type]').change(function() {
var value = $(this).val();
window.location.href = '<?=$this->url(array('action'=>'liste'))?>/source/' + value;
window.location.href = '<?=$this->url(array('controller'=>'surveillance' , 'action'=>'liste'), null, true)?>/source/' + value;
});
<?php
if ($source == '') {