From a7e494b6d82dc14f28f2d4777b0530f29001740a Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Fri, 18 Oct 2013 09:57:31 +0000
Subject: [PATCH] Rapport et cache

---
 library/Scores/Partner/Report.php             |  7 +--
 .../Templates/indiscore3/annonces.phtml       | 24 +++++++-
 .../juridique/annonces-resume.phtml           | 31 ----------
 library/Scores/WsScores.php                   |  4 +-
 public/themes/default/css/justified-nav.css   | 57 +------------------
 5 files changed, 27 insertions(+), 96 deletions(-)
 delete mode 100644 library/Scores/Partner/Templates/indiscore3/juridique/annonces-resume.phtml

diff --git a/library/Scores/Partner/Report.php b/library/Scores/Partner/Report.php
index 7f19370..c634bd8 100644
--- a/library/Scores/Partner/Report.php
+++ b/library/Scores/Partner/Report.php
@@ -159,12 +159,7 @@ class Scores_Partner_Report
 
 			require_once 'Scores/Annonces.php';
 			$objAnnonces = new Annonces($infos->Annonces->result->item);
-			$typeAnnonces = array(
-					'Bodacc',
-					'Balo',
-					'Bomp',
-					'Asso',
-			);
+			$typeAnnonces = array('Bodacc');
 			foreach ($typeAnnonces as $type)
 			{
 				$classType = 'annonces'.$type;
diff --git a/library/Scores/Partner/Templates/indiscore3/annonces.phtml b/library/Scores/Partner/Templates/indiscore3/annonces.phtml
index d1c3a03..f421422 100644
--- a/library/Scores/Partner/Templates/indiscore3/annonces.phtml
+++ b/library/Scores/Partner/Templates/indiscore3/annonces.phtml
@@ -12,7 +12,29 @@
 	Néant
 	<?php } else {?>
 	<table class="data">
-	<?=$this->partialLoop('juridique/annonces-resume.phtml', $this->annoncesBodacc)?>
+	<?php foreach ($this->annoncesBodacc as $k => $annonce) {?>
+		<?php
+		$class = '';
+		if ($annonce['deleted']!='') {
+		    $class = ' class="deleted"';
+		}
+		?>
+		<tr<?=$class?>>
+			<td width="140" class="StyleInfoLib">
+			<span id="annoncesDate">Le <?=$annonce['date']?></span>
+			</td>
+			<td>
+			<span id="annoncesImg">
+			<?php if (!empty($annonce['logo'])) {?>
+			<img src="/themes/default/images/annonces/<?=$annonce['logo']?>" title="<?=$annonce['title']?>" />
+			<?php }?>
+			</span>
+			</td>
+			<td width="450" colspan="2" class="StyleInfoData">
+			<?=$annonce['lib']?>
+			</td>
+		</tr>
+	<?php }?>
 	</table>
 	<?php }?>
 	</div>
diff --git a/library/Scores/Partner/Templates/indiscore3/juridique/annonces-resume.phtml b/library/Scores/Partner/Templates/indiscore3/juridique/annonces-resume.phtml
deleted file mode 100644
index aaae30b..0000000
--- a/library/Scores/Partner/Templates/indiscore3/juridique/annonces-resume.phtml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$class = '';
-if ($this->deleted!='') {
-    $class = ' class="deleted"';
-}
-?>
-<tr<?=$class?>>
-	<td width="140" class="StyleInfoLib">
-	<span id="annoncesDate">Le <?=$this->date?></span>
-	</td>
-	<td>
-	<span id="annoncesImg">
-	<?php if (!empty($this->logo)) {?>
-	<img src="/themes/default/images/annonces/<?=$this->logo?>" title="<?=$this->title?>" />
-	<?php }?>
-	</span>
-	</td>
-	<td width="450" colspan="2" class="StyleInfoData">
-	<a class="tiptxt" href="<?=$this->partialLoop()->view->url(array(
-		'controller' => 'juridique',
-		'action' => 'annonces',
-		'siret' => $this->partialLoop()->view->siret,
-		'id' => $this->partialLoop()->view->id,
-		'idAnn' => $this->idAnn,
-		'vue' => $this->type,
-	))?>">
-	<?=$this->lib?>
-	</a>
-	<span style="display:none;"><?=$this->RemplaceSiren($this->texte)?></span>
-	</td>
-</tr>
diff --git a/library/Scores/WsScores.php b/library/Scores/WsScores.php
index e11b55c..8341b75 100644
--- a/library/Scores/WsScores.php
+++ b/library/Scores/WsScores.php
@@ -31,13 +31,13 @@ class WsScores
 	 * Enable/Disable using of cache
 	 * @var unknown
 	 */
-	protected $cacheEnable = true;
+	protected $cacheEnable = false;
 
 	/**
 	 * Enbale/Disable cache writing
 	 * @var boolean
 	 */
-	protected $cacheWrite = true;
+	protected $cacheWrite = false;
 
 	/**
 	 * Load WebService config
diff --git a/public/themes/default/css/justified-nav.css b/public/themes/default/css/justified-nav.css
index 9ac290f..c1d72bd 100644
--- a/public/themes/default/css/justified-nav.css
+++ b/public/themes/default/css/justified-nav.css
@@ -1,65 +1,10 @@
-body {
-    padding-top: 20px;
-}
 .footer {
     border-top: 1px solid #EEEEEE;
     margin-top: 40px;
     padding-bottom: 40px;
     padding-top: 40px;
 }
-.jumbotron {
-    background-color: rgba(0, 0, 0, 0);
-    text-align: center;
-}
-.jumbotron .btn {
-    font-size: 21px;
-    padding: 14px 24px;
-}
-.nav-justified {
-    background-color: #EEEEEE;
-    border: 1px solid #CCCCCC;
-    border-radius: 5px 5px 5px 5px;
-}
-.nav-justified > li > a {
-    background-color: #E5E5E5;
-    background-image: -moz-linear-gradient(center top , #F5F5F5 0%, #E5E5E5 100%);
-    background-repeat: repeat-x;
-    border-bottom: 1px solid #D5D5D5;
-    color: #777777;
-    font-weight: bold;
-    padding-bottom: 15px;
-    padding-top: 15px;
-    text-align: center;
-}
-.nav-justified > .active > a, .nav-justified > .active > a:hover, .nav-justified > .active > a:focus {
-    background-color: #DDDDDD;
-    background-image: none;
-    box-shadow: 0 3px 7px rgba(0, 0, 0, 0.15) inset;
-}
-.nav-justified > li:first-child > a {
-    border-radius: 5px 5px 0 0;
-}
-.nav-justified > li:last-child > a {
-    border-bottom: 0 none;
-    border-radius: 0 0 5px 5px;
-}
-@media (min-width: 768px) {
-.nav-justified {
-    max-height: 52px;
-}
-.nav-justified > li > a {
-    border-left: 1px solid #FFFFFF;
-    border-right: 1px solid #D5D5D5;
-}
-.nav-justified > li:first-child > a {
-    border-left: 0 none;
-    border-radius: 5px 0 0 5px;
-}
-.nav-justified > li:last-child > a {
-    border-radius: 0 5px 5px 0;
-    border-right: 0 none;
-}
-}
+
 @media screen and (min-width: 768px) {
 .masthead, .marketing, .footer {
     padding-left: 0;