diff --git a/app/Http/Controllers/Api/PembangunanController.php b/app/Http/Controllers/Api/PembangunanController.php index c8bd7ef33..88c7a469b 100644 --- a/app/Http/Controllers/Api/PembangunanController.php +++ b/app/Http/Controllers/Api/PembangunanController.php @@ -73,7 +73,7 @@ public function store(PembangunanRequest $request) return response()->json([ "message" => "Proses Sinkronisasi Data gagal. Error : " . $e->getMessage(), "status" => "danger" - ]); + ]); } // Hapus folder temp ketika sudah selesai @@ -82,8 +82,8 @@ public function store(PembangunanRequest $request) Storage::disk('public')->delete('pembangunan/' . $filecsv); return response()->json([ - "message" => "Proses Sinkronisasi Data Pembangunan OpenSID sedang berjalan", - "status" => "success" + "message" => "Proses Sinkronisasi Data Pembangunan OpenSID sedang berjalan", + "status" => "success" ]); } @@ -118,8 +118,8 @@ public function storeDokumentasi(PembangunanDokumentasiRequest $request) Storage::disk('public')->delete('pembangunan/' . $filecsv); return response()->json([ - "message" => "Proses Sinkronisasi Data Pembangunan OpenSID sedang berjalan", - "status" => "success" + "message" => "Proses Sinkronisasi Data Pembangunan OpenSID sedang berjalan", + "status" => "success" ]); } } diff --git a/app/Http/Controllers/Data/DataPembangunanController.php b/app/Http/Controllers/Data/DataPembangunanController.php index e8337c89f..723d2cb40 100644 --- a/app/Http/Controllers/Data/DataPembangunanController.php +++ b/app/Http/Controllers/Data/DataPembangunanController.php @@ -56,31 +56,31 @@ public function getPembangunan(Request $request) $pembangunan = Pembangunan::when($desa, function ($q) use ($desa) { return $desa === 'Semua' - ? $q : $q->where('kode_desa', $desa); + ? $q : $q->where('desa_id', $desa); }) ->with('dokumentasi'); return DataTables::of($pembangunan) ->addColumn('aksi', function ($row) { - $data['detail_url'] = route('data.pembangunan.rincian', ['id' => $row->id,'kode_desa' => $row->kode_desa]); + $data['detail_url'] = route('data.pembangunan.rincian', ['id' => $row->id,'desa_id' => $row->desa_id]); return view('forms.aksi', $data); })->make(); } } - public function rincian($id, $kode_desa) + public function rincian($id, $desa_id) { $page_title = 'Pembangunan'; $page_description = 'Rincian Pembangunan'; - $pembangunan = Pembangunan::where('id', $id)->where('kode_desa', $kode_desa)->first(); + $pembangunan = Pembangunan::where('id', $id)->where('desa_id', $desa_id)->first(); return view('data.pembangunan.rincian', compact('page_title', 'page_description', 'pembangunan')); } - public function getrinciandata($id, $kode_desa) + public function getrinciandata($id, $desa_id) { if (request()->ajax()) { - $pembangunanDokumentasi = PembangunanDokumentasi::where('kode_desa', $kode_desa)->where('id_pembangunan', $id)->get(); + $pembangunanDokumentasi = PembangunanDokumentasi::where('desa_id', $desa_id)->where('id_pembangunan', $id)->get(); return DataTables::of($pembangunanDokumentasi) ->addIndexColumn() ->make(); diff --git a/app/Http/Controllers/Data/ProgramBantuanController.php b/app/Http/Controllers/Data/ProgramBantuanController.php index 8aa47505c..55ad1a860 100644 --- a/app/Http/Controllers/Data/ProgramBantuanController.php +++ b/app/Http/Controllers/Data/ProgramBantuanController.php @@ -70,33 +70,6 @@ public function getaProgramBantuan(Request $request) ->rawColumns(['aksi'])->make(); } - public function create() - { - $page_title = 'Tambah'; - $page_description = 'Tambah Program Bantuan Baru'; - - return view('data.program_bantuan.create', compact('page_title', 'page_description')); - } - - public function store(Request $request) - { - request()->validate([ - 'sasaran' => 'required', - 'nama' => 'required', - 'start_date' => 'required|date', - 'end_date' => 'required|date', - ]); - - try { - Program::create($request->all()); - } catch (\Exception $e) { - report($e); - return back()->withInput()->with('error', 'Data gagal disimpan!'); - } - - return redirect()->route('data.program-bantuan.index')->with('success', 'Data berhasil disimpan!'); - } - public function show($id, $desa_id) { $program = Program::with('desa')->findOrFail($id); @@ -108,78 +81,6 @@ public function show($id, $desa_id) return view('data.program_bantuan.show', compact('page_title', 'page_description', 'program', 'sasaran', 'peserta')); } - public function update(Request $request, $id) - { - request()->validate([ - 'sasaran' => 'required', - 'nama' => 'required', - 'start_date' => 'required|date', - 'end_date' => 'required|date', - ]); - - try { - $program = Program::findOrFail($id); - $program->fill($request->all()); - $program->update(); - } catch (\Exception $e) { - report($e); - return back()->withInput()->with('error', 'Data gagal disimpan!'); - } - - return redirect()->route('data.program-bantuan.index')->with('success', 'Data berhasil disimpan!'); - } - - public function edit($id) - { - $program = Program::findOrFail($id); - $page_title = 'Edit Program'; - $page_description = 'Program Bantuan ' . $program->nama; - $sasaran = [1 => 'Penduduk/Perorangan', 2 => 'Keluarga-KK']; - $peserta = PesertaProgram::where('program_id', $id)->get(); - - return view('data.program_bantuan.edit', compact('page_title', 'page_description', 'program', 'sasaran', 'peserta')); - } - - public function destroy($id) - { - try { - Program::findOrFail($id)->delete(); - PesertaProgram::where('program_id', $id)->delete(); - } catch (\Exception $e) { - report($e); - return back()->withInput()->with('error', 'Data gagal dihapus!'); - } - - return redirect()->route('data.program-bantuan.index')->with('success', 'Data berhasil dihapus!'); - } - - public function createPeserta($id) - { - $program = Program::findOrFail($id); - $page_title = 'Tambah Peserta'; - $page_description = 'Program Bantuan ' . $program->nama; - $sasaran = [1 => 'Penduduk/Perorangan', 2 => 'Keluarga-KK']; - - return view('data.program_bantuan.add_peserta', compact('page_title', 'page_description', 'program', 'sasaran')); - } - - public function add_peserta(Request $request) - { - request()->validate([ - 'peserta' => 'required', - 'tanggal_lahir' => 'date', - ]); - - try { - PesertaProgram::create($request->all()); - } catch (\Exception $e) { - report($e); - return back()->withInput()->with('error', 'Data gagal disimpan!'); - } - - return redirect()->route('data.program-bantuan.show', $request->input('program_id'))->with('success', 'Data berhasil disimpan!'); - } - public function import() { $page_title = 'Impor'; @@ -209,12 +110,12 @@ public function do_import(Request $request) $zip->extractTo($extract); $zip->close(); - $fileExtracted = glob($extract.'*.xlsx'); + glob($extract.'*.xlsx'); (new SinkronBantuan()) - ->queue($extract . $csvName = Str::replaceLast('zip', 'csv', $name)); + ->queue($extract . Str::replaceLast('zip', 'csv', $name)); (new SinkronPesertaBantuan()) - ->queue($extract . $csvName = Str::replaceLast('zip', 'csv', 'peserta+'.$name)); + ->queue($extract . Str::replaceLast('zip', 'csv', 'peserta_'.$name)); } catch (\Exception $e) { report($e); return back()->with('error', 'Import data gagal. '. $e->getMessage()); diff --git a/app/Imports/SinkronBantuan.php b/app/Imports/SinkronBantuan.php index d8202359e..121b59c33 100644 --- a/app/Imports/SinkronBantuan.php +++ b/app/Imports/SinkronBantuan.php @@ -58,6 +58,7 @@ public function collection(Collection $collection) { foreach ($collection as $value) { $insert = [ + 'desa_id' => $value['desa_id'], 'id' => $value['id'], 'nama' => $value['nama'], 'sasaran' => $value['sasaran'], @@ -65,7 +66,6 @@ public function collection(Collection $collection) 'start_date' => $value['sdate'], 'end_date' => $value['edate'], 'description' => $value['ndesc'], - 'desa_id' => $value['kode_desa'] ]; Program::updateOrCreate([ diff --git a/app/Imports/SinkronPembangunan.php b/app/Imports/SinkronPembangunan.php index 364f32457..31c1f472c 100644 --- a/app/Imports/SinkronPembangunan.php +++ b/app/Imports/SinkronPembangunan.php @@ -58,31 +58,31 @@ public function collection(Collection $collection) { foreach ($collection as $value) { $insert = [ - "id" => $value['id'], - "sumber_dana" => $value['sumber_dana'], - "lokasi" => $value['lokasi'], - "keterangan" => $value['keterangan'], - "judul" => $value['judul'], - "volume" => $value['volume'], - "tahun_anggaran" => $value['tahun_anggaran'], - "pelaksana_kegiatan" => $value['pelaksana_kegiatan'], - "status" => $value['status'], - "anggaran" => $value['anggaran'], - "perubahan_anggaran" => $value['perubahan_anggaran'], + "desa_id" => $value['desa_id'], + "id" => $value['id'], + "sumber_dana" => $value['sumber_dana'], + "lokasi" => $value['lokasi'], + "keterangan" => $value['keterangan'], + "judul" => $value['judul'], + "volume" => $value['volume'], + "tahun_anggaran" => $value['tahun_anggaran'], + "pelaksana_kegiatan" => $value['pelaksana_kegiatan'], + "status" => $value['status'], + "anggaran" => $value['anggaran'], + "perubahan_anggaran" => $value['perubahan_anggaran'], "sumber_biaya_pemerintah" => $value['sumber_biaya_pemerintah'], - "sumber_biaya_provinsi" => $value['sumber_biaya_provinsi'], - "sumber_biaya_kab_kota" => $value['sumber_biaya_kab_kota'], - "sumber_biaya_swadaya" => $value['sumber_biaya_swadaya'], - "sumber_biaya_jumlah" => $value['sumber_biaya_jumlah'], - "manfaat" => $value['manfaat'], - "waktu" => $value['waktu'], - "foto" => $value['foto'], - "kode_desa" => (string) $value['desa_id'], + "sumber_biaya_provinsi" => $value['sumber_biaya_provinsi'], + "sumber_biaya_kab_kota" => $value['sumber_biaya_kab_kota'], + "sumber_biaya_swadaya" => $value['sumber_biaya_swadaya'], + "sumber_biaya_jumlah" => $value['sumber_biaya_jumlah'], + "manfaat" => $value['manfaat'], + "waktu" => $value['waktu'], + "foto" => $value['foto'], ]; Pembangunan::updateOrCreate([ - 'kode_desa' => $insert['kode_desa'], - 'id' => $insert['id'] + 'desa_id' => $insert['desa_id'], + 'id' => $insert['id'] ], $insert); } } diff --git a/app/Imports/SinkronPembangunanDokumentasi.php b/app/Imports/SinkronPembangunanDokumentasi.php index a4df5f52f..dc0eaa45d 100644 --- a/app/Imports/SinkronPembangunanDokumentasi.php +++ b/app/Imports/SinkronPembangunanDokumentasi.php @@ -58,20 +58,20 @@ public function collection(Collection $collection) { foreach ($collection as $value) { $insert = [ - "id" => $value['id'], + "desa_id" => $value['desa_id'], + "id" => $value['id'], "id_pembangunan" => $value['id_pembangunan'], - "gambar" => $value['gambar'], - "persentase" => $value['persentase'], - "keterangan" => $value['keterangan'], - "created_at" => $value['created_at'], - "updated_at" => $value['updated_at'], - "kode_desa" => (string) $value['desa_id'], + "gambar" => $value['gambar'], + "persentase" => $value['persentase'], + "keterangan" => $value['keterangan'], + "created_at" => $value['created_at'], + "updated_at" => $value['updated_at'], ]; PembangunanDokumentasi::updateOrCreate([ - 'kode_desa' => $insert['kode_desa'], - 'id' => $insert['id'], - 'id_pembangunan' => $insert['id_pembangunan'] + 'desa_id' => $insert['desa_id'], + 'id' => $insert['id'], + 'id_pembangunan' => $insert['id_pembangunan'] ], $insert); } } diff --git a/app/Imports/SinkronPesertaBantuan.php b/app/Imports/SinkronPesertaBantuan.php index 531e69575..74640dddf 100644 --- a/app/Imports/SinkronPesertaBantuan.php +++ b/app/Imports/SinkronPesertaBantuan.php @@ -31,12 +31,10 @@ namespace App\Imports; -use App\Models\Keluarga; use App\Models\Penduduk; use App\Models\PesertaProgram; use Exception; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; @@ -63,8 +61,6 @@ public function chunkSize(): int */ public function collection(Collection $collection) { - $col_kk = Arr::flatten(Keluarga::pluck('no_kk')); - $col_nik = Arr::flatten(Keluarga::pluck('no_kk')); DB::beginTransaction(); //multai transaction foreach ($collection as $value) { @@ -87,6 +83,7 @@ public function collection(Collection $collection) } $insert = [ + 'desa_id' => $value['desa_id'], 'id' => $value['id'], 'peserta' => $value['peserta'], 'program_id' => $value['program_id'], @@ -98,13 +95,12 @@ public function collection(Collection $collection) 'kartu_tanggal_lahir' => $value['kartu_tanggal_lahir'], 'kartu_alamat' => $value['kartu_alamat'], 'kartu_peserta' => $value['kartu_peserta'], - 'desa_id' => $value['kode_desa'], ]; PesertaProgram::updateOrCreate([ - 'kartu_nik' => $insert['kartu_nik'], + 'desa_id' => $insert['desa_id'], 'program_id' => $insert['program_id'], - 'desa_id' => $insert['desa_id'] + 'kartu_nik' => $insert['kartu_nik'], ], $insert); } diff --git a/database/migrations/2022_04_17_225617_create_table_das_pembangunan.php b/database/migrations/2022_04_17_225617_create_table_das_pembangunan.php index 828b358d0..bd9f3bc5e 100644 --- a/database/migrations/2022_04_17_225617_create_table_das_pembangunan.php +++ b/database/migrations/2022_04_17_225617_create_table_das_pembangunan.php @@ -44,7 +44,7 @@ public function up() { Schema::create('das_pembangunan', function (Blueprint $table) { $table->integer('id', false); - $table->char('kode_desa', 13); + $table->char('desa_id', 13); $table->string('lokasi', 255)->nullable(); $table->string('sumber_dana', 255)->nullable(); $table->string('judul', 255)->nullable(); @@ -65,7 +65,7 @@ public function up() $table->string('manfaat', 100)->nullable(); $table->integer('waktu')->nullable(); $table->timestamps(); - $table->unique(['id', 'kode_desa']); + $table->unique(['id', 'desa_id']); }); } diff --git a/database/migrations/2022_04_18_070823_create_table_das_pembangunan_dokumentasi.php b/database/migrations/2022_04_18_070823_create_table_das_pembangunan_dokumentasi.php index 8e86f5b64..d8e20e90f 100644 --- a/database/migrations/2022_04_18_070823_create_table_das_pembangunan_dokumentasi.php +++ b/database/migrations/2022_04_18_070823_create_table_das_pembangunan_dokumentasi.php @@ -45,12 +45,12 @@ public function up() Schema::create('das_pembangunan_dokumentasi', function (Blueprint $table) { $table->integer('id'); $table->integer('id_pembangunan'); - $table->char('kode_desa', 13); + $table->char('desa_id', 13); $table->string('gambar', 255)->nullable(); $table->string('persentase', 255)->nullable(); $table->string('keterangan', 255)->nullable(); $table->timestamps(); - $table->unique(['id', 'kode_desa', 'id_pembangunan']); + $table->unique(['id', 'desa_id', 'id_pembangunan']); }); } diff --git a/resources/views/data/pembangunan/rincian.blade.php b/resources/views/data/pembangunan/rincian.blade.php index 1e3296844..22963b28c 100644 --- a/resources/views/data/pembangunan/rincian.blade.php +++ b/resources/views/data/pembangunan/rincian.blade.php @@ -73,7 +73,7 @@ processing: true, serverSide: true, ajax: { - url: "{!! route( 'data.pembangunan.getrinciandata', ['id' => $pembangunan->id, 'kode_desa' => $pembangunan->kode_desa ] ) !!}" + url: "{!! route( 'data.pembangunan.getrinciandata', ['id' => $pembangunan->id, 'desa_id' => $pembangunan->desa_id ] ) !!}" }, columns: [ {data: 'DT_RowIndex', name: 'DT_RowIndex', class: 'text-center', searchable: false, orderable: true}, diff --git a/resources/views/data/program_bantuan/_peserta_kk.blade.php b/resources/views/data/program_bantuan/_peserta_kk.blade.php deleted file mode 100755 index 2cd571b8d..000000000 --- a/resources/views/data/program_bantuan/_peserta_kk.blade.php +++ /dev/null @@ -1,117 +0,0 @@ -
- -
- {!! Form::hidden('program_id', $program->id) !!} - {!! Form::hidden('sasaran', $program->sasaran) !!} - {!! Form::select('peserta', [], null, ['class' => 'form-control', 'required'=>true, 'id' => 'peserta']) !!} -
-
-
-
- - -
- {!! Form::text('kartu_peserta', null, ['placeholder' => 'No Kartu', 'class' => 'form-control', 'id' => 'kartu_peserta']) !!} -
-
- -Identitas Pada Kartu Peserta -
- - -
- {!! Form::text('kartu_nik', null, ['placeholder' => 'NIK', 'class' => 'form-control', 'id' => 'kartu_nik']) !!} -
-
-
- - -
- {!! Form::text('kartu_nama', null, ['placeholder' => 'Nama', 'class' => 'form-control', 'id' => 'kartu_nama']) !!} -
-
-
- - -
- {!! Form::text('kartu_tempat_lahir', null, ['placeholder' => 'Tempat Lahir', 'class' => 'form-control', 'id' => 'kartu_tempat_lahir']) !!} -
-
-
- - -
-
- {!! Form::text('kartu_tanggal_lahir', null, ['placeholder' => 'Tanggal Lahir','class' => 'form-control datepicker', 'id' => 'kartu_tanggal_lahir']) !!} -
-
-
-
- -@include('partials.asset_datetimepicker') -@include('partials.asset_select2') -@push('scripts') - -@endpush \ No newline at end of file diff --git a/resources/views/data/program_bantuan/_peserta_penduduk.blade.php b/resources/views/data/program_bantuan/_peserta_penduduk.blade.php deleted file mode 100755 index 589cea7a1..000000000 --- a/resources/views/data/program_bantuan/_peserta_penduduk.blade.php +++ /dev/null @@ -1,122 +0,0 @@ -
- - -
- {!! Form::hidden('program_id', $program->id) !!} - {!! Form::hidden('sasaran', $program->sasaran) !!} - {!! Form::select('peserta', [], null, ['class' => 'form-control', 'required'=>true, 'id' => 'peserta']) !!} -
-
-
-
- - -
- {!! Form::text('kartu_peserta', null, ['placeholder' => 'No Kartu', 'class' => 'form-control', 'id' => 'kartu_peserta']) !!} -
-
- -Identitas Pada Kartu Peserta -
- - -
- {!! Form::text('kartu_nik', null, ['placeholder' => 'NIK', 'class' => 'form-control', 'id' => 'kartu_nik']) !!} -
-
-
- - -
- {!! Form::text('kartu_nama', null, ['placeholder' => 'Nama', 'class' => 'form-control', 'id' => 'kartu_nama']) !!} -
-
-
- - -
- {!! Form::text('kartu_tempat_lahir', null, ['placeholder' => 'Tempat Lahir', 'class' => 'form-control', 'id' => 'kartu_tempat_lahir']) !!} -
-
-
- - -
-
- {!! Form::text('kartu_tanggal_lahir', null, ['placeholder' => 'Tanggal Lahir','class' => 'form-control datepicker', 'id' => 'kartu_tanggal_lahir']) !!} -
-
-
-
- -@include('partials.asset_datetimepicker') -@include('partials.asset_select2') -@push('scripts') - -@endpush \ No newline at end of file diff --git a/resources/views/data/program_bantuan/add_peserta.blade.php b/resources/views/data/program_bantuan/add_peserta.blade.php deleted file mode 100755 index 524187d16..000000000 --- a/resources/views/data/program_bantuan/add_peserta.blade.php +++ /dev/null @@ -1,109 +0,0 @@ -@extends('layouts.dashboard_template') - -@section('content') -
-

