X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Ffusionax%2Fpromo.tpl;h=b1d4cd8e822194a1e311a415965d653317f8b8dd;hb=6995cd8573dfed49a8197bc40e5ebf53d67d8e00;hp=d237fae1902c74067b990bc42ebf8e01342738e4;hpb=90862af65777b54eb2830b501729236fe50aa110;p=platal.git diff --git a/templates/fusionax/promo.tpl b/templates/fusionax/promo.tpl index d237fae..b1d4cd8 100644 --- a/templates/fusionax/promo.tpl +++ b/templates/fusionax/promo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2007 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 @@
-{if $nbMissmatchingPromos > 0} -Il y a {$nbMissmatchingPromos} différences entre les deux bases dans pour les promotions.
-Grosses différences (oranjisation ?) :
-{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos1 field1='user_id' namefield1='ID X.org' field3='promo_etude_xorg' +{if $nbMissmatchingPromosTotal > 0} +Il y a {$nbMissmatchingPromosTotal} différences entre les deux bases dans pour les promotions.
+ +Grosses différences ({$nbMissmatchingPromos} camarades) :
+{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'} + +Petites différences (oranjisation) ({$nbMissmatchingPromos1} camarades) :
+{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'} + +Petites différences (oranjisation + étrangers) ({$nbMissmatchingPromos3} camarades) :
+{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'} -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
-{include file='fusionax/listFusion.tpl' fusionList=$missmatchingPromos2 field1='user_id' namefield1='ID X.org' field3='promo_etude_xorg' +Petites différences : (étrangers mal inclus) ({$nbMissmatchingPromos2} camarades)
+{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}