issue #0001219 : Rearrange criteres

This commit is contained in:
Michael RICOIS 2012-07-23 11:13:34 +00:00
parent dc8246438f
commit 88478b95f9
5 changed files with 58 additions and 67 deletions

View File

@ -1,25 +1,21 @@
<div id="economique"> <div id="economique">
<div id="s_economique"> <ul id="fieldsblock">
<ul id="fieldsblock"> <li><?=$this->Field('capital')?></li>
<li><?=$this->Field('capital')?></li> <li><?=$this->Field('ape_entrep')?></li>
<li><?=$this->Field('ape_etab')?></li> <li class="advanced"><?=$this->Field('ape_etab')?></li>
<li><?=$this->Field('ape_entrep')?></li> <li><?=$this->Field('age_entrep')?></li>
<li><?=$this->Field('age_etab')?></li> <li class="advanced"><?=$this->Field('age_etab')?></li>
<li><?=$this->Field('teff_etab')?></li> <li><?=$this->Field('teff_entrep')?></li>
<li><?=$this->Field('eff_etab')?></li> <li class="advanced"><?=$this->Field('teff_etab')?></li>
<div id="a_economique" style="display:none;"> <li><?=$this->Field('eff_entrep')?></li>
<li><?=$this->Field('age_entrep')?></li> <li class="advanced"><?=$this->Field('eff_etab')?></li>
<li><?=$this->Field('teff_entrep')?></li> <li class="advanced"><?=$this->Field('nbEtab')?></li>
<li><?=$this->Field('eff_entrep')?></li>
<li><?=$this->Field('nbEtab')?></li>
</div>
</ul> </ul>
<p> <p>
<a class="mode" id="a_economique" style="cursor:pointer;margin-left:50%"> <a class="mode" id="a_economique" style="cursor:pointer;margin-left:50%">
<img src="/themes/default/images/fleche-bas.gif" /> <img src="/themes/default/images/fleche-bas.gif" />
</a> </a>
</p> </p>
</div>
</div> </div>
<div style="text-align:right;margin-top:20px;"> <div style="text-align:right;margin-top:20px;">
<a class="resetFamille" id="economique">Réinitialiser les critères economiques</a> <a class="resetFamille" id="economique">Réinitialiser les critères economiques</a>

View File

@ -1,31 +1,25 @@
<div id="financiere"> <div id="financiere">
<div id="s_financier"> <ul id="fieldsblock">
<ul id="fieldsblock"> <li><?=$this->Field('bilType')?></li>
<li><?=$this->Field('bilType')?></li> <li><?=$this->Field('avisCs')?></li>
<li><?=$this->Field('avisCs')?></li> <li><?=$this->Field('bilAnnee')?></li>
<li><?=$this->Field('bilAnnee')?></li> <li><?=$this->Field('bilCloture')?></li>
<li><?=$this->Field('bilCloture')?></li> <li><?=$this->Field('bilDuree')?></li>
<li><?=$this->Field('bilDuree')?></li> <li><?=$this->Field('bilTca')?></li>
<li><?=$this->Field('bilTca')?></li> <li><?=$this->Field('bilFL')?></li>
<li><?=$this->Field('bilFL')?></li> <li class="advanced"><?=$this->Field('bilEE')?></li>
</ul> <li class="advanced"><?=$this->Field('bilFK')?></li>
</div> <li class="advanced"><?=$this->Field('bilFR')?></li>
<div id="a_financiere" style="display:none"> <li class="advanced"><?=$this->Field('bilGF')?></li>
<ul id="fieldsblock"> <li class="advanced"><?=$this->Field('bilGP')?></li>
<li><?=$this->Field('bilEE')?></li> <li class="advanced"><?=$this->Field('bilGW')?></li>
<li><?=$this->Field('bilFK')?></li> <li class="advanced"><?=$this->Field('bilHD')?></li>
<li><?=$this->Field('bilFR')?></li> <li class="advanced"><?=$this->Field('bilHH')?></li>
<li><?=$this->Field('bilGF')?></li> <li class="advanced"><?=$this->Field('bilHL')?></li>
<li><?=$this->Field('bilGP')?></li> <li class="advanced"><?=$this->Field('bilHM')?></li>
<li><?=$this->Field('bilGW')?></li> <li class="advanced"><?=$this->Field('bilHN')?></li>
<li><?=$this->Field('bilHD')?></li> <li class="advanced"><?=$this->Field('bilYP')?></li>
<li><?=$this->Field('bilHH')?></li> </ul>
<li><?=$this->Field('bilHL')?></li>
<li><?=$this->Field('bilHM')?></li>
<li><?=$this->Field('bilHN')?></li>
<li><?=$this->Field('bilYP')?></li>
</ul>
</div>
<p> <p>
<a class="mode" id="a_financiere" style="cursor:pointer;margin-left:50%"> <a class="mode" id="a_financiere" style="cursor:pointer;margin-left:50%">
<img src="/themes/default/images/fleche-bas.gif" /> <img src="/themes/default/images/fleche-bas.gif" />

View File

@ -1,17 +1,11 @@
<div id="juridique"> <div id="juridique">
<div id="s_juridique"> <ul id="fieldsblock">
<ul id="fieldsblock"> <li><?=$this->Field('cj')?></li>
<li><?=$this->Field('cj')?></li> <li><?=$this->Field('actifEco')?></li>
<li><?=$this->Field('actifEco')?></li> <li><?=$this->Field('procolHisto')?></li>
<li><?=$this->Field('procolHisto')?></li> <li><?=$this->Field('dateImmat')?></li>
<li><?=$this->Field('dateImmat')?></li> <li class="advanced"><?=$this->Field('tvaIntraValide')?></li>
</ul> </ul>
</div>
<div id="a_juridique" style="display:none">
<ul id="fieldsblock">
<li><?=$this->Field('tvaIntraValide')?></li>
</ul>
</div>
<p> <p>
<a class="mode" id="a_juridique" style="cursor:pointer;margin-left:50%"> <a class="mode" id="a_juridique" style="cursor:pointer;margin-left:50%">
<img src="/themes/default/images/fleche-bas.gif" /> <img src="/themes/default/images/fleche-bas.gif" />

View File

@ -53,19 +53,22 @@ $(document).ready(function(){
return false; return false;
}); });
$('.mode').click(function(){ $('.mode').click(function() {
var id = $(this).attr('id'); var mode = 0;
$('ul#fieldsblock li').each(function() {
if ($(this).attr('class')=='advanced') {
if($(this).css('display')=='none') {
$(this).css('display', 'block');
if($('#'+id).css('display') == 'none') { mode++;
$('#'+id).show('blind'); } else {
$(this).html('<img src="/themes/default/images/fleche-haut.gif" />'); $(this).css('display', 'none');
} }
else { }
$('#'+id).hide('blind'); });
if (mode==0) {
$(this).html('<img src="/themes/default/images/fleche-bas.gif" />'); $(this).html('<img src="/themes/default/images/fleche-bas.gif" />');
} else {
$(this).html('<img src="/themes/default/images/fleche-haut.gif" />');
} }
}); });
}); });

View File

@ -254,6 +254,10 @@ ul#fieldsblock li:hover {
background-color:#9EC5FF; background-color:#9EC5FF;
} }
ul#fieldsblock li.advanced {
display:none;
}
ul#fieldsblock li div.fieldgrp { ul#fieldsblock li div.fieldgrp {
clear: both; clear: both;
width: 100%; width: 100%;