CDPP / AMDA_IHM

Commit 3eab488ef12e0b10b2958c380eceda4f00080110

Authored by Hacene SI HADJ MOHAND
1 parent 265c5cdf
Exists in master and in 98 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

filters ok

Showing 2 changed files with 20 additions and 0 deletions   Show diff stats
Inline Side-by-side
php/classes/TimeTableCacheFilterObject.php
  Diff comments   View file @3eab488
@@ -8,6 +8,7 @@ class TimeTableCacheFilterPartObject @@ -8,6 +8,7 @@ class TimeTableCacheFilterPartObject
8 public static $TYPE_DURATION_SEC = 3; 8 public static $TYPE_DURATION_SEC = 3;
9 public static $TYPE_DURATION_MIN = 4; 9 public static $TYPE_DURATION_MIN = 4;
10 public static $TYPE_DURATION_HOUR = 5; 10 public static $TYPE_DURATION_HOUR = 5;
  11 + public static $TYPE_DURATION_DAY = 6;
11 12
12 public static $OPERATION_UNKNOWN = 0; 13 public static $OPERATION_UNKNOWN = 0;
13 public static $OPERATION_LT = 1; 14 public static $OPERATION_LT = 1;
@@ -75,12 +76,15 @@ class TimeTableCacheFilterPartObject @@ -75,12 +76,15 @@ class TimeTableCacheFilterPartObject
75 case self::$TYPE_DURATION_SEC : 76 case self::$TYPE_DURATION_SEC :
76 case self::$TYPE_DURATION_MIN : 77 case self::$TYPE_DURATION_MIN :
77 case self::$TYPE_DURATION_HOUR : 78 case self::$TYPE_DURATION_HOUR :
  79 + case self::$TYPE_DURATION_DAY :
78 { 80 {
79 $value = $this->value; 81 $value = $this->value;
80 if ($this->type == self::$TYPE_DURATION_MIN) 82 if ($this->type == self::$TYPE_DURATION_MIN)
81 $value *= 60; 83 $value *= 60;
82 else if ($this->type == self::$TYPE_DURATION_HOUR) 84 else if ($this->type == self::$TYPE_DURATION_HOUR)
83 $value *= 3600; 85 $value *= 3600;
  86 + else if ($this->type == self::$TYPE_DURATION_DAY)
  87 + $value *= 86400;
84 switch ($this->op) { 88 switch ($this->op) {
85 case self::$OPERATION_LT : 89 case self::$OPERATION_LT :
86 return ($interval->getDuration() < $value); 90 return ($interval->getDuration() < $value);
@@ -122,6 +126,10 @@ class TimeTableCacheFilterPartObject @@ -122,6 +126,10 @@ class TimeTableCacheFilterPartObject
122 $this->value = $part_obj->value; 126 $this->value = $part_obj->value;
123 $this->type = self::$TYPE_DURATION_SEC; 127 $this->type = self::$TYPE_DURATION_SEC;
124 break; 128 break;
  129 + case 'durationDay' :
  130 + $this->value = $part_obj->value;
  131 + $this->type = self::$TYPE_DURATION_DAY;
  132 + break;
125 default: 133 default:
126 $this->value = 0.; 134 $this->value = 0.;
127 $this->type = self::$TYPE_UNKNOWN; 135 $this->type = self::$TYPE_UNKNOWN;
@@ -176,6 +184,10 @@ class TimeTableCacheFilterPartObject @@ -176,6 +184,10 @@ class TimeTableCacheFilterPartObject
176 case self::$TYPE_DURATION_HOUR : 184 case self::$TYPE_DURATION_HOUR :
177 echo "duration hour"; 185 echo "duration hour";
178 break; 186 break;
  187 +
  188 + case self::$TYPE_DURATION_DAY :
  189 + echo "duration day";
  190 + break;
179 default: 191 default:
180 echo "unknown"; 192 echo "unknown";
181 } 193 }
php/classes/TimeTableCacheSortObject.php
  Diff comments   View file @3eab488
@@ -8,6 +8,7 @@ class TimeTableCacheSortPartObject @@ -8,6 +8,7 @@ class TimeTableCacheSortPartObject
8 public static $TYPE_DURATION_SEC = 3; 8 public static $TYPE_DURATION_SEC = 3;
9 public static $TYPE_DURATION_MIN = 4; 9 public static $TYPE_DURATION_MIN = 4;
10 public static $TYPE_DURATION_HOUR = 5; 10 public static $TYPE_DURATION_HOUR = 5;
  11 + public static $TYPE_DURATION_DAY = 6;
11 12
12 public static $DIRECTION_UNKNOWN = 0; 13 public static $DIRECTION_UNKNOWN = 0;
13 public static $DIRECTION_ASC = 1; 14 public static $DIRECTION_ASC = 1;
@@ -60,6 +61,7 @@ class TimeTableCacheSortPartObject @@ -60,6 +61,7 @@ class TimeTableCacheSortPartObject
60 case self::$TYPE_DURATION_SEC : 61 case self::$TYPE_DURATION_SEC :
61 case self::$TYPE_DURATION_MIN : 62 case self::$TYPE_DURATION_MIN :
62 case self::$TYPE_DURATION_HOUR : 63 case self::$TYPE_DURATION_HOUR :
  64 + case self::$TYPE_DURATION_DAY :
63 { 65 {
64 switch ($this->dir) { 66 switch ($this->dir) {
65 case self::$DIRECTION_ASC : 67 case self::$DIRECTION_ASC :
@@ -93,6 +95,9 @@ class TimeTableCacheSortPartObject @@ -93,6 +95,9 @@ class TimeTableCacheSortPartObject
93 case 'durationSec' : 95 case 'durationSec' :
94 $this->type = self::$TYPE_DURATION_SEC; 96 $this->type = self::$TYPE_DURATION_SEC;
95 break; 97 break;
  98 + case 'durationDay' :
  99 + $this->type = self::$TYPE_DURATION_DAY;
  100 + break;
96 default: 101 default:
97 $this->type = self::$TYPE_UNKNOWN; 102 $this->type = self::$TYPE_UNKNOWN;
98 } 103 }
@@ -139,6 +144,9 @@ class TimeTableCacheSortPartObject @@ -139,6 +144,9 @@ class TimeTableCacheSortPartObject
139 case self::$TYPE_DURATION_HOUR : 144 case self::$TYPE_DURATION_HOUR :
140 echo "duration hour"; 145 echo "duration hour";
141 break; 146 break;
  147 + case self::$TYPE_DURATION_DAY :
  148 + echo "duration day";
  149 + break;
142 default: 150 default:
143 echo "unknown"; 151 echo "unknown";
144 } 152 }