Work on new design

This commit is contained in:
Michael RICOIS 2015-05-26 09:48:06 +00:00
parent 041141eb8c
commit 66b97afcf1
33 changed files with 568 additions and 575 deletions

View File

@ -1,6 +1,18 @@
<?php
class AccountController extends Zend_Controller_Action
{
/**
* Affichage des paramètres pour l'utilisateur
* Identite utilisateur
* Réglages des préférences
* Nom client / Service
* Accès disponible
*
*/
public function indexAction()
{
}
/**
* Liste des clients
@ -11,7 +23,7 @@ class AccountController extends Zend_Controller_Action
/**
* Fiche du client
* Accès administrateur
* Afficher du Commercial
* Afficher nom Commercial
* Liste des Services => utilisateurs, consommation, contrats
*/
public function clientAction()
@ -22,8 +34,35 @@ class AccountController extends Zend_Controller_Action
/**
* Fiche du service
*/
public function serviceAction(){}
public function consoAction(){}
public function usersAction(){}
public function userAction(){}
public function serviceAction()
{
}
/**
* Tableau des consommations par rapport aux paramètres contrat
* Calculé tout les J-1 au service
*/
public function consoAction()
{
}
/**
* Liste des utilisateurs
*/
public function usersAction()
{
}
/**
* Fiche d'un utilisateur pour edition
*/
public function userAction()
{
}
}

View File

@ -7,7 +7,7 @@ class AuthController extends Zend_Controller_Action
'clientId' => 195,
'serviceCode' => 'SSO',
'authType' => 'userSSO',
'login' => 'MAIL',
'login' => 'mail',
'token' => 'token',
)
);
@ -64,10 +64,10 @@ class AuthController extends Zend_Controller_Action
// --- Set form value
$this->view->FormPartner = $partner;
$this->view->FormIdentifiant = $login;
$this->view->FormCourriel = $request->getParam('MAIL');
$this->view->FormSiret = $request->getParam('SIRET');
$this->view->FormNom = $request->getParam('LASTNAME');
$this->view->FormPrenom = $request->getParam('FIRSTNAME');
$this->view->FormCourriel = $request->getParam('mail');
$this->view->FormSiret = $request->getParam('siret');
$this->view->FormNom = $request->getParam('lastname');
$this->view->FormPrenom = $request->getParam('name');
}
// --- Redirection
else {

View File

@ -634,7 +634,7 @@ class DashboardController extends Zend_Controller_Action
$ws = new WsScores();
$reponse = $ws->setClient($infos);
if ($reponse->error->errnum==1) {
$this->_forward('client', 'dashboard', null, array('idClient' => $infos['idClient']));
$this->forward('client', 'dashboard', null, array('idClient' => $infos['idClient']));
}
$this->view->assign('infos', $request->getParams());
}

View File

@ -83,15 +83,15 @@ class EvaluationController extends Zend_Controller_Action
);
$bornes = array(
'indiScore' => array('min'=>0, 'max'=>20, 'rouge'=>8, 'orange'=>12),
'scoreDir' => array('min'=>0, 'max'=>100, 'rouge'=>45, 'orange'=>56),
'scoreConf' => array('min'=>0, 'max'=>100, 'rouge'=>45, 'orange'=>56),
'scoreZ' => array('min'=>-3, 'max'=>3, 'rouge'=>-0.25, 'orange'=>0.125),
'scoreCH' => array('min'=>-4.5,'max'=>16, 'rouge'=>3.75, 'orange'=>10),
'scoreAfdcc1' => array('min'=>-7, 'max'=>7, 'rouge'=>0, 'orange'=>1),
'scoreAfdcc2' => array('min'=>-3, 'max'=>2, 'rouge'=>-1, 'orange'=>0.5),
'scoreAltman' => array('min'=>-2, 'max'=>8, 'rouge'=>0, 'orange'=>2.7),
'scoreCCF' => array('min'=>500,'max'=>5000,'rouge'=>2160, 'orange'=>3450 ),
'indiScore' => array('min' => 0, 'max' => 20, 'rouge' => 7, 'orange' => 10),
'scoreDir' => array('min' => 0, 'max' => 100, 'rouge' => 45, 'orange' => 56),
'scoreConf' => array('min' => 0, 'max' => 100, 'rouge' => 45, 'orange' => 56),
'scoreZ' => array('min' => -3, 'max' => 3, 'rouge' => -0.25, 'orange' => 0.125),
'scoreCH' => array('min' => -4.5, 'max' => 16, 'rouge' => 3.75, 'orange' => 10),
'scoreAfdcc1' => array('min' => -7, 'max' => 7, 'rouge' => 0, 'orange' => 1),
'scoreAfdcc2' => array('min' => -3, 'max' => 2, 'rouge' => -1, 'orange' => 0.5),
'scoreAltman' => array('min' => -2, 'max' => 8, 'rouge' => 0, 'orange' => 2.7),
'scoreCCF' => array('min' => 500, 'max' => 5000, 'rouge' => 2160, 'orange' => 3450 ),
);
$request = $this->getRequest();

View File

