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

Redesign

Browse Source
This commit is contained in:
Michael RICOIS 2016-09-07 15:50:45 +02:00
parent 49e7934ffb
commit 84c269b14d
3 changed files with 53 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/modules/user/controllers/PortfolioController.php
View File

@ -51,11 +51,7 @@ class User_PortfolioController extends Zend_Controller_Action
$this->forward('perms', 'error', 'default');
}
$this->view->headLink()
->appendStylesheet('/libs/tablesorter/themes/blue/style.css', 'all');
$this->view->headScript()
->appendFile('/libs/tablesorter/jquery.tablesorter.js', 'text/javascript')
->appendFile($this->theme->pathScript.'/surveillance.js', 'text/javascript');
$request = $this->getRequest();
@ -198,11 +194,7 @@ class User_PortfolioController extends Zend_Controller_Action
$this->forward('perms', 'error', 'default');
}
$this->view->headLink()
->appendStylesheet('/libs/tablesorter/themes/blue/style.css', 'all');
$this->view->headScript()
->appendFile('/libs/tablesorter/jquery.tablesorter.js', 'text/javascript')
->appendFile($this->theme->pathScript.'/surveillance.js', 'text/javascript');
$request = $this->getRequest();

65
application/modules/user/views/default/scripts/portfolio/index.phtml
View File

