X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Ffusionax.php;h=d09af8ec0fdbb8d996a83c804121cba765edc7f1;hb=723ea674199306b74f36ebfe673163b0bd3d9f21;hp=1262db9963dda758479ca4373ca0b8178cc51d57;hpb=4823ca5e32d0b39c0204aad3736bf4770f043285;p=platal.git diff --git a/modules/fusionax.php b/modules/fusionax.php index 1262db9..d09af8e 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -255,12 +255,12 @@ class FusionAxModule extends PLModule $page->changeTpl('fusionax/view.tpl'); if ($action == 'create') { XDB::execute('DROP VIEW IF EXISTS fusionax_deceased'); - XDB::execute('CREATE VIEW fusionax_deceased AS + XDB::execute("CREATE VIEW fusionax_deceased AS SELECT p.pid, a.ax_id, pd.private_name, pd.promo, p.deathdate AS deces_xorg, a.Date_deces AS deces_ax FROM profiles AS p INNER JOIN profile_display AS pd ON (p.pid = pd.pid) INNER JOIN fusionax_anciens AS a ON (a.ax_id = p.ax_id) - WHERE p.deathdate != a.Date_deces'); + WHERE p.deathdate != a.Date_deces OR (p.deathdate IS NULL AND a.Date_deces != '0000-00-00')"); XDB::execute('DROP VIEW IF EXISTS fusionax_promo'); XDB::execute('CREATE VIEW fusionax_promo AS SELECT p.pid, p.ax_id, pd.private_name, pd.promo, pe.entry_year AS promo_etude_xorg,