@ -192,7 +192,7 @@ class SurveillanceController extends Zend_Controller_Action
$this->_helper->layout->disableLayout();
$this->_forward('ajouter', 'surveillance', null, array( 'source' => 'score' ));
}
/**
* Affiche les infos d'une surveillance
*/
@ -210,8 +210,6 @@ class SurveillanceController extends Zend_Controller_Action
$user = new Scores_Utilisateur();
//if ($user->checkPerm())
$listSurv = array();
if (intval($siret)!=0)
@ -422,16 +420,11 @@ class SurveillanceController extends Zend_Controller_Action
public function portefeuilleAction()
{
$user = new Scores_Utilisateur();
if(!$user->checkPerm('portefeuille')){
if( !$user->checkPerm('portefeuille') ) {
$this->_forward('perms', 'error');
}
$this->view->headLink()
->appendStylesheet('/libs/tablesorter/themes/blue/style.css', 'all');
$this->view->headScript()
->appendFile('/libs/tablesorter/jquery.tablesorter.js', 'text/javascript')
->appendFile('/themes/default/scripts/surveillance.js', 'text/javascript');
$this->view->headScript()->appendFile('/themes/default/scripts/surveillance.js', 'text/javascript');
$request = $this->getRequest();
@ -482,15 +475,15 @@ class SurveillanceController extends Zend_Controller_Action
);
$couleurRisque100 = array(
'rouge' => array('min'=>0, 'max'=>40),
'rouge' => array('min'=>0, 'max'=>40),
'orange' => array('min'=>41, 'max'=>50),
'vert' => array('min'=>51, 'max'=>100),
'vert' => array('min'=>51, 'max'=>100),
);
$couleurRisque20 = array(
'rouge' => array('min'=>0, 'max'=>6),
'rouge' => array('min'=>0, 'max'=>6),
'orange' => array('min'=>7, 'max'=>10),
'vert' => array('min'=>11, 'max'=>20),
'vert' => array('min'=>11, 'max'=>20),
);
$ws = new WsScores();

View File

@ -36,14 +36,20 @@ class UserController extends Zend_Controller_Action
*/
public function indexAction()
{
$this->view->headLink()->appendStylesheet('/themes/default/styles/user.css', 'all');
$user = new Scores_Utilisateur();
if (!$user->checkPerm('MONPROFIL')){
$this->_forward('perms', 'error');
// --- Redirection vers l'authentification v2
if ($user->getVersion() == 2) {
$this->redirect('/account/index');
}
// @todo : transformer en affichage simple pour les utilisateurs
if ( !$user->checkPerm('MONPROFIL') ){
$this->forward('perms', 'error');
}
$this->view->headLink()->appendStylesheet('/themes/default/styles/user.css', 'all');
$this->view->assign('device_type', $user->getBrowserInfo()->mobile);
$this->view->assign('browser_info', $user->getBrowserInfo()->name.' '.$user->getBrowserInfo()->version);

View File

@ -0,0 +1 @@
<?php

View File

@ -0,0 +1 @@
<?php

View File

@ -0,0 +1 @@
<?php

View File

@ -0,0 +1 @@
<?php

View File

@ -0,0 +1 @@
<?php

View File

@ -0,0 +1 @@
<?php

View File

@ -0,0 +1 @@
<?php

View File

@ -1,24 +1,14 @@
<style>
table { width:100%; }
table th { border:1px solid; font-weight:bold; padding:5px; }
table tr { }
table td { border:1px solid; padding:5px; }
</style>
<div id="center">
<h1>Nouveautés</h1>
<div class="paragraph">
<!-- Tri par date - Tri par catégorie -->
</div>
<h2>Liste par date</h2>
<div class="paragraph">
<table>
<table class="table table-bordered">
<thead>
<tr>
<th>Date</th>
<th>Intitulé</th>
<th>Catégorie</th>
<th>Intitulé</th>
<th>Catégorie</th>
</tr>
</thead>
<tbody>
@ -27,11 +17,11 @@ table td { border:1px solid; padding:5px; }
<tr>
<td><?=substr($nouveau->date,8,2).'/'.substr($nouveau->date,5,2).'/'.substr($nouveau->date,0,4)?></td>
<td>
<a href="<?=$this->url(array('controller'=>'fichier',
<a href="<?=$this->url(array('controller'=>'fichier',
'action'=>'new', 'fichier'=>$nouveau->fichier))?>" target="_blank">
<?=$nouveau->intitule?></a>
</td>
<td><?=$nouveau->categorie?></td>
</td>
<td><?=$nouveau->categorie?></td>
</tr>
<?php }?>
<?php }?>

View File

@ -1,5 +1,3 @@
<div class="paragraph">
<p class="confidentiel">
<?=$this->cgu?>
</p>
<small class="text-muted"><em><?=$this->cgu?></em></small>
</div>

View File

@ -1,18 +1,20 @@
<!--[if lte IE 6]>
<div class="ui-state-highlight ui-corner-all">
<p><span style="float:left;margin-right:0.3em;" class="ui-icon ui-icon-info"></span>
<strong>Savez-vous que votre version d'Internet Explorer (version 6) est périmée ?</strong>
<br/><span><a style="text-decoration:none;" href="/libs/ie6/index.html" target="_blank">
Pour obtenir la meilleure expérience de navigation possible sur notre site web,
nous vous recommandons de mettre à jour votre navigateur ou d'en choisir un autre,
pour en savoir plus cliquez-ici</a></span>
</p>
<div class="container">
<div class="row">
<div class="col-lg-3 col-md-3"></div>
<div class="col-lg-9 col-md-9">
<p class="text-muted credit">
&copy; 2006 - <?php echo date('Y')?> <a href="http://www.scores-decisions.com">Scores &amp; Décisions SAS</a>
- <?=$this->translate("Tous droits r&eacute;serv&eacute;s")?> -
<a href="http://www.scores-decisions.com/mentions-legales/" target="_blank">
<?=$this->translate("Mentions l&eacute;gales")?></a> -
<img class="flag" id="fr" src="/themes/default/images/drapeaux/fr.png"/>
<img class="flag" id="en" src="/themes/default/images/drapeaux/en.png"/>
</p>
</div>
</div>
<![endif]-->
<p>&copy; 2006-<?php echo date('Y')?> Scores &amp; D&eacute;cisions SAS -
<?=$this->translate("Tous droits r&eacute;serv&eacute;s")?> -
<a href="http://www.scores-decisions.com/mentions.php" target="_blank">
<?=$this->translate("Mentions l&eacute;gales")?></a> -
<img class='flag' id="fr" src="/themes/default/images/drapeaux/fr.png"/>
<img class='flag' id="en" src="/themes/default/images/drapeaux/en.png"/>
</p>
</div>

View File

@ -1,13 +1,49 @@
<div class="container">
<div class="row">
<div id="logo" class="col-md-3">
<img src="<?=$this->theme->pathImg?>/logos/logo.png" width="200" height="60" />
<div id="logo" class="col-lg-3 col-md-3">
<img class="center-block" src="<?=$this->theme->pathImg?>/logos/logo.png" width="200" height="60" />
</div>
<div id="notification" class="col-md-9">
<?php echo $this->render('menu-mobile.phtml')?>
<div class="col-lg-3 col-md-3">
<div class="btn-group btn-group-sm site-title-buttons">
<button type="button" class="btn btn-info">Suivi</button>
<button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Aucun suivi</a></li>
<li class="divider"></li>
<li><a href="#">Ajouter au portefeuille</a></li>
<li><a href="#">Voir le portefeuille</a></li>
</ul>
</div>
</div>
<div class="col-lg-3 col-md-3">
<div class="input-group input-group-sm site-title-buttons">
<input type="text" class="form-control" placeholder="Identifiant">
<span class="input-group-btn">
<button class="btn btn-default" type="button">
<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
</button>
</span>
</div>
</div>
<div class="col-lg-3 col-md-3 site-title-buttons">
<div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default"><span class="glyphicon glyphicon-print" aria-hidden="true"></span> Imprimer</button>
<button type="button" class="btn btn-default"><span class="fa fa-file-pdf-o" aria-hidden="true"></span> PDF</button>
<button type="button" class="btn btn-default">XML</button>
</div>
</div>
</div>
</div>
<div class="container-fluid" id="header-separator">&nbsp;</div>
<div class="container-fluid" id="header-separator">
<div class="col-lg-3 col-md-3"></div>
<div class="col-lg-3 col-md-6"></div>
<div class="col-lg-3 col-md-3"></div>
</div>

View File