- {{ $page_title ?? "Page Title" }} - {{ $page_description ?? '' }} -

-
    -
  1. Dashboard
    2. -
  2. Program Bantuan
    3. -
  3. Program {{ $program->nama }}
    4. -
  4. {{ $page_title }}
    5. -
-
- -
-
-
- @include( 'partials.flash_message' ) - - {!! Form::open( [ 'route' => 'data.program-bantuan.add_peserta', 'method' => 'post','id' => 'form-peserta', 'class' => 'form-horizontal form-label-left'] ) !!} - -
-
-
- Detail Program - - - - - - - - - - - - - - - - - -
Nama{{ $program->nama }}
Sasaran{{ $sasaran[$program->sasaran] }}
Periode Program{{ $program->start_date }} - {{ $program->end_date }}
Keterangan{{ $program->description }}
-
-
- -
- Tambahkan Peserta - @if (count($errors) > 0) -
- Oops! Ada yang salah dengan inputan Anda.

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - -
- @if($program->sasaran == 1) - @include('data.program_bantuan._peserta_penduduk') - @elseif($program->sasaran == 2) - @include('data.program_bantuan._peserta_kk') - @endif -
- -
- -
-
-
-
- - - - -
-
-
- {!! Form::close() !!} -
-
- -
-@endsection -@include('partials.asset_datetimepicker') -@push('scripts') - -@endpush \ No newline at end of file diff --git a/resources/views/data/program_bantuan/create.blade.php b/resources/views/data/program_bantuan/create.blade.php deleted file mode 100755 index e49e7d9ff..000000000 --- a/resources/views/data/program_bantuan/create.blade.php +++ /dev/null @@ -1,75 +0,0 @@ -@extends('layouts.dashboard_template') - -@section('content') -
-

