Validation design

This commit is contained in:
Michael RICOIS 2016-03-02 16:07:26 +00:00
parent 6db0fafa7f
commit ad41fcfcd5
8 changed files with 77 additions and 70 deletions

View File

@ -7,7 +7,7 @@
<?php if ($this->MenuEdit !== null) {?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<a href="#" class="dropdown-toggle sd-edit" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Mode Edition <span class="caret"></span></a>
<ul class="dropdown-menu">
</ul>
@ -16,7 +16,7 @@
<?php if ($this->print) {?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<a href="#" class="dropdown-toggle sd-bgblue" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Imprimer <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a title="Impression" href="/editer/ecran/<?=$this->print.'.html'?>"
@ -34,7 +34,7 @@
<?php if ($this->MenuSuivi !== null) {?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<a href="#" class="dropdown-toggle sd-bgblue" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Suivi <span class="badge"><?=count($this->Suivi)?></span> <span class="caret"></span></a>
<ul class="dropdown-menu">
<?php if (count($this->Suivi) == 0) {?>
@ -52,7 +52,7 @@
<?php }?>
<li class="dropdown">
<a href="#" class="dropdown-toggle sd-txtblue" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<a href="#" class="dropdown-toggle sd-bgblue" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Tableau de bord <span class="caret"></span></a>
<ul class="dropdown-menu">
<?php if (in_array($this->UserProfil, array('Administrateur', 'SuperAdministrateur'))) {?>
@ -78,7 +78,7 @@
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle sd-txtblue" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<a href="#" class="dropdown-toggle sd-bgblue" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
Outils Métier <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="http://ws.scores-decisions.com" target="_blank">WebService</a></li>

View File

@ -9,7 +9,8 @@ class Zend_View_Helper_ProfileLink extends Zend_View_Helper_Abstract
$username = $auth->getIdentity()->username;
$logoutUrl = $this->view->url(array('module'=>'default', 'controller'=>'user', 'action'=>'logout'),
'default', true);
return '<a href="'.$logoutUrl.'" title="Se déconnecter" class="navbar-link">Déconnexion : ' . $username . '</a>';
return '<a href="'.$logoutUrl.'" title="Déconnexion : '.$username.'" class="navbar-link visible-xs visible-sm"><span class="glyphicon glyphicon-off"></span></a>'
.'<a href="'.$logoutUrl.'" title="Se déconnecter" class="navbar-link hidden-xs hidden-sm">Déconnexion : '.$username.'</a>';
}
}
}

View File

@ -49,15 +49,15 @@ class FinanceController extends Zend_Controller_Action
}
$tabRatio = array(
'r5' => array('evol'=>'r6', 'op' => 1000, 'titre'=>'CHIFFRE D\'AFFAIRES'),
'r7' => array('evol'=>'r8', 'op' => 1000, 'titre'=>'RESULTAT COURANT AVANT IMPOTS'),
'r10' => array('evol'=>'r11', 'op' => 1000, 'titre'=>'RESULTAT NET'),
'r18' => array('evol'=>'r19', 'op' => 1000, 'titre'=>'FONDS PROPRES'),
'r22' => array('evol'=>'r23', 'op' => 1000, 'titre'=>'TOTAL BILAN'),
'r231' => array('evol'=>'r235', 'op' => 1000, 'titre'=>'FONDS DE ROULEMENT'),
'r232' => array('evol'=>'r236', 'op' => 1000, 'titre'=>'BESOIN EN FONDS DE ROULEMENT'),
'r249' => array('evol'=>'r254', 'op' => 1000, 'titre'=>'TRESORERIE'),
'r24' => array('evol'=>'r24', 'op' => 1, 'titre'=>'EFFECTIF', 'unite' => 1),
'r5' => array('evol'=>'r6', 'op' => 1000, 'titre'=>"CHIFFRE D'AFFAIRES"),
'r7' => array('evol'=>'r8', 'op' => 1000, 'titre'=>"RESULTAT COURANT AVANT IMPOTS"),
'r10' => array('evol'=>'r11', 'op' => 1000, 'titre'=>"RESULTAT NET"),
'r18' => array('evol'=>'r19', 'op' => 1000, 'titre'=>"FONDS PROPRES"),
'r22' => array('evol'=>'r23', 'op' => 1000, 'titre'=>"TOTAL BILAN"),
'r231' => array('evol'=>'r235', 'op' => 1000, 'titre'=>"FONDS DE ROULEMENT"),
'r232' => array('evol'=>'r236', 'op' => 1000, 'titre'=>"BESOIN EN FONDS DE ROULEMENT"),
'r249' => array('evol'=>'r254', 'op' => 1000, 'titre'=>"TRESORERIE"),
'r24' => array('evol'=>'r24', 'op' => 1, 'titre'=>"EFFECTIF", 'unite' => 1),
);
$tabRatioGraph = array(

View File

@ -82,9 +82,7 @@ Aucun bilan disponible.
<tbody>
<?php foreach($this->tabRatio as $ratio => $info) { ?>
<tr>
<td class="head">
<a class="tooltip" title="<?=$info['comment']?>"><?=$info['titre']?></a>
</td>
<td class="head qtip-tooltip" data-tooltip="<?=$info['comment']?>"><?=$info['titre']?></td>
<td class="right"><?=$this->tabResult[0]['entrep'][$ratio]?></td>
<td class="right"><?=$this->tabResult[0]['entrepEvol'][$ratio]?></td>
<td class="right"><?=$this->tabResult[1]['entrep'][$ratio]?></td>
@ -92,24 +90,14 @@ Aucun bilan disponible.
<td class="right"><?=$this->tabResult[2]['entrep'][$ratio]?></td>
<td class="right"><?=$this->tabResult[2]['entrepEvol'][$ratio]?></td>
<td>
<?php if ($this->graph): ?>
<a href="<?=$this->url(array(
'controller' => 'finance',
'action' => 'synthese',
'siret' => $this->siret,
'id' => $this->id,
'ratio' => $ratio,
))?>">
<img class="sTip" rel="<?=$this->url(array(
'controller' => 'finance',
'action' => 'synthesegraphevol',
'siret' => $this->siret,
'id' => $this->id,
'ratio' => $ratio,
))?>" title="<?=$info['titre']?>" src="/themes/default/images/finance/char_bar.png" alt="Visionner le graphique">
<?php endif;?>
<?php if ($this->graph) { ?>
<a class="sTip" data-url="<?=$this->url(array('controller'=>'finance', 'action'=>'synthesegraphevol',
'siret'=>$this->siret, 'id'=>$this->id, 'ratio'=>$ratio), 'default', true)?>" data-title="<?=$info['titre']?>"
href="<?=$this->url(array('controller'=>'finance', 'action'=>'synthese', 'siret'=>$this->siret,
'id'=>$this->id, 'ratio'=>$ratio), 'default', true)?>">
<img src="/themes/default/images/finance/char_bar.png" alt="Visionner le graphique">
</a>
<?php }?>
</td>
</tr>
<?php }?>
@ -118,11 +106,11 @@ Aucun bilan disponible.
</div>
<div class="paragraph">
<?php if ($this->graph):?>
<?php if ($this->graph) {?>
<?=$this->action('synthesegraphcompare', 'finance', null, array('siret'=>$this->siret, 'id'=>$this->id, 'typeBilan'=>$this->typeBilan))?>
<?php else:?>
<?php } else {?>
<b>Les informations sont insuffisantes pour générer le graphique de synthèse.</b>
<?php endif;?>
<?php }?>
</div>
<?php }?>