@ -1,5 +1,5 @@
<div id="center">
<h1><?=$this->translate("LISTE DES &Eacute;TABLISSEMENTS")?></h1>
<div class="row"><h1><?=$this->translate("Liste des établissements")?></h1></div>
<div class="paragraph">
<table class="identite">
<tr>
@ -48,11 +48,11 @@
</table>
</div>
<h2>&Eacute;tablissements</h2>
<div class="row"><h2>&Eacute;tablissements</h2></div>
<?php if (count($this->etabs)>0) { ?>
<div class="paragraph">
<table class="data">
<table class="table table-bordered">
<?php foreach ($this->etabs as $etab) { ?>
<?php
if ($etab->Siege==1) $type = 'siège ';
@ -74,7 +74,7 @@
<td class="StyleInfoData" width="50" valign="top">
<b><a title="<?=$this->translate("Voir la fiche d'identité")?>" href="<?=$href?>"><?=$etab->Nic?></a></b>
</td>
<td class="StyleInfoData" width="70" valign="top"><?=$type?></td>
<td class="StyleInfoData" style="white-space:nowrap" width="70" valign="top"><?=$type?></td>
<td class="StyleInfoData" width="250">
<?php
if ($etab->Enseigne!='') {
@ -133,6 +133,4 @@
<?php if ( empty($this->AutrePage) ) {?>
<?=$this->render('cgu.phtml', $this->cgu)?>
<?php }?>
</div>
<?php }?>

View File

@ -1,29 +1,15 @@
<?php if ( empty($this->AutrePage) ) {?>
<div id="center">
<?php }?>
<h1>LISTE DES &Eacute;V&Eacute;NEMENTS</h1>
<div class="paragraph">
<table class="identite">
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Num&eacute;ro identifiant Siren</td>
<td width="350" class="StyleInfoData"><?=$this->SirenTexte($this->siren)?></td>
</tr>
<tr>
<td width="30">&nbsp;</td>
<td width="200" class="StyleInfoLib">Dénomination Sociale</td>
<td width="350" class="StyleInfoData"><?=$this->raisonSociale?></td>
</tr>
<tr>
<td width="30">&nbsp;</td>
<td colspan="2" width="550" class="StyleInfoData">
<?=$this->action('infos','surveillance',null,array('source' => 'insee','siret'=>$this->siret))?>
</td>
</tr>
</table>
<div class="row"><h1>LISTE DES &Eacute;V&Eacute;NEMENTS</h1></div>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Num&eacute;ro identifiant Siren</p></div>
<div class="col-lg-8 col-md-8"<p><?=$this->SirenTexte($this->siren)?></p></div>
</div>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Dénomination Sociale</p></div>
<div class="col-lg-8 col-md-8"<p><?=$this->raisonSociale?></p></div>
</div>
<h2>&Eacute;v&eacute;nements INSEE</h2>
<div class="row"><h2>&Eacute;v&eacute;nements INSEE</h2></div>
<?php if ( empty($this->AutrePage) ) {?>
<div class="paragraph">
@ -46,8 +32,7 @@ Liste des événements uniquement sur l'établissement <?=$this->Nic?>.
<?php if ( count($this->evens)==0 ) { ?>
<div class="paragraph">Aucun &eacute;v&egrave;nement n'est pr&eacute;sent dans notre base</div>
<?php } else { ?>
<div class="paragraph">
<table class="data">
<table class="table table-bordered">
<?php
foreach ($this->evens as $i=>$even) {
if ($even->Siege==1) $type='siège';
@ -85,7 +70,6 @@ Liste des événements uniquement sur l'établissement <?=$this->Nic?>.
</tr>
<?php }?>
</table>
</div>
<?php if ( $this->PageTotal>1 ) {?>
<div class="paragraph">
@ -103,5 +87,4 @@ Liste des événements uniquement sur l'établissement <?=$this->Nic?>.
<?php if ( empty($this->AutrePage) ) {?>
<?=$this->render('cgu.phtml', $this->cgu)?>
</div>
<?php }?>

View File

@ -1,18 +1,18 @@
<?php if ( $this->texte ) {?>
<tr>
<td width="50" class="aide">
<?php if ( !empty($this->aide) ) {?>
<img src="/themes/default/images/interfaces/aideligne.png" width="16" height="16" style="display:none;"/>
<div id="<?=$this->id?>" style="display:none;"><?=$this->aide?></div>
<?php } ?></td>
<td width="200" class="StyleInfoLib"><?=$this->label?></td>
<?php
<div class="row">
<div class="col-lg-4 col-md-4">
<p class="identite-label"><?=$this->label?></p>
</div>
<?php
if (!empty($this->titre)) {
$titre = ' title="'.$this->titre.'"';
} else {
$titre = '';
}
?>
<td width="350" class="StyleInfoData"<?=$titre?>><?=$this->texte?></td>
</tr>
<div class="col-lg-8 col-md-8"<?=$titre?>>
<p><?=$this->texte?></p>
</div>
</div>
<?php } ?>

View File

@ -1,10 +1,6 @@
<?php if ( empty($this->AutrePage) ) {?>
<div id="center">
<?php }?>
<?php if ( $this->message ) {?>
<h2>Informations</h2>
<h3>Informations</h3>
<div class="paragraph">
<div style="padding:0.7em;" class="ui-state-highlight ui-corner-all">
<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-info"></span>
@ -16,15 +12,6 @@
<?php if ( empty($this->AutrePage) ) {?>
<div class="paragraph" style="text-align:right;">
<?php if (!empty($this->dateDerMaj)) { ?>
<a class="datemaj" 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))?>
@ -34,11 +21,18 @@
<?php }?>
<?php if ( empty($this->AutrePage) ) {?>
<h1 class="titre"><?=$this->translate("FICHE D'IDENTIT&Eacute;");?></h1>
<?php if (!empty($this->dateDerMaj)) { ?>
<div class="row">
<span class="label label-warning pull-right datemaj">
<?=$this->translate("Dernière mise à jour le")?> <?=$this->dateDerMaj?>
<span><?=$this->datemajTexte?></span>
</span>
</div>
<?php }?>
<div class="paragraph">
<table>
<div class="row"><h1 class="titre"><?=$this->translate("Fiche d'identité")?></h1></div>
<?php }?>
<?php
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Siret']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SiretSiege']);
@ -55,14 +49,13 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SituationInsee']
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SituationRncs']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreSiren']);
?>
</table>
<div class="row">
<h2><?=$this->translate("Dénomination sociale &amp; Coordonnées")?></h2>
</div>
<h2><?=$this->translate("Dénomination sociale &amp; Coordonnées")?></h2>
<div class="paragraph">
<?php if ( empty($this->AutrePage) && $this->accessWorldCheck) { ?>
<div style="float:right;">
<!-- <div style="float:right;">
<img style="cursor:pointer;" class="wcheck" data-url="<?=$this->url(array(
'controller'=>'worldcheck',
'action'=>'occurence',
@ -92,9 +85,9 @@ $('img.wcheck').each(function(){
});
});
</script>
-->
<?php }?>
<table>
<?php
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['RaisonSociale']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['NomCommercial']);
@ -110,12 +103,8 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Fax']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Web']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Mail']);
?>
</table>
</div>
<h2><?=$this->translate("Activité(s) &amp; Chiffre d'affaires")?></h2>
<div class="paragraph">
<table>
<div class="row"><h2><?=$this->translate("Activité(s) &amp; Chiffre d'affaires")?></h2></div>
<?php
//Remplace Siren pour texte
//$this->dBlock['ActiviteEn']['texte'] = $this->RemplaceSiren($this->dBlock['ActiviteEn']['texte']);
@ -135,8 +124,6 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Dirigeants']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Effectif']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['EffectifEtab']);
?>
</table>
</div>
<?php if ( empty($this->AutrePage) ) {?>
@ -148,20 +135,10 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['EffectifEtab']);
Actualités de la société <?=$this->raisonSociale?> sur le Web</a>
</div>
<?php if ( !empty($this->surveillance) ) {?>
<div class="paragraph" style="clear:both;">
<?=$surveillances?>
</div>
<?php }?>
<?php }?>
<?php if ( empty($this->AutrePage) ) {?>
<?=$this->render('cgu.phtml', $this->cgu)?>
<?php }?>
<?php }?>
<?php if ( empty($this->AutrePage) ) {?>
</div>
<?php }?>

