diff --git a/app/Models/Dataset/DatasetTable32.php b/app/Models/Dataset/DatasetTable32.php index c957112..306edf1 100644 --- a/app/Models/Dataset/DatasetTable32.php +++ b/app/Models/Dataset/DatasetTable32.php @@ -32,17 +32,18 @@ use SoftDeletes; $years = $datasets->pluck('tahun')->toArray(); $model = self::with('dataset')->whereHas('dataset',function($query) use ($years){ $query->whereIn('tahun',$years); - })->where('dataset_id',$datasetId)->selectRaw(' - SUM(REPLACE(tidak_sekolah_l,",",".")::numeric ) as ts_l, - SUM(REPLACE(tidak_sekolah_p,",",".")::numeric ) as ts_p, - SUM(REPLACE(sd_p,",",".")::numeric ) as dasar_p, - SUM(REPLACE(sd_l,",",".")::numeric ) as dasar_l, - SUM(REPLACE(sltp_p,",",".")::numeric ) as smp_p, - SUM(REPLACE(sltp_l,",",".")::numeric ) as smp_l, - SUM(REPLACE(slta_smk_p,",",".")::numeric ) as sma_p, - SUM(REPLACE(slta_smk_l,",",".")::numeric ) as sma_l, - SUM(REPLACE(pt_l,",",".")::numeric ) as univ_l, - SUM(REPLACE(pt_p,",",".")::numeric ) as univ_p + })->where('dataset_id',$datasetId) + ->selectRaw(' + SUM(COALESCE(NULLIF(REPLACE(dataset.tidak_sekolah_l, \',\', \'.\'), \'\')::numeric,0)) as ts_l, + SUM(COALESCE(NULLIF(REPLACE(dataset.tidak_sekolah_p, \',\', \'.\'), \'\')::numeric,0)) as ts_p, + SUM(COALESCE(NULLIF(REPLACE(dataset.sd_l, \',\', \'.\'), \'\')::numeric,0)) as dasar_l, + SUM(COALESCE(NULLIF(REPLACE(dataset.sd_p, \',\', \'.\'), \'\')::numeric,0)) as dasar_p, + SUM(COALESCE(NULLIF(REPLACE(dataset.sltp_l, \',\', \'.\'), \'\')::numeric,0)) as smp_l, + SUM(COALESCE(NULLIF(REPLACE(dataset.sltp_p, \',\', \'.\'), \'\')::numeric,0)) as smp_p, + SUM(COALESCE(NULLIF(REPLACE(dataset.slta_smk_l, \',\', \'.\'), \'\')::numeric,0)) as sma_l, + SUM(COALESCE(NULLIF(REPLACE(dataset.slta_smk_p, \',\', \'.\'), \'\')::numeric,0)) as sma_p, + SUM(COALESCE(NULLIF(REPLACE(dataset.pt_l, \',\', \'.\'), \'\')::numeric,0)) as univ_l, + SUM(COALESCE(NULLIF(REPLACE(dataset.pt_p, \',\', \'.\'), \'\')::numeric,0)) as univ_p ')->get(); // Sekolah::selectRaw('SUM(jumlah_siswa) as total_siswa, SUM(jumlah_guru) as total_guru')->first();