[openaria-Commits] r2366 - in branches/trunk_sur_fmwk_4.9.0/gen: obj sql/pgsql

[fmi...@adullact.net]

Author: fmichon
Date: 2018-05-25 17:00:23 +0200 (Fri, 25 May 2018)
New Revision: 2366

Modified:
branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses.class.php
branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses_type.class.php
branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses.inc.php
branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses_type.inc.php
Log:
* Reg?\195?\169n?\195?\169ration compl?\195?\168te suite ?\195?\160 la suppression de cl?\195?\169secondire en doublon dans le g?\195?\169n?\195?\169rateur.


Modified: branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses.class.php
===================================================================
--- branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses.class.php 2018-05-15 08:09:35 UTC (rev 2365)
+++ branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses.class.php 2018-05-25 15:00:23 UTC (rev 2366)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 03/05/2018 09:12
+//gen openMairie le 25/05/2018 16:52

require_once "../obj/om_dbform.class.php";

@@ -969,39 +969,6 @@
$this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
true
);
- // modele_edition_compte_rendu
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_compte_rendu",
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu"),
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
- true
- );
- // modele_edition_compte_rendu
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_compte_rendu",
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu"),
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
- true
- );
- // modele_edition_compte_rendu
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_compte_rendu",
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu"),
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
- true
- );
// modele_edition_proces_verbal
$this->init_select(
$form,
@@ -1013,39 +980,6 @@
$this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
true
);
- // modele_edition_proces_verbal
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_proces_verbal",
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal"),
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
- true
- );
- // modele_edition_proces_verbal
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_proces_verbal",
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal"),
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
- true
- );
- // modele_edition_proces_verbal
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_proces_verbal",
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal"),
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
- true
- );
// modele_edition_rapport
$this->init_select(
$form,
@@ -1057,39 +991,6 @@
$this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
true
);
- // modele_edition_rapport
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_rapport",
- $this->get_var_sql_forminc__sql("modele_edition_rapport"),
- $this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
- true
- );
- // modele_edition_rapport
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_rapport",
- $this->get_var_sql_forminc__sql("modele_edition_rapport"),
- $this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
- true
- );
- // modele_edition_rapport
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_rapport",
- $this->get_var_sql_forminc__sql("modele_edition_rapport"),
- $this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
- true
- );
// reunion_avis
$this->init_select(
$form,
@@ -1140,27 +1041,9 @@
if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
$form->setVal('modele_edition_compte_rendu', $idxformulaire);
if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_compte_rendu', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_compte_rendu', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_compte_rendu', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
$form->setVal('modele_edition_proces_verbal', $idxformulaire);
if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_proces_verbal', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_proces_verbal', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_proces_verbal', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
$form->setVal('modele_edition_rapport', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_rapport', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_rapport', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_rapport', $idxformulaire);
}// fin validation
$this->set_form_default_values($form, $maj, $validation);
}// fin setValsousformulaire

Modified: branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses_type.class.php
===================================================================
--- branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses_type.class.php 2018-05-15 08:09:35 UTC (rev 2365)
+++ branches/trunk_sur_fmwk_4.9.0/gen/obj/analyses_type.class.php 2018-05-25 15:00:23 UTC (rev 2366)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 03/05/2018 09:12
+//gen openMairie le 25/05/2018 16:52

require_once "../obj/om_dbform.class.php";