View File

@ -1,8 +1,8 @@
<h2>Localisation géographique</h2>
<div class="paragraph">
<div id="infogeo" class="clearfix">
<div id="infogeo_txt">
<?php if ( $this->infos->GeoLat && $this->infos->GeoLon ):?>
<div class="row"><h2>Localisation géographique</h2></div>
<div class="row">
<div class="col-lg-6 col-md-6">
<?php if ( $this->infos->GeoLat && $this->infos->GeoLon ) {?>
<span id=geolocalisation>
<b>Information géographique :</b><br/>
Latitude : <?=$this->decLat?> (<?=$this->infos->GeoLat?>)<br />
@ -11,58 +11,58 @@
<a id="lien-google" href="<?=$this->mapsHref?>" target="_blank">
Afficher l'adresse sur Google Map &copy;</a><br/>
<br/>
<?endif;?>
<?php }?>
<b>Code commune / Rivoli :</b><br/>
<?=$this->infos->Dept.' '.$this->infos->codeCommune.' / '.$this->infos->Rivoli; ?>
<?=$this->infos->Dept.' '.$this->infos->codeCommune.' / '.$this->infos->Rivoli; ?>
<?php if (count($this->infos->InfosIris)>0){?>
<?php
if (count($this->infos->InfosIris)>0){
$InfosIris = $this->infos->InfosIris;
$codComIris = str_replace($InfosIris->codIris, '', $InfosIris->codComIris);
?>
<br/><br/><b>Iris :</b>
<?php if (intval($InfosIris->codIris) == 0){ ?>
<br/>Commune non découpée en Iris
<?php } else {?>
<br/>Code : <?=$codComIris?> <?=$InfosIris->codIris?>
<br/>Libellé : <a title="Consulter le plan d'assemblage de la commune" href="<?=$this->url(array('controller'=>'identite', 'action'=>'iris', 'code'=>$codComIris), 'default', true)?>" target="_blank"><?=$InfosIris->libIris?></a>
<img title="<?=$InfosIris->typIris?>" style="vertical-align:middle;" src="/themes/default/images/info.gif">
<?php }?>
<?php }?>
$InfosIris = $this->infos->InfosIris;
$codComIris = str_replace($InfosIris->codIris, '', $InfosIris->codComIris);
?>
<br/><br/><b>Iris :</b>
<?php if (intval($InfosIris->codIris) == 0){ ?>
<br/>Commune non découpée en Iris
<?php } else {?>
<br/>Code : <?=$codComIris?> <?=$InfosIris->codIris?>
<br/>Libellé : <a title="Consulter le plan d'assemblage de la commune" href="<?=$this->url(array('controller'=>'identite', 'action'=>'iris', 'code'=>$codComIris), 'default', true)?>" target="_blank"><?=$InfosIris->libIris?></a>
<img title="<?=$InfosIris->typIris?>" style="vertical-align:middle;" src="/themes/default/images/info.gif">
<?php }?>
<?php }?>
</div>
<div class="col-lg-6 col-md-6">
<?php if ($this->source == 'google') {?>
<div id="infogeo_photo">
<?=$this->action('streetview', 'identite', null, array('infos' => $this->infos));?>
</div>
<?php } elseif ($this->source == 'mappy') {?>
<div><img id="pp-cb-thumb" width="300px" /></div>
<script src="<?=$this->lienJs?>"></script>
<script type="text/javascript">
$(document).ready(function() {
var serviceHandler = function(result) {
if (result instanceof Mappy.api.visiocity.Frontage) {
var current = result.getCurrent();
var img = $('<img src="' + current.getURL(320, null) +
'" alt="' + current.getDescription() +
'" width="300px" />');
$('#pp-cb-thumb').replaceWith(img);
}
};
var address = "<?=$this->adresse?>";
var geo = new Mappy.api.geolocation.Geocoder();
var photoService = new Mappy.api.visiocity.PhotoService();
geo.geocode(address, function(result) {
photoService.search(result[0], 'f', serviceHandler);
}, function(error) {});
});
</script>
<?php }?>
</div>
<?php if ($this->source == 'google') {?>
<div id="infogeo_photo">
<?=$this->action('streetview', 'identite', null, array(
'infos' => $this->infos,
));?>
</div>
<?php } elseif ($this->source == 'mappy') {?>
<div><img id="pp-cb-thumb" width="300px" /></div>
<script src="<?=$this->lienJs?>"></script>
<script type="text/javascript">
$(document).ready(function() {
var serviceHandler = function(result) {
if (result instanceof Mappy.api.visiocity.Frontage) {
var current = result.getCurrent();
var img = $('<img src="' + current.getURL(320, null) +
'" alt="' + current.getDescription() +
'" width="300px" />');
$('#pp-cb-thumb').replaceWith(img);
}
};
var address = "<?=$this->adresse?>";
var geo = new Mappy.api.geolocation.Geocoder();
var photoService = new Mappy.api.visiocity.PhotoService();
geo.geocode(address, function(result) {
photoService.search(result[0], 'f', serviceHandler);
}, function(error) {});
});
</script>
<?php }?>
</div>
</div>

View File

