Merge branch 'fronkdev' into 'master'

only importing active campaigns in Opsdata Api

See merge request fronk/thetool!644

application/Api/v1/OperationaldataApicontroller.php

@@ -161,6 +161,9 @@ class OperationaldataApicontroller extends mfBaseApicontroller
         $return = [];
 
         foreach($this->campaigns as $campaign) {
+            if($campaign->from > date('U') || $campaign->to < date('U')) {
+                continue;
+            }
             $c = [];
             $c["id"] = $campaign->id;
             $c["name"] = $campaign->name;