@@ -402,39 +402,6 @@
$this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
true
);
- // modele_edition_compte_rendu
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_compte_rendu",
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu"),
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
- true
- );
- // modele_edition_compte_rendu
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_compte_rendu",
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu"),
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
- true
- );
- // modele_edition_compte_rendu
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_compte_rendu",
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu"),
- $this->get_var_sql_forminc__sql("modele_edition_compte_rendu_by_id"),
- true
- );
// modele_edition_proces_verbal
$this->init_select(
$form,
@@ -446,39 +413,6 @@
$this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
true
);
- // modele_edition_proces_verbal
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_proces_verbal",
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal"),
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
- true
- );
- // modele_edition_proces_verbal
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_proces_verbal",
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal"),
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
- true
- );
- // modele_edition_proces_verbal
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_proces_verbal",
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal"),
- $this->get_var_sql_forminc__sql("modele_edition_proces_verbal_by_id"),
- true
- );
// modele_edition_rapport
$this->init_select(
$form,
@@ -490,39 +424,6 @@
$this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
true
);
- // modele_edition_rapport
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_rapport",
- $this->get_var_sql_forminc__sql("modele_edition_rapport"),
- $this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
- true
- );
- // modele_edition_rapport
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_rapport",
- $this->get_var_sql_forminc__sql("modele_edition_rapport"),
- $this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
- true
- );
- // modele_edition_rapport
- $this->init_select(
- $form,
- $this->f->db,
- $maj,
- null,
- "modele_edition_rapport",
- $this->get_var_sql_forminc__sql("modele_edition_rapport"),
- $this->get_var_sql_forminc__sql("modele_edition_rapport_by_id"),
- true
- );
// service
$this->init_select(
$form,
@@ -552,27 +453,9 @@
if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
$form->setVal('modele_edition_compte_rendu', $idxformulaire);
if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_compte_rendu', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_compte_rendu', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_compte_rendu', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
$form->setVal('modele_edition_proces_verbal', $idxformulaire);
if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_proces_verbal', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_proces_verbal', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_proces_verbal', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
$form->setVal('modele_edition_rapport', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_rapport', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_rapport', $idxformulaire);
- if($this->is_in_context_of_foreign_key('modele_edition', $this->retourformulaire))
- $form->setVal('modele_edition_rapport', $idxformulaire);
}// fin validation
$this->set_form_default_values($form, $maj, $validation);
}// fin setValsousformulaire

Modified: branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses.inc.php
===================================================================
--- branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses.inc.php 2018-05-15 08:09:35 UTC (rev 2365)
+++ branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses.inc.php 2018-05-25 15:00:23 UTC (rev 2366)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 03/05/2018 09:12
+//gen openMairie le 25/05/2018 16:52

$DEBUG=0;
$serie=15;
@@ -32,27 +32,9 @@
LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition4
ON analyses.modele_edition_compte_rendu=modele_edition4.modele_edition
LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition5
- ON analyses.modele_edition_compte_rendu=modele_edition5.modele_edition
+ ON analyses.modele_edition_proces_verbal=modele_edition5.modele_edition
LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition6
- ON analyses.modele_edition_compte_rendu=modele_edition6.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition7
- ON analyses.modele_edition_compte_rendu=modele_edition7.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition8
- ON analyses.modele_edition_proces_verbal=modele_edition8.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition9
- ON analyses.modele_edition_proces_verbal=modele_edition9.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition10
- ON analyses.modele_edition_proces_verbal=modele_edition10.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition11
- ON analyses.modele_edition_proces_verbal=modele_edition11.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition12
- ON analyses.modele_edition_rapport=modele_edition12.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition13
- ON analyses.modele_edition_rapport=modele_edition13.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition14
- ON analyses.modele_edition_rapport=modele_edition14.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition15
- ON analyses.modele_edition_rapport=modele_edition15.modele_edition
+ ON analyses.modele_edition_rapport=modele_edition6.modele_edition
LEFT JOIN ".DB_PREFIXE."reunion_avis
ON analyses.reunion_avis=reunion_avis.reunion_avis
LEFT JOIN ".DB_PREFIXE."service
@@ -88,9 +70,9 @@
"case analyses.acc_sanitaire when 't' then 'Oui' else 'Non' end as \"".__("acc_sanitaire")."\"",
'analyses.acc_places_assises_public as "'.__("acc_places_assises_public").'"',
'dossier_instruction.libelle as "'.__("dossier_instruction").'"',
- 'modele_edition12.libelle as "'.__("modele_edition_rapport").'"',
+ 'modele_edition6.libelle as "'.__("modele_edition_rapport").'"',
'modele_edition4.libelle as "'.__("modele_edition_compte_rendu").'"',
- 'modele_edition8.libelle as "'.__("modele_edition_proces_verbal").'"',
+ 'modele_edition5.libelle as "'.__("modele_edition_proces_verbal").'"',
"case analyses.modifiee_sans_gen when 't' then 'Oui' else 'Non' end as \"".__("modifiee_sans_gen")."\"",
'proces_verbal.numero as "'.__("dernier_pv").'"',
'analyses.dec1 as "'.__("dec1").'"',
@@ -127,9 +109,9 @@
'derogation_scda.libelle as "'.__("acc_derogation_scda").'"',
'analyses.acc_places_assises_public as "'.__("acc_places_assises_public").'"',
'dossier_instruction.libelle as "'.__("dossier_instruction").'"',
- 'modele_edition12.libelle as "'.__("modele_edition_rapport").'"',
+ 'modele_edition6.libelle as "'.__("modele_edition_rapport").'"',
'modele_edition4.libelle as "'.__("modele_edition_compte_rendu").'"',
- 'modele_edition8.libelle as "'.__("modele_edition_proces_verbal").'"',
+ 'modele_edition5.libelle as "'.__("modele_edition_proces_verbal").'"',
'proces_verbal.numero as "'.__("dernier_pv").'"',
'analyses.dec1 as "'.__("dec1").'"',
'analyses.delai1 as "'.__("delai1").'"',