View File

@ -15,24 +15,23 @@
<?php } else {?>
<?php if ( empty($this->AutrePage) ) {?>
<div class="paragraph" style="text-align:right;">
<?php if (!empty($this->dateDerMaj)) { ?>
<a class="datemaj" href="#">
<div class="paragraph row">
<div class="col-md-6">
<?php if ( !empty($this->surveillance) ) {?>
<?php echo $surveillances = $this->action('infos','surveillance', null, array('siret' => $this->siret))?>
<?php }?>
</div>
<div class="col-md-6">
<?php if (!empty($this->dateDerMaj)) { ?>
<a class="datemaj pull-right" href="#">
<?=$this->translate("Dernière mise à jour le")?> <?=$this->dateDerMaj?>
<span><?=$this->datemajTexte?></span>
</a>
<?php }?>
</div>
<?php if ( !empty($this->surveillance) ) {?>
<div class="paragraph" style="clear:both;">
<?php echo $surveillances = $this->action('infos','surveillance', null, array('siret' => $this->siret))?>
</div>
<?php }?>
<?php }?>
<?php if ( empty($this->AutrePage) ) {?>
<h1 class="titre"><?=$this->translate("FICHE D'IDENTIT&Eacute;");?></h1>
<?php }?>

View File

@ -23,6 +23,9 @@ class Application_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
$view->UserModeEdit = $identity->modeEdition;
// --- Menu Edition
if ($view->UserModeEdit) {
$menu = array();
}
}
}
$view->MenuEdit = $menu;

