Changeset 2595 for cpc/trunk/project

Timestamp:

Jan 10, 2012, 6:56:04 AM (9 years ago)

Author:

goya

Message:

refix plots

File:

• cpc/trunk/project/apps/frontend/modules/plot/actions/components.class.php (modified) (2 diffs)

cpc/trunk/project/apps/frontend/modules/plot/actions/components.class.php

@@ -21 +21 @@
       if ($sem >= 52 && date('n', $date) == 1) $sem = 0;
       if ($sem0 >= 52 && $sem <= 1) $sem0 = 0;
-      $n_weeks = ($annee - $annee0)*53 + $sem - $sem0 + 1;
+      $n_weeks = ($annee - $annee0)*53 + $sem - $sem0;
 #print "$date ; $annee ; $sem ; $last_year ; $annee0 ; $sem0 ; $date_debut ; $n_weeks";
     } else {
@@ -134 +134 @@
 
  public static function getLabelsSemaines($n_weeks, $annee, $sem) {
-    if ($sem != 0 && $sem <= 51) $an = $annee + 1;
+    if ($sem > 1 && $sem <= 51) $an = $annee + 1;
     else $an = $annee;
     $hashmap = array( '3'  => "Jan ".sprintf('%02d', $an-2000), '6'  => " Fév", '10' => " Mar", '15' => "Avr",