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

SD-29 : Modifs libellés pour coller au ws + ameliorations ergo

Browse Source
This commit is contained in:
Claire DELBOS 2017-04-03 13:50:59 +02:00
parent b3ff8e1398
commit 35ffcdc73d
5 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/views/scripts/profil/create.phtml
View File

@ -75,14 +75,15 @@ Clé de dédoublonnage : <br/>
<input type="checkbox" name="doublon" value="nic" <?php if(in_array('nic', $this->doublon)) echo ' checked';?>/> NIC<br/>
<input type="checkbox" name="doublon" value="ref" <?php if(in_array('ref', $this->doublon)) echo ' checked';?>/> REF<br/>
</div>
<div id="message" class="text-danger"></div>
<div style="clear:both;">
Référence <input type="text" name="profil" value="<?=$this->reference?>" />
<?php if ($this->edit) { ?>
<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" class="btn btn-sm btn-primary" 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>
</div>

8
application/views/scripts/profil/index.phtml
View File

@ -1,10 +1,13 @@
<div>
<h2>Gestion des profils</h2>
<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 if (count($this->profils)>0) {?>
<table class="table">
<thead>
<tr>
<th>Référence</th>
<th>Résumé</th>
<th>Action</th>
</tr>
</thead>
@ -12,7 +15,8 @@
<?php foreach($this->profils as $profil) {?>
<tr>
<td><a href="<?=$this->url(array('controller'=>'profil', 'action'=>'detail', 'id'=>$profil->id))?>"><?=$profil->reference?></a></td>
<td><a href="<?=$this->url(array('controller'=>'profil', 'action'=>'create', 'id'=>$profil->id))?>">Edition</a></td>
<td>(<?php echo substr(implode(', ',(array)json_decode($profil->criteres)),0,100)?>...)</td>
<td><a class="btn btn-sm btn-primary" href="<?=$this->url(array('controller'=>'profil', 'action'=>'create', 'id'=>$profil->id))?>">Edition</a></td>
</tr>
<?php }?>
</tbody>

14
library/Scores/Extract/Dict.php
View File

@ -585,18 +585,22 @@ class Scores_Extract_Dict
NB le fichier en sortie contiendra plus de lignes que le fichier en entrée.",
'columns' => array(
'idAffaire' => 'identifiant de l\'afaire',
'qualite' => 'En qualité de DE = Demandeur, DF = Défendeur',
'tiers' => 'En qualité de DE = Demandeur, DF = Défendeur',
'statusCode' => 'Etat de l\'affaire abrégé',
'statusLabel' => 'Etat de l\'affaire',
'categoryCode' => 'Nature de demande abregée',
'categoryLabel' => 'Nature de demande',
'label' => 'Nature de demande',
'dateAffaire' => 'Date d\'enrôlement au greffe',
'categorieAffaire' => 'Categorie d\'affaire',
'typeAffaire' => 'Nature de demande abregée',
'natureDemande' => 'Nature de demande',
'nomPartie' => 'Nom de l\'acteur',
'nomDemandeur' => 'Nom du/des demandeur(s)',
'nomDefendeur' => 'Nom du/des défendeur(s)',
'statutAffaire' => 'Etat de l\'affaire',
'codeGreffe' => 'Code du greffe',
'nomGreffe' => 'Nom du greffe',
'parties' => 'Detail des parties du dossier',
'representants' => 'Représentants',
'nomsRepresentants' => 'Noms du/des représentants',
'categorieAffaire' => 'Categorie d\'affaire',
'historique' => 'Historique des actions : date, libellé',
)
),

1
public/themes/default/js/profil.js
View File

@ -51,6 +51,7 @@ $(function() {
if (data!='Erreur'){ window.location.href = '/'; }
}, 'json');
}
$('#message').html('Parametres enregistres');
});
$('div#dico li').click(function(e){

22
scripts/jobs/enrichissement.php
View File

@ -2138,18 +2138,22 @@ function contentieuxlisteMultiple($siren, $nic=0, $values = false)
$histojoin='';
$fields=array(
'idAffaire' => 'a.idAffaire',
'qualite' => 's.qualite',
'tiers' => 's.qualite as tiers',
'statusCode' => 'etatAffaire as statusCode',
'statusLabel' => 'etatAffaire as statusLabel',
'categoryCode' => 'codNatureDemande as categoryCode',
'categoryLabel' => 'codNatureDemande as categoryLabel',
'label' => 'natureDemande as label',
'dateAffaire' => 'dateEnrolement as dateAffaire',
'categorieAffaire' => 'typeAffaireEnum as categorieAffaire',
'typeAffaire' => 'codNatureDemande as typeAffaire',
'natureDemande' => 'natureDemande',
'nomPartie' => 's.nomPartie',
'nomDemandeur' => 'nomDemandeur',
'nomDefendeur' => 'nomDefendeur',
'statutAffaire' => 'etatAffaire as statutAffaire',
'codeGreffe' => 'codeGreffe',
'nomGreffe' => 'nomGreffe',
'representants' => 'representants',
'nomsRepresentants' => 'rep0nom as nomsRepresentants',
'parties' => 'a.parties',
'categorieAffaire' => 'typeAffaireEnum as categorieAffaire',
'historique' => 'h.numLigneHisto as historique',
'dateDecision' => 'h.dateDecision',
'libelleDecision' => 'h.libelleDecision'
@ -2201,6 +2205,14 @@ function contentieuxlisteMultiple($siren, $nic=0, $values = false)
throw new Exception(__METHOD__ . ': ' . $e->getMessage());
}
$tabData=$stmt->fetchAll(\PDO::FETCH_ASSOC);
if(in_array('statusLabel',$tabFields) || in_array('categoryLabel',$tabFields)){
$status = include APPLICATION_PATH . '/../library/Metier/Ctx/AffaireStatus.php';
$categories = include APPLICATION_PATH . '/../library/Metier/Table/AffairesTypes.php';
foreach($tabData as $row){
if(isset($row['statusLabel']) && isset($status[$row['statusLabel']])){$row['statusLabel']=$status[$row['statusLabel']];}
if(isset($row['categoryLabel']) && isset($categories[$row['categoryLabel']])){$row['categoryLabel']=$categories[$row['categoryLabel']];}
}
}
return $tabData;
}