@@ -270,6 +270,25 @@ public function getIssueQueryWhere($project_key, $query)
270270 $ and [] = [ $ key => [ '$lte ' => strtotime ($ sections [1 ] . ' 23:59:59 ' ) ] ];
271271 }
272272 }
273+ else if (in_array ($ val , [ '0d ' , '0w ' , '0m ' , '0y ' ]))
274+ {
275+ if ($ val == '0d ' )
276+ {
277+ $ and [] = [ $ key => [ '$gte ' => strtotime (date ('Y-m-d ' )), '$lte ' => strtotime (date ('Y-m-d ' ) . ' 23:59:59 ' ) ] ];
278+ }
279+ else if ($ val == '0w ' )
280+ {
281+ $ and [] = [ $ key => [ '$gte ' => mktime (0 , 0 , 0 , date ('m ' ), date ('d ' ) - date ('w ' ) + 1 , date ('Y ' )), '$lte ' => mktime (23 , 59 , 59 , date ('m ' ), date ('d ' ) - date ('w ' ) + 7 , date ('Y ' )) ] ];
282+ }
283+ else if ($ val == '0m ' )
284+ {
285+ $ and [] = [ $ key => [ '$gte ' => mktime (0 , 0 , 0 , date ('m ' ), 1 , date ('Y ' )), '$lte ' => mktime (23 , 59 , 59 , date ('m ' ), date ('t ' ), date ('Y ' )) ] ];
286+ }
287+ else
288+ {
289+ $ and [] = [ $ key => [ '$gte ' => mktime (0 , 0 , 0 , 1 , 1 , date ('Y ' )), '$lte ' => mktime (23 , 59 , 59 , 12 , 31 , date ('Y ' )) ] ];
290+ }
291+ }
273292 else
274293 {
275294 $ unitMap = [ 'w ' => 'week ' , 'm ' => 'month ' , 'y ' => 'year ' ];
@@ -293,7 +312,7 @@ public function getIssueQueryWhere($project_key, $query)
293312 {
294313 $ and [] = [ $ key => [ '$regex ' => $ val ] ];
295314 }
296- else if ($ key_type_fields [$ key ] === 'Number ' )
315+ else if (in_array ( $ key_type_fields [$ key ], [ 'Number ' , ' Integer ' ]) )
297316 {
298317 if (strpos ($ val , '~ ' ) !== false )
299318 {
0 commit comments