Changeset 3063

Timestamp:

Jan 6, 2013, 3:29:20 PM (8 years ago)

Author:

roux

Message:

better handle weeks during change of year for plots

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

@@ -21 +21 @@
       else $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;
-      if ($sem0 >= 52 && $sem <= 1) {
-        $sem0 = 0;
-        $annee0 += 1;
+      $annee0 = date('o', $last_year); $sem0 = date('W', $last_year);
+      if ($sem > 51 && date('n', $date) == 1) $sem = 0;
+      if ($sem < 2 && $annee != date('o', $date)) {
+        $annee = date('o', $date);
+        $sem0 -= 1;
       }
       $n_weeks = ($annee - $annee0)*53 + $sem - $sem0 + 1;
@@ -232 +232 @@
 
   public static function getLabelsSemaines($n_weeks, $annee, $sem) {
-    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",
+    if ($sem > 1 && $sem <= 52) $annee += 1;
+    $hashmap = array( '3'  => "Jan ".sprintf('%02d', $annee-2000), '6'  => " Fév", '10' => " Mar", '15' => "Avr",
                       '19' => " Mai", '24' => "Juin", '28' => "Juil", '33' => "Août",
                       '38' => "Sept", '42' => " Oct", '47' => "Nov", '52' => "Déc");
@@ -242 +241 @@
       if (isset($hashmap[$index]) && !(($index == 3) && ($sem < 3 && $sem > 1))) $labels[$i] = $hashmap[$index];
     }
-    if ($sem < 3 && $sem != 0) $labels[54] = "Jan";
+    if ($n_weeks > 54 && $sem < 3 && $sem != 0) $labels[55] = "Jan";
     return $labels;
   }