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

Issue #0001652: Show scores for 'idClient' = 1

Browse Source
This commit is contained in:
Aram HARUTYUNYAN 2013-07-26 12:22:48 +00:00
parent d9e0074c29
commit c06ef199f0
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/EvaluationController.php
View File

@ -95,6 +95,7 @@ class EvaluationController extends Zend_Controller_Action
$this->view->assign('indiscore', $infos);
$this->view->assign('AutrePage', $autrePage);
$this->view->assign('exportObjet', $infos);
$this->view->assign('idClient', $user->getIdClient());
$this->view->assign('aviscredit', $user->checkPerm('aviscredit'));
$this->view->assign('surveillance', $user->checkPerm('survscore'));
@ -108,6 +109,7 @@ class EvaluationController extends Zend_Controller_Action
$this->view->headScript()->appendFile('/themes/default/scripts/finance.js', 'text/javascript');
$user = new Scores_Utilisateur();
$wdate = new WDate();
if(!$user->checkPerm('INDISCORE2') && !$user->checkPerm('INDISCORE2P'))
$this->_forward('perms', 'error');
@ -166,7 +168,7 @@ class EvaluationController extends Zend_Controller_Action
$dInfo[$idRatio] = $valRatio['total_info'];
}
$tabResult[] = array(
'dateCloture' => WDate::dateT('Ymd','d/m/Y',$annee),
'dateCloture' => $wdate->dateT('Ymd','d/m/Y',$annee),
'duree' => $infosAnnee[$annee]->duree.' Mois',
'ratio' => $data,
'total' => $dataTotal,
@ -218,7 +220,7 @@ class EvaluationController extends Zend_Controller_Action
$dateRadiation = '';
if(isset($indiscore->DateRadiation) && $indiscore->DateRadiation!='' && $indiscore->DateRadiation!='0000-00-00')
$this->view->assign('dateRadiation', WDate::dateT('Ymd', 'd/m/Y', str_replace('-','',$indiscore->DateRadiation)));
$this->view->assign('dateRadiation', $wdate->dateT('Ymd', 'd/m/Y', str_replace('-','',$indiscore->DateRadiation)));
foreach($indiscore->scores as $name => $sc){
if($name == 'ConanH')

8
application/views/default/scripts/evaluation/indiscore.phtml
View File

@ -135,9 +135,9 @@
<div class="stats gradiant_pic">
<ul>
<li>
<i><?=$this->indiscore->AnalyseConfor?></i>
<i><?=$this->indiscore->AnalyseConfor; ?></i>
<div class="blocdegrade clearfix">
<span class="textdegrade">Conformit&eacute;</span>
<span class="textdegrade">Conformit&eacute;&nbsp;<? if ($this->idClient==1) { echo '('.$this->indiscore->ScoreConfor.')';}?></span>
<div class="imgdegrade"><img class="borderimg" src="/themes/default/images/indiscore/imgscores-<?=$this->FormatPct($this->indiscore->ScoreConfor)?>.png"/></div>
<div class="regle"><img src="/themes/default/images/indiscore/sgradiant2.png" /></div>
</div>
@ -151,7 +151,7 @@
<li>
<i><?=$this->indiscore->AnalyseDirigeance?></i>
<div class="blocdegrade clearfix">
<span class="textdegrade">Dirigeance</span>
<span class="textdegrade">Dirigeance&nbsp;<? if ($this->idClient==1) { echo '('.$this->indiscore->ScoreDirigeance.')';}?></span>
<div class="imgdegrade"><img class="borderimg" src="/themes/default/images/indiscore/imgscores-<?=$this->FormatPct($this->indiscore->ScoreDirigeance)?>.png"/></div>
<div class="regle"><img src="/themes/default/images/indiscore/sgradiant2.png" /></div>
</div>
@ -165,7 +165,7 @@
<li>
<i>L'analyse de la solvabilit&eacute; est <?=$this->indiscore->AnalyseSolvabilite?></i>
<div class="blocdegrade clearfix">
<span class="textdegrade">Solvabilit&eacute;</span>
<span class="textdegrade">Solvabilit&eacute;&nbsp;<? if ($this->idClient==1) { echo '('.$this->indiscore->Indiscore.')';}?></span>
<div class="imgdegrade"><img class="borderimg" src="/themes/default/images/indiscore/imgscores-<?php echo $this->FormatPct($this->indiscore->Indiscore);?>.png"/></div>
<div class="regle"><img src="/themes/default/images/indiscore/sgradiant2.png" /></div>
</div>

6
public/themes/default/scripts/scorecutoff.js
View File

@ -75,8 +75,8 @@ $('#dialog').dialog({ buttons: [
] });
if($('#dateInsert').text()!='') {
$(".ui-dialog-buttonpane button:contains('Supprimer')").show();
}
else {
$(".ui-dialog-buttonpane button:contains('Supprimer')").hide(); // change to show() when webservice will be ready
}
else {
$(".ui-dialog-buttonpane button:contains('Supprimer')").hide();
}