Modified: branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses_type.inc.php
===================================================================
--- branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses_type.inc.php 2018-05-15 08:09:35 UTC (rev 2365)
+++ branches/trunk_sur_fmwk_4.9.0/gen/sql/pgsql/analyses_type.inc.php 2018-05-25 15:00:23 UTC (rev 2366)
@@ -1,6 +1,6 @@
<?php
//$Id$
-//gen openMairie le 03/05/2018 09:12
+//gen openMairie le 25/05/2018 16:52

$DEBUG=0;
$serie=15;
@@ -25,27 +25,9 @@
LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition0
ON analyses_type.modele_edition_compte_rendu=modele_edition0.modele_edition
LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition1
- ON analyses_type.modele_edition_compte_rendu=modele_edition1.modele_edition
+ ON analyses_type.modele_edition_proces_verbal=modele_edition1.modele_edition
LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition2
- ON analyses_type.modele_edition_compte_rendu=modele_edition2.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition3
- ON analyses_type.modele_edition_compte_rendu=modele_edition3.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition4
- ON analyses_type.modele_edition_proces_verbal=modele_edition4.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition5
- ON analyses_type.modele_edition_proces_verbal=modele_edition5.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition6
- ON analyses_type.modele_edition_proces_verbal=modele_edition6.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition7
- ON analyses_type.modele_edition_proces_verbal=modele_edition7.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition8
- ON analyses_type.modele_edition_rapport=modele_edition8.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition9
- ON analyses_type.modele_edition_rapport=modele_edition9.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition10
- ON analyses_type.modele_edition_rapport=modele_edition10.modele_edition
- LEFT JOIN ".DB_PREFIXE."modele_edition as modele_edition11
- ON analyses_type.modele_edition_rapport=modele_edition11.modele_edition
+ ON analyses_type.modele_edition_rapport=modele_edition2.modele_edition
LEFT JOIN ".DB_PREFIXE."service
ON analyses_type.service=service.service ";
// SELECT
@@ -54,9 +36,9 @@
'service.libelle as "'.__("service").'"',
'analyses_type.code as "'.__("code").'"',
'analyses_type.libelle as "'.__("libelle").'"',
- 'modele_edition8.libelle as "'.__("modele_edition_rapport").'"',
+ 'modele_edition2.libelle as "'.__("modele_edition_rapport").'"',
'modele_edition0.libelle as "'.__("modele_edition_compte_rendu").'"',
- 'modele_edition4.libelle as "'.__("modele_edition_proces_verbal").'"',
+ 'modele_edition1.libelle as "'.__("modele_edition_proces_verbal").'"',
);
// Spécificité des dates de validité
$displayed_fields_validite = array(
@@ -81,9 +63,9 @@
'service.libelle as "'.__("service").'"',
'analyses_type.code as "'.__("code").'"',
'analyses_type.libelle as "'.__("libelle").'"',
- 'modele_edition8.libelle as "'.__("modele_edition_rapport").'"',
+ 'modele_edition2.libelle as "'.__("modele_edition_rapport").'"',
'modele_edition0.libelle as "'.__("modele_edition_compte_rendu").'"',
- 'modele_edition4.libelle as "'.__("modele_edition_proces_verbal").'"',
+ 'modele_edition1.libelle as "'.__("modele_edition_proces_verbal").'"',
);
$tri="ORDER BY analyses_type.libelle ASC NULLS LAST";
$edition="analyses_type";