Changeset 2545 for cpc/trunk/project

Timestamp:

Jan 1, 2012, 5:43:24 AM (9 years ago)

Author:

goya

Message:

fix (pour de bon cette fois?) le bug de graphes de nouvel an

File:

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

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

@@ -16 +16 @@
       } else $date = time();
       $annee = date('Y', $date); $sem = date('W', $date);
-      $annee0 = $annee - 1;
-      $sem0 = $sem;
-      if ($sem == 53 && date('n', $date) == 1) {
-        $annee0--;
-        $sem = 0;
-      }
       $last_year = $date - 32054400;
       $date_debut = date('Y-m-d', $last_year);
+      $annee0 = date('Y', $last_year); $sem0 = date('W', $last_year);
+      if ($sem >= 52 && date('n', $date) == 1) $sem = 0;
       $n_weeks = ($annee - $annee0)*53 + $sem - $sem0 + 1;
+//print "$date ; $annee ; $sem ; $last_year ; $annee0 ; $sem0 ; $date_debut ; $n_weeks";
     } else {
       $query4 = Doctrine_Query::create()
@@ -44 +41 @@
       $n_weeks = ($annee - $annee0)*53 + $sem - $sem0 + 1;
     }
-    $this->data['labels'] = $this->getLabelsSemaines($n_weeks, $annee, $sem0);
+    $this->data['labels'] = $this->getLabelsSemaines($n_weeks, $annee0, $sem0);
     $this->data['vacances'] = $this->getVacances($n_weeks, $annee0, $sem0, strtotime($this->parlementaire->debut_mandat));
 
@@ -136 +133 @@
 
  public static function getLabelsSemaines($n_weeks, $annee, $sem) {
-    if ($sem <= 1) $an = $annee - 1;
+    if ($sem <= 51) $an = $annee + 1;
     else $an = $annee;
     $hashmap = array( '3'  => "Jan ".sprintf('%02d', $an-2000), '6'  => " Fév", '10' => " Mar", '15' => "Avr",