[Noalyss-commit] [noalyss] 23/34: Bug Fiche Option

[dwm]

sparkyx pushed a commit to branch devel
in repository noalyss.

commit 5f389826a8b22efb5fa3c1f72683c66ad944ae77
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Fri Jan 12 17:54:46 2024 +0100

    Bug Fiche Option
---
 include/class/follow_up_other_concerned.class.php |  3 ++-
 include/export/export_follow_up_contact_csv.php   | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/include/class/follow_up_other_concerned.class.php 
b/include/class/follow_up_other_concerned.class.php
index d1ba3aea9..1c4a28c47 100644
--- a/include/class/follow_up_other_concerned.class.php
+++ b/include/class/follow_up_other_concerned.class.php
@@ -190,7 +190,8 @@ EOF;
                         where 
                         apo2.contact_option_ref_id =$1
                         and ap.f_id=$2
-                        ", array($pa_Column[$i]['cor_id'], $p_fid));
+                        and ap.ag_id=$3
+                        ", array($pa_Column[$i]['cor_id'], $p_fid, 
$this->ag_id));
             $r.=td($value);
         }
         $r.='<td>'.$remove.'</td>';
diff --git a/include/export/export_follow_up_contact_csv.php 
b/include/export/export_follow_up_contact_csv.php
index ebd929fda..5b1251962 100644
--- a/include/export/export_follow_up_contact_csv.php
+++ b/include/export/export_follow_up_contact_csv.php
@@ -44,7 +44,7 @@ join fiche_detail f on (a.f_id=f.f_id)
 join fiche_def fd on (fd.fd_id=f1.fd_id)
 join jnt_fic_attr jfa on (fd.fd_id=jfa.fd_id and jfa.ad_id=f.ad_id)
 where ag_id=$1 
-order by f1.fd_id, a.f_id,jnt_order;;",[$ag_id]);
+order by f1.fd_id, a.f_id,jnt_order",[$ag_id]);
 
 $nb=count($aRow);
 $lastcat=0;$lastcard=0;
@@ -105,5 +105,14 @@ where ag_id=$1 and f_id=$2  order by 
cor_id",array($ag_id,$lastcard));
     $csv->add($aRow[$i]['ad_value']);
     
 }
-
+$aOption=$cn->get_array(" select ap_value
+from 
+action_person a
+join action_person_option apo on (a.ap_id=apo.action_person_id)
+join contact_option_ref cor on (cor.cor_id=apo.contact_option_ref_id)
+where ag_id=$1 and f_id=$2  order by cor_id",array($ag_id,$lastcard));
+$nb_option=count($aOption);
+for ($h=0;$h < $nb_option;$h++) {
+    $csv->add($aOption[$h]['ap_value']);
+}
 $csv->write();
\ No newline at end of file