From b3ff8e1398cb4ff0eddfd5cd605f9bbf81c9474f Mon Sep 17 00:00:00 2001
From: Claire DELBOS <cdelbos@scores-decisions.com>
Date: Mon, 3 Apr 2017 09:37:15 +0200
Subject: [PATCH] SD-29 ajout des top + boutons retour

---
 application/views/scripts/profil/create.phtml |  5 +++--
 application/views/scripts/profil/detail.phtml |  1 +
 application/views/scripts/profil/help.phtml   |  1 +
 application/views/scripts/profil/index.phtml  |  3 ++-
 library/Scores/Extract/Dict.php               | 10 ++++++++++
 scripts/jobs/enrichissement.php               |  2 ++
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/application/views/scripts/profil/create.phtml b/application/views/scripts/profil/create.phtml
index c6a22be5..ffce3088 100644
--- a/application/views/scripts/profil/create.phtml
+++ b/application/views/scripts/profil/create.phtml
@@ -80,8 +80,9 @@ Clé de dédoublonnage : <br/>
 Référence <input type="text" name="profil" value="<?=$this->reference?>" />
 
 <?php if ($this->edit) { ?>
-<a id="save" href="<?=$this->url(array('controller'=>'profil', 'action'=>'save', 'id'=>$this->id))?>">Modifier</a>
+<a id="save" class="btn btn-sm btn-primary"  href="<?=$this->url(array('controller'=>'profil', 'action'=>'save', 'id'=>$this->id))?>">Modifier</a>
 <?php } else {?>
-<a id="save" href="<?=$this->url(array('controller'=>'profil', 'action'=>'save'))?>">Sauvegarder</a>
+<a id="save" class="btn btn-sm btn-primary" href="<?=$this->url(array('controller'=>'profil', 'action'=>'save'))?>">Sauvegarder</a>
 <?php }?>
+<a id="return" class="btn btn-sm btn-info" href="<?=$this->url(array('controller'=>'index', 'action'=>'index'))?>">Retour</a>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/profil/detail.phtml b/application/views/scripts/profil/detail.phtml
index 746b06d4..fd8a6741 100644
--- a/application/views/scripts/profil/detail.phtml
+++ b/application/views/scripts/profil/detail.phtml
@@ -5,4 +5,5 @@
 	<li><?=$item?></li>
 <?php }?>
 </ol>
+<a id="return" class="btn btn-sm btn-info" href="<?=$this->url(array('controller'=>'index', 'action'=>'index'))?>">Retour</a>
 </div>
\ No newline at end of file
diff --git a/application/views/scripts/profil/help.phtml b/application/views/scripts/profil/help.phtml
index 1fd71d54..b297d022 100644
--- a/application/views/scripts/profil/help.phtml
+++ b/application/views/scripts/profil/help.phtml
@@ -45,6 +45,7 @@ function setListChecked(){
 		var chp=tab[i];
 		document.getElementById('help'+chp).checked=true;
 		}
+	$('input[name=<?=$this->key?>]').val(iref);
 }
 </script>
 <?php endif;?>
diff --git a/application/views/scripts/profil/index.phtml b/application/views/scripts/profil/index.phtml
index 115d6862..c2422dbe 100644
--- a/application/views/scripts/profil/index.phtml
+++ b/application/views/scripts/profil/index.phtml
@@ -24,6 +24,7 @@ Aucun profils d'enrichissement.
 </div>
 
 <p>
-<a href="<?=$this->url(array('controller'=>'profil', 'action'=>'create'))?>">Créer un nouveau profil</a>
+<a id="return" class="btn btn-sm btn-info" href="<?=$this->url(array('controller'=>'index', 'action'=>'index'))?>">Retour</a>
+<a  class="btn btn-sm btn-danger"  href="<?=$this->url(array('controller'=>'profil', 'action'=>'create'))?>">Créer un nouveau profil</a>
 </p>
 
diff --git a/library/Scores/Extract/Dict.php b/library/Scores/Extract/Dict.php
index 83b067a5..6894b39e 100644
--- a/library/Scores/Extract/Dict.php
+++ b/library/Scores/Extract/Dict.php
@@ -558,6 +558,16 @@ class Scores_Extract_Dict
             'help' => "",
             'columns' => array()
         ),
+        'topContentieuxDE'=> array(
+            'lib' => 'Greffe Top Contentieux DE',
+            'help' => "Présence de contentieux DE",
+            'columns' => array()
+        ),
+        'topContentieuxDF'=> array(
+            'lib' => 'Greffe Top Contentieux DF',
+            'help' => "Présence de contentieux DF",
+            'columns' => array()
+        ),
         'nbContentieuxDE'=> array(
             'lib' => 'Greffe Nbre Contentieux DE',
             'help' => "Nbre de contentieux DE",
diff --git a/scripts/jobs/enrichissement.php b/scripts/jobs/enrichissement.php
index 7bddbffe..ec192dc3 100644
--- a/scripts/jobs/enrichissement.php
+++ b/scripts/jobs/enrichissement.php
@@ -232,6 +232,8 @@ $tabDico = array(
         'cle' => array(
             'nbContentieuxDE' 	=> 'SUM(IF(qualite="DE",1,0)) as nbContentieuxDE',
             'nbContentieuxDF' 	=> 'SUM(IF(qualite="DF",1,0)) as nbContentieuxDF',
+            'topContentieuxDE' 	=> 'IF(SUM(IF(qualite="DE",1,0))>0,1,0) as topContentieuxDE',
+            'topContentieuxDF' 	=> 'IF(SUM(IF(qualite="DF",1,0))>0,1,0) as topContentieuxDF',
         ),
         'where' => ' WHERE entSiren=$siren',
     ),