Добавяне на последно известно местоположение

georgikolev7 · Aug 16, 2019 · 4bcdaa4 · 4bcdaa4
1 parent 36c658f
commit 4bcdaa4
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 8 deletions.
diff --git a/public/js/pages/persons.create.js b/public/js/pages/persons.create.js
@@ -30,7 +30,6 @@ $(document).ready(function () {
     					$('input#item-id').val(data.id);
     					$('input#item-hash').val(data.hash);
     					var api = $.fileuploader.getInstance('.filename');
-                        console.log('uploadStart');
     					api.uploadStart();
     				}
     			},
@@ -53,7 +52,13 @@ $(document).ready(function () {
 			_token: $('meta[name="csrf-token"]').attr('content'),
 		};
 
-        var region_id = $('select#grid-region option:selected').val();
+        var region = $('select#grid-region option:selected');
+        var region_id = region.val();
+
+        // Assign exact address
+        $('#exact-address-text').val(region.text());
+        $('#exact-address-latitude').val(region.data('lat'));
+        $('#exact-address-longitude').val(region.data('lng'));
 
 		$('select#grid-settlement').empty().addClass('disabled').prop('disabled', true);
 
@@ -62,13 +67,27 @@ $(document).ready(function () {
 				$('select#grid-settlement').removeClass('disabled').prop('disabled', false);
 				$.each(response.settlements, function (index, settlement) {
 					$('select#grid-settlement').append($('<option></option>')
-                    .attr('data-lng', settlement.lng).attr('data-lat', settlement.lat).attr("value", settlement.id).text(settlement.name));
+                    .attr('data-lng', settlement.lng).attr('data-lat', settlement.lat).attr('value', settlement.id).text(settlement.name));
 				});
 			}
 		});
 
 	});
 
+    $(document).on('change', 'select#grid-settlement', function (e)
+    {
+        e.preventDefault();
+
+        var region = $('select#grid-region option:selected');
+        var settlement = $('select#grid-settlement option:selected');
+
+        // Update last location address
+        $('#exact-address-text').val(settlement.text() + ', ' + region.text());
+        $('#exact-address-latitude').val(settlement.data('lat'));
+        $('#exact-address-longitude').val(settlement.data('lng'));
+
+    });
+
 	$('input.filename').fileuploader({
 		enableApi: true,
 		theme: 'thumbnails',

diff --git a/resources/views/persons/create.blade.php b/resources/views/persons/create.blade.php
@@ -118,8 +118,12 @@
                 </div>
             </div>
 
-            <input type="text" name="id" id="item-id" />
-            <input type="text" name="hash" id="item-hash" />
+            <input type="hidden" name="exact_address_text" value="" id="exact-address-text">
+            <input type="hidden" name="exact_address_latitude" value="" id="exact-address-latitude">
+            <input type="hidden" name="exact_address_longitude" value="" id="exact-address-longitude">
+
+            <input type="hidden" name="id" id="item-id" />
+            <input type="hidden" name="hash" id="item-hash" />
 
            <div class="-mx-3 md:flex mb-6">
                <div class="md:w-full px-3 mb-6 md:mb-0">

diff --git a/src/Http/Controllers/PersonController.php b/src/Http/Controllers/PersonController.php
@@ -126,8 +126,7 @@ public function store(Request $request)
                 'description' => 'required',
             ]);
 
-            // Update field
-
+            // Update fields
             $person = \Slavic\MissingPersons\Model\Person::updateOrCreate([
                 'hash' => $hash,
                 'name' => $request->get('name'),
@@ -137,11 +136,20 @@ public function store(Request $request)
                 'eyes_color' => $request->get('eyes_color'),
                 'hair_color' => $request->get('hair_color'),
                 'description' => $request->get('description'),
-                'last_seen_date' => $request->get('last_seen_date'),
+                //'last_seen' => $request->get('last_seen_date'),
                 'region_id' => $request->get('region_id'),
                 'settlement_id' => $request->get('settlement_id')
             ]);
 
+            // Update last known place
+            $last_place = \Slavic\MissingPersons\Model\LastPlace::updateOrCreate([
+                'person_id' => $person->id,
+            ],[
+                'address' => $request->get('exact_address_text'),
+                'lat' => $request->get('exact_address_latitude'),
+                'lng'    => $request->get('exact_address_longitude')
+            ]);
+
             return \Response::json($person, 200);
         }
     }

diff --git a/src/Model/LastPlace.php b/src/Model/LastPlace.php
@@ -8,6 +8,15 @@ class LastPlace extends Model
 {
     protected $table = 'person_last_place';
 
+    /**
+    * The attributes that are mass assignable.
+    *
+    * @var array
+    */
+    protected $fillable = [
+        'person_id', 'address', 'lat', 'lng'
+    ];
+
     /**
      * Associations.
      *