X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Ffusionax%2Fpromo.tpl;h=b1d4cd8e822194a1e311a415965d653317f8b8dd;hb=7757efd6c4bf3542c57efa4b248de641b39a7003;hp=7a49350362f8af5b63caab188649872c3ed70d35;hpb=34465ab035104f739a54ec62660f04f874448627;p=platal.git

diff --git a/templates/fusionax/promo.tpl b/templates/fusionax/promo.tpl
index 7a49350..b1d4cd8 100644
--- a/templates/fusionax/promo.tpl
+++ b/templates/fusionax/promo.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -24,14 +24,22 @@
 
 <p></p>
 
-{if $nbMissmatchingPromos > 0}
-<p>Il y a {$nbMissmatchingPromos} différences entre les deux bases dans pour les promotions.</p>
-<p>Grosses différences (oranjisation ?) :</p>
-{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos1 field1='user_id' namefield1='ID X.org' field3='promo_etude_xorg'
+{if $nbMissmatchingPromosTotal > 0}
+<p>Il y a {$nbMissmatchingPromosTotal} différences entre les deux bases dans pour les promotions.</p>
+
+<p>Grosses différences ({$nbMissmatchingPromos} camarades) :</p>
+{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos field1='pid' namefield1='ID X.org' field3='promo_etude_xorg'
+namefield3='etude_xorg' field4='promo_sortie_xorg' namefield4='sortie_xorg' field2='promo_etude_ax' namefield2='etude_ax'}
+
+<p>Petites différences (oranjisation) ({$nbMissmatchingPromos1} camarades) :</p>
+{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos1 field1='pid' namefield1='ID X.org' field3='promo_etude_xorg'
+namefield3='etude_xorg' field4='promo_sortie_xorg' namefield4='sortie_xorg' field2='promo_etude_ax' namefield2='etude_ax'}
+
+<p>Petites différences (oranjisation + étrangers) ({$nbMissmatchingPromos3} camarades) :</p>
+{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos3 field1='pid' namefield1='ID X.org' field3='promo_etude_xorg'
 namefield3='etude_xorg' field4='promo_sortie_xorg' namefield4='sortie_xorg' field2='promo_etude_ax' namefield2='etude_ax'}
 
-<p>Petites différences : promo_etude_xorg == promo_etude_ax + 1 et promo_etude_xorg + 3 == promo_sortie_xorg, a priori ce sont les étrangers que nous avons mal
-inclus</p>
-{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos2 field1='user_id' namefield1='ID X.org' field3='promo_etude_xorg'
+<p>Petites différences : (étrangers mal inclus) ({$nbMissmatchingPromos2} camarades)</p>
+{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos2 field1='pid' namefield1='ID X.org' field3='promo_etude_xorg'
 namefield3='etude_xorg' field4='promo_sortie_xorg' namefield4='sortie_xorg' field2='promo_etude_ax' namefield2='etude_ax'}
 {/if}