소스 검색

Adding special case with no end date set by user -refs BT#12773

Nicolas Ducoulombier 7 년 전
부모
커밋
092599f30f
1개의 변경된 파일11개의 추가작업 그리고 5개의 파일을 삭제
  1. 11 5
      load_search.php

+ 11 - 5
load_search.php

@@ -720,12 +720,18 @@ if (!empty($filterToSend)) {
     $userEndDatePlus = api_get_utc_datetime(substr($userEndDatePlus, 0, 11). '23:59:59');
     $userEndDatePlus = api_get_utc_datetime(substr($userEndDatePlus, 0, 11). '23:59:59');
 
 
     // Special OFAJ date logic
     // Special OFAJ date logic
+    if ($userEndDate == '') {
     $sql = " AND (
     $sql = " AND (
-        (s.access_start_date >= '$userStartDateMinus' AND s.access_end_date < '$userEndDatePlus') OR
-        (s.access_start_date >= '$userStartDateMinus' AND (s.access_end_date = '' OR s.access_end_date IS NULL)) OR 
-        ((s.access_start_date = '' OR s.access_start_date IS NULL) AND (s.access_end_date = '' OR s.access_end_date IS NULL))
-    )";
-
+            (s.access_start_date >= '$userStartDateMinus') OR 
+            ((s.access_start_date = '' OR s.access_start_date IS NULL) AND (s.access_end_date = '' OR s.access_end_date IS NULL))
+        )";
+    } else {
+        $sql = " AND (
+            (s.access_start_date >= '$userStartDateMinus' AND s.access_end_date < '$userEndDatePlus') OR
+            (s.access_start_date >= '$userStartDateMinus' AND (s.access_end_date = '' OR s.access_end_date IS NULL)) OR 
+            ((s.access_start_date = '' OR s.access_start_date IS NULL) AND (s.access_end_date = '' OR s.access_end_date IS NULL))
+        )";
+    }
     $deleteFiliere = false;
     $deleteFiliere = false;
 
 
     $extraFieldOptions = new ExtraFieldOption('session');
     $extraFieldOptions = new ExtraFieldOption('session');