From f328c4c8a1ab4c882ed3776b3727784c74f34741 Mon Sep 17 00:00:00 2001
From: Claire DELBOS <cdelbos@scores-decisions.com>
Date: Tue, 4 Apr 2017 17:26:03 +0200
Subject: [PATCH] SD-29 Ajout fil d'ariane

---
 application/controllers/IndexController.php   |  1 +
 application/controllers/ProfilController.php  |  4 ++++
 application/views/scripts/index/ariane.phtml  | 10 ++++++++++
 application/views/scripts/index/restart.phtml |  2 ++
 application/views/scripts/profil/create.phtml |  1 +
 application/views/scripts/profil/detail.phtml |  2 ++
 application/views/scripts/profil/index.phtml  |  2 ++
 scripts/jobs/enrichissement.php               |  6 +++---
 8 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 application/views/scripts/index/ariane.phtml

diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php
index 459716ce..19c12dc6 100644
--- a/application/controllers/IndexController.php
+++ b/application/controllers/IndexController.php
@@ -117,6 +117,7 @@ class IndexController extends Zend_Controller_Action
 			);
 			$commandesM->update($data, "id=$id");
 		}
+		$this->view->request=$request;
 	}
 
 	public function repriseAction()
diff --git a/application/controllers/ProfilController.php b/application/controllers/ProfilController.php
index cbd33004..40d2a6ba 100644
--- a/application/controllers/ProfilController.php
+++ b/application/controllers/ProfilController.php
@@ -8,6 +8,7 @@ class ProfilController extends Zend_Controller_Action
 		$sql = $profilM->select()->order('reference ASC');
 		$rows = $profilM->fetchAll($sql);
 		$this->view->assign('profils', $rows);
+		$this->view->assign('request', $this->getRequest());
 	}
 
 	public function detailAction()
@@ -24,6 +25,8 @@ class ProfilController extends Zend_Controller_Action
 			foreach ($criteres as $critere) {
 				$tmp[] = $data->getDicoLib($critere);
 			}
+			$this->view->assign('request', $request);
+			$this->view->assign('id', $id);
 			$this->view->assign('profil', $tmp);
 			$this->view->assign('reference', $profil->current()->reference);
 		}
@@ -73,6 +76,7 @@ class ProfilController extends Zend_Controller_Action
 			$this->view->assign('reference', $profil->current()->reference);
 		}
 
+		$this->view->assign('request', $request);
 		$this->view->assign('doublon', $doublon);
 		$this->view->assign('id', $id);
 		$this->view->assign('edit', true);
diff --git a/application/views/scripts/index/ariane.phtml b/application/views/scripts/index/ariane.phtml
new file mode 100644
index 00000000..757d1dc0
--- /dev/null
+++ b/application/views/scripts/index/ariane.phtml
@@ -0,0 +1,10 @@
+<div class="row alert-info">
+<a href="/">Enrichissement</a>&nbsp;/&nbsp;
+<a href="<?=$this->url(array('controller' => $this->request->getParam('controller', 'index'),'action' => 'index'))?>">
+<?=$this->request->getParam('controller', 'index')?></a>&nbsp;/&nbsp;
+<?php if($this->request->getParam('action', 'index')!='index'):?>
+<a href="<?=$this->url(array('controller' => $this->request->getParam('controller', 'index'),
+    'action' => $this->request->getParam('action', 'index')))?>">
+<?=$this->request->getParam('action', 'index')?></a>&nbsp;/&nbsp;
+<?php endif;?>
+</div>
diff --git a/application/views/scripts/index/restart.phtml b/application/views/scripts/index/restart.phtml
index b395a073..f348d1bc 100644
--- a/application/views/scripts/index/restart.phtml
+++ b/application/views/scripts/index/restart.phtml
@@ -1 +1,3 @@
+<?php echo $this->partial('/index/ariane.phtml',array('request' => $this->request));?>
+
 <a href="<?=$this->url(array('controller'=>'index', 'action'=>'index'))?>">Retour</a>
diff --git a/application/views/scripts/profil/create.phtml b/application/views/scripts/profil/create.phtml
index 303be39b..d21b0b8c 100644
--- a/application/views/scripts/profil/create.phtml
+++ b/application/views/scripts/profil/create.phtml
@@ -14,6 +14,7 @@ div#dico .panel-body, div#entete .panel-body {
 </style>
 
 <div class="row">
+<?php echo $this->partial('/index/ariane.phtml',array('request' => $this->request));?>
 <div class="col-md-4">
 	<div class="panel panel-default" id="entete">
 	  <div class="panel-heading">
diff --git a/application/views/scripts/profil/detail.phtml b/application/views/scripts/profil/detail.phtml
index fd8a6741..98f947ff 100644
--- a/application/views/scripts/profil/detail.phtml
+++ b/application/views/scripts/profil/detail.phtml
@@ -1,9 +1,11 @@
 <div>
 <h2>Profil : <?=$this->reference?></h2>
+<?php echo $this->partial('/index/ariane.phtml',array('request' => $this->request));?>
 <ol>
 <?php foreach ($this->profil as $item) {?>
 	<li><?=$item?></li>
 <?php }?>
 </ol>
 <a id="return" class="btn btn-sm btn-info" href="<?=$this->url(array('controller'=>'index', 'action'=>'index'))?>">Retour</a>
+<a id="edit" class="btn btn-sm btn-warning" href="<?=$this->url(array('controller'=>'profil', 'action'=>'create', 'id' => $this->id))?>">Edition</a>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/profil/index.phtml b/application/views/scripts/profil/index.phtml
index 132fd8c0..d8b3f161 100644
--- a/application/views/scripts/profil/index.phtml
+++ b/application/views/scripts/profil/index.phtml
@@ -2,6 +2,8 @@
 <h2>Gestion des profils
 &nbsp;&nbsp;&nbsp;<a id="return" class="btn btn-sm btn-info" href="<?=$this->url(array('controller'=>'index', 'action'=>'index'))?>">Retour</a>
 </h2>
+<?php echo $this->partial('/index/ariane.phtml',array('request' => $this->request));?>
+
 <?php if (count($this->profils)>0) {?>
 <table class="table table-responsive">
 <thead>
diff --git a/scripts/jobs/enrichissement.php b/scripts/jobs/enrichissement.php
index 90460b12..91d51b27 100644
--- a/scripts/jobs/enrichissement.php
+++ b/scripts/jobs/enrichissement.php
@@ -2223,13 +2223,13 @@ function contentieuxlisteMultiple($siren, $nic=0, $values = false,$qualite='')
                 $text='';
                 $parties=json_decode($row['Parties']);
                 foreach($parties as $p){
-                    $text.=(isset($p->nomPartie)?$p->nomPartie:'').'('.(isset($p->entreprise->siren)?$p->entreprise->siren:'').')';
+                    $text.=(isset($p->nomPartie)?$p->nomPartie:'').' ('.(isset($p->entreprise->siren)?$p->entreprise->siren:'').') ';
                     if(isset($p->representants) && !empty($p->representants)){
                         foreach ($p->representants as $r){
-                            $text.='#'.isset($r->nom)?$r->nom:'';
+                            $text.=' '.isset($r->nom)?' # '.$r->nom:'';
                         }
                     }
-                    $text.='  ';
+                    $text.=' | ';
                 }
                 //echo $tabData[$k]['parties'];echo $text;
                 $tabData[$k]['Parties']=$text;