@@ -1126,7 +1126,7 @@ function listeClients($agence, $entites, $type, $motifs) {
...
@@ -1126,7 +1126,7 @@ function listeClients($agence, $entites, $type, $motifs) {
array_push($liste,$tmp);
array_push($liste,$tmp);
}
}
}elseif($type=="pris_en_charge"){
}elseif($type=="pris_en_charge"){
$q="SELECT cl.id_client, cl.nbr, DATE_FORMAT(cl.date_arrivee, '%Hh%i') as date_arrivee,DATE_FORMAT(cl.date_priseencharge, '%Hh%i') as date_priseencharge, cl.date_cloture, cl.rdv, cl.rdv_type, cl.civ, cl.nom, cl.id_conseiller, cs.nom as conseillerNom, cl.id_action, csa.civ as civ_conseiller_action, csa.nom as nom_conseiller_action, csa.prenom as prenom_conseiller_action".$additionalColumns."
$q="SELECT cl.id_client, cl.nbr, DATE_FORMAT(cl.date_arrivee, '%Hh%i') as date_arrivee,DATE_FORMAT(cl.date_priseencharge, '%Hh%i') as date_priseencharge, cl.date_cloture, cl.rdv, cl.rdv_type, cl.civ, cl.nom, cl.matricule, cl.id_conseiller, cs.nom as conseillerNom, cl.id_action, csa.civ as civ_conseiller_action, csa.nom as nom_conseiller_action, csa.prenom as prenom_conseiller_action".$additionalColumns."
FROM ca_clients cl
FROM ca_clients cl
".$leftJoins."
".$leftJoins."
LEFT OUTER JOIN ca_conseillers cs ON cl.id_conseiller=cs.id_conseiller
LEFT OUTER JOIN ca_conseillers cs ON cl.id_conseiller=cs.id_conseiller