diff --git a/application/modules/frontend/views/scripts/juridique/index.phtml b/application/modules/frontend/views/scripts/juridique/index.phtml
index 0fe8316b..9e846caf 100644
--- a/application/modules/frontend/views/scripts/juridique/index.phtml
+++ b/application/modules/frontend/views/scripts/juridique/index.phtml
@@ -1,7 +1,11 @@
- Field('cj', $this->fields->get('cj'));?>
- - Field('cj', $this->fields->get('cj'), 'text');?>
+ -
+ Indiquez les formes juridiques ou les codes (insee) sur un deux ou quatres chiffres séparés par des virgules.
+ Si vous disposez d'une liste sous forme excel glissez le fichier dans l'encadré
+ Field('cj', $this->fields->get('cj'), 'text');?>
+
- Field('actifEco', $this->fields->get('actifEco'));?>
- Field('procolHisto', $this->fields->get('procolHisto'));?>
- Field('tvaIntraValide', $this->fields->get('tvaIntraValide'));?>
diff --git a/batch/extract.php b/batch/extract.php
new file mode 100644
index 00000000..e288d4e2
--- /dev/null
+++ b/batch/extract.php
@@ -0,0 +1,163 @@
+reference = $reference;
+ $dbConfig = new Zend_Config_Ini(APPLICATION_PATH . '/configs/configuration.ini', 'databases');
+ try {
+ $this->db = Zend_Db::factory($dbConfig->db);
+ } catch ( Exception $e ) {
+ exit ( $e->getMessage() );
+ }
+ }
+
+ public function getHttp()
+ {
+ /* Depuis le navigateur */
+ }
+
+ protected function getCj($liste)
+ {
+ foreach($liste as $valeur)
+ {
+ if(strlen($valeur) < 5) {
+ $sql = $this->db->select('formejuridique', array('fjCode'))
+ ->from('formejuridique')
+ ->where('fjCode LIKE "'.$valeur.'%"');
+ } else {
+ $sql = $this->db->select('formejuridique', array('fjCode'))
+ ->from('formejuridique')
+ ->where('fjCode = "'.$valeur.'"');exit;
+ }
+ $result = $this->db->fetchAll($sql);
+ foreach ($result as $code) {
+ if(strlen($code['fjCode']) > 2) {
+ $return[] = $code['fjCode'];
+ }
+ }
+ }
+ return ($return);
+ }
+
+ protected function localisationArbo($name, $liste)
+ {
+ foreach($liste as $valeur)
+ {
+ if(strlen($valeur) == 2) {
+ switch($name) {
+ case 'adr_reg':
+ $return = array();
+ $sql = $this->db->select()
+ ->from('departements')
+ ->join(array('cp' => 'codepostaux'), 'cp.codepos LIKE CONCAT(departements.numdep, "%")', array('INSEE'))
+ ->where('codeRegionInsee ='.$valeur);
+ $result = $this->db->fetchAll($sql);
+ foreach ($result as $res) {
+ $return[] = trim($res['INSEE']);
+ }
+ break;
+ case 'adr_dept':
+ $return = array();
+ $sql = $this->db->select()
+ ->from('departements')
+ ->join(array('cp' => 'codepostaux'), 'cp.codepos LIKE CONCAT(departements.numdep, "%")', array('INSEE'))
+ ->where('numdep ='.$valeur);
+ $result = $this->db->fetchAll($sql);
+ foreach ($result as $res) {
+ $return[] = trim($res['INSEE']);
+ }
+ break;
+ }
+ }
+ }
+
+ return ($return);
+ }
+
+ public function getCli()
+ {
+ require_once('Scores/Ciblage.php');
+ require_once('Scores/Field.php');
+
+ $sql = 'SELECT id, idDefinition, uniteInsee FROM comptages WHERE id = '.$this->reference;
+ $fetch = $this->db->query($sql);
+ $result = $fetch->fetchAll();
+ $idComptage = $result[0]['id'];
+ $uniteInsee = $result[0]['uniteInsee'];
+
+ $sql = 'SELECT id, criteres.criteres FROM criteres WHERE id ='.$result[0]['idDefinition'];
+ $fetch = $this->db->query($sql);
+ $result = $fetch->fetchAll();
+ $idCriteres = $result[0]['id'];
+
+ $structure = json_decode($result[0]['criteres']);
+ $element = array();
+ foreach ($structure as $name => $valeur){
+ $type = explode(':', $valeur);
+ if($type[0] == 'adr_dept') {
+ $array['adr_com'] = $this->localisationArbo($type[0], explode(',', $type[1]));
+ }
+ if($name == 'cj') {
+ $array['cj'] = $this->getCj(explode(',', $valeur));
+ }
+ }
+ $array['ape_etab'] = explode(',', $structure->ape_etab);
+ $ciblage = new Ciblage($array);
+ $res = $ciblage->execute(true);
+ $data = array(
+ 'idComptage' => $idComptage,
+ 'idCriteres' => $idCriteres,
+ 'idProfil' => 0,
+ 'reference' => 'batch',
+ 'identifiants' => json_encode($res),
+ 'nbLigneTotales' => count($res),
+ 'nbLigneTraites' => count($res),
+ 'uniteInsee' => $uniteInsee,
+ 'error' => 0
+ );
+ //$this->db->insert('enrichissement_identifiants',$data);
+ $fd = fopen($idComptage.'_batch'.date('Y-m-d-hms').'.csv', 'x+');
+ try {
+ $array = array();
+ foreach($res as $field) {
+ fputcsv($fd, array($field), ';');
+ }
+
+ } catch(Exception $e) {
+ echo $e->getMessage();
+ }
+ fclose($fd);
+ echo count($res).' Success !';
+ }
+}
+
+$a = new extract('20');
+$a->getCli();
\ No newline at end of file
diff --git a/library/Scores/Ciblage.php b/library/Scores/Ciblage.php
index 5fc59d84..be438d62 100644
--- a/library/Scores/Ciblage.php
+++ b/library/Scores/Ciblage.php
@@ -9,7 +9,7 @@ Class Ciblage
public $index = 'ciblage';
- public $nb_results = 5000;
+ public $nb_results = 50000;
public $max_results = 500000;
public $mysql_host = '192.168.78.230';
@@ -75,13 +75,33 @@ Class Ciblage
return ($resSphinx['total_found']);
}
+
+ protected function getSiret($structure)
+ {
+ $siret = array();
+ foreach($structure['matches'] as $element)
+ {
+ $siret[] = $element['attrs']['siren'].$element['attrs']['nic'];
+ }
+ return ($siret);
+ }
+
public function execute($need = false)
{
- $resSphinx = $this->sphinx->Query($this->alpha, $this->index);
-
+ /* Retourne les resultats */
if($need) {
- return ($resSphinx);
- }
+ $return = array();
+ $limit = 0;
+ do {
+ $this->sphinx->SetLimits($limit, 1000, 50000);
+ $resSphinx = $this->sphinx->Query($this->alpha, $this->index);
+ if(is_array($resSphinx))
+ $return = array_merge($return, $this->getSiret($resSphinx));
+ $limit = $limit + 1000;
+ }while($limit < $resSphinx['total_found']);
+ return ($return);
+ } else
+ $resSphinx = $this->sphinx->Query($this->alpha, $this->index);
return ($resSphinx['total_found']);
}
@@ -144,14 +164,6 @@ Class Ciblage
protected function siege($valeur) {
$this->setFilter('siege', $valeur);
}
-
- protected function adr_cp($valeur) {
- $this->setFilter('adr_cp', $valeur);
- }
-
- protected function adr_dep($valeur) {
- $this->setAlpha('adr_dep', $valeur);
- }
protected function adr_com($valeur) {
$this->setFilter('adr_com', $valeur);
@@ -178,7 +190,7 @@ Class Ciblage
}
protected function capital($valeur) {
- $valeur = $this->setMinMax($name, $valeur);
+ //$valeur = $this->setMinMax($name, $valeur);
$this->setFilterRange('capital', $valeur);
}
diff --git a/library/Scores/Field.php b/library/Scores/Field.php
index 39f51dcf..3787ee96 100644
--- a/library/Scores/Field.php
+++ b/library/Scores/Field.php
@@ -374,7 +374,33 @@ Class Fields
'class' => null,
'action' => 'geographique',
'title' => 'Localisation'
- ),
+ ),
+ 'adr_dept' => array(
+ 'label' => 'Liste départements',
+ 'fields' => array(
+ 'text' => array('value' => null),
+ 'textarea' => array('value' => null)
+ ),
+ 'famille' => 'geographique',
+ 'activated' => true,
+ 'type' => 'textarea',
+ 'class' => null,
+ 'action' => '',
+ 'title' => 'Localisation'
+ ),
+ 'adr_reg' => array(
+ 'label' => 'Liste code région',
+ 'fields' => array(
+ 'text' => array('value' => null),
+ 'textarea' => array('value' => null)
+ ),
+ 'famille' => 'geographique',
+ 'activated' => true,
+ 'type' => 'textarea',
+ 'class' => null,
+ 'action' => '',
+ 'title' => 'Localisation'
+ ),
//juridique
'cj' => array(
'label' => 'Forme Juridique',
@@ -658,18 +684,26 @@ Class Fields
$val = $session->getCriteres();
}
$values = array();
-
+ unset($val['vil']);
foreach($val as $key => $item)
{
if($item != '') {
if($this->fields[$key]['type'] == 'interval' or
$this->fields[$key]['type'] == 'intervalSelect' or
$this->fields[$key]['type'] == 'textarea' and
- empty($this->fields[$key]['action']) or $this->fields[$key]['action'] == 'naf')
+ empty($this->fields[$key]['action']))
{
$values[$key] = explode(',', $item);
} else if (!empty($this->fields[$key]['action'])) {
- $values[$key] = $this->selectArbo($key, $item);
+ if($key == 'adr_reg' or $key == 'adr_dept') {
+ $key = 'adr_com';
+ }
+ if(!empty($values[$key])) {
+ $values[$key] = array_merge($this->selectArbo($key, $item), $values[$key]);
+ }
+ else {
+ $values[$key] = $this->selectArbo($key, $item);
+ }
} else {
$values[$key] = $item;
}
@@ -687,24 +721,32 @@ Class Fields
case 'ape_entrep' :
$nafs = explode(',', $valeur);
foreach($nafs as $naf) {
- if($naf != ' ')
+ if($naf != ' ') {
$values = array_merge($values, $this->nafArbo($name, $naf));
+ }
}
break;
+ case 'adr_dept':
+ case 'adr_reg':
case 'adr_com':
$valeurs = explode(',', $valeur);
foreach($valeurs as $element) {
- $array = $this->localisationArbo($name, $element);
- if(!empty($array))
- $values = array_merge($values, $array);
+ if(!empty($element)) {
+ $val = explode(':', $element);
+ $array = array_diff($this->localisationArbo($val[0], $val[1]), $values);
+ if(!empty($array)) {
+ $values = array_merge($values, $array);
+ }
+ }
}
break;
case 'cj':
$valeurs = explode(',', $valeur);
- foreach($valeurs as $valeur)
- $values = array_merge($values, $this->fj($name, $valeur));
+ foreach($valeurs as $valeur) {
+ if($valeur != ' ' and !empty($valeur))
+ $values = array_merge($values, $this->fj($name, $valeur));
+ }
}
-
return ($values);
}
@@ -715,11 +757,11 @@ Class Fields
if(strlen($valeur) < 5) {
$sql = $table->select('formejuridique', array('fjCode'))
->where('fjCode LIKE "'.$valeur.'%"');
- } else
+ } else {
$sql = $table->select('formejuridique', array('fjCode'))
->where('fjCode = "'.$valeur.'"');
+ }
$result = $table->fetchAll($sql)->toArray();
-
foreach ($result as $code) {
if(strlen($code['fjCode']) > 2) {
$return[] = $code['fjCode'];
@@ -730,14 +772,14 @@ Class Fields
protected function localisationArbo($name, $valeur)
{
- if(strlen($valeur) <= 3) {
- switch($valeur[0]) {
- case 'R':
+ if(strlen($valeur) == 2) {
+ switch($name) {
+ case 'adr_reg':
$table = new Table_Departements();
$sql = $table->select()
->from('departements')
->join(array('cp' => 'codepostaux'), 'cp.codepos LIKE CONCAT(departements.numdep, "%")', array('INSEE'))
- ->where('codeRegionInsee ='.substr($valeur, 1, strlen($valeur)))
+ ->where('codeRegionInsee ='.$valeur)
->setIntegrityCheck(false);
$result = $table->fetchAll($sql)->toArray();
@@ -745,12 +787,12 @@ Class Fields
$return[] = $res['INSEE'];
}
break;
- case 'D':
+ case 'adr_dept':
$table = new Table_Departements();
$sql = $table->select()
->from('departements')
->join(array('cp' => 'codepostaux'), 'cp.codepos LIKE CONCAT(departements.numdep, "%")', array('INSEE'))
- ->where('numdep ='.substr($valeur, 1, strlen($valeur)))
+ ->where('numdep ='.$valeur)
->setIntegrityCheck(false);
$result = $table->fetchAll($sql)->toArray();
foreach ($result as $res) {
@@ -763,40 +805,13 @@ Class Fields
return ($return);
}
-
- protected function deptArbo($name, $valeur)
- {
- if(strlen($valeur) < 5){
- if($valeur[0] == 'D') {
- $codepostaux = new Table_Codepostauxs();
- $sql = $codepostaux->select()->where('Codepos LIKE "'.substr($valeur, 1).'%"');
- $codes = $codepostaux->fetchAll($sql)->toArray();
- foreach($codes as $code) {
- $values[] = $code['Codepos'];
- }
- } else if($valeur[0] == 'R') {
- $departements = new Table_Departements();
- $codepostaux = new Table_Codepostauxs();
- $sql = $departements->select()->from('departements', array('numdep'))->where('codeRegionInsee = ?', substr($valeur, 1));
- $results = $departements->fetchAll($sql)->toArray();
- foreach($results as $result) {
- $sql = $codepostaux->select()->from('codepostaux', array('Codepos'))->where('Codepos LIKE "'.$result['numdep'].'%"');
- $codes = $codepostaux->fetchAll($sql)->toArray();
- foreach($codes as $code) {
- $values[] = $code['Codepos'];
- }
- }
- }
- return ($values);
- }
- return (array($valeur));
- }
-
+
protected function nafArbo($key, $valeur)
{
$value = array();
$table = new Table_Nafs();
-
+ $valeur = trim($valeur);
+
if(strlen($valeur) == 1)
{
$sql = $table->select()->where('parent = ?', $valeur);
@@ -816,13 +831,17 @@ Class Fields
return ($value);
}
- public function __construct()
+ public function __construct($batch = false)
{
- foreach($this->fields as $name => $valeur) {
- if($this->fields[$name]['type'] == 'interval') {
- $minmax = $this->getMinMax($name);
- $this->fields[$name]['fields'][$this->fields['type']]['value']
- = array($minmax[0]['min'], $minmax[0]['max']);
+ if(!$batch) {
+ foreach($this->fields as $name => $valeur) {
+ if($this->fields[$name]['type'] == 'interval') {
+ $minmax = $this->getMinMax($name);
+ if(!empty($minmax)) {
+ $this->fields[$name]['fields'][$this->fields[$name]['type']]['value']
+ = array($minmax[0]['min'], $minmax[0]['max']);
+ }
+ }
}
}
}
diff --git a/public/themes/default/images/help.png b/public/themes/default/images/help.png
new file mode 100644
index 00000000..64e74124
Binary files /dev/null and b/public/themes/default/images/help.png differ
diff --git a/public/themes/default/scripts/autocompleted.js b/public/themes/default/scripts/autocompleted.js
index bc371ed7..bcfe4aaa 100644
--- a/public/themes/default/scripts/autocompleted.js
+++ b/public/themes/default/scripts/autocompleted.js
@@ -40,7 +40,7 @@ $(document).ready(function(){
}
});
- $('textarea.complitedDep').autocomplete({
+ $('#textarea_adr_dept').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/geographique/completed/dep/1', { q: extractLast( request.term ) },
@@ -57,7 +57,7 @@ $(document).ready(function(){
}
});
- $('textarea.complitedReg').autocomplete({
+ $('#textarea_adr_reg').autocomplete({
delay:600,
source: function(request, response) {
$.getJSON('/geographique/completed/reg/1', { q: extractLast( request.term ) },
diff --git a/public/themes/default/scripts/upload.js b/public/themes/default/scripts/upload.js
new file mode 100644
index 00000000..9cd6f063
--- /dev/null
+++ b/public/themes/default/scripts/upload.js
@@ -0,0 +1,14 @@
+$(document).ready(function(){
+ $('.upload').change(function(){
+ term = $(this).val();
+ a = term.split('/');
+ $.ajax(
+ '/upload/arborescance/'+a,
+ {
+ type : "GET",
+ cache : false,
+ data : $(this).serializeArray()
+ }
+ );
+ });
+});
\ No newline at end of file
diff --git a/public/themes/default/styles/geographique.css b/public/themes/default/styles/geographique.css
index 7adc0976..0025ce83 100644
--- a/public/themes/default/styles/geographique.css
+++ b/public/themes/default/styles/geographique.css
@@ -5,7 +5,7 @@
}
#geographique li {
- height:20px;
+ height:30px;
padding:5px;
border:1px solid silver;
margin-top:2px;