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

ajout exclusion et corrections

Browse Source
This commit is contained in:
Damien LASSERRE 2012-04-13 08:56:39 +00:00
parent d2cd06d96b
commit 75c0391a19
9 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/modules/frontend/models/Objects/Dashboard.php
View File

@ -60,7 +60,7 @@ Class Object_Dashboard
)
->where('criteres.idClient = ?', $user->idClient)
->where('criteres.login = ?', $user->username)
->where('i.idComptage = ?', $idComptage);
->where('i.idCriteres = ?', $idComptage);
return ($enrichissements->fetchAll($sql));
}

8
application/modules/frontend/views/scripts/dashboard/ciblage.phtml
View File

@ -63,7 +63,13 @@
<th><?=$item['dateAdded']?></th>
<th><?=$item['reference']?></th>
<th><?=number_format($item['nbLigneTotales'], 0, '', ' ')?></th>
<td><a href="/enrichissement/download/fichier/<?php echo $item['fichier'];?>"><?php echo $item['fichier']; ?></a></td>
<td>
<?php if($item['dateStart']>0): ?>
<a href="/enrichissement/download/id/<?php echo $item['id'];?>"><?php echo $item['fichier']; ?></a>
<?php else: ?>
En attente de traitement
<?php endif; ?>
</td>
</tr>
<?php endforeach;?>
</tbody>

2
application/modules/frontend/views/scripts/dashboard/enrichissements.phtml
View File

@ -58,7 +58,7 @@ Enrichissement à partir d'un ciblage
<td><?=$item['reference']?></td>
<td><?=number_format($item['nbLigneTotales'], 0, ',', ' ')?></td>
<td><?=$item['dateAdded']?></td>
<td><a href="/enrichissement/download/fichier/<?php echo $item['fichier'];?>"><?php echo $item['fichier']; ?></a></td>
<td><a href="/enrichissement/download/id/<?php echo $item['id'];?>"><?php echo $item['fichier']; ?></a></td>
</tr>
<?php endforeach;?>
</tbody>

2
application/modules/frontend/views/scripts/dashboard/index.phtml
View File

@ -72,7 +72,7 @@
<td><?=$item['dateAdded']?></td>
<td>
<?php if ( $item['dateStop']!='0000-00-00 00:00:00' ) {?>
<a href="/enrichissement/download/fichier/<?php echo $item['fichier'];?>"><?php echo $item['fichier']; ?></a>
<a href="/enrichissement/download/id/<?php echo $item['id'];?>"><?php echo $item['fichier']; ?></a>
<?php }elseif ( $item['dateStart']!='0000-00-00 00:00:00' ) {?>
En cours de traitement
<?php } else {?>

5
application/modules/frontend/views/scripts/geographique/index.phtml
View File

@ -1,6 +1,11 @@
<div id="geographique">
<ul id="fieldsblock">
<li><?php echo $this->Field('adr_com', $this->fields->get('adr_com'));?></li>
<li style="height:50px;background-image:none">
Exclure DOM-TOM <input style="float:right" value="1" type="checkbox" class="ex_prede" name="ex_domtom" /><br />
Exclure Etranger <input style="float:right" value="1" type="checkbox" class="ex_prede" name="ex_entr" /><br />
Exclure Corse <input style="float:right" value="1" type="checkbox" class="ex_prede" name="ex_corse" /><br />
</li>
<li>
<p style="float:left;"><b>Selection manuelle</b></p>
<a class="manuel" ref="localisation" style="margin-right:10px;color:blue;font-size:10px;">

2
application/modules/frontend/views/scripts/index/criteres.phtml
View File

@ -26,7 +26,7 @@ a
</tr>
<?php $color = 0;foreach($this->criteres as $critere => $valeur):?>
<?php $label = $this->field->get($critere); ?>
<?php if($valeur != 'tous' and $valeur != null and $valeur != 'null' and $valeur != ','):?>
<?php if($valeur != 'tous' and $valeur != null and $valeur != 'null' and $valeur != ',' and !empty($valeur)):?>
<?php if(!is_array($valeur)) {$valeur = explode(',', $valeur);} ?>
<tr <?php echo ((($color%2) == 0)?'class="color"':''); $color++;?>>
<td valign="top" style="padding:5px;width:150px">

22
library/Scores/Ciblage.php
View File

@ -70,8 +70,6 @@ Class Ciblage
{
$this->sphinx->SetFilter('presentrcs', array(0));
$resSphinx = $this->sphinx->Query($this->alpha, $this->index);
if(empty($resSphinx['total_found']))
return (0);
return ($resSphinx['total_found']);
}
protected function getSiret($structure)
@ -97,7 +95,7 @@ Class Ciblage
if(is_array($resSphinx))
$return = array_merge($return, $this->getSiret($resSphinx));
$limit = $limit + 1000;
}while($limit < ($limitD)?$limitD:$resSphinx['total_found']);
}while($limit < (($limitD)?$limitD:$resSphinx['total_found']));
return ($return);
} else
$resSphinx = $this->sphinx->Query($this->alpha, $this->index);
@ -197,6 +195,24 @@ Class Ciblage
protected function adr_com($valeur) {
$this->setAlpha('adr_com', $valeur);
}
protected function ex_domtom($valeur)
{
if($valeur == 1) {
$this->setAlpha('adr_dept_ex', array(971, 972, 973, 974, 976), true);
}
}
protected function ex_entr($valeur)
{
if($valeur == 1) {
$this->setAlpha('adr_dept_ex', array(986, 987, 988), true);
}
}
protected function ex_corse($valeur)
{
if($valeur == 1) {
$this->setAlpha('adr_dept_ex', array(200), true);
}
}
protected function adr_com_ex($valeur) {
$this->setAlpha('adr_com_ex', $valeur, true);
}

8
public/themes/default/scripts/fields.js
View File

@ -211,6 +211,14 @@ $(document).ready(function()
$('#'+$(this).attr('name')+'_ex').css('display', 'none');
}
});
$('.ex_prede').click(function(){
if($(this).is(':checked')) {
set($(this).attr('name'), 1);
} else {
set($(this).attr('name'), 0)
}
});
});
function set(key, value)

2
public/themes/default/scripts/scripts.js
View File

@ -41,7 +41,7 @@ $(document).ready(function(){
$(this).load(href);
},
buttons: {
Enrichire : function() {
Commander : function() {
$(this).load('/comptage/savedialog');
},
Annuler: function() { $(this).dialog('close'); }