Revize 143e4121

#6638: Upraveno vyhledavani zarizeni podle adresy.

backend/app/Http/Controllers/DeviceController.php

@@ -16 +16 @@
 class DeviceController extends Controller
 {
     public function getDevice(Request $request) {
-        $town = null;
-        $street = null;
+        $address = null;
         $showDirection=0;
         if ($request->has('address')) {
             $address = $request->input('address');
-            // todo: what is a format of address ?
-            $addressParts = explode(";", $address);
-            if (count($addressParts) == 2) {
-                $town = $addressParts[0];
-                $street = $addressParts[1];
-            }
         }
 
         if ($request->has('showDirection')) {
             $showDirection = ($request->input('showDirection') === 1);
         }
 
-        return Zarizeni::findByAddressJoinAddress($street, $town);
+        return Zarizeni::findByAddressJoinAddress($address);
     }
 
     /**

backend/app/Model/Zarizeni.php

@@ -34 +34 @@
         return DB::table('zarizeni')
             ->join('ulice', 'zarizeni.ulice_id', '=', 'ulice.id')
             ->join('mesto', 'ulice.mesto_id', '=', 'mesto.id')
-            ->select('zarizeni.id as id', 'zarizeni.smer_popis as name', 'ulice.nazev as street', 'ulice.id as street_id', 'mesto.nazev as town', 'mesto.id as town_id')
+            ->select('zarizeni.id as id',
+                'zarizeni.smer_popis as name',
+                'ulice.nazev as street',
+                'ulice.id as street_id',
+                'mesto.nazev as town',
+                'mesto.id as town_id')
             ->get();
     }
 
     /**
      * Vrati zarizeni nalezene podle adresy (mesto+ulice).
-     * Mesto a ulice jsou vraceny spolu se zarizenim.
      *
-     * @param $street Nazev ulice.
-     * @param $town Nazev mesta.
+     * @param $address Adresa, jsou vraceny zaznamy u kterych ulice, nebo mesto odpovida adrese.
      * @return mixed
      */
-    public static function findByAddressJoinAddress($street, $town) {
+    public static function findByAddressJoinAddress($address) {
         return DB::table('zarizeni')
             ->join('ulice', 'zarizeni.ulice_id', '=', 'ulice.id')
             ->join('mesto', 'ulice.mesto_id', '=', 'mesto.id')
-            ->select('zarizeni.id as id', 'zarizeni.smer_popis as name', 'ulice.nazev as street', 'ulice.id as street_id', 'mesto.nazev as town', 'mesto.id as town_id')
-            ->where('ulice.nazev', '=', $street)
-            ->where('mesto.nazev', '=', $town)
+            ->select('zarizeni.id as id',
+                'zarizeni.smer_popis as name',
+                'ulice.nazev as street',
+                'ulice.id as street_id',
+                'mesto.nazev as town',
+                'mesto.id as town_id')
+            ->where('ulice.nazev', 'like', '%'.$address.'%')
+            ->orWhere('mesto.nazev', 'like', '%'.$address.'%')
             ->get();
     }