- {{ $page_title ?? "Page Title" }} - {{ $page_description ?? '' }} -

-
    -
  1. Dashboard
    2. -
  2. Daftar Program Bantuan
    3. -
  3. {{ $page_title }}
    4. -
-
- -
-
-
- @include( 'partials.flash_message' ) - - {!! Form::open( [ 'route' => 'data.program-bantuan.store', 'method' => 'post','id' => 'form-bantuan', 'class' => 'form-horizontal form-label-left'] ) !!} - -
- - @if (count($errors) > 0) -
- Oops! Ada yang salah dengan inputan Anda.

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - - @include('data.program_bantuan.form_create') - -
-
-
-
- - - - -
-
-
- {!! Form::close() !!} -
-
- -
-@endsection -@include('partials.asset_datetimepicker') -@push('scripts') - -@endpush \ No newline at end of file diff --git a/resources/views/data/program_bantuan/edit.blade.php b/resources/views/data/program_bantuan/edit.blade.php deleted file mode 100755 index 6ab2b81cf..000000000 --- a/resources/views/data/program_bantuan/edit.blade.php +++ /dev/null @@ -1,74 +0,0 @@ -@extends('layouts.dashboard_template') - -@section('content') -
-

- {{ $page_title ?? "Page Title" }} - {{ $page_description ?? '' }} -

