Merge pull request #698 from flipace/develop

Fixed filtering of statements with "between" values

Author: daniel-abbey

app/models/Report.php

@@ -56,7 +56,14 @@ public function getMatchAttribute() {
           $instructorMatch['$or'][] = $this->constructOr($key, $value);
         } else {
           if (is_array($value)) {
-            $match[$key] = ['$in' => $value];
+            if($value[0] != '<>')
+            {
+              $match[$key] = ['$in' => $value];
+            }
+            else
+            {
+              $match[$key] = ['$lte' => $value[2], '$gte' => $value[1]];
+            }
           } else {
             $match[$key] = $value;
           }
@@ -100,7 +107,14 @@ public function getWhereAttribute() {
           array_push($instructorArray, [$key, $query[$key]]);
         } else {
           if (is_array($query[$key])) {
-            array_push($wheres, [$key, 'in', $query[$key]]);
+            if($query[$key][0] != '<>')
+            {
+              array_push($wheres, [$key, 'in', $query[$key]]);
+            }
+            else
+            {
+              array_push($wheres, [$key, 'between', $query[$key][1], $query[$key][2]]);
+            }
           } else {
             array_push($wheres, [$key, '=', $query[$key]]);
           }