@@ -100,7 +102,7 @@ if ($this->actif==1){
-
+
-
diff --git a/application/modules/default/views/default/scripts/surveillance/surveillanceserie.phtml b/application/modules/default/views/default/scripts/surveillance/surveillanceserie.phtml
new file mode 100644
index 000000000..71754e011
--- /dev/null
+++ b/application/modules/default/views/default/scripts/surveillance/surveillanceserie.phtml
@@ -0,0 +1,70 @@
+
+
+step==0)):?>
+standardhelptext;
+?>
+
+
+
+
+
+
+
+step==2)):?>
+
+
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 8b18c2865..a4111e0b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -92,21 +92,21 @@
},
{
"name": "guzzlehttp/guzzle",
- "version": "6.2.2",
+ "version": "6.2.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
- "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60"
+ "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
- "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
+ "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8d6c6cc55186db87b7dc5009827429ba4e9dc006",
+ "reference": "8d6c6cc55186db87b7dc5009827429ba4e9dc006",
"shasum": ""
},
"require": {
"guzzlehttp/promises": "^1.0",
- "guzzlehttp/psr7": "^1.3.1",
+ "guzzlehttp/psr7": "^1.4",
"php": ">=5.5"
},
"require-dev": {
@@ -150,7 +150,7 @@
"rest",
"web service"
],
- "time": "2016-10-08T15:01:37+00:00"
+ "time": "2017-02-28T22:50:30+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -205,16 +205,16 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.3.1",
+ "version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
+ "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
- "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
+ "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c",
"shasum": ""
},
"require": {
@@ -250,29 +250,36 @@
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
+ },
+ {
+ "name": "Tobias Schultze",
+ "homepage": "https://github.com/Tobion"
}
],
- "description": "PSR-7 message implementation",
+ "description": "PSR-7 message implementation that also provides common utility methods",
"keywords": [
"http",
"message",
+ "request",
+ "response",
"stream",
- "uri"
+ "uri",
+ "url"
],
- "time": "2016-06-24T23:00:38+00:00"
+ "time": "2017-03-20T17:10:46+00:00"
},
{
"name": "monolog/monolog",
- "version": "1.22.0",
+ "version": "1.22.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "bad29cb8d18ab0315e6c477751418a82c850d558"
+ "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bad29cb8d18ab0315e6c477751418a82c850d558",
- "reference": "bad29cb8d18ab0315e6c477751418a82c850d558",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0",
+ "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0",
"shasum": ""
},
"require": {
@@ -337,7 +344,7 @@
"logging",
"psr-3"
],
- "time": "2016-11-26T00:15:39+00:00"
+ "time": "2017-03-13T07:08:03+00:00"
},
{
"name": "phpoffice/phpexcel",
@@ -597,16 +604,16 @@
},
{
"name": "symfony/browser-kit",
- "version": "v3.2.2",
+ "version": "v3.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
- "reference": "548f8230bad9f77463b20b15993a008f03e96db5"
+ "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/browser-kit/zipball/548f8230bad9f77463b20b15993a008f03e96db5",
- "reference": "548f8230bad9f77463b20b15993a008f03e96db5",
+ "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2fe0caa60c1a1dfeefd0425741182687a9b382b8",
+ "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8",
"shasum": ""
},
"require": {
@@ -650,20 +657,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:32:22+00:00"
+ "time": "2017-02-21T09:12:04+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.2.2",
+ "version": "v3.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa"
+ "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
- "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
+ "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
"shasum": ""
},
"require": {
@@ -703,20 +710,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:32:22+00:00"
+ "time": "2017-02-21T09:12:04+00:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v3.2.2",
+ "version": "v3.2.7",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "27d9790840a4efd3b7bb8f5f4f9efc27b36b7024"
+ "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/27d9790840a4efd3b7bb8f5f4f9efc27b36b7024",
- "reference": "27d9790840a4efd3b7bb8f5f4f9efc27b36b7024",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/403944e294cf4ceb3b8447f54cbad88ea7b99cee",
+ "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee",
"shasum": ""
},
"require": {
@@ -759,7 +766,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:32:22+00:00"
+ "time": "2017-02-21T09:12:04+00:00"
},
{
"name": "symfony/polyfill-mbstring",
diff --git a/library/Application/Model/CommandesSurveillance.php b/library/Application/Model/CommandesSurveillance.php
new file mode 100644
index 000000000..ff87cd5f0
--- /dev/null
+++ b/library/Application/Model/CommandesSurveillance.php
@@ -0,0 +1,8 @@
+toArray();
+ $config=$ct[APPLICATION_ENV];
+ //home/vhosts/data/extranet
+ $this->filepath=$config['profil']['path']['shared'].'/persist/surveillance/';
+ if(!is_dir($this->filepath)){
+ mkdir($this->filepath);
+ }
+ }
+ public function verifandupload($file,$request){
+ $ref=$request->getParam('ref');
+ $user = new Scores_Utilisateur();
+ $login = $user->identity->username;
+ //var_dump($user->identity);die;
+ $email=$request->getParam('email');
+ $sources=$request->getParam('source');
+
+ $fileinname=$file["fichier"]["name"];
+ $fileType = pathinfo($fileinname,PATHINFO_EXTENSION);
+ if($fileType!='csv'){
+ return array('success' => false, 'message' => 'Extension incorrecte');
+ }
+ $fileoutname=$ref.'.csv';
+ $target=$this->filepath.$fileoutname;
+ if (!move_uploaded_file($file["fichier"]["tmp_name"], $target)) {
+ return array('success' => false, 'message' => 'Le fichier '
+ . basename( $file["fichier"]["name"]). ' ne peut pas être chargé.');
+ }
+ $result=$this->verifyformat($fileoutname);
+ if($result['success']){
+ $row=$result['message'];
+ }else{
+ return $result;
+ }
+ $result=$this->sendtoftp($fileoutname);
+ if(!$result['success']){
+ return $result;
+ }
+ $user = new Scores_Utilisateur();
+
+ $cmd=new Application_Model_CommandesSurveillance();
+ foreach($sources as $source){
+ $data= array(
+ 'ref' => $ref,
+ 'login' =>$login,
+ 'email' => $email,
+ 'filename' => $fileinname,
+ 'surv_source' => $source,
+ 'date_created' => Date('Y-m-d')
+ );
+ $cmd->insert($data);
+ }
+ return array('success' => true, 'message' => $row);
+ }
+ private function verifyformat($filename){
+ $handle=fopen($this->filepath.$filename,'r');
+ if(!$handle){
+ return array('success' => false, 'message' => 'Fichier illisible.');
+ }
+ ini_set("auto_detect_line_endings", true);
+ $row=1;
+ while (($data = fgetcsv($handle)) !== FALSE) {
+ $num = count($data);
+ if($num!=3){
+ return array('success' => false, 'message' => 'Nombre de colonnes erronné à la ligne '.$row.'.');
+ }
+ if($data[0]=='siren' & $row==1){
+ continue;
+ }
+ $data[0]=trim($data[0]);
+ if(strlen($data[0])>9){
+ return array('success' => false, 'message' => 'Siren mal formaté à la ligne '.$row.'.');
+ }
+ if(!is_numeric($data[0])){
+ return array('success' => false, 'message' => 'Siren non numérique '.$data[0].' à la ligne '.$row.'.');
+ }
+ $siren=substr('000000000'.$data[0],-9,9);
+ if(!$this->estValide($siren)){
+ return array('success' => false, 'message' => 'Siren invalide '.$data[0].' à la ligne '.$row.'.');
+ }
+ $row++;
+ }
+ fclose($handle);
+
+ return array('success' => true, 'message' => $row);
+
+ }
+ private function sendtoftp($filename){
+ $connection = ftp_connect('ftp.scores-decisions.com',21);
+
+ $login = ftp_login($connection, 'internesd', 'internesd2017');
+
+ $dest='/send/'.$filename;
+
+ $source=$this->filepath.$filename;
+
+ if (!$connection || !$login) {
+ return array('success' => false, 'message' => 'Un problement technique est survenu merci de nous contacter avec le code erreur '.__LINE__);
+ }
+
+ if(!ftp_pasv($connection, true)){
+ return array('success' => false, 'message' => 'Un problement technique est survenu merci de nous contacter avec le code erreur '.__LINE__);
+ }
+ $upload = ftp_put($connection, $dest, $source, FTP_BINARY);
+
+ if (!$upload) {
+ return array('success' => false, 'message' => 'Un problement technique est survenu merci de nous contacter avec le code erreur '.__LINE__);
+ }
+
+ ftp_close($connection);
+ return array('success' => true, 'message' => '');
+ }
+ private function estValide($siren){
+ // Donc le SIREN est un numérique à 9 chiffres
+ $somme = 0;
+ for ($cpt = 0; $cpt
9)
+ $tmp -= 9; // Si le résultat est supérieur à 9, on lui soustrait 9
+ }
+ else
+ $tmp = substr($siren,$cpt,1);
+ $somme += (int)$tmp;
+ }
+ if (($somme % 10) == 0)
+ return true; // Si la somme est un multiple de 10 alors le SIREN est valide
+ else
+ return false;
+
+ }
+}
\ No newline at end of file
diff --git a/public/themes/default/styles/bsmain.css b/public/themes/default/styles/bsmain.css
new file mode 100644
index 000000000..66250b595
--- /dev/null
+++ b/public/themes/default/styles/bsmain.css
@@ -0,0 +1 @@
+@import url("./../../../libs/bootstrap-3.3.7/css/bootstrap.min.css");