update
parent
87db67ee36
commit
41bb614441
|
|
@ -59,15 +59,21 @@ class DatasetTambahanController extends Controller
|
||||||
public function grid(Request $request)
|
public function grid(Request $request)
|
||||||
{
|
{
|
||||||
if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){
|
if((session('group_id') == 1) || (session('group_alias') == 'admin') || (session('group_alias') == 'admin_ta') ){
|
||||||
$data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->get();
|
$data = DatasetTambahan::with(['tabelData']);
|
||||||
}else{
|
}else{
|
||||||
$data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[session('instansi_id')])->get();
|
$data = DatasetTambahan::with(['tabelData'])->whereIn('instansi_id',[session('instansi_id')]);
|
||||||
}
|
}
|
||||||
|
if(@$request->tahun){
|
||||||
|
$data->where('tahun',$request->tahun);
|
||||||
|
}else{
|
||||||
|
$data->where('tahun',date('Y'));
|
||||||
|
}
|
||||||
|
$data->orderBy('DatasetTambahanId','DESC');
|
||||||
// $data = User::with(['group'])->orderBy('id','DESC')->get();
|
// $data = User::with(['group'])->orderBy('id','DESC')->get();
|
||||||
$_data = [];
|
$_data = [];
|
||||||
|
|
||||||
|
|
||||||
foreach ($data as $key => $row) {
|
foreach ($data->get() as $key => $row) {
|
||||||
|
|
||||||
|
|
||||||
$action = '';
|
$action = '';
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,12 @@
|
||||||
<h3 class="text-lg font-bold text-slate-900">{{$title}}</h3>
|
<h3 class="text-lg font-bold text-slate-900">{{$title}}</h3>
|
||||||
{{-- <p class="text-xs text-slate-500 font-medium">Pengelolaan data masuk dari berbagai stasiun pemantauan.</p> --}}
|
{{-- <p class="text-xs text-slate-500 font-medium">Pengelolaan data masuk dari berbagai stasiun pemantauan.</p> --}}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center space-x-2">
|
<div class="flex items-center space-x-2" id="pencarian">
|
||||||
|
<select name="tahun" class="p-2 border tahun rounded bg-white" id="">
|
||||||
|
@for($i = (date('Y')-2); date('Y') >= $i ; $i++)
|
||||||
|
<option {{$i == date('Y') ? 'selected' : ''}} value="{{$i}}">{{$i}}</option>
|
||||||
|
@endfor
|
||||||
|
</select>
|
||||||
@if(access('is_create', $route.'.*','module',false) || access('is_update', $route.'.*','module',false))
|
@if(access('is_create', $route.'.*','module',false) || access('is_update', $route.'.*','module',false))
|
||||||
<a href="{{route($route.'.update')}}" class="p-2 rounded-xl bg-blue-500 transition-colors flex items-center text-sm font-semibold text-white">
|
<a href="{{route($route.'.update')}}" class="p-2 rounded-xl bg-blue-500 transition-colors flex items-center text-sm font-semibold text-white">
|
||||||
<i data-lucide="plus" class="w-4 h-4 mr-2"></i> Tambah Data
|
<i data-lucide="plus" class="w-4 h-4 mr-2"></i> Tambah Data
|
||||||
|
|
@ -34,6 +39,7 @@
|
||||||
data-sort-order="desc"
|
data-sort-order="desc"
|
||||||
data-page-size="10"
|
data-page-size="10"
|
||||||
data-id-field="id"
|
data-id-field="id"
|
||||||
|
data-query-params="queryParams"
|
||||||
id="grid-data">
|
id="grid-data">
|
||||||
<thead class="bg-slate-100 border-b border-slate-100">
|
<thead class="bg-slate-100 border-b border-slate-100">
|
||||||
<tr class="">
|
<tr class="">
|
||||||
|
|
@ -57,6 +63,17 @@
|
||||||
@endsection
|
@endsection
|
||||||
@section('js')
|
@section('js')
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
var $table = $('#grid-data');
|
||||||
|
$('.tahun').on('change',function(){
|
||||||
|
$table.bootstrapTable('refresh');
|
||||||
|
});
|
||||||
|
function queryParams(params) {
|
||||||
|
$('#pencarian').find('input[name], select').each(function() {
|
||||||
|
params[$(this).attr('name')] = $(this).val()
|
||||||
|
})
|
||||||
|
|
||||||
|
return params
|
||||||
|
}
|
||||||
$("#grid-data").on("click", ".remove_data", function() {
|
$("#grid-data").on("click", ".remove_data", function() {
|
||||||
var base_url = $(this).attr('data-href');
|
var base_url = $(this).attr('data-href');
|
||||||
var id = $(this).attr('data-id');
|
var id = $(this).attr('data-id');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue