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

Merge from branch 2.5

Browse Source
This commit is contained in:
Michael RICOIS 2013-11-06 14:29:20 +00:00
parent e0095d5d63
commit 2245d33e62
3 changed files with 1084 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1074
library/Metier/partenaires/classMGreffes.php
View File

File diff suppressed because it is too large Load Diff

13
library/Metier/partenaires/classMMap.php
View File

@ -614,7 +614,7 @@ API keybing = 56D6CBA671C986D3EA11B1B48F97507BE9B46999
$this->geocodeur='Cloudmade'; $this->geocodeur='Cloudmade';
$this->precision=0; $this->precision=0;
$fileName=REP_TEMP.'geoCodeur'.$this->geocodeur; $fileName=REP_TEMP.'/geoCodeur'.$this->geocodeur;
$tmp=@explode(',',file_get_contents($filename)); $tmp=@explode(',',file_get_contents($filename));
$nbQuery=$tmp[0]*1; $nbQuery=$tmp[0]*1;
@ -676,7 +676,7 @@ API keybing = 56D6CBA671C986D3EA11B1B48F97507BE9B46999
$this->geocodeur='Yahoo'; $this->geocodeur='Yahoo';
$this->precision=0; $this->precision=0;
$fileName=REP_TEMP.'geoCodeur'.$this->geocodeur; $fileName=REP_TEMP.'/geoCodeur'.$this->geocodeur;
$tmp=@explode(',',file_get_contents($filename)); $tmp=@explode(',',file_get_contents($filename));
$nbQuery=$tmp[0]*1; $nbQuery=$tmp[0]*1;
@ -737,7 +737,7 @@ API keybing = 56D6CBA671C986D3EA11B1B48F97507BE9B46999
} else } else
$this->codeRetourY='INVALID_REQUEST'; $this->codeRetourY='INVALID_REQUEST';
} else } else
die('Code Retour Yahoo 200 mais :'.$this->body.EOL); //die('Code Retour Yahoo 200 mais :'.$this->body.EOL);
if ($this->latitudeDec==0 && ($this->longitudeDec==0 || $this->precision==0)) die('Réponse Yahoo = '.$this->body.EOL); if ($this->latitudeDec==0 && ($this->longitudeDec==0 || $this->precision==0)) die('Réponse Yahoo = '.$this->body.EOL);
return true;//array("lat"=>$lat,"lng"=>$lng,"address"=>$address); return true;//array("lat"=>$lat,"lng"=>$lng,"address"=>$address);
@ -751,7 +751,7 @@ API keybing = 56D6CBA671C986D3EA11B1B48F97507BE9B46999
$this->geocodeur='Google'; $this->geocodeur='Google';
$this->precision=0; $this->precision=0;
$fileName=REP_TEMP.'geoCodeur'.$this->geocodeur; $fileName=REP_TEMP.'/geoCodeur'.$this->geocodeur;
$tmp=@explode(',',file_get_contents($filename)); $tmp=@explode(',',file_get_contents($filename));
$nbQuery=$tmp[0]*1; $nbQuery=$tmp[0]*1;
@ -844,8 +844,9 @@ API keybing = 56D6CBA671C986D3EA11B1B48F97507BE9B46999
$this->codeRetourG=='OVER_QUERY_LIMIT') { $this->codeRetourG=='OVER_QUERY_LIMIT') {
return false; return false;
} else { } else {
echo $url.' ('.$this->codeRetour.')'.EOL; return false;
die('Code Retour Google ='.$this->codeRetourG.EOL); //echo $url.' ('.$this->codeRetour.')'.EOL;
//die('Code Retour Google ='.$this->codeRetourG.EOL);
} }
} }
return false; return false;

8
library/WsScore/Saisie/v0.2/Saisie.php
View File

@ -1357,7 +1357,7 @@ class Saisie extends WsScore
} }
} }
} }
} } //End of Mathematic control
if ( $step == 'onlycheck' ) { if ( $step == 'onlycheck' ) {
@ -1381,8 +1381,13 @@ class Saisie extends WsScore
} }
} }
$postesDiff = array();
if ($row!==null) { if ($row!==null) {
//Make the diff
$postesDiff = array_diff(explode(';', $data->postes), explode(';',$row->postes));
//Backup in historiques //Backup in historiques
$historiquesM = new Application_Model_HistoriquesBilans(); $historiquesM = new Application_Model_HistoriquesBilans();
$backupData = $row->toArray(); $backupData = $row->toArray();
@ -1468,6 +1473,7 @@ class Saisie extends WsScore
'dateExercice' => $data->dateCloture, 'dateExercice' => $data->dateCloture,
'typeBilan' => $data->typeBilan, 'typeBilan' => $data->typeBilan,
'dateAction' => date('YmdHis'), 'dateAction' => date('YmdHis'),
'postesDiff' => implode(';', $postesDiff),
)); ));
} catch (Zend_Db_Exception $e) { } catch (Zend_Db_Exception $e) {
if ($this->tabInfoUser['idClient']!=1) { if ($this->tabInfoUser['idClient']!=1) {