@ -1,7 +1,7 @@
<?php if ($this->url) {?>
<div id="legende-photo">Cliché à l'approche de l'adresse postale.</div>
<img id="pp-cb-thumb" src="<?=$this->url?>" width="320" height="320" />
<div id="legende-photo">Cliché à l'approche de l'adresse postale.</div>
<?php if ($this->streetviewMode == 'gps') {?>
<div>

View File

@ -9,20 +9,29 @@
<body>
<div id="wrap">
<header><?php echo $this->render('header.phtml')?></header>
<div class="container">
<div class="row">
<div class="col-lg-3 col-md-3 hidden-xs hidden-sm"><?php echo $this->render('menu.phtml')?></div>
<div id="content" class="col-lg-9 col-md-9">
<?php echo $this->layout()->content?>
<div id="footer">
<?php echo $this->render('footer.phtml')?>
</div>
</div>
<div class="row">
<div class="col-lg-3 col-md-3">
<?php echo $this->render('menu.phtml')?>
</div>
<div id="content" class="col-lg-9 col-md-9">
<?php echo $this->layout()->content?>
</div>
</div>
</div>
</div>
<footer></footer>
<div id="footer"><?php echo $this->render('footer.phtml')?></div>
<?php echo $this->inlineScript()?>
</body>
</html>

View File

@ -1,41 +0,0 @@
<?php if ( $this->navigation()->menu()->hasPages() ) { ?>
<nav class="navbar navbar-default visible-xs visible-sm">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="nav navbar-nav">
<?php $i = 0; $activeMenudId = 0;?>
<?php foreach ($this->navigation()->getContainer() as $page) {?>
<?php $class = 'dropdown'; if ( $page->isActive(true) ) { $class = 'dropdown active'; $activeMenudId = $i; } $i++; ?>
<li<?php if ( !empty($class) ) { echo ' class="'.$class.'"'; } ?>>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<?=$page->label?> <span class="caret"></span></a>
<?php if ( $page->hasPages() ) {?>
<ul class="dropdown-menu" role="menu">
<?php foreach ( $page->getPages() as $child ) {?>
<?php if ( $child->getHref() == '#') {?>
<li class="divider"></li>
<?php } else {?>
<li<?php if ( $child->isActive(true) ) { echo ' class="active"'; } ?>>
<a href="<?=$child->getHref()?>"><?=$child->label?></a>
</li>
<?php }?>
<?php }?>
</ul>
<?php }?>
</li>
<?php }?>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
<?php }?>

View File

@ -1,109 +1,108 @@
<?=$this->action('new', 'aide')?>
<div id="center-recherche">
<div id="recherche">
<?php if (!empty($this->message)){ ?>
<div style="padding:0.7em;" class="ui-state-error ui-corner-all">
<p><span style="float: left; margin-right: 0.3em;" class="ui-icon ui-icon-alert"></span>
<?=$this->message?></p>
</div>
<p class="bg-danger bg-classes"><?=$this->message?></p>
<?php }?>
<h3><?=$this->translate("RECHERCHE ENTREPRISE")?></h3>
<form class="form-horizontal" name="<?=$this->form->getName()?>"
method="<?=$this->form->getMethod()?>" action="<?=$this->form->getAction()?>">
<h3><?=$this->translate("Recherche Entreprise")?></h3>
<form class="form-horizontal recherche" name="<?php echo $this->form->getName()?>" method="<?=$this->form->getMethod()?>"
action="<?=$this->form->getAction()?>">
<?=$this->form->type?>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->siret->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->siret->getLabel()?></label>
<div class="col-sm-8">
<input type="text" class="form-control" name="<?=$this->form->siret->getName()?>"
value="<?=$this->form->siret->getValue()?>"
placeholder="<?=$this->form->siret->getDescription()?>">
</div>
<div class="col-sm-1">
<button class="btn btn-default btn-sm" type="button"
title="Accès direct à la fiche identité (Racourci clavier : Maintenir CTRL puis ENTREE)"
id="goidentite"><span class="glyphicon glyphicon-arrow-right"></span></button>
<div class="input-group input-group-sm">
<input type="text" class="form-control" name="<?=$this->form->siret->getName()?>" value="<?=$this->form->siret->getValue()?>">
<span class="input-group-btn">
<button class="btn btn-default" type="button" title="Accès direct à la fiche identité (Racourci clavier : Maintenir CTRL puis ENTREE)" id="goidentite">
<span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span>
</button>
</span>
<span class="input-group-btn">
<button class="btn btn-default" type="button" title="Recherche par SIREN, SIRET, N° TVA intracommunautaire, N° RC, R.N.A., ISIN">
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
</button>
</span>
</div>
</div>
<?php if ($this->SEARCHENT) {?>
</div>
<?php if ($this->SEARCHENT) {?>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->raisonSociale->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->raisonSociale->getLabel()?></label>
<div class="col-sm-8">
<input type="text" class="form-control" name="<?=$this->form->raisonSociale->getName()?>"
value="<?=$this->form->raisonSociale->getValue()?>"
placeholder="<?=$this->form->raisonSociale->getDescription()?>">
<input type="text" class="form-control" name="<?=$this->form->raisonSociale->getName()?>" value="<?=$this->form->raisonSociale->getValue()?>">
</div>
</div>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->numero->getLabel()?></label>
<div class="col-sm-2">
<input type="text" class="form-control" name="<?=$this->form->numero->getName()?>" value="<?=$this->form->numero->getValue()?>">
<label class="col-sm-3 control-label"><?=$this->form->numero->getLabel()?></label>
<div class="col-sm-3">
<input type="text" class="form-control" name="<?=$this->form->numero->getName()?>" value="<?=$this->form->numero->getValue()?>">
</div>
<div class="col-sm-6">
<input type="text" class="form-control" name="<?=$this->form->voie->getName()?>" value="<?=$this->form->voie->getValue()?>">
<div class="col-sm-5">
<input type="text" class="form-control" name="<?=$this->form->voie->getName()?>" value="<?=$this->form->voie->getValue()?>">
</div>
</div>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->cpVille->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->cpVille->getLabel()?></label>
<div class="col-sm-8">
<input type="text" class="form-control" name="<?=$this->form->cpVille->getName()?>" value="<?=$this->form->cpVille->getValue()?>">
<input type="text" class="form-control" name="<?=$this->form->cpVille->getName()?>" value="<?=$this->form->cpVille->getValue()?>">
</div>
</div>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->telFax->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->telFax->getLabel()?></label>
<div class="col-sm-8">
<input type="text" class="form-control" name="<?=$this->form->telFax->getName()?>" value="<?=$this->form->telFax->getValue()?>">
<input type="text" class="form-control" name="<?=$this->form->telFax->getName()?>" value="<?=$this->form->telFax->getValue()?>">
</div>
</div>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->naf->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->naf->getLabel()?></label>
<div class="col-sm-8">
<input type="text" class="form-control" name="<?=$this->form->naf->getName()?>" value="<?=$this->form->naf->getValue()?>">
<input type="text" class="form-control" name="<?=$this->form->naf->getName()?>" value="<?=$this->form->naf->getValue()?>">
</div>
</div>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->fj->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->fj->getLabel()?></label>
<div class="col-sm-8">
<input type="text" class="form-control" name="<?=$this->form->fj->getName()?>" value="<?=$this->form->fj->getValue()?>">
<input type="text" class="form-control" name="<?=$this->form->fj->getName()?>" value="<?=$this->form->fj->getValue()?>">
</div>
</div>
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label"><?=$this->form->pays->getLabel()?></label>
<label class="col-sm-3 control-label"><?=$this->form->pays->getLabel()?></label>
<div class="col-sm-8">
<select class="form-control" name="<?=$this->form->pays->getName()?>">
<?php foreach ($this->form->pays->getMultiOptions() as $code => $label) {?>
<?php $selected = ''; if ($code == $this->form->pays->getValue()) { $selected = ' selected'; }?>
<option value="<?=$code?>"<?=$selected?>><?=$label?></option>
<?php }?>
</select>
<select class="form-control" name="<?=$this->form->pays->getName()?>">
<?php foreach ($this->form->pays->getMultiOptions() as $code => $label) {?>
<?php $selected = ''; if (in_array($code,$this->form->pays->getValue())) { $selected = ' selected'; }?>
<option value="<?=$code?>"<?=$selected?>><?=$label?></option>
<?php }?>
</select>
</div>
</div>
<?php }?>
<div class="form-group form-group-sm submit">
<div class="col-sm-offset-3 col-sm-8">
<input class="btn btn-sm btn-warning" type="submit" name="<?=$this->form->reset->getName()?>" value="<?=$this->form->reset->getLabel()?>">
<input class="btn btn-sm btn-primary" type="submit" name="<?=$this->form->submit->getName()?>" value="<?=$this->form->submit->getLabel()?>">
</div>
</div>
<?php }?>
<div class="form-group form-group-sm">
<div class="col-sm-offset-2 col-sm-8">
<input type="submit" class="btn btn-default btn-sm" name="<?=$this->form->submit->getName()?>" value="<?=$this->form->submit->getLabel()?>">
<input type="reset" class="btn btn-default btn-sm" name="<?=$this->form->reset->getName()?>" value="<?=$this->form->reset->getLabel()?>">
</div>
</div>
</form>
</div>
<?php if ($this->RefClient){?>
<?=$this->action('refclient', 'recherche')?>
<?php }?>
</div>
<?php }?>

View File

@ -1,8 +1,5 @@
<div id="center">
<div id="recherche-info">
<p class="StyleInfoLib">
<div id="recherche-info" class="row">
<p class="bg-info bg-classes">
<?=$this->nbReponsesTotal?> r&eacute;ponse<?php if ($this->nbReponsesTotal>1){?>s<?php }?>
avec les crit&egrave;res "<a href="<?php echo $this->criteresLien?>">
<?=$this->criteresTexte?></a>".
@ -23,7 +20,6 @@ $('select[name=filtre]').change(function(e){
});
</script>
<?php }?>
</p>
</div>
@ -34,79 +30,92 @@ $('select[name=filtre]').change(function(e){
</div>
<?php }?>
<?php if ( count($this->liste) > 0 ) {?>
<ol>
<?php foreach ( $this->liste as $item ) { ?>
<li style="list-style-type:decimal;" class="<?=$item['class']?>" type="1" value="<?=$item['position']?>">
<b>
<?php if ($this->IDENTITE) {?>
<?php if ($item['source']==7 && !empty($item['sourceId'])) {?>
<a title="Voir les liens inter entreprises de cet établissement"
href="<?=$this->url(array('controller'=>'identite','action'=>'liens','lienref'=>$item['sourceId']),'default',true)?>">
<?php } else {?>
<a title="Voir la fiche d'identité de cet établissement"
href="<?=$this->url(array('controller'=>'identite','action'=>'fiche','id'=>$item['id'],'siret'=>$item['siret']),'default',true)?>">
<?php }?>
<?php } else {?>
<a title="Vous n'avez pas les permissions nécessaires pour accèder à la fiche identité" href="#">
<?php }?>
<?=$item['InfoNom']?></a></b><br/>
<?php
$lienHref = '#';
$lienTitle = "";
if ($this->IDENTITE) {
if ($item['source']==7 && !empty($item['sourceId'])) {
$lienHref = $this->url(array('controller'=>'identite','action'=>'liens','lienref'=>$item['sourceId']), 'default', true);
$lienTitle = "Voir les liens inter entreprises de cet établissement";
} else {
$lienHref = $this->url(array('controller'=>'identite','action'=>'fiche','id'=>$item['id'],'siret'=>$item['siret']), 'default', true);
$lienTitle = "Voir la fiche d'identité de cet établissement";
}
} else {
$lienHref = '#';
$lienTitle = "Vous n'avez pas les permissions nécessaires pour accèder à la fiche identité";
}
?>
<p><strong><a title="<?=$lienTitle?>" href="<?=$lienHref?>"><?=$item['InfoNom']?></a></strong>
<br/>
<?=$item['InfoNomDetail']?>
<b>RCS <?=$item['InfoSiret']?></b>
<br/>
<b><?=$item['InfoEtab']?></b><br/>
<?=$item['InfoAdresse']?><br/>
<b><?=$item['InfoEtab']?></b>
<br/>
<?=$item['InfoAdresse']?>
<br/>
<?=$item['InfoForme']?>
<?=$item['InfoActivite']?>
<?php if (isset($item['InfoDirigeant'])) { ?>
<?=$item['InfoDirigeant']?>
<?=$item['InfoDirigeant']?>
<?php } elseif(isset($item['InfoActionnaire'])) {?>
<?=$item['InfoActionnaire']?>
<?=$item['InfoActionnaire']?>
<?php }?>
<?php if (isset($item['lien']) && count($item['lien'])>0) {?>
<br/> Liens : <?php foreach($item['lien'] as $lien){?>
<br/>
Liens : <?php foreach($item['lien'] as $lien){?>
<a href="<?=$lien['href']?>"><?=$lien['title']?></a>
<?php }?>
<?php }?>
<?php }?>
</p>
</li>
<?php }?>
</ol>
<?php } else {}?>
<?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>
<p class="text-center">
<ul class="pagination">
<li><a href="<?=$this->url(array('page'=>1, 'token'=> $this->token))?>" aria-label="Début"><span aria-hidden="true">&laquo;</span></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PagePrev, 'token'=> $this->token))?>" aria-label="Précédent">&lsaquo;</a></li>
<li><a href="#">Page <?=$this->PageCurrent?>/<?=$this->PageTotal?></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PageNext, 'token'=> $this->token))?>" aria-label="Suivant"><span aria-hidden="true">&rsaquo;</span></a></li>
<li><a href="<?=$this->url(array('page'=>$this->PageTotal, 'token'=> $this->token))?>" aria-label="Fin"><span aria-hidden="true">&raquo;</span></a></li>
</ul>
</p>
<?php }?>
<div class="paragraph">
<?php if ($this->rechCsv) { ?>
<?php foreach ($this->filtres as $k => $filtre) { if ( !empty($filtre['select']) ) break; }?>
<p class="StyleInfoLib">
<p>
<a href="<?=$this->url(array('controller'=>'recherche', 'action'=>'csv', 'filtre'=>$k), 'default', true)?>" target="_blank">
Exporter les résultats de la recherche en CSV.</a>
</p>
<?php } ?>
<?php if ($this->blockDirToEntreprise){ ?>
<p class="StyleInfoLib">
Effectuer une recherche entreprise avec les paramètres "<a href="<?=$this->searchDirToEntrepriseLien?>">
<?=$this->searchDirToEntrepriseTxt?></a>"
</p>
<p>Effectuer une recherche entreprise avec les paramètres "<a href="<?=$this->searchDirToEntrepriseLien?>">
<?=$this->searchDirToEntrepriseTxt?></a>"</p>
<?php }?>
<?php if ($this->blockInvestig) { ?>
<p class="StyleInfoLib">
<p>
Si aucun r&eacute;sultat ne correspond &agrave; votre recherche.
<a href="<?=$this->url(array('controller'=>'recherche','action'=>'enquete'), 'default', true)?>">Cliquez-ici.</a>
</p>
<?php }?>
</div>
</div>
<?php }?>

