[openads-Commits] r8633 - branches/4.9.0-dossiers-parallele/obj

[sof...@adullact.net]

Author: softime
Date: 2019-03-22 17:02:33 +0100 (Fri, 22 Mar 2019)
New Revision: 8633

Modified:
branches/4.9.0-dossiers-parallele/obj/dossier_autorisation.class.php
Log:
* Correction des m?\195?\169thodes de mise ?\195?\160 jour des donn?\195?\169es du DA

Modified: branches/4.9.0-dossiers-parallele/obj/dossier_autorisation.class.php
===================================================================
--- branches/4.9.0-dossiers-parallele/obj/dossier_autorisation.class.php 2019-03-22 12:58:33 UTC (rev 8632)
+++ branches/4.9.0-dossiers-parallele/obj/dossier_autorisation.class.php 2019-03-22 16:02:33 UTC (rev 8633)
@@ -2003,7 +2003,7 @@
function update_da_lot($params = array()) {
$sql_lots = "SELECT lot.lot
FROM ".DB_PREFIXE."lot
- JOIN ".DB_PREFIXE."dossier ON dossier.dossier = lot.dossier";
+ LEFT JOIN ".DB_PREFIXE."dossier ON dossier.dossier = lot.dossier";
$valLot['dossier_autorisation'] = NULL;
$res_update_lots = $this->db->autoExecute(DB_PREFIXE."lot",
$valLot,
@@ -2190,13 +2190,11 @@
function update_da_date_init($params = array()) {
$sql_date_init =
"SELECT
- MIN(dossier.date_depot) as date_depot,
- MIN(dossier.date_decision) as date_decision
- FROM ".DB_PREFIXE."dossier
- WHERE dossier.dossier_autorisation='".
- $this->getVal("dossier_autorisation")."'";
- $res_date_init = $this->db->query($sql_date_init);
- $this->addToLog(__METHOD__."(): db->query(\"". $sql_date_init."\")", VERBOSE_MODE);
+ date_depot,
+ date_decision
+ FROM ".DB_PREFIXE."dossier ";
+ $res_date_init = $this->db->query($sql_date_init.$params['query_where']);
+ $this->addToLog(__METHOD__."(): db->query(\"". $sql_date_init.$params['query_where']."\")", VERBOSE_MODE);
if(database::isError($res_date_init)) {
// Appel de la methode de recuperation des erreurs
$this->erreur_db(
@@ -2244,12 +2242,10 @@
function update_da_date_validite($params = array()) {
$sql_date_validite =
"SELECT
- MAX(dossier.date_validite) as date_validite
- FROM ".DB_PREFIXE."dossier
- WHERE dossier.dossier_autorisation='".
- $this->getVal("dossier_autorisation")."'";
- $res_date_validite = $this->db->query($sql_date_validite);
- $this->addToLog(__METHOD__."(): db->query(\"".$sql_date_validite."\")", VERBOSE_MODE);
+ date_validite
+ FROM ".DB_PREFIXE."dossier ";
+ $res_date_validite = $this->db->query($sql_date_validite.$params['query_where']);
+ $this->addToLog(__METHOD__."(): db->query(\"".$sql_date_validite.$params['query_where']."\")", VERBOSE_MODE);
if(database::isError($res_date_validite)) {
// Appel de la methode de recuperation des erreurs
$this->erreur_db(
@@ -2299,17 +2295,10 @@
$sql_date_doc =
"SELECT
MAX(dossier.date_chantier) as date_chantier
- FROM ".DB_PREFIXE."dossier
- LEFT OUTER JOIN ".DB_PREFIXE."avis_decision ON
- dossier.avis_decision = avis_decision.avis_decision
- WHERE dossier.dossier_autorisation = '".
- $this->getVal("dossier_autorisation")."'
- AND date_decision IS NOT NULL
- AND (avis_decision.typeavis='F'
- OR avis_decision.typeavis='A')";
- $res_date_doc = $this->db->query($sql_date_doc);
+ FROM ".DB_PREFIXE."dossier ";
+ $res_date_doc = $this->db->query($sql_date_doc.$params['query_where']);
$this->addToLog(__METHOD__."(): db->query(\"".
- $sql_date_doc."\")", VERBOSE_MODE);
+ $sql_date_doc.$params['query_where']."\")", VERBOSE_MODE);
if(database::isError($res_date_doc)) {
// Appel de la methode de recuperation des erreurs
$this->erreur_db($res_date_doc->getDebugInfo(),
@@ -2356,16 +2345,9 @@
$sql_date_daact =
"SELECT
MAX(dossier.date_achevement) as date_achevement
- FROM ".DB_PREFIXE."dossier
- LEFT OUTER JOIN ".DB_PREFIXE."avis_decision ON
- dossier.avis_decision = avis_decision.avis_decision
- WHERE dossier.dossier_autorisation = '".
- $this->getVal("dossier_autorisation")."'
- AND date_decision IS NOT NULL
- AND (avis_decision.typeavis='F'
- OR avis_decision.typeavis='A')";
- $res_date_daact = $this->db->query($sql_date_daact);
- $this->addToLog(__METHOD__."(): db->query(\"".$sql_date_daact."\")", VERBOSE_MODE);
+ FROM ".DB_PREFIXE."dossier ";
+ $res_date_daact = $this->db->query($sql_date_daact.$params['query_where']);
+ $this->addToLog(__METHOD__."(): db->query(\"".$sql_date_daact.$params['query_where']."\")", VERBOSE_MODE);
if(database::isError($res_date_daact)) {
// Appel de la methode de recuperation des erreurs
$this->erreur_db($res_date_daact->getDebugInfo(),
@@ -2415,7 +2397,7 @@
dossier.dossier=donnees_techniques.dossier_instruction ";
$donnees_techniques = $this->db->getOne($sql_donnees_techniques.$params['query_where']);
$this->addToLog(
- __METHOD__."(): db->query(\"".$sql_donnees_techniques."\")",
+ __METHOD__."(): db->query(\"".$sql_donnees_techniques.$params['query_where']."\")",
VERBOSE_MODE
);
if(database::isError($donnees_techniques)) {
@@ -2559,13 +2541,13 @@
$sql_last_di = '
SELECT dossier.dossier
FROM %1$sdossier
- JOIN %1$savis_decision
+ LEFT JOIN %1$savis_decision
ON dossier.avis_decision = avis_decision.avis_decision
- WHERE dossier.dossier_autorisation = \'%2$s\'
- AND version = 0
- OR (date_decision IS NOT NULL
- AND (avis_decision.typeavis=\'%3$s\'
- OR avis_decision.typeavis=\'%4$s\'))
+ WHERE dossier.dossier_autorisation = \'%2$s\'
+ AND (version = 0
+ OR (date_decision IS NOT NULL
+ AND (avis_decision.typeavis=\'%3$s\'
+ OR avis_decision.typeavis=\'%4$s\')))
ORDER BY version DESC
LIMIT 1';
$params['di_id'] = $this->f->db->getOne(sprintf(
@@ -2575,6 +2557,13 @@
'F',
'A'
));
+ $this->f->addToLog(
+ __METHOD__."(): db->getOne(\"".$sql_last_di."\");",
+ VERBOSE_MODE
+ );
+ if ($this->f->isDatabaseError($params['di_id'], true) === true) {
+ return false;
+ }
}

// Condition pour les requêtes de récupération des données du DI dans
@@ -2650,9 +2639,8 @@
//
$updates_da = $this->get_dit_update_da($params['di_id']);
}
- if (isset($params['updates_da']) === null
- && is_array($params['updates_da']) === true
- && empty($params['updates_da']) !== true) {
+ if (isset($params['updates_da']) === true
+ && is_array($params['updates_da']) === true) {
//
$updates_da = $params['updates_da'];
}