fmi...@adullact.net
unread,Mar 16, 2018, 6:52:24 AM3/16/18Sign 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 openmairie-o...@googlegroups.com
Author: fmichon
Date: 2018-03-16 11:52:12 +0100 (Fri, 16 Mar 2018)
New Revision: 690
Modified:
trunk/sql/pgsql/defunt.reqmo.inc.php
Log:
* Reqmo 'defunt' : les jointures de la requ?\195?\170te n'?\195?\169taient pas correctes (trop restrictives).
Modified: trunk/sql/pgsql/defunt.reqmo.inc.php
===================================================================
--- trunk/sql/pgsql/defunt.reqmo.inc.php 2018-03-16 08:36:40 UTC (rev 689)
+++ trunk/sql/pgsql/defunt.reqmo.inc.php 2018-03-16 10:52:12 UTC (rev 690)
@@ -1,8 +1,8 @@
<?php
// Libellé de la requête
-$reqmo['libelle']=_("Liste des défunts trié par libellé du cimetière, nom et prénom du défunt");
+$reqmo['libelle']=_("Liste des défunts triée par libellé du cimetière, nom et prénom du défunt");
-$reqmo['reqmo_libelle']=_('tri_defunt');
+$reqmo['reqmo_libelle']=_('defunt');
// Requête à effectuer
$reqmo['sql'] = "
@@ -14,25 +14,24 @@
emplacement.nature,
emplacement.famille
FROM
- opencimetiere.defunt,
- opencimetiere.emplacement,
- opencimetiere.cimetiere,
- opencimetiere.titre_de_civilite,
- opencimetiere.voie,
- opencimetiere.zone,
- opencimetiere.voie_type,
- opencimetiere.zone_type
-WHERE
- defunt.titre = titre_de_civilite.titre_de_civilite AND
- defunt.emplacement = emplacement.emplacement AND
- emplacement.voie = voie.voie AND
- voie.voietype = voie_type.voie_type AND
- voie.zone = zone.zone AND
- zone.zonetype = zone_type.zone_type AND
- zone.cimetiere = cimetiere.cimetiere
+ opencimetiere.defunt
+ LEFT JOIN opencimetiere.titre_de_civilite
+ ON defunt.titre = titre_de_civilite.titre_de_civilite
+ LEFT JOIN opencimetiere.emplacement
+ ON defunt.emplacement = emplacement.emplacement
+ LEFT JOIN opencimetiere.voie
+ ON emplacement.voie = voie.voie
+ LEFT JOIN opencimetiere.voie_type
+ ON voie.voietype = voie_type.voie_type
+ LEFT JOIN opencimetiere.zone
+ ON voie.zone = zone.zone
+ LEFT JOIN opencimetiere.zone_type
+ ON zone.zonetype = zone_type.zone_type
+ LEFT JOIN opencimetiere.cimetiere
+ ON zone.cimetiere = cimetiere.cimetiere
ORDER BY
cimetiere.cimetierelib,
defunt.nom,
defunt.prenom
";
-?>
\ No newline at end of file
+?>