SD-29 Ajout fil d'ariane

This commit is contained in:
Claire DELBOS 2017-04-04 17:26:03 +02:00
parent 3178234a0a
commit f328c4c8a1
8 changed files with 25 additions and 3 deletions

View File

@ -117,6 +117,7 @@ class IndexController extends Zend_Controller_Action
);
$commandesM->update($data, "id=$id");
}
$this->view->request=$request;
}
public function repriseAction()

View File

@ -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);

View File

@ -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>

View File

@ -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>

View File

@ -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">

View File

@ -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>

View File

@ -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>

View File

@ -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;