-
    -
  1. Dashboard
    2. -
  2. Daftar Program Bantuan
    3. -
  3. {{ $page_title }}
    4. -
-
- -
-
-
- @include('partials.flash_message') - - {!! Form::model($program, [ 'route' => ['data.program-bantuan.update', $program->id], 'method' => 'put','id' => 'form-bantuan', 'class' => 'form-horizontal form-label-left'] ) !!} - -
- - @if (count($errors) > 0) -
- Oops! Ada yang salah dengan inputan Anda.

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
- @endif - - @include('data.program_bantuan.form_edit') - -
-
-
-
- - - - -
-
-
- {!! Form::close() !!} -
-
- -
-@endsection -@include('partials.asset_datetimepicker') -@push('scripts') - -@endpush \ No newline at end of file diff --git a/resources/views/data/program_bantuan/form_create.blade.php b/resources/views/data/program_bantuan/form_create.blade.php deleted file mode 100755 index 165d29229..000000000 --- a/resources/views/data/program_bantuan/form_create.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -
- - -
- {!! Form::select('sasaran', [1=> 'Penduduk/Perorangan', 2=> 'Keluarga - KK'], null, ['class' => 'form-control', 'required'=>true, 'id' => 'sasaran']) !!} -
-
-
- - -
- {!! Form::text('nama', null, ['placeholder' => 'Nama Program', 'required' => 'required', 'class' => 'form-control', 'id' => 'nama_program']) !!} -
-
- -
- - -
-
- {!! Form::text('start_date', null, ['placeholder' => 'Tanggal Mulai','class' => 'form-control datepicker', 'required'=>true]) !!} -
-
- {!! Form::text('end_date', null, ['placeholder' => 'Tanggal Selesai','class' => 'form-control datepicker', 'required'=>true]) !!} -
-
-
-
- - -
- {!! Form::textarea('description', null, ['rows'=>2, 'class' => 'textarea', 'placeholder' => 'Keterangan', 'class' => 'form-control', 'id' => 'description']) !!} -
-
-
diff --git a/resources/views/data/program_bantuan/form_edit.blade.php b/resources/views/data/program_bantuan/form_edit.blade.php deleted file mode 100755 index 165d29229..000000000 --- a/resources/views/data/program_bantuan/form_edit.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -
- - -
- {!! Form::select('sasaran', [1=> 'Penduduk/Perorangan', 2=> 'Keluarga - KK'], null, ['class' => 'form-control', 'required'=>true, 'id' => 'sasaran']) !!} -
-
-
- - -
- {!! Form::text('nama', null, ['placeholder' => 'Nama Program', 'required' => 'required', 'class' => 'form-control', 'id' => 'nama_program']) !!} -
-
- -
- - -
-
- {!! Form::text('start_date', null, ['placeholder' => 'Tanggal Mulai','class' => 'form-control datepicker', 'required'=>true]) !!} -
-
- {!! Form::text('end_date', null, ['placeholder' => 'Tanggal Selesai','class' => 'form-control datepicker', 'required'=>true]) !!} -
-
-
-
- - -
- {!! Form::textarea('description', null, ['rows'=>2, 'class' => 'textarea', 'placeholder' => 'Keterangan', 'class' => 'form-control', 'id' => 'description']) !!} -
-
-
diff --git a/resources/views/data/program_bantuan/import.blade.php b/resources/views/data/program_bantuan/import.blade.php index a9a8f5da6..9a46a5a3e 100644 --- a/resources/views/data/program_bantuan/import.blade.php +++ b/resources/views/data/program_bantuan/import.blade.php @@ -1,25 +1,25 @@ @extends('layouts.dashboard_template') @section('content') -
-

