From bc55b878c41105b26b71174023194cd242b47a8d Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 17 Jun 2013 07:10:47 +0000
Subject: [PATCH] issue #0001642 : Display mor clearly "Effectif" from account

---
 library/Scores/IdentiteEntreprise.php | 39 ++++++++++++++-------------
 public/themes/default/styles/main.css |  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/library/Scores/IdentiteEntreprise.php b/library/Scores/IdentiteEntreprise.php
index 14bccbbd1..11fc45a7f 100644
--- a/library/Scores/IdentiteEntreprise.php
+++ b/library/Scores/IdentiteEntreprise.php
@@ -1047,34 +1047,35 @@ class IdentiteEntreprise
 
 	public function getEffectifLabel()
 	{
-		return 'Effectif de l\'entreprise';
-	}
-	public function getEffectifTitre()
-	{
-		$title = '';
-	    if (!empty($this->identite->Bilan->Effectif)) {
-	        $title .= $this->identite->Bilan->Effectif.' salarié(s)';
-	    }
-	    if (!empty($this->identite->Bilan->Cloture)) {
-	        $title .= ' au '.WDate::dateT('Ymd', 'd/m/Y',$this->identite->Bilan->Cloture);
-	    }
-	    return $title;
+		return "Effectif de l'entreprise";
 	}
+
 	public function getEffectifTexte()
 	{
 	    $data = '';
 
-	    if (empty($this->identite->Effectif)
-	    	|| ($this->identite->Effectif == 'N/C' || $this->identite->Effectif == 0)
-	    	&& !empty($this->identite->Bilan->Effectif)) {
-	        	$data.= 'N/C';
-	    } else if ($this->identite->Effectif != 'N/C' && $this->identite->Effectif != 0) {
+	    if ($this->identite->Effectif != 'N/C' && $this->identite->Effectif != 0) {
+
 	        $data.= number_format(intval($this->identite->Effectif), null, null, ' ').' salarié(s)';
 	        $data.= empty($this->identite->AnneeEffEn) || $this->identite->AnneeEffEn=='0000' ?
-	        	'' : ' en '.$this->identite->AnneeEffEn;
-	    } else {
+	        '' : ' en '.$this->identite->AnneeEffEn;
+
+	    }
+
+	    if (!empty($this->identite->Bilan->Effectif)) {
+	        if ( !empty($data) ) {
+	            $data.= "<br/>";
+	        }
+	        $data.= $this->identite->Bilan->Effectif.' salarié(s) au bilan';
+	        if (!empty($this->identite->Bilan->Cloture)) {
+	            $data.= " cloturé le ".WDate::dateT('Ymd', 'd/m/Y',$this->identite->Bilan->Cloture);
+	        }
+	    }
+
+	    if ( empty($data) ) {
 	        $data.= 'N/C';
 	    }
+
 	    return $data;
 	}
 
diff --git a/public/themes/default/styles/main.css b/public/themes/default/styles/main.css
index 8928b1949..917972937 100644
--- a/public/themes/default/styles/main.css
+++ b/public/themes/default/styles/main.css
@@ -389,7 +389,7 @@ a:visited {color: #0000CC; text-decoration:none;}
 a:hover {color: #000066; text-decoration:none;}
 #center h1 {clear:both;margin:5px;padding:5px; background:#606060; 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:#00008c; color:#ffffff; font:bold 1.2em Arial, Verdana, Sans-serif; }
-.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353;}
+.StyleInfoLib {font-family: Arial, Helvetica, sans-serif;font-size:  11px;font-weight: bold;color:#535353; vertical-align:top;}
 .StyleInfoData {font-family: Arial, Helvetica, sans-serif;font-size: 11px;color:#535353;}
 .StyleInfoDataActif {font-family: Arial, Helvetica, sans-serif;font-size: 11px;}
 table.identite {border-collapse:separate;border-spacing:4px;}