View File

@ -10,10 +10,10 @@ $(document).ready(function()
$(this).parent('form').submit();
});
$('a.tooltip').qtip({
$('.qtip-tooltip').qtip({
style: { width: 500, classes: 'qtip-dark' },
position: { my: 'top left', at: 'bottom left' },
content: { attr: 'title'}
content: { attr: 'data-tooltip' }
});
$('area.detailsgraphique').qtip({
@ -34,17 +34,16 @@ $(document).ready(function()
});
});
$('a img.sTip').each(function(){
$(this).qtip({
position: { at: 'right center', my: 'right center', adjust: { x: -20 } },
show: { solo: true },
style: { width: 420, classes: 'qtip-light' },
content: {
text: "Chargement...",
title: { text: "Evolution - " + $(this).attr('title') },
ajax: { url: $(this).attr('rel') }
}
});
$('a.sTip').qtip({
position: { at: 'right center', my: 'right center', adjust: { x: -20 } },
show: { solo: true },
style: { width: 420, classes: 'qtip-light' },
content: {
text: "Chargement...",
title: { text: "Evolution - " + $(this).data('title') },
content: { text: "coucou" }
/*ajax: { url: $(this).data('url') }*/
}
});
$('#bilanClient').on('click', function(e){

View File

@ -10,14 +10,16 @@ body {
#center {background-color:#fff;padding:5px 0;}
#footer {background-color:#eee;clear:both;text-align:center;margin:15px 0 0 0;}
#footer p {font:0.9em Arial, Helvetica, sans-serif; }
#center h1 {clear:both;margin:5px;padding:5px;background:#8f8f8f;color:#ffffff;font:600 1.4em Arial, Verdana, Sans-serif;letter-spacing:1px;line-height:1.2em;}
#center h2 {clear:both; margin:5px; padding:5px;background:#1A5C7D;color:#ffffff;font:bold 1.2em Arial, Verdana, Sans-serif; }
#center h1 {clear:both;margin:5px;padding:5px;background:#8f8f8f;color:#ffffff;font-weight:bold;font-size:1.4em;}
#center h2 {clear:both; margin:5px; padding:5px;background:#1A5C7D;color:#ffffff;font-weight:bold;font-size:1.2em;}
div.paragraph {margin:5px;padding:5px;}
/*
a:link {color: #9c093a; text-decoration:none;}
a:visited {color: #0000CC; text-decoration:none;}
a:hover {color: #000066; text-decoration:none;}
.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:11px;font-weight:bold;color:#535353; vertical-align:top;line-height:18px;}
.StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size:11px;color:#535353;line-height:18px;}
a:visited {color:#0000CC; text-decoration:none;}
a:hover {color:#000066; text-decoration:none;}
*/
.StyleInfoLib {font-size:12px;font-weight:bold;color:#535353; vertical-align:top;line-height:18px;}
.StyleInfoData {font-size:12px;color:#535353;line-height:18px;}
.StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size:11px;line-height:16px;}
table.identite {border-collapse:separate;border-spacing:4px;}
table.data {width:100%;}
@ -63,11 +65,26 @@ img {vertical-align:middle;}
vertical-align: middle;
width: 25px;
}
.navbar-default .navbar-nav > li > a.sd-txtblue {
color:#1A5C7D;
}
/* Navbar
----------------------------------*/
.navbar-default .navbar-nav > .open > a.sd-bgblue,
.navbar-default .navbar-nav > li > a.sd-bgblue:hover,
.navbar-default .navbar-nav > .open > a.sd-bgblue:focus,
.navbar-default .navbar-nav > .open > a.sd-bgblue:hover {
background-color: #1a5c7d;
color: #ffffff;
}
.navbar-default .navbar-nav > .open > a.sd-edit,
.navbar-default .navbar-nav > li > a.sd-edit,
.navbar-default .navbar-nav > li > a.sd-edit:hover,
.navbar-default .navbar-nav > .open > a.sd-edit:focus,
.navbar-default .navbar-nav > .open > a.sd-edit:hover {
background-color: #f0ad4e;
color: #ffffff;
}
/* Menu
----------------------------------*/
div#menu {position: absolute;width:220px;}