- {{ $page_title ?? "Page Title" }} - {{ $page_description ?? '' }} -

-
    -
  1. Dashboard
    2. -
  2. Program Bantuan
    3. -
  3. {{ $page_title }}
    4. -
-
+
+

+ {{ $page_title ?? 'Page Title' }} + {{ $page_description ?? '' }} +

+
    +
  1. Dashboard
    2. +
  2. Program Bantuan
    3. +
  3. {{ $page_title }}
    4. +
+
-
+
- @include('partials.flash_message') -
-
+ @include('partials.flash_message') +
+
- {!! Form::open( [ 'route' => 'data.program-bantuan.do_import', 'method' => 'post','id' => 'form-import', 'class' => 'form-horizontal form-label-left', 'files' => true ] ) !!} + {!! Form::open(['route' => 'data.program-bantuan.do_import', 'method' => 'post', 'id' => 'form-import', 'class' => 'form-horizontal form-label-left', 'files' => true]) !!}
@@ -37,17 +37,21 @@
- +
- +

Instruksi Unggah Data:

-

Silahkan unduh template unggah data di sini: Unduh

+

Silahkan unduh template unggah data di sini: Unduh +

@@ -56,50 +60,49 @@
- + - +
{!! Form::close() !!}
-
-
+ +
@endsection -@include(('partials.asset_select2')) -@include(('partials.asset_datetimepicker')) +@include('partials.asset_select2') +@include('partials.asset_datetimepicker') @push('scripts') - + //Datetimepicker + $('.datepicker').each(function() { + var $this = $(this); + $this.datetimepicker({ + format: 'YYYY-MM-D' + }); + }); + }) + @endpush diff --git a/resources/views/data/program_bantuan/show.blade.php b/resources/views/data/program_bantuan/show.blade.php index a68325ad0..69e3c8378 100644 --- a/resources/views/data/program_bantuan/show.blade.php +++ b/resources/views/data/program_bantuan/show.blade.php @@ -1,6 +1,5 @@ @extends('layouts.dashboard_template') - @section('content')

