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

issue #0001920 : Design et modification suite à remarques

Browse Source
This commit is contained in:
Michael RICOIS 2014-06-20 07:57:14 +00:00
parent 3e31c1c430
commit 7deeb90b8e
7 changed files with 73 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
application/controllers/IdentiteController.php
View File

@ -119,6 +119,8 @@ class IdentiteController extends Zend_Controller_Action
'AutreId',
'Actif',
'SituationJuridique',
'SituationInsee',
'SituationRncs',
'AutreSiren',
'RaisonSociale',
'NomCommercial',
@ -189,7 +191,7 @@ class IdentiteController extends Zend_Controller_Action
//Vérification des permissions
$user = new Scores_Utilisateur();
if(!$user->checkPerm('idprocol')){
$this->_forward('perms', 'error');
$this->forward('perms', 'error');
}
$siren = substr($this->siret,0,9);
@ -1611,6 +1613,12 @@ class IdentiteController extends Zend_Controller_Action
*/
public function avisrncsAction()
{
//Vérification des permissions
$user = new Scores_Utilisateur();
if( $user->getIdClient()!=1 /*!$user->checkPerm('avisrncs')*/ ){
$this->forward('perms', 'error');
}
$request = $this->getRequest();
$this->view->assign('siret', $this->siret);
@ -1639,8 +1647,12 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('NumGest', $result->NumGest); // 4 ou 2 + 1 lettre +
$date = new Zend_Date($result->ImmatDate, 'yyyy-MM-dd');
$this->view->assign('ImmatDate', $date->toString('dd/MM/yyyy'));
if ($result->ImmatDate === null || $result->ImmatDate=='0000-00-00 00:00:00' ) {
$this->view->assign('ImmatDate', '');
} else {
$date = new Zend_Date($result->ImmatDate, 'yyyy-MM-dd');
$this->view->assign('ImmatDate', $date->toString('dd/MM/yyyy'));
}
$this->view->assign('FormeJuridique', $result->FjLabel);
$this->view->assign('Capital', number_format($result->Capital, 0, ',', ' ').' '.$result->CapitalDev);
@ -1650,9 +1662,14 @@ class IdentiteController extends Zend_Controller_Action
$result->SiegeAdresseCP . ' ' .
$result->SiegeAdresseVille);
$date = new Zend_Date();
$date->set($result->CompteArretMois, Zend_Date::MONTH, $locale);
$this->view->assign('CompteArretDate', $result->CompteArretJour . ' ' . $date->toString(Zend_Date::MONTH_NAME));
if ( $result->CompteArretMois === null ) {
$this->view->assign('CompteArretDate', '');
} else {
$date = new Zend_Date();
$date->set($result->CompteArretMois, Zend_Date::MONTH, $locale);
$this->view->assign('CompteArretDate', $result->CompteArretJour . ' ' . $date->toString(Zend_Date::MONTH_NAME));
}
$administration = array();
foreach ($result->Administration->item as $item) {
@ -1713,8 +1730,12 @@ class IdentiteController extends Zend_Controller_Action
$this->view->assign('Activite', $result->Activite);
$date = new Zend_Date($result->ActiviteDate, 'yyyy-MM-dd');
$this->view->assign('ActiviteDate', $date->toString('dd/MM/yyyy'));
if ( $result->ActiviteDate === null || $result->ActiviteDate == '0000-00-00 00:00:00') {
$this->view->assign('ActiviteDate', '');
} else {
$date = new Zend_Date($result->ActiviteDate, 'yyyy-MM-dd');
$this->view->assign('ActiviteDate', $date->toString('dd/MM/yyyy'));
}
$tabTypeExploitation = array(
0 => "-",

4
application/views/default/scripts/error/perms.phtml
View File

@ -1,9 +1,7 @@
<div id="center">
<h2>Droits d'accès</h2>
<div class="paragraph">
<?php
$message = 'Vous n\'avez pas les droits nécessaires pour afficher cette page.';
?>
<?php $message = 'Vous n\'avez pas les droits nécessaires pour afficher cette page.'; ?>
<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>
<strong>Erreur :</strong> <?=$message?></p>

7
application/views/default/scripts/identite/avisrncs.phtml
View File

@ -24,11 +24,16 @@ div.avisrncs-footer p { margin:0; padding:0; }
<div class="avisrncs-header">
<p>Avis de situtation RNCS édité le <?=$this->AvisDateTxt?></p>
<p>Département Système et Opérations</p>
<p>Société Scores & Decisions SAS</p>
<p>Société Scores & Décisions SAS</p>
<p>1 rue de Clairefontaine - 78120 Rambouillet</p>
</div>
</div>
<div class="paragraph" style="text-align:right;">
<a target="_blank" href="http://www.inpi.fr/fr/services-et-prestations/reutilisation-des-donnees-de-l-inpi/licences-rncs/liste-des-licencies.html">
Rediffuseur officiel du RNCS</a> - Service distinct
</div>
<div class="avisrncs-title">
<h2><?=$this->translate("AVIS DE SITUATION RNCS")?></h2>
<p><?=$this->translate("REGISTRE NATIONAL DU COMMERCES ET DES SOCIETES")?></p>

2
application/views/default/scripts/identite/fiche.phtml
View File

@ -51,6 +51,8 @@ echo $this->partial('identite/fiche-item.phtml', $this->dBlock['AutreId']);
//echo $this->partial('identite/fiche-item.phtml', $this->dBlock['NumRM']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['Actif']);
echo $this->partial('identite/fiche-item.phtml', $this->dBlock['SituationJuridique']);
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>

41
library/Scores/IdentiteEntreprise.php
View File

@ -321,10 +321,9 @@ class IdentiteEntreprise
}
if ( $this->identite->AncienSiege==1
|| ( property_exists($this->identite->AutreSiret, 'item') && count($this->identite->AutreSiret->item)>0 )
|| ($this->identite->ActifEco==0 && !empty($this->identite->ActifEcoDate)) )
{
$data.= '</a>';
|| ( property_exists($this->identite->AutreSiret, 'item') && count($this->identite->AutreSiret->item)>0 )
|| ($this->identite->ActifEco==0 && !empty($this->identite->ActifEcoDate)) ) {
$data.= '</a>';
}
if ($this->identite->Actif==0 && $this->identite->DateClotEt != '') {
@ -332,15 +331,41 @@ class IdentiteEntreprise
$data.= "<i>&nbsp;(Fin d'activité en ".$date->toString('dd/MM/yyyy').')</i>';
}
$user = new Scores_Utilisateur();
if (intval($this->identite->Siren)!=0 && $user->checkPerm('avisinsee')) {
$data.='&nbsp;&nbsp;&nbsp;<a title="Voir l\'avis de situation correspondant de l\'INSEE" target="_blank" href="/identite/avis/siret/'.
$this->identite->Siret.'">(Situation au répertoire SIRENE)</a>';
return $data;
}
public function getSituationInseeLabel()
{
return '';
}
public function getSituationInseeTexte()
{
$user = new Scores_Utilisateur();
$data = '';
if ( intval($this->identite->Siren)!=0 && $user->checkPerm('avisinsee') ) {
$data ='<a title="Voir l\'avis de situation correspondant de l\'INSEE" target="_blank" href="/identite/avis/siret/'.
$this->identite->Siret.'">Situation au répertoire SIRENE</a>';
}
return $data;
}
public function getSituationRncsLabel()
{
return '';
}
public function getSituationRncsTexte()
{
$user = new Scores_Utilisateur();
$data = '';
if ( intval($this->identite->Siren)!=0 && $user->getIdClient()==1 /*$user->checkPerm('avisrncs')*/ ) {
$data ='<a title="Voir l\'avis de situation RNCS" target="_blank" href="/identite/avisrncs/siret/'.
$this->identite->Siret.'">Situation au répertoire RNCS</a>';
}
return $data;
}
public function getSituationJuridiqueLabel()
{
return 'Situation juridique';

6
library/Scores/Menu.php
View File

@ -816,12 +816,6 @@ class Scores_Menu
}
return false;
break;
case 'avisrncs':
$user = new Scores_Utilisateur();
if ( $user->getIdClient()==1 ){
return true;
}
break;
case 'groupe':
case 'etablissements':
case 'evenements':

4
public/themes/default/styles/main.css
View File

@ -437,8 +437,8 @@ 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:16px;}
.StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size:11px;color:#535353;line-height:16px;}
.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;}
.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%;}