View File

@ -1,4 +1,4 @@
<h3 style="color:#ffffff;font-size:medium;font-weight:bold;"><?=$this->translate("RECHERCHE SURVEILLANCE")?></h3>
<h3><?=$this->translate("Recherche Surveillance")?></h3>
<form class="form-horizontal" name="refclient" method="post" action="<?=$this->url(array(
'controller'=>'recherche', 'action'=>'refclientliste'), 'default', true)?>">
@ -6,12 +6,16 @@
<input type="hidden" name="type" value="refclient" />
<div class="form-group form-group-sm">
<label class="col-sm-2 control-label">Référence client</label>
<div class="col-sm-6">
<input type="text" class="form-control" name="ref" value="" />
<label class="col-sm-3 control-label">Référence client</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="ref" value="">
</div>
</div>
<div class="form-group form-group-sm submit">
<div class="col-sm-offset-3 col-sm-8">
<input class="btn btn-sm btn-primary" type="submit" name="submit" value="Rechercher">
</div>
<div class="col-sm-1">
<input class="btn btn-default btn-sm" type="submit" name="submit" value="Rechercher" />
</div>
</form>

View File

@ -1,8 +1,8 @@
<div id="center">
<h1 class="titre">PORTEFEUILLE</h1>
<h1>Portefeuille</h1>
<div class="paragraph">
<table id="info">
<table class="table">
<tr>
<td width="200" class="StyleInfoLib">Nombre d'entités affichées</td>
<td><?=$this->nbReponses?></td>
@ -14,12 +14,21 @@
</table>
</div>
<h2>Exportation de votre portefeuille</h2>
<h2>Extraction de votre portefeuille</h2>
<div class="paragraph">
<?=$this->action('portefeuillecsv', 'surveillance')?>
</div>
<h2>Options de recherche</h2>
<h2>Affichage</h2>
<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"?>" />
<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>
<div class="paragraph">
Tri par
<select name="tri">
@ -31,39 +40,17 @@ Tri par
</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="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-bordered table-striped">
<thead>
<tr>
<th>Siren</th>
<th>Dénomination Sociale</th>
<th>Référence</th>
<th class="score">Score</th>
<th>Score</th>
<th>Encours demandé</th>
<th>Encours conseillé</th>
</tr>
@ -71,60 +58,36 @@ if (count($this->portefeuille)>0) {
<tbody>
<?php foreach ( $this->portefeuille as $item ){ ?>
<tr>
<td>
<a href="<?=$this->url(array(
'controller' => 'identite',
'action' => 'fiche',
'siret' => $item->siren));?>">
<?=$item->siren?>
</a>
</td>
<td width="110">
<?=$item->rs?><br/>
<i><?=$item->cp.' '.$item->ville?></i>
<td><a href="<?=$this->url(array('controller'=>'identite', 'action'=>'fiche', 'siret'=>$item->siren))?>">
<?=$item->siren?></a>
</td>
<td>
<p><?=$item->ref?></p>
<p><?=$item->rs?></p>
<p><i><?=$item->cp.' '.$item->ville?></i></p>
</td>
<td class="tooltip" title="<?=$item->tooltip?>">
<div class="align_image"><?=$item->colScore?></div>
<td><p><?=$item->ref?></p>
</td>
<td class="infotip" data-tooltip="<?=$item->tooltip?>" style="white-space: nowrap"><?=$item->colScore?></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) { ?>
<span>
<?php if(!empty($item->encoursClient)) { ?>
<?=number_format(round($item->encoursClient/1000), 0, ',', ' ')?> K&euro;
<?php }else{ ?> - <?php }
}else{ ?> - <?php }
?>
</span>
</div>
<?php if (empty($item->encoursClient)) { ?> - <?php } else { ?>
<?=number_format(round($item->encoursClient/1000), 0, ',', ' ')?> K&euro;
<?php } ?>
</span>
<a class="dialogsurv editencours pull-right" href="<?=$this->url(array('action'=>'encours', 'siret'=>$item->siren.$item->nic,
'ref' => $item->ref, 'email' => $item->email))?>" title="Editer encours">
<span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
<?php } else { ?> <span>-</span> <?php }?>
</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, ',', ' ')?>
K&euro;">
<?=number_format(round($item->encours/1000), 0, ',', ' ')?> K&euro;
<?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>
<?php }else{ ?>
<?php } else { ?>
<td class="encours">-</td>
<?php } ?>
</tr>
</tr>
<?php }?>
</tbody>
</table>
@ -165,28 +128,14 @@ $(document).ready(function(){
window.location.href = $(this).val();
});
$('#surveillance').tablesorter({
headers: {
3: { sorter: false },
4: { sorter: false },
5: { sorter: false }
}
});
$('.tooltip').each(function(){
$('td.infotip').each(function(){
$(this).qtip({
content: $(this).attr('tooltip'),
content: $(this).attr('data-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();

View File

@ -6,7 +6,7 @@
</p></div>
<?php } ?>
<h1 class="titre">PROFIL UTILISATEUR</h1>
<h1 class="titre">Paramètres utilisateur</h1>
<div class="paragraph">
@ -15,101 +15,107 @@
<input type="hidden" name="frmOptions[idClient]" value="<?=$this->options->idClient?>"/>
<input type="hidden" name="frmOptions[action]" value="<?=$this->action?>"/>
<div class="infoTitle StyleInfoLib">Identifiant utilisateur</div>
<div class="infoData">
<?php
if ($this->action != 'new') {
echo $this->loginVu;
} else {
?>
<input type="text" size="20" maxlength="80" name="frmOptions[login]" value="<?=$this->loginNew?>"/>
<?php } ?>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Identifiant utilisateur</p></div>
<div class="col-lg-8 col-md-8"><p>
<?php
if ($this->action != 'new') {
echo $this->loginVu;
} else {
?>
<input type="text" size="20" maxlength="80" name="frmOptions[login]" value="<?=$this->loginNew?>"/>
<?php } ?>
</p></div>
</div>
<div class="infoTitle StyleInfoLib">Identit&eacute; (NOM/Pr&eacute;nom)</div>
<div class="infoData">
<?php if ($this->isAdmin) { ?>
<input type="text" size="20" maxlength="80" name="frmOptions[nom]" value="<?=$this->options->nom?>"/>
<input type="text" size="20" maxlength="80" name="frmOptions[prenom]" value="<?=$this->options->prenom?>"/>
<?php
} else { echo $this->options->nom.' '.$this->options->prenom ; } ?>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Identit&eacute; (NOM/Pr&eacute;nom)</p></div>
<div class="col-lg-8 col-md-8">
<?php if ($this->isAdmin) { ?>
<input type="text" size="20" maxlength="80" name="frmOptions[nom]" value="<?=$this->options->nom?>"/>
<input type="text" size="20" maxlength="80" name="frmOptions[prenom]" value="<?=$this->options->prenom?>"/>
<?php } else { echo $this->options->nom.' '.$this->options->prenom ; } ?>
</div>
</div>
<div class="infoTitle StyleInfoLib">R&eacute;f. facturation (service, etc...)</div>
<div class="infoData">
<?php if ($this->isAdmin) { ?>
<input type="text" size="20" maxlength="80" name="frmOptions[reference]" value="<?=$this->options->reference?>"/>
<? } else { echo $this->options->reference; } ?>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">R&eacute;f. facturation (service, etc...)</p></div>
<div class="col-lg-8 col-md-8">
<?php if ($this->isAdmin) { ?>
<input type="text" size="20" maxlength="80" name="frmOptions[reference]" value="<?=$this->options->reference?>"/>
<? } else { echo $this->options->reference; } ?>
</div>
</div>
<div class="infoTitle StyleInfoLib">Adresse e-mail</div>
<div class="infoData" id="email">
<?php $emails = explode(';', $this->options->email); ?>
<?php foreach ( $emails as $email ) {?>
<span><?=$email?></span><br/>
<?php }?>
<div class="row">
<div class="col-lg-4 col-md-4"><p class="identite-label">Adresse e-mail</p></div>
<div class="col-lg-4 col-md-4" id="email">
<?php $emails = explode(';', $this->options->email); ?>
<?php foreach ( $emails as $email ) {?>
<span><?=$email?></span><br/>
<?php }?>
</div>
<div class="col-lg-4 col-md-4">
<button id="user-emails" data-href="<?=$this->url(array(
'controller' => 'user', 'action' => 'email',
'q' => $this->options->email,
))?>">Editer e-mail du compte</button>
<button id="user-emailsecondary" data-href="<?=$this->url(array(
'controller' => 'user', 'action' => 'emailsecondary',
'idClient' => $this->options->idClient,
'login' => $this->loginVu,
))?>">Voir ou associer des e-mails secondaires</button>
<script>
$('button#user-emails').button({ icons: { primary: "ui-icon-pencil" }, text: false}).click(function(e) {
e.preventDefault();
var title = $(this).text();
var href = $(this).data('href');
var dialogOpts = {
bgiframe: true,
title: title,
width: 500,
height: 300,
modal: true,
open: function(event, ui) {
$(this).html('Chargement...');
$(this).load(href);
},
buttons: {
Quitter: function() { $(this).dialog('close'); }
},
close: function() { $('#dialog').remove(); }
};
$('<div id="dialog"></div>').dialog(dialogOpts);
return false;
});
$('button#user-emailsecondary').button({icons: { primary: "ui-icon-plusthick" }, text: false}).click(function(e) {
e.preventDefault();
var title = $(this).text();
var href = $(this).data('href');;
var dialogOpts = {
bgiframe: true,
title: title,
width: 500,
height: 300,
modal: true,
open: function(event, ui) {
$(this).html('Chargement...');
$(this).load(href);
},
buttons: {
Quitter: function() { $(this).dialog('close'); }
},
close: function() { $('#dialog').remove(); }
};
$('<div id="dialog"></div>').dialog(dialogOpts);
return false;
});
</script>
</div>
</div>
<div style="float:left;">
<button id="user-emails" data-href="<?=$this->url(array(
'controller' => 'user', 'action' => 'email',
'q' => $this->options->email,
))?>">Editer e-mail du compte</button>
<button id="user-emailsecondary" data-href="<?=$this->url(array(
'controller' => 'user', 'action' => 'emailsecondary',
'idClient' => $this->options->idClient,
'login' => $this->loginVu,
))?>">Voir ou associer des e-mails secondaires</button>
<script>
$('button#user-emails').button({ icons: { primary: "ui-icon-pencil" }, text: false}).click(function(e) {
e.preventDefault();
var title = $(this).text();
var href = $(this).data('href');
var dialogOpts = {
bgiframe: true,
title: title,
width: 500,
height: 300,
modal: true,
open: function(event, ui) {
$(this).html('Chargement...');
$(this).load(href);
},
buttons: {
Quitter: function() { $(this).dialog('close'); }
},
close: function() { $('#dialog').remove(); }
};
$('<div id="dialog"></div>').dialog(dialogOpts);
return false;
});
$('button#user-emailsecondary').button({icons: { primary: "ui-icon-plusthick" }, text: false}).click(function(e) {
e.preventDefault();
var title = $(this).text();
var href = $(this).data('href');;
var dialogOpts = {
bgiframe: true,
title: title,
width: 500,
height: 300,
modal: true,
open: function(event, ui) {
$(this).html('Chargement...');
$(this).load(href);
},
buttons: {
Quitter: function() { $(this).dialog('close'); }
},
close: function() { $('#dialog').remove(); }
};
$('<div id="dialog"></div>').dialog(dialogOpts);
return false;
});
</script>
</div>
<input type="hidden" name="frmOptions[email]" value="<?=$this->options->email?>"/>

