jyma...@adullact.net
unread,Jun 22, 2017, 11:59:46 AM6/22/17Sign in to reply to author
Sign in to forward
You do not have permission to delete messages in this group
Sign in to report message
Either email addresses are anonymous for this group or you need the view member email addresses permission to view the original message
to openmairi...@googlegroups.com
Author: jymadier
Date: 2017-06-22 17:59:44 +0200 (Thu, 22 Jun 2017)
New Revision: 6963
Modified:
branches/contentieux_evo_test_dossier_ws/tests/binary_files/tests_services/metier/demandemanager.php
Log:
* Correction de demande_manager
Modified: branches/contentieux_evo_test_dossier_ws/tests/binary_files/tests_services/metier/demandemanager.php
===================================================================
--- branches/contentieux_evo_test_dossier_ws/tests/binary_files/tests_services/metier/demandemanager.php 2017-06-22 15:27:43 UTC (rev 6962)
+++ branches/contentieux_evo_test_dossier_ws/tests/binary_files/tests_services/metier/demandemanager.php 2017-06-22 15:59:44 UTC (rev 6963)
@@ -191,8 +191,8 @@
$demande_values[$value] = null;
}
- $dossier_instruction_id = str_replace(" ", "", $request_data["dossier_instruction"]);
- $dossier_existant_values = $this->get_values_dossier_existant($dossier_instruction_id);
+ $dossier_existant_id = str_replace(" ", "", $request_data["dossier_instruction"]);
+ $dossier_existant_values = $this->get_values_dossier_existant($dossier_existant_id);
if ($dossier_existant_values === false) {
return false;
}
@@ -208,7 +208,7 @@
}
$demande_values['dossier_autorisation_type_detaille']
- = $this->get_dossier_autorisation_type_depuis_dossier($dossier_instruction_id);
+ = $this->get_dossier_autorisation_type_depuis_dossier($dossier_existant_id);
if ($demande_values['dossier_autorisation_type_detaille'] === false) {
return false;
}
@@ -220,7 +220,7 @@
FROM '.DB_PREFIXE.'lien_dossier_demandeur
LEFT JOIN '.DB_PREFIXE.'demandeur
ON lien_dossier_demandeur.demandeur = demandeur.demandeur
- WHERE lien_dossier_demandeur.dossier = \'' . $this->f->db->escapeSimple($dossier_instruction_id) . '\'';
+ WHERE lien_dossier_demandeur.dossier = \'' . $this->f->db->escapeSimple($dossier_existant_id) . '\'';
$res = $this->f->db->query($sql);
$this->f->addToLog(__METHOD__."() : db->query(\"".$sql."\")", VERBOSE_MODE);
@@ -235,8 +235,8 @@
}
$_POST[$row["type_demandeur"]][] = $row['demandeur'];
}
- $_POST["idx_dossier"] = $dossier_instruction_id;
- $demande_values["dossier_instruction"] = $dossier_instruction_id;
+ $_POST["idx_dossier"] = $dossier_existant_id;
+ $demande_values["dossier_instruction"] = $dossier_existant_id;
//
return $demande_values;
@@ -332,7 +332,10 @@
*/
private function getAutorisationContestee($demande_values) {
- $autorisation_contestee_values = $this->get_values_dossier_existant($demande_values["dossier_instruction"]);
+ $autorisation_contestee_values = $this->get_values_dossier_existant($demande_values["autorisation_contestee"]);
+ if ($autorisation_contestee_values === false) {
+ return false;
+ }
foreach ($autorisation_contestee_values as $colonne => $valeur) {
if ($colonne !== "dossier_autorisation" && $colonne !== "om_collectivite") {
@@ -416,6 +419,8 @@
*/
private function get_values_dossier_existant($dossier_instruction_id) {
+ $dossier_instruction_id = str_replace(" ", "", $dossier_instruction_id);
+
$sql = "SELECT
dossier.dossier_autorisation,
dossier.om_collectivite,
@@ -438,13 +443,14 @@
$this->setMessage(_("Erreur de base de données."));
return false;
}
- elseif ($res_dossier_instruction_values == null) {
+ $raw_dossier_instruction_values = $res_dossier_instruction_values->fetchRow(DB_FETCHMODE_ASSOC);
+
+ if ($raw_dossier_instruction_values === null) {
$this->setMessage(_("Le dossier passé en paramètre n'existe pas."));
return false;
}
- $dossier_instruction_values = $res_dossier_instruction_values->fetchRow(DB_FETCHMODE_ASSOC);
- foreach ($dossier_instruction_values as $colonne => $valeur) {
+ foreach ($raw_dossier_instruction_values as $colonne => $valeur) {
$dossier_instruction_values[$colonne] = $valeur;
}
return $dossier_instruction_values;