From 3a3400116a8a2156761695acfabf81e50cc6d952 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Tue, 16 Feb 2010 18:22:02 +0000
Subject: [PATCH] Correction suppression, issue #0000175 Tester ajout et
 edition

---
 www/pages/ajax_surveillance.php |  4 ++--
 www/pages/options_surv.php      | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/www/pages/ajax_surveillance.php b/www/pages/ajax_surveillance.php
index 4c9e9d64a..f08917c23 100644
--- a/www/pages/ajax_surveillance.php
+++ b/www/pages/ajax_surveillance.php
@@ -27,9 +27,9 @@ elseif($_REQUEST['q']=='getsurv')
 elseif($_REQUEST['q']=='ajouter')
 {
 	$firephp->log($_REQUEST, 'REQUEST');
-	$siren = $_REQUEST['siren'];
+	$siret = $_REQUEST['siret'];
 	$source = ( isset($_REQUEST['source']) && !empty($_REQUEST['source']) ) ? $_REQUEST['source'] : '' ;
-	$return = formSurveillance($source, $siren, array(), false);
+	$return = formSurveillance($source, $siret, array(), false);
 }
 echo $return;
 exit;
diff --git a/www/pages/options_surv.php b/www/pages/options_surv.php
index fbe05c938..2bb5da71b 100644
--- a/www/pages/options_surv.php
+++ b/www/pages/options_surv.php
@@ -14,8 +14,8 @@ isset($_REQUEST['siret'])? $siret=$_REQUEST['siret'] : $siret='';
 
 if($_REQUEST['action']=='supprimer'){
 	require_once 'surveillance/surveillance.php';
-	deleteSurveillance($_REQUEST['siren'], $_REQUEST['email'], $_REQUEST['ref'], $_REQUEST['source'], true);
-	header('Location: ./?page=surveillance&idEntreprise='.$idEntreprise.'&siret='.$siret);
+	deleteSurveillance($siret, $_REQUEST['email'], $_REQUEST['ref'], $_REQUEST['source'], true);
+	header('Location: ./?page=surveillance');
 }
 isset($_REQUEST['vue']) ? $vue = $_REQUEST['vue'] : $vue = 'default' ;
 isset($_REQUEST['tri']) ? $tri = $_REQUEST['tri'] : $tri = 'siren' ;
@@ -283,6 +283,7 @@ if($totPage != 1)
 if($vue=='default'){
 foreach($listTrier as $item)
 {
+$firephp->log($item, 'item');
 ?>
 <tr>
 	<td class="aleft"><a href="./?page=identite&siret=<?php print $item['siren']; ?>"><?php print $item['siren']; ?></a></td>
@@ -319,9 +320,9 @@ foreach($listTrier as $item)
 				?>
 				<div id="a<?php print $item['siren'];?>" class="action">
 				<p><?php print ucfirst($source);?></p>
-				<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siren=<?=$item['siren']?>&source=<?=$source?>" title="Ajouter la surveillance <?=$source?>"><img src="./img/interface/ajouter.png"/></a>
-				<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siren=<?=$item['siren']?>&source=<?=$source?>&ref=<?=$surveillance['ref']?>&email=<?=$surveillance['email']?>" title="Editer la surveillance <?=$source?>"><img src="./img/interface/editer.png"/></a>
-				<a href="./?page=surveillance&action=supprimer&siren=<?=$item['siren']; ?>&ref=<?=$surveillance['ref']?>&source=<?=$source?>&email=<?=$surveillance['email']?>&idEntreprise=<?=$idEntreprise?>&siret=<?=$siret?>" title="Supprimer la surveillance <?=$source.' '.$surveillance['email']?>"><img src="./img/interface/supprimer.png"/></a>
+				<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?=$source?>" title="Ajouter la surveillance <?=$source?>"><img src="./img/interface/ajouter.png"/></a>
+				<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?=$source?>&ref=<?=$surveillance['ref']?>&email=<?=$surveillance['email']?>" title="Editer la surveillance <?=$source?>"><img src="./img/interface/editer.png"/></a>
+				<a href="./?page=surveillance&action=supprimer&siret=<?=$item['siren'].$item['nic']?>&ref=<?=$surveillance['ref']?>&source=<?=$source?>&email=<?=$surveillance['email']?>" title="Supprimer la surveillance <?=$source.' '.$surveillance['email']?>"><img src="./img/interface/supprimer.png"/></a>
 				</div>
 				<?php
 				}
@@ -329,9 +330,9 @@ foreach($listTrier as $item)
 			else
 			{
 			?>
-			<div id="a<?php print $item['siren'];?>" class="action">
-			<p><?php print ucfirst($source);?></p>
-			<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siren=<?php print $item['siren']; ?>&source=<?php print $source;?>" title="Ajouter la surveillance <?=$source?>"><img src="./img/interface/ajouter.png"/></a>
+			<div id="a<?=$item['siren']?>" class="action">
+			<p><?=ucfirst($source)?></p>
+			<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?php print $source;?>" title="Ajouter la surveillance <?=$source?>"><img src="./img/interface/ajouter.png"/></a>
 			</div>
 			<?php
 			}
@@ -381,8 +382,8 @@ elseif($vue=='source')
 foreach($listTrier as $item){
 ?>
 <tr>
-	<td class="aleft"><a href="./?page=identite&siret=<?php print $item['siren']; ?>"><?php print $item['siren']; ?></a></td>
-	<td><?php print $item['rs']; ?><br/><i><?php print $item['cp'].' '.$item['ville']; ?></i></td>
+	<td class="aleft"><a href="./?page=identite&siret=<?=$item['siren'].$item['nic']?>"><?=$item['siren']?></a></td>
+	<td><?=$item['rs']?><br/><i><?=$item['cp'].' '.$item['ville']?></i></td>
 	<td>
 	<?php
 	if($item['ref']!=''){
@@ -393,8 +394,8 @@ foreach($listTrier as $item){
 	<td class="aleft">
 		<div id="a<?php print $item['siren'];?>" class="action">
 		<p><?php print ucfirst($item['source']);?></p>
-		<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siren=<?php print $item['siren']; ?>&source=<?php print $item['source'];?>&ref=<?php print $item['ref'];?>&email=<?php print $item['email'];?>" title="Editer la surveillance <?php print $item['source'];?>"><img src="./img/interface/editer.png"/></a>
-		<a href="./?page=surveillance&action=supprimer&siren=<?php print $item['siren']; ?>&ref=<?php print $item['ref']; ?>&source=<?php print $item['source'];?>&email=<?php print $item['email']; ?>" title="Supprimer la surveillance <?php print $item['source'].' '.$item['email'];?>"><img src="./img/interface/supprimer.png"/></a>
+		<a class="thickbox" href="./pages/ajax_surveillance.php?q=ajouter&siret=<?=$item['siren'].$item['nic']?>&source=<?php print $item['source'];?>&ref=<?php print $item['ref'];?>&email=<?php print $item['email'];?>" title="Editer la surveillance <?php print $item['source'];?>"><img src="./img/interface/editer.png"/></a>
+		<a href="./?page=surveillance&action=supprimer&siret=<?$item['siren'].$item['nic']?>&ref=<?php print $item['ref']; ?>&source=<?php print $item['source'];?>&email=<?php print $item['email']; ?>" title="Supprimer la surveillance <?php print $item['source'].' '.$item['email'];?>"><img src="./img/interface/supprimer.png"/></a>
 		</div>
 		<br/>
 	</td>