@ -27,17 +27,15 @@
<h2>Extraction des surveillances</h2>
<?php //$this->action('surveillancecsv', 'surveillance')?>
<h2>Options de recherche</h2>
<div class="paragraph">
<div>
<label>Afficher uniquement les suveillances de type</label>
<select name="type">
<option value="">toutes</option>
<?=$this->selectTri?>
</select>
</div>
<div class="paragraph">
<div>
Tri
<select name="triMode">
<option value="asc"<?=($this->triMode=='asc')? ' selected' : ''?>>croissant</option>
@ -53,7 +51,7 @@ par
</select>
</div>
<div class="paragraph" id="formSurveillance">
<div id="formSurveillance">
<form name="recherche" action="<?=$this->url(array('controller'=>'surveillance', 'action'=>'liste'))?>">
<input type="text" name="q" class="search" value="<?=($this->q != null)? $this->q : "Siren, Référence, Dénomination Sociale"?>" />
<input type="submit" value="Rechercher" class="submit"/>
@ -62,20 +60,7 @@ par
<h2>Liste des surveillances</h2>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1, 'token'=> $this->token))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev, 'token'=> $this->token))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext, 'token'=> $this->token))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal, 'token'=> $this->token))?>">&raquo;</a>
</div>
</div>
<?php }?>
<div class="paragraph">
<table class="tablesorter" id="surveillance" width="570">
<table class="table table-bordered table-condensed" id="surveillance">
<thead>
<tr>
<th width="75">Siren</th>
@ -218,17 +203,16 @@ par
<?php } ?>
</tbody>
</table>
</div>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
</div>
<div class="text-center">
<ul class="pagination">
<li><a href="<?=$this->url(array('page'=>1))?>" aria-label="First"><span aria-hidden="true">&laquo;</span></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a></li>
<li><a href="#"><span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a></li>
<li><a href="<?=$this->url(array('page'=>$this->PageTotal))?>" aria-label="Last"><span aria-hidden="true">&raquo;</span></a></li>
</ul>
</div>
<?php }?>
@ -245,7 +229,7 @@ function submitTri() {
), 'default', true)?>/source/'+source+'/tri/'+tri+'/triMode/'+triMode;
}
$(document).ready(function() {
$(function() {
$('select[name=page]').change(function(){
window.location.href = $(this).val();
});
@ -267,29 +251,6 @@ $(document).ready(function() {
var val = $(this).val();
if ( val == '' ){ $(this).val(txt); }
});
<?php
if ($source == '') {
?>
$('#surveillance').tablesorter({
headers: {
2: { sorter: false },
3: { sorter: false },
4: { sorter: false },
5: { sorter: false }
}
});
<?php
} else {
?>
$('#surveillance').tablesorter({
headers: {
3: { sorter: false }
}
});
<?php
}
?>
});
</script>

115
application/modules/user/views/default/scripts/portfolio/score.phtml
View File

@ -1,7 +1,8 @@
<div id="center">
<h1 class="titre">PORTEFEUILLE</h1>
<div id="content">
<div class="page-header">
<h1>PORTEFEUILLE</h1>
</div>
<div class="paragraph">
<table id="info">
<tr>
<td width="200" class="StyleInfoLib">Nombre d'entités affichées</td>
@ -12,7 +13,6 @@
<td><?=$this->nbSurveillances?></td>
</tr>
</table>
</div>
<h2>Exportation de votre portefeuille</h2>
<div class="paragraph">
@ -20,7 +20,6 @@
</div>
<h2>Options de recherche</h2>
<div class="paragraph">
Tri par
<select name="tri">
<option value="siren"<?=($this->tri=='siren')? ' selected' : ''?>>Siren</option>
@ -29,35 +28,19 @@ Tri par
<option value="dateAjout"<?=($this->tri=='dateAjout')? ' selected' : ''?>>Date d'ajout</option>
<option value="dateDerEnvoi"<?=($this->tri=='dateDerEnvoi')? ' selected' : ''?>>Date d'envoi</option>
</select>
</div>
<div class="paragraph" id="formSurveillance">
<form name="recherche" action="<?=$this->url(array('controller'=>'surveillance', 'action'=>'portefeuille'))?>">
<input type="text" name="siren" class="search" value="<?=($this->siren != null)? $this->siren : "Siren"?>" /><br/>
<input type="text" name="ref" class="search" value="<?=($this->ref != null)? $this->ref : "Référence"?>" /><br/>
<input type="text" name="siren" class="search" value="<?=($this->siren != null)? $this->siren : "Siren"?>" />
<input type="text" name="ref" class="search" value="<?=($this->ref != null)? $this->ref : "Référence"?>" />
<input type="text" name="rs" class="search" value="<?=($this->rs != null)? $this->rs : "Dénomination Sociale"?>"/>
<input type="submit" value="Rechercher" class="submit"/>
</form>
</div>
<h2>Surveillance Score</h2>
<?php if ($this->totPage>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->curPage-1))?>">&lsaquo;</a>
<span>Page <?=$this->curPage?>/<?=$this->totPage?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->curPage+1))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->totPage))?>">&raquo;</a>
</div>
</div>
<?php }?>
<div class="paragraph">
<?php
if (count($this->portefeuille)>0) {
?>
<table class="tablesorter" id="surveillance">
<?php if (count($this->portefeuille)>0) { ?>
<table class="table table-condensed table-bordered" id="surveillance">
<thead>
<tr>
<th>Siren</th>
@ -72,38 +55,24 @@ if (count($this->portefeuille)>0) {
<?php foreach ($this->portefeuille as $item) { ?>
<tr>
<td>
<a href="<?=$this->url(array(
'controller' => 'identite',
'action' => 'fiche',
'siret' => $item->siren));?>">
<?=$item->siren?>
</a>
<a href="<?=$this->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=>$item->siren),
'default', true)?>"><?=$item->siren?></a>
</td>
<td width="110">
<?=$item->rs?><br/>
<i><?=$item->cp.' '.$item->ville?></i>
<td>
<?=$item->rs?><br/><i><?=$item->cp.' '.$item->ville?></i>
</td>
<td>
<p><?=$item->ref?></p>
</td>
<td class="tooltip" title="<?=$item->tooltip?>">
<div class="align_image"><?=$item->colScore?></div>
<td>
<div class="qtip-tooltip" title="<?=$item->tooltip?>"><?=$item->colScore?></div>
</td>
<td class="encours set">
<div class="valign">
<?php
if( $item->indiScoreDate!='0000-00-00' &&
$item->procol!='P' && $item->actif!=0)
{
?>
<a class="dialogsurv editencours" href="<?=$this->url(array(
'action' => 'encours',
'siret' => $item->siren.$item->nic,
'ref' => $item->ref,
'email' => $item->email));
?>" title="Editer encours">
<img src="/themes/default/images/interfaces/editer.png"/>
</a>
<?php if( $item->indiScoreDate!='0000-00-00' && $item->procol!='P' && $item->actif!=0) {?>
<a class="dialogsurv editencours" href="<?=$this->url(array('action'=>'encours',
'siret'=>$item->siren.$item->nic, 'ref'=>$item->ref, 'email'=>$item->email))?>"
title="Editer encours"><img src="/themes/default/images/interfaces/editer.png"/></a>
<span>
<?php if(!empty($item->encoursClient)) { ?>
<?=number_format(round($item->encoursClient/1000), 0, ',', ' ')?> K&euro;
@ -113,11 +82,8 @@ if (count($this->portefeuille)>0) {
</span>
</div>
</td>
<?php
if( $item->indiScoreDate!='0000-00-00' && $item->procol!='P' && $item->actif!=0) {
?>
<td class="encours" title="Précédent :
<?=number_format(round($item->encoursPre/1000), 0, ',', ' ')?>
<?php if( $item->indiScoreDate!='0000-00-00' && $item->procol!='P' && $item->actif!=0) { ?>
<td class="encours" title="Précédent : <?=number_format(round($item->encoursPre/1000), 0, ',', ' ')?>
K&euro;">
<?=number_format(round($item->encours/1000), 0, ',', ' ')?> K&euro;
</td>
@ -129,24 +95,21 @@ if (count($this->portefeuille)>0) {
</tbody>
</table>
<?php } else {?>
Aucune surveillance Score.
<p>Aucune surveillance Score.</p>
<?php }?>
</div>
<?php if ($this->PageTotal>1) {?>
<div class="paragraph">
<div class="pagination clearfix">
<a class="first" href="<?=$this->url(array('page'=>1))?>">&laquo;</a>
<a class="previous" href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a>
<span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span>
<a class="next" href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a>
<a class="last" href="<?=$this->url(array('page'=>$this->PageTotal))?>">&raquo;</a>
</div>
<div class="text-center">
<ul class="pagination">
<li><a href="<?=$this->url(array('page'=>1))?>" aria-label="First"><span aria-hidden="true">&laquo;</span></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PagePrev))?>">&lsaquo;</a></li>
<li><a href="#"><span>Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></span></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PageNext))?>">&rsaquo;</a></li>
<li><a href="<?=$this->url(array('page'=>$this->PageTotal))?>" aria-label="Last"><span aria-hidden="true">&raquo;</span></a></li>
</ul>
</div>
<?php }?>
</div>
<script>
function submitTri() {
var tri = $('select[name=tri] option:selected').val();
@ -159,34 +122,22 @@ function submitTri() {
), 'default', true)?>/tri/'+tri;
}
$(document).ready(function(){
$(function(){
$('select[name=page]').change(function(){
window.location.href = $(this).val();
});
$('#surveillance').tablesorter({
headers: {
3: { sorter: false },
4: { sorter: false },
5: { sorter: false }
}
});
$('.tooltip').each(function(){
$('.qtip-tooltip').each(function(){
$(this).qtip({
content: $(this).attr('tooltip'),
style: { width: 300, classes: "qtip-dark" },
position: { at: "bottom center", my: "top center" }
});
});
$('.set').hover(function(){
$(this).find('a.editencours').css('display', 'inline');
},function () {
$(this).find('a.editencours').css('display', 'none');
});
$('input[name=siren]').focusin(function(){
var txt = 'Siren';
var val = $(this).val();
@ -196,7 +147,6 @@ $(document).ready(function(){
var val = $(this).val();
if ( val == '' ){ $(this).val(txt); }
});
$('input[name=ref]').focusin(function(){
var txt = 'Référence';
var val = $(this).val();
@ -206,7 +156,6 @@ $(document).ready(function(){
var val = $(this).val();
if ( val == '' ){ $(this).val(txt); }
});
$('input[name=rs]').focusin(function(){
var txt = 'Dénomination Sociale';
var val = $(this).val();
@ -216,10 +165,8 @@ $(document).ready(function(){
var val = $(this).val();
if ( val == '' ){ $(this).val(txt); }
});
$('select[name=tri]').change(function() {
submitTri();
});
});
</script>