Added order position deletion; added fontawesome pro

application/Building/BuildingController.php

@@ -349,8 +349,11 @@ class BuildingController extends mfBaseController {
     $data = [];
     
     switch($do) {
-      case "findBuildings":
-        $return = $this->findBuildingsApi();
+      case "getFilteredBuildings":
+        $return = $this->getFilteredBuildingsApi();
+        break;
+      case 'findBuildings':
+        $return = $this->findBuildings();
         break;
       default:
         $return = false;
@@ -365,7 +368,7 @@ class BuildingController extends mfBaseController {
     $this->returnJson($data);
   }
   
-  private function findBuildingsApi() {
+  private function getFilteredBuildingsApi() {
     $buildings = [];
     $filter = $this->request->filter;
     
@@ -381,4 +384,55 @@ class BuildingController extends mfBaseController {
     return ["buildings" => $buildings];
   }
   
+  private function findBuildings() {
+    $buildings = [];
+    $network_id = $this->request->network_id;
+    $search = $this->request->search;
+    
+    foreach(BuildingModel::search(['network_id' => $network_id, 'street' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'code' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'oan_id' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'zip' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'city' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    
+    $unsorted = [];
+    
+    foreach($buildings as $building) {
+      $u = [];
+      $u['id'] = $building->id;
+      $u['street'] = $building->street;
+      $u['zip'] = $building->zip;
+      $u['city'] = $building->city;
+      $u['oan_id'] = $building->oan_id;
+      $u['code'] = $building->code;
+      $u['status'] = $building->status->name;
+      $unsorted[$building->street."-".$building->id] = $u;
+    }
+    
+    //var_dump($unsorted);exit;
+    
+    ksort($unsorted);
+    
+    $results = [];
+    foreach($unsorted as $r) {
+      $results[] = $r;
+      if(count($results) >= 20) {
+        break;
+      }
+    }
+    
+    return ["count" => count($buildings), "buildings" => $results];
+    
+  }
+  
 }

application/Building/BuildingModel.php

@@ -215,6 +215,13 @@ class BuildingModel {
       }
     }
     
+    if(array_key_exists("oan_id", $filter)) {
+      $oan_id = FronkDB::singleton()->escape($filter['oan_id']);
+      if($oan_id) {
+        $where .= " AND Building.`oan_id` like '%$oan_id%'";
+      }
+    }
+    
     if(array_key_exists("street", $filter)) {
       $street = FronkDB::singleton()->escape($filter["street"]);
       if($street) {