From 685c792ae51114f11646ef95efaa1f956ccd422f Mon Sep 17 00:00:00 2001 From: Ilham Wara Nugroho Date: Tue, 2 Sep 2025 10:20:21 +0700 Subject: [PATCH] update --- app/Imports/DatasetTable41AImport.php | 11 +++--- app/Imports/DatasetTable41Import.php | 10 +++--- app/Imports/DatasetTable42Import.php | 14 ++++---- app/Imports/DatasetTable43AImport.php | 10 +++--- app/Imports/DatasetTable43BImport.php | 10 +++--- app/Imports/DatasetTable43Import.php | 10 +++--- app/Imports/DatasetTable44AImport.php | 14 ++++---- app/Imports/DatasetTable44BImport.php | 17 ++++++++- app/Imports/DatasetTable44Import.php | 12 +++---- app/Imports/DatasetTable45Import.php | 12 +++---- app/Imports/DatasetTable46Import.php | 16 ++++----- app/Imports/DatasetTable47Import.php | 16 ++++----- app/Imports/DatasetTable48AImport.php | 36 +++++++++++++------ app/Imports/DatasetTable48Import.php | 33 +++++++++++------ app/Imports/DatasetTable49Import.php | 8 ++--- app/Imports/DatasetTable50Import.php | 9 ++--- app/Imports/DatasetTable51Import.php | 10 +++--- app/Imports/DatasetTable52Import.php | 10 +++--- app/Imports/DatasetTable53Import.php | 12 +++---- app/Imports/DatasetTable54Import.php | 10 +++--- app/Imports/DatasetTable55Import.php | 10 +++--- app/Imports/DatasetTable56Import.php | 8 ++--- app/Imports/DatasetTable57Import.php | 8 ++--- app/Imports/DatasetTable58Import.php | 12 +++---- app/Imports/DatasetTable59Import.php | 8 ++--- app/Imports/DatasetTable60AImport.php | 8 ++--- app/Imports/DatasetTable60Import.php | 6 ++-- app/Imports/DatasetTable61Import.php | 10 +++--- ...6_033814_create_dataset_table48s_table.php | 1 + ...33822_create_dataset_table48_a_s_table.php | 1 + ...6_033828_create_dataset_table50s_table.php | 1 + 31 files changed, 199 insertions(+), 154 deletions(-) diff --git a/app/Imports/DatasetTable41AImport.php b/app/Imports/DatasetTable41AImport.php index fc9bc37..b09a2b8 100644 --- a/app/Imports/DatasetTable41AImport.php +++ b/app/Imports/DatasetTable41AImport.php @@ -37,12 +37,11 @@ public function model(array $row) return new DatasetTable41A([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'jenis_dokumen' => $row[0], - 'kegiatan' => $row[1], - 'komisi_penilai' => $row[2], - 'pemrakarsa' => $row[3], - 'dokumen' => $row[4], - 'nomor_rekomendasi' => $row[5], + 'jenis_dokumen' => $row[2], + 'kegiatan' => $row[3], + 'komisi_penilai' => $row[4], + 'pemrakarsa' => $row[5], + 'nomor_rekomendasi' => $row[6], ]); } } diff --git a/app/Imports/DatasetTable41Import.php b/app/Imports/DatasetTable41Import.php index 3dca312..c692fa6 100644 --- a/app/Imports/DatasetTable41Import.php +++ b/app/Imports/DatasetTable41Import.php @@ -37,11 +37,11 @@ public function model(array $row) return new DatasetTable41([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'jenis_dokumen' => $row[0], - 'kegiatan' => $row[1], - 'komisi_penilai' => $row[2], - 'pemrakarsa' => $row[3], - 'dokumen' => $row[4], + 'jenis_dokumen' => $row[2], + 'kegiatan' => $row[3], + 'komisi_penilai' => $row[4], + 'pemrakarsa' => $row[5], + 'dokumen' => $row[6], ]); } } diff --git a/app/Imports/DatasetTable42Import.php b/app/Imports/DatasetTable42Import.php index ee49459..087fa02 100644 --- a/app/Imports/DatasetTable42Import.php +++ b/app/Imports/DatasetTable42Import.php @@ -31,18 +31,18 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null && $row[7] === null) { return null; // baris kosong dilewati } return new DatasetTable42([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'nama_perusahaan' => $row[0], - 'lokasi' => $row[1], - 'jenis_kegiatan' => $row[2], - 'jenis_izin' => $row[3], - 'nomor_sk' => $row[4], - 'dokumen' => $row[5], + 'nama_perusahaan' => $row[2], + 'lokasi' => $row[3], + 'jenis_kegiatan' => $row[4], + 'jenis_izin' => $row[5], + 'nomor_sk' => $row[6], + 'dokumen' => $row[7], ]); } } diff --git a/app/Imports/DatasetTable43AImport.php b/app/Imports/DatasetTable43AImport.php index 6ccae23..ef61b5b 100644 --- a/app/Imports/DatasetTable43AImport.php +++ b/app/Imports/DatasetTable43AImport.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null) { return null; // baris kosong dilewati } return new DatasetTable43A([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'lokasi' => $row[0], - 'nama_perusahaan' => $row[1], - 'waktu' => $row[2], - 'hasil_pengawasan' => $row[3], + 'lokasi' => $row[1], + 'nama_perusahaan' => $row[3], + 'waktu' => $row[4], + 'hasil_pengawasan' => $row[5], ]); } } diff --git a/app/Imports/DatasetTable43BImport.php b/app/Imports/DatasetTable43BImport.php index 46b3ee9..20f6497 100644 --- a/app/Imports/DatasetTable43BImport.php +++ b/app/Imports/DatasetTable43BImport.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null) { return null; // baris kosong dilewati } return new DatasetTable43B([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'lokasi' => $row[0], - 'nama_perusahaan' => $row[1], - 'waktu' => $row[2], - 'hasil_pengawasan' => $row[3], + 'lokasi' => $row[1], + 'nama_perusahaan' => $row[3], + 'waktu' => $row[4], + 'hasil_pengawasan' => $row[5], ]); } } diff --git a/app/Imports/DatasetTable43Import.php b/app/Imports/DatasetTable43Import.php index aba4f16..db8e1d9 100644 --- a/app/Imports/DatasetTable43Import.php +++ b/app/Imports/DatasetTable43Import.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null) { return null; // baris kosong dilewati } return new DatasetTable43([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'lokasi' => $row[0], - 'nama_perusahaan' => $row[1], - 'waktu' => $row[2], - 'hasil_pengawasan' => $row[3], + 'lokasi' => $row[1], + 'nama_perusahaan' => $row[3], + 'waktu' => $row[4], + 'hasil_pengawasan' => $row[5], ]); } } diff --git a/app/Imports/DatasetTable44AImport.php b/app/Imports/DatasetTable44AImport.php index ec1df61..8aeff5f 100644 --- a/app/Imports/DatasetTable44AImport.php +++ b/app/Imports/DatasetTable44AImport.php @@ -37,13 +37,13 @@ public function model(array $row) return new DatasetTable44A([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'kecamatan' => $row[0], - 'lokasi' => $row[1], - 'jenis_bencana' => $row[2], - 'jumlah_area_terdampak' => $row[3], - 'jumlah_korban_mengungsi' => $row[4], - 'jumlah_korban_meninggal' => $row[5], - 'perkiraan_kerugian' => $row[6], + 'kecamatan' => $row[1], + 'lokasi' => $row[2], + 'jenis_bencana' => $row[3], + 'jumlah_area_terdampak' => $row[4], + 'jumlah_korban_mengungsi' => $row[5], + 'jumlah_korban_meninggal' => $row[6], + 'perkiraan_kerugian' => $row[7], ]); } } diff --git a/app/Imports/DatasetTable44BImport.php b/app/Imports/DatasetTable44BImport.php index 70576fe..704be01 100644 --- a/app/Imports/DatasetTable44BImport.php +++ b/app/Imports/DatasetTable44BImport.php @@ -31,7 +31,22 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ( + $row[0] === null && + $row[1] === null && + $row[2] === null && + $row[3] === null && + $row[4] === null && + $row[5] === null && + $row[6] === null && + $row[7] === null && + $row[8] === null && + $row[9] === null && + $row[10] === null && + $row[11] === null && + $row[12] === null && + $row[13] === null + ) { return null; // baris kosong dilewati } return new DatasetTable44B([ diff --git a/app/Imports/DatasetTable44Import.php b/app/Imports/DatasetTable44Import.php index 7ceaf3a..d8a9c56 100644 --- a/app/Imports/DatasetTable44Import.php +++ b/app/Imports/DatasetTable44Import.php @@ -37,12 +37,12 @@ public function model(array $row) return new DatasetTable44([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'kecamatan' => $row[0], - 'lokasi' => $row[1], - 'jenis_bencana' => $row[2], - 'jumlah_area_terdampak' => $row[3], - 'jumlah_korban_mengungsi' => $row[4], - 'jumlah_korban_meninggal' => $row[5], + 'kecamatan' => $row[1], + 'lokasi' => $row[2], + 'jenis_bencana' => $row[3], + 'jumlah_area_terdampak' => $row[4], + 'jumlah_korban_mengungsi' => $row[5], + 'jumlah_korban_meninggal' => $row[6], ]); } } diff --git a/app/Imports/DatasetTable45Import.php b/app/Imports/DatasetTable45Import.php index 2028a1d..410090b 100644 --- a/app/Imports/DatasetTable45Import.php +++ b/app/Imports/DatasetTable45Import.php @@ -31,17 +31,17 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null) { return null; // baris kosong dilewati } return new DatasetTable45([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'kabupaten_kota' => $row[0], - 'luas' => $row[1], - 'jumlah_penduduk' => $row[2], - 'pertumbuhan_penduduk' => $row[3], - 'kepadatan_penduduk' => $row[4], + 'kabupaten_kota' => $row[1], + 'luas' => $row[2], + 'jumlah_penduduk' => $row[3], + 'pertumbuhan_penduduk' => $row[4], + 'kepadatan_penduduk' => $row[5], ]); } } diff --git a/app/Imports/DatasetTable46Import.php b/app/Imports/DatasetTable46Import.php index 5180228..fa4f640 100644 --- a/app/Imports/DatasetTable46Import.php +++ b/app/Imports/DatasetTable46Import.php @@ -31,19 +31,19 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null && $row[7] === null) { return null; // baris kosong dilewati } return new DatasetTable46([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'kabupaten_kota' => $row[0], - 'lokasi' => $row[1], - 'nama_tpa' => $row[2], - 'jenis_tpa' => $row[3], - 'luas_tpa' => $row[4], - 'kapasitas' => $row[5], - 'volume_eksisting' => $row[6], + 'kabupaten_kota' => $row[1], + 'lokasi' => $row[2], + 'nama_tpa' => $row[3], + 'jenis_tpa' => $row[4], + 'luas_tpa' => $row[5], + 'kapasitas' => $row[6], + 'volume_eksisting' => $row[7], ]); } } diff --git a/app/Imports/DatasetTable47Import.php b/app/Imports/DatasetTable47Import.php index bef9ff9..11e8196 100644 --- a/app/Imports/DatasetTable47Import.php +++ b/app/Imports/DatasetTable47Import.php @@ -31,19 +31,19 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null && $row[7] === null) { return null; // baris kosong dilewati } return new DatasetTable47([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'kabupaten_kota' => $row[0], - 'lokasi' => $row[1], - 'jumlah_penduduk' => $row[2], - 'timbulan_sampah' => $row[3], - 'status_open_dumping' => $row[4], - 'status_sanitary_landfill' => $row[5], - 'status_controlled_landfill' => $row[6], + 'kabupaten_kota' => $row[1], + 'lokasi' => $row[2], + 'jumlah_penduduk' => $row[3], + 'timbulan_sampah' => $row[4], + 'status_open_dumping' => $row[5], + 'status_sanitary_landfill' => $row[6], + 'status_controlled_landfill' => $row[7], ]); } } diff --git a/app/Imports/DatasetTable48AImport.php b/app/Imports/DatasetTable48AImport.php index a022048..21188af 100644 --- a/app/Imports/DatasetTable48AImport.php +++ b/app/Imports/DatasetTable48AImport.php @@ -31,22 +31,36 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ( + $row[0] === null && + $row[1] === null && + $row[2] === null && + $row[3] === null && + $row[4] === null && + $row[5] === null && + $row[6] === null && + $row[7] === null && + $row[8] === null && + $row[9] === null && + $row[10] === null && + $row[11] === null + ) { return null; // baris kosong dilewati } return new DatasetTable48A([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'lokasi' => $row[0], - 'nama_bank_sampah' => $row[1], - 'sk' => $row[2], - 'jumlah_sampah' => $row[3], - 'status' => $row[4], - 'kelurahan' => $row[5], - 'rw' => $row[6], - 'jumlah_penabung' => $row[7], - 'jumlah_karyawan' => $row[8], - 'omset' => $row[9], + 'lokasi' => $row[1], + 'tahun' => $row[2], + 'nama_bank_sampah' => $row[3], + 'sk' => $row[4], + 'jumlah_sampah' => $row[5], + 'status' => $row[6], + 'kelurahan' => $row[7], + 'rw' => $row[8], + 'jumlah_penabung' => $row[9], + 'jumlah_karyawan' => $row[10], + 'omset' => $row[11], ]); } } diff --git a/app/Imports/DatasetTable48Import.php b/app/Imports/DatasetTable48Import.php index a79c145..2962601 100644 --- a/app/Imports/DatasetTable48Import.php +++ b/app/Imports/DatasetTable48Import.php @@ -31,21 +31,34 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ( + $row[0] === null && + $row[1] === null && + $row[2] === null && + $row[3] === null && + $row[4] === null && + $row[5] === null && + $row[6] === null && + $row[7] === null && + $row[8] === null && + $row[9] === null && + $row[10] === null + ) { return null; // baris kosong dilewati } return new DatasetTable48([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'lokasi' => $row[0], - 'nama_bank_sampah' => $row[1], - 'sk' => $row[2], - 'jumlah_sampah' => $row[3], - 'status' => $row[4], - 'wilayah_pelayanan' => $row[5], - 'jumlah_penabung' => $row[6], - 'jumlah_karyawan' => $row[7], - 'omset' => $row[8], + 'lokasi' => $row[1], + 'tahun' => $row[2], + 'nama_bank_sampah' => $row[3], + 'sk' => $row[4], + 'jumlah_sampah' => $row[5], + 'status' => $row[6], + 'wilayah_pelayanan' => $row[7], + 'jumlah_penabung' => $row[8], + 'jumlah_karyawan' => $row[9], + 'omset' => $row[10], ]); } } diff --git a/app/Imports/DatasetTable49Import.php b/app/Imports/DatasetTable49Import.php index 53bc65c..af81243 100644 --- a/app/Imports/DatasetTable49Import.php +++ b/app/Imports/DatasetTable49Import.php @@ -31,15 +31,15 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null) { return null; // baris kosong dilewati } return new DatasetTable49([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'nama_kegiatan' => $row[0], - 'lokasi_kegiatan' => $row[1], - 'pelaksana_kegiatan' => $row[2], + 'nama_kegiatan' => $row[1], + 'lokasi_kegiatan' => $row[2], + 'pelaksana_kegiatan' => $row[3], ]); } } diff --git a/app/Imports/DatasetTable50Import.php b/app/Imports/DatasetTable50Import.php index 6871f33..bf689b8 100644 --- a/app/Imports/DatasetTable50Import.php +++ b/app/Imports/DatasetTable50Import.php @@ -31,15 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null) { return null; // baris kosong dilewati } return new DatasetTable50([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'pihak_mengadu' => $row[0], - 'masalah' => $row[1], - 'proses_pengaduan' => $row[2], + 'pihak_mengadu' => $row[1], + 'masalah' => $row[2], + 'tahun' => $row[3], + 'proses_pengaduan' => $row[4], ]); } } diff --git a/app/Imports/DatasetTable51Import.php b/app/Imports/DatasetTable51Import.php index 364700f..17d4ae2 100644 --- a/app/Imports/DatasetTable51Import.php +++ b/app/Imports/DatasetTable51Import.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null) { return null; // baris kosong dilewati } return new DatasetTable51([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'nama_lsm' => $row[0], - 'lokasi' => $row[1], - 'akta_pendirian' => $row[2], - 'alamat' => $row[3], + 'nama_lsm' => $row[1], + 'lokasi' => $row[2], + 'akta_pendirian' => $row[3], + 'alamat' => $row[4], ]); } } diff --git a/app/Imports/DatasetTable52Import.php b/app/Imports/DatasetTable52Import.php index 43e462d..a4bc6b1 100644 --- a/app/Imports/DatasetTable52Import.php +++ b/app/Imports/DatasetTable52Import.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null) { return null; // baris kosong dilewati } return new DatasetTable52([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'tingkat_pendidikan' => $row[0], - 'lakilaki' => $row[1], - 'perempuan' => $row[2], - 'jumlah' => $row[3], + 'tingkat_pendidikan' => $row[1], + 'lakilaki' => $row[2], + 'perempuan' => $row[3], + 'jumlah' => $row[4], ]); } } diff --git a/app/Imports/DatasetTable53Import.php b/app/Imports/DatasetTable53Import.php index 2c2cca6..0f3bf0a 100644 --- a/app/Imports/DatasetTable53Import.php +++ b/app/Imports/DatasetTable53Import.php @@ -37,12 +37,12 @@ public function model(array $row) return new DatasetTable53([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'nama_instansi' => $row[0], - 'jabatan_fungsional' => $row[1], - 'laki_laki' => $row[2], - 'perempuan' => $row[3], - 'staf_diklat_l' => $row[4], - 'staf_diklat_p' => $row[5], + 'nama_instansi' => $row[1], + 'jabatan_fungsional' => $row[2], + 'laki_laki' => $row[3], + 'perempuan' => $row[4], + 'staf_diklat_l' => $row[5], + 'staf_diklat_p' => $row[6], ]); } } diff --git a/app/Imports/DatasetTable54Import.php b/app/Imports/DatasetTable54Import.php index 1be22c9..3087b7f 100644 --- a/app/Imports/DatasetTable54Import.php +++ b/app/Imports/DatasetTable54Import.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null) { return null; // baris kosong dilewati } return new DatasetTable54([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'nama' => $row[0], - 'nama_penghargaan' => $row[1], - 'pemberi_penghargaan' => $row[2], - 'tahun_penghargaan' => $row[3], + 'nama' => $row[1], + 'nama_penghargaan' => $row[2], + 'pemberi_penghargaan' => $row[3], + 'tahun_penghargaan' => $row[4], ]); } } diff --git a/app/Imports/DatasetTable55Import.php b/app/Imports/DatasetTable55Import.php index a67c9f9..1136db7 100644 --- a/app/Imports/DatasetTable55Import.php +++ b/app/Imports/DatasetTable55Import.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null) { return null; // baris kosong dilewati } return new DatasetTable55([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'nama_kegiatan' => $row[0], - 'instansi' => $row[1], - 'kelompok_sasaran' => $row[2], - 'waktu_pelaksanaan' => $row[3], + 'nama_kegiatan' => $row[1], + 'instansi' => $row[2], + 'kelompok_sasaran' => $row[3], + 'waktu_pelaksanaan' => $row[4], ]); } } diff --git a/app/Imports/DatasetTable56Import.php b/app/Imports/DatasetTable56Import.php index 037f4a9..87a61b8 100644 --- a/app/Imports/DatasetTable56Import.php +++ b/app/Imports/DatasetTable56Import.php @@ -31,15 +31,15 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null) { return null; // baris kosong dilewati } return new DatasetTable56([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'uraian' => $row[0], - 'satu_tahun_sebelumnya' => $row[1], - 'dua_tahun_sebelumnya' => $row[2], + 'uraian' => $row[1], + 'satu_tahun_sebelumnya' => $row[2], + 'dua_tahun_sebelumnya' => $row[3], ]); } } diff --git a/app/Imports/DatasetTable57Import.php b/app/Imports/DatasetTable57Import.php index c58b272..3c7bda4 100644 --- a/app/Imports/DatasetTable57Import.php +++ b/app/Imports/DatasetTable57Import.php @@ -31,15 +31,15 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null) { return null; // baris kosong dilewati } return new DatasetTable57([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'uraian' => $row[0], - 'satu_tahun_sebelumnya' => $row[1], - 'dua_tahun_sebelumnya' => $row[2], + 'uraian' => $row[1], + 'satu_tahun_sebelumnya' => $row[2], + 'dua_tahun_sebelumnya' => $row[3], ]); } } diff --git a/app/Imports/DatasetTable58Import.php b/app/Imports/DatasetTable58Import.php index 0f57c2f..365e812 100644 --- a/app/Imports/DatasetTable58Import.php +++ b/app/Imports/DatasetTable58Import.php @@ -31,17 +31,17 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null) { return null; // baris kosong dilewati } return new DatasetTable58([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'jenis_produk_hukum_bidang_lingkungan_hidup' => $row[0], - 'jenis_produk_hukum_bidang_kehutanan' => $row[1], - 'nomor_tanggal' => $row[2], - 'tentang' => $row[3], - 'dokumen' => $row[4], + 'jenis_produk_hukum_bidang_lingkungan_hidup' => $row[1], + 'jenis_produk_hukum_bidang_kehutanan' => $row[2], + 'nomor_tanggal' => $row[3], + 'tentang' => $row[4], + 'dokumen' => $row[5], ]); } } diff --git a/app/Imports/DatasetTable59Import.php b/app/Imports/DatasetTable59Import.php index 9ceae40..5847775 100644 --- a/app/Imports/DatasetTable59Import.php +++ b/app/Imports/DatasetTable59Import.php @@ -31,15 +31,15 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null) { return null; // baris kosong dilewati } return new DatasetTable59([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'sumber' => $row[0], - 'peruntukan_anggaran' => $row[1], - 'jumlah_anggaran' => $row[2], + 'sumber' => $row[1], + 'peruntukan_anggaran' => $row[2], + 'jumlah_anggaran' => $row[3], ]); } } diff --git a/app/Imports/DatasetTable60AImport.php b/app/Imports/DatasetTable60AImport.php index e384680..27710fd 100644 --- a/app/Imports/DatasetTable60AImport.php +++ b/app/Imports/DatasetTable60AImport.php @@ -31,15 +31,15 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null) { return null; // baris kosong dilewati } return new DatasetTable60A([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'sumber' => $row[0], - 'jumlah_2022' => $row[1], - 'jumlah_2023' => $row[2], + 'sumber' => $row[1], + 'jumlah_2022' => $row[2], + 'jumlah_2023' => $row[3], ]); } } diff --git a/app/Imports/DatasetTable60Import.php b/app/Imports/DatasetTable60Import.php index 34aeacb..4f5542e 100644 --- a/app/Imports/DatasetTable60Import.php +++ b/app/Imports/DatasetTable60Import.php @@ -31,14 +31,14 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null) { return null; // baris kosong dilewati } return new DatasetTable60([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'sumber' => $row[0], - 'jumlah' => $row[1], + 'sumber' => $row[1], + 'jumlah' => $row[2], ]); } } diff --git a/app/Imports/DatasetTable61Import.php b/app/Imports/DatasetTable61Import.php index 6c88007..8331116 100644 --- a/app/Imports/DatasetTable61Import.php +++ b/app/Imports/DatasetTable61Import.php @@ -31,16 +31,16 @@ public function model(array $row) { // cek kalau row kosong jangan insert - if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null && $row[5] === null && $row[6] === null) { + if ($row[0] === null && $row[1] === null && $row[2] === null && $row[3] === null && $row[4] === null) { return null; // baris kosong dilewati } return new DatasetTable61([ 'dataset_id' => $this->datasetId, 'created_by' => $this->userId, - 'lokasi' => $row[0], - 'inovasi' => $row[1], - 'deskripsi_inovasi' => $row[2], - 'dasar_hukum_inovasi' => $row[3], + 'lokasi' => $row[1], + 'inovasi' => $row[2], + 'deskripsi_inovasi' => $row[3], + 'dasar_hukum_inovasi' => $row[4], ]); } } diff --git a/database/migrations/2025_08_26_033814_create_dataset_table48s_table.php b/database/migrations/2025_08_26_033814_create_dataset_table48s_table.php index 0645849..96eca6b 100644 --- a/database/migrations/2025_08_26_033814_create_dataset_table48s_table.php +++ b/database/migrations/2025_08_26_033814_create_dataset_table48s_table.php @@ -15,6 +15,7 @@ return new class extends Migration $table->id('DatasetTable48Id'); $table->integer('dataset_id'); $table->string('lokasi')->nullable(); + $table->string('tahun')->nullable(); $table->string('nama_bank_sampah')->nullable(); $table->string('sk')->nullable(); // Nomor SK $table->bigInteger('jumlah_sampah')->nullable(); // Kg per bulan diff --git a/database/migrations/2025_08_26_033822_create_dataset_table48_a_s_table.php b/database/migrations/2025_08_26_033822_create_dataset_table48_a_s_table.php index 243ca38..69d9cd1 100644 --- a/database/migrations/2025_08_26_033822_create_dataset_table48_a_s_table.php +++ b/database/migrations/2025_08_26_033822_create_dataset_table48_a_s_table.php @@ -15,6 +15,7 @@ return new class extends Migration $table->id('DatasetTable48AId'); $table->integer('dataset_id'); $table->string('lokasi')->nullable(); + $table->string('tahun')->nullable(); $table->string('nama_bank_sampah')->nullable(); $table->string('sk')->nullable(); // Nomor SK $table->float('jumlah_sampah')->default(0); // Kg per bulan, pakai decimal diff --git a/database/migrations/2025_08_26_033828_create_dataset_table50s_table.php b/database/migrations/2025_08_26_033828_create_dataset_table50s_table.php index 75d8128..b2b9f53 100644 --- a/database/migrations/2025_08_26_033828_create_dataset_table50s_table.php +++ b/database/migrations/2025_08_26_033828_create_dataset_table50s_table.php @@ -16,6 +16,7 @@ return new class extends Migration $table->integer('dataset_id'); $table->string('pihak_mengadu')->nullable(); $table->text('masalah')->nullable(); + $table->string('tahun')->nullable(); $table->text('proses_pengaduan')->nullable(); $table->integer('created_by'); $table->timestampsTz();