@@ -15,9 +14,6 @@

- - @include('partials.flash_message') -
diff --git a/routes/web.php b/routes/web.php index 310669ea7..408dacd3a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -405,14 +405,7 @@ Route::group(['prefix' => 'program-bantuan', 'middleware' => ['role:super-admin|administrator-website|admin-desa']], function () { Route::get('/', ['as' => 'data.program-bantuan.index', 'uses' => 'ProgramBantuanController@index']); Route::get('getdata', ['as' => 'data.program-bantuan.getdata', 'uses' => 'ProgramBantuanController@getaProgramBantuan']); - Route::get('create', ['as' => 'data.program-bantuan.create', 'uses' => 'ProgramBantuanController@create']); - Route::post('store', ['as' => 'data.program-bantuan.store', 'uses' => 'ProgramBantuanController@store']); - Route::post('add_peserta', ['as' => 'data.program-bantuan.add_peserta', 'uses' => 'ProgramBantuanController@add_peserta']); - Route::get('edit/{id}', ['as' => 'data.program-bantuan.edit', 'uses' => 'ProgramBantuanController@edit']); Route::get('show/{id}/{id_desa}', ['as' => 'data.program-bantuan.show', 'uses' => 'ProgramBantuanController@show']); - Route::get('create-peserta/{id}', ['as' => 'data.program-bantuan.create-peserta', 'uses' => 'ProgramBantuanController@createPeserta']); - Route::put('update/{id}', ['as' => 'data.program-bantuan.update', 'uses' => 'ProgramBantuanController@update']); - Route::delete('destroy/{id}', ['as' => 'data.program-bantuan.destroy', 'uses' => 'ProgramBantuanController@destroy']); Route::get('import', ['as' => 'data.program-bantuan.import', 'uses' => 'ProgramBantuanController@import']); Route::post('do_import', ['as' => 'data.program-bantuan.do_import', 'uses' => 'ProgramBantuanController@do_import']); }); @@ -452,8 +445,8 @@ Route::group(['prefix' => 'pembangunan', 'middleware' => ['role:super-admin|administrator-website|admin-desa']], function () { Route::get('/', ['as' => 'data.pembangunan.index', 'uses' => 'DataPembangunanController@index']); Route::get('getdata', ['as' => 'data.pembangunan.getdata', 'uses' => 'DataPembangunanController@getPembangunan']); - Route::get('rincian/{id}/{kode_desa}', ['as' => 'data.pembangunan.rincian', 'uses' => 'DataPembangunanController@rincian']); - Route::get('getrinciandata/{id}/{kode_desa}', ['as' => 'data.pembangunan.getrinciandata', 'uses' => 'DataPembangunanController@getrinciandata']); + Route::get('rincian/{id}/{desa_id}', ['as' => 'data.pembangunan.rincian', 'uses' => 'DataPembangunanController@rincian']); + Route::get('getrinciandata/{id}/{desa_id}', ['as' => 'data.pembangunan.getrinciandata', 'uses' => 'DataPembangunanController@getrinciandata']); }); }); diff --git a/storage/app/public/template_upload/program_bantuan.zip b/storage/app/public/template_upload/program_bantuan.zip deleted file mode 100644 index 0f52afa17..000000000 Binary files a/storage/app/public/template_upload/program_bantuan.zip and /dev/null differ diff --git a/storage/app/public/template_upload/program_bantuan_22_12_2020_opendk.zip b/storage/app/public/template_upload/program_bantuan_22_12_2020_opendk.zip new file mode 100644 index 000000000..1b4912313 Binary files /dev/null and b/storage/app/public/template_upload/program_bantuan_22_12_2020_opendk.zip differ