Browse Source

Add user death info page

pull/68/head
Nafies Luthfi 5 years ago
parent
commit
c8af19ee9c
  1. 24
      app/Http/Controllers/UsersController.php
  2. 2
      resources/lang/id/user.php
  3. 78
      resources/views/users/death.blade.php
  4. 3
      resources/views/users/partials/action-buttons.blade.php
  5. 1
      routes/web.php

24
app/Http/Controllers/UsersController.php

@ -99,6 +99,26 @@ class UsersController extends Controller
}
/**
* Show user death info.
*
* @param \App\User $user
* @return \Illuminate\View\View
*/
public function death(User $user)
{
$mapZoomLevel = 4;
$mapCenterLatitude = $user->getMetadata('cemetery_location_latitude');
$mapCenterLongitude = $user->getMetadata('cemetery_location_longitude');
if ($mapCenterLatitude && $mapCenterLongitude) {
$mapZoomLevel = 18;
}
$mapCenterLatitude = $mapCenterLatitude ?: '-0.87887';
$mapCenterLongitude = $mapCenterLongitude ?: '117.4863';
return view('users.death', compact('user', 'mapZoomLevel', 'mapCenterLatitude', 'mapCenterLongitude'));
}
/**
* Show the form for editing the specified User.
*
* @param \App\User $user
@ -120,9 +140,9 @@ class UsersController extends Controller
$mapCenterLongitude = $user->getMetadata('cemetery_location_longitude');
if ($mapCenterLatitude && $mapCenterLongitude) {
$mapZoomLevel = 18;
$mapCenterLatitude = $mapCenterLatitude ?: '-0.87887';
$mapCenterLongitude = $mapCenterLongitude ?: '117.4863';
}
$mapCenterLatitude = $mapCenterLatitude ?: '-0.87887';
$mapCenterLongitude = $mapCenterLongitude ?: '117.4863';
return view('users.edit', compact(
'user', 'replacementUsers', 'validTabs', 'mapZoomLevel', 'mapCenterLatitude', 'mapCenterLongitude'

2
resources/lang/id/user.php

@ -51,7 +51,7 @@ return [
'phone' => 'Telp.',
'manager' => 'Pengelola',
'cemetery_location' => 'Cemetary Location',
'cemetery_location' => 'Lokasi Makam',
// Photo
'reupload_photo' => 'Upload ulang Foto',

78
resources/views/users/death.blade.php

@ -0,0 +1,78 @@
@extends('layouts.user-profile')
@section('subtitle', __('user.death'))
@section('user-content')
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
@can('edit', $user)
{{ link_to_route('users.edit', __('app.edit'), [$user->id, 'tab' => 'death'], ['class' => 'pull-right']) }}
@endcan
<h3 class="panel-title">{{ __('user.death') }}</h3>
</div>
<table class="table">
<tbody>
<tr>
<th>{{ __('address.location_name') }}</th>
<td>{{ $user->getMetadata('cemetery_location_name') }}</td>
</tr>
<tr>
<th>{{ __('address.address') }}</th>
<td>{{ $user->getMetadata('cemetery_location_address') }}</td>
</tr>
<tr>
<th>{{ __('user.dod') }}</th>
<td>{{ $user->dod ?: $user->yod }}</td>
</tr>
<tr>
<th>{{ __('user.age') }}</th>
<td>
@if ($user->age)
{!! $user->age_string !!}
@endif
</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">{{ __('user.cemetery_location') }}</h3></div>
<div class="panel-body">
<div id="mapid"></div>
</div>
</div>
</div>
</div>
@endsection
@section('ext_css')
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
crossorigin=""/>
<style>
#mapid { height: 300px; }
</style>
@endsection
@section('script')
<script src="https://unpkg.com/leaflet@1.7.1/dist/leaflet.js"
integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
crossorigin=""></script>
<script>
var mapCenter = [{{ $mapCenterLatitude }}, {{ $mapCenterLongitude }}];
var map = L.map('mapid').setView(mapCenter, {{ $mapZoomLevel }});
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);
var marker = L.marker(mapCenter).addTo(map);
</script>
@endsection

3
resources/views/users/partials/action-buttons.blade.php

@ -6,4 +6,7 @@
{{ link_to_route('users.chart', trans('app.show_family_chart'), [$user->id], ['class' => Request::segment(3) == 'chart' ? 'btn btn-default active' : 'btn btn-default']) }}
{{ link_to_route('users.tree', trans('app.show_family_tree'), [$user->id], ['class' => Request::segment(3) == 'tree' ? 'btn btn-default active' : 'btn btn-default']) }}
{{ link_to_route('users.marriages', trans('app.show_marriages'), [$user->id], ['class' => Request::segment(3) == 'marriages' ? 'btn btn-default active' : 'btn btn-default']) }}
@if ($user->yod)
{{ link_to_route('users.death', trans('user.death'), [$user->id], ['class' => Request::segment(3) == 'death' ? 'btn btn-default active' : 'btn btn-default']) }}
@endif
</div>

1
routes/web.php

@ -35,6 +35,7 @@ Route::get('users/{user}/edit', 'UsersController@edit')->name('users.edit');
Route::patch('users/{user}', 'UsersController@update')->name('users.update');
Route::get('users/{user}/chart', 'UsersController@chart')->name('users.chart');
Route::get('users/{user}/tree', 'UsersController@tree')->name('users.tree');
Route::get('users/{user}/death', 'UsersController@death')->name('users.death');
Route::patch('users/{user}/photo-upload', 'UsersController@photoUpload')->name('users.photo-upload');
Route::delete('users/{user}', 'UsersController@destroy')->name('users.destroy');

Loading…
Cancel
Save