View File

@ -2,35 +2,53 @@
class Scores_Auth_Adapter_Ws implements Zend_Auth_Adapter_Interface
{
/**
*
* @var unknown
* Identifiant de l'utilisateur
* @var string
*/
protected $_username;
/**
*
* @var unknown
* Password
* @var string
*/
protected $_password;
/**
*
* @var unknown
* Timeout
* @var int
*/
protected $_timeout = 1800;
/**
*
* @var unknown
* Marqueur de vérification IP (en iponly)
* @var boolean
*/
protected $_checkIp = false;
/**
* Liste des IPs des frontends (proxy)
* @var array
*/
protected $listProxyIp = array(
'62.210.222.34',
);
/**
* Authentification par WS
* @param string $username
* @param string $password
* @param boolean $iponly
*/
public function __construct($username, $password, $iponly = false)
{
$this->_username = $username;
$this->_password = $password;
if ($iponly){
$this->_password = 'iponly:'.$_SERVER['REMOTE_ADDR'];
if ($iponly){
$ip = $_SERVER['REMOTE_ADDR'];
if ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) && in_array($ip, $this->listProxyIp)) {
$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
$this->_password = 'iponly:'.$ip;
}
$this->_checkIp = $iponly;
}
@ -41,11 +59,14 @@ class Scores_Auth_Adapter_Ws implements Zend_Auth_Adapter_Interface
*/
public function authenticate()
{
$adressIp = $_SERVER['REMOTE_ADDR'];
$ip = $_SERVER['REMOTE_ADDR'];
if ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) && in_array($ip, $this->listProxyIp)) {
$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
require_once 'Scores/WsScores.php';
$ws = new WsScores($this->_username, $this->_password);
$InfosLogin = $ws->getInfosLogin($this->_username, $adressIp);
$InfosLogin = $ws->getInfosLogin($this->_username, $ip);
$identity = new stdClass();
$identity->username = $this->_username;
$identity->password = $this->_password;
@ -70,7 +91,7 @@ class Scores_Auth_Adapter_Ws implements Zend_Auth_Adapter_Interface
$identity->dateDebutCompte = $InfosLogin->result->dateDebutCompte;
$identity->dateFinCompte = $InfosLogin->result->dateFinCompte;
$identity->acceptationCGU = $InfosLogin->result->acceptationCGU;
$identity->ip = $adressIp;
$identity->ip = $ip;
$identity->version = $InfosLogin->result->version;
$identity->modeEdition = false;

View File

@ -421,7 +421,6 @@ class Scores_Menu
'label' => "Paramètres",
'controller' => 'user',
'action' => 'index',
'permission' => 'MONPROFIL'
),
array(
'label' => "Surveillances",

View File

@ -209,7 +209,8 @@ class Scores_Utilisateur
*/
public function getIpAddress()
{
if ( !isset($this->identity->ip) || empty($this->identity->ip) ){
//@todo : ATTENTION lorsque reverse proxy
if ( !isset($this->identity->ip) || empty($this->identity->ip) ){
return $_SERVER['REMOTE_ADDR'];
}
return $this->identity->ip;
@ -222,6 +223,14 @@ class Scores_Utilisateur
{
return $this->identity->dateDerniereConnexion;
}
/**
* Retourne la version d'authentification
*/
public function getVersion()
{
return $this->identity->version;
}
/**
* Vérifie que l'utiliasteur a le mode edition