adding laravel excel queue driver using redis, fixing laporan jalinan…

… excel download, fixing kegiatan bkcu peserta table view
t0n1zz · Jul 22, 2020 · 455916d · 455916d
1 parent ea4bc0e
commit 455916d
Show file tree

Hide file tree

Showing 27 changed files with 11,616 additions and 552 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/AnggotaCu.php b/app/AnggotaCu.php
@@ -62,7 +62,12 @@ public static function initialize()
     }
 
     public function anggota_cu_cu(){
-        return $this->hasMany('App\AnggotaCuCu','anggota_cu_id','id');
+        $cu = \Auth::user()->id_cu;
+        if($cu != 0){
+            return $this->hasMany('App\AnggotaCuCu','anggota_cu_id','id')->where('cu_id',$cu);
+        }else{
+            return $this->hasMany('App\AnggotaCuCu','anggota_cu_id','id');
+        }
     }
 
     public function anggota_cu_cu_not_keluar(){

diff --git a/app/Http/Controllers/AktivisController.php b/app/Http/Controllers/AktivisController.php
@@ -740,11 +740,21 @@ public function saveDiklat(Request $request, $id)
 
 		$kelas->kegiatan_id = 0;
 		$kelas->name = $request->diklat['name'];
-		$kelas->tempat = $request->diklat['tempat'];
-		$kelas->lembaga = $request->diklat['lembaga'];
-		$kelas->fasilitator = $request->diklat['fasilitator'];
-		$kelas->datang = $request->diklat['datang'];
-		$kelas->pulang = $request->diklat['pulang'];
+		if(array_key_exists('tempat', $request->diklat)){
+			$kelas->tempat = $request->diklat['tempat'];
+		}
+		if(array_key_exists('lembaga', $request->diklat)){
+			$kelas->lembaga = $request->diklat['lembaga'];
+		}
+		if(array_key_exists('fasilitator', $request->diklat)){
+			$kelas->fasilitator = $request->diklat['fasilitator'];
+		}
+		if(array_key_exists('datang', $request->diklat)){
+			$kelas->datang = $request->diklat['datang'];
+		}
+		if(array_key_exists('pulang', $request->diklat)){
+			$kelas->pulang = $request->diklat['pulang'];
+		}
 
 		$kelas->save();
 

diff --git a/app/Http/Controllers/AnggotaCuController.php b/app/Http/Controllers/AnggotaCuController.php
@@ -675,7 +675,7 @@ private function syncCu($request, $kelas)
 
 			if($diff){
 				$val = array_values($diff)[0];
-				KegiatanPilih::findOrFail($val)->delete();
+				AnggotaCuCu::findOrFail($val)->delete();
 			}
 			foreach($cus as $cu){
 				if(array_key_exists('id', $cu)){
@@ -702,10 +702,10 @@ private function syncCu($request, $kelas)
 		}
 
 		if($request->id_cu){
-			$kelasCu = AnggotaCuCu::where('anggota_cu_id',$kelas->id)->first();
+			$kelasCu = AnggotaCuCu::where('anggota_cu_id',$kelas->id)->where('cu_id', $request->id_cu)->first();
 
 			if($kelasCu){
-				$kelasCu = AnggotaCuCu::where('anggota_cu_id',$kelas->id);
+				$kelasCu = AnggotaCuCu::where('anggota_cu_id',$kelas->id)->where('cu_id', $request->id_cu);
 				$kelasCu->update([
 					'anggota_cu_id' => $kelas->id,
 					'cu_id' => $request->id_cu,
@@ -750,6 +750,7 @@ private function syncProdukCu($request, $kelas)
 
 	public function uploadExcel(Request $request)
 	{
+
 		Excel::import(new AnggotaCuDraftImport, request()->file('file'));
 
 		return response()

diff --git a/app/Http/Controllers/AnggotaCuDraftController.php b/app/Http/Controllers/AnggotaCuDraftController.php
@@ -72,18 +72,18 @@ public function store($id)
 			$kelas3 = AnggotaCu::create($data);
 
 			$data2 = array_map(function($dat) use ($kelas3) {
-					return array(
-							'anggota_cu_id' => $kelas3->id,
-							'cu_id' => $dat['cu_id'],
-							'tp_id' => $dat['tp_id'],
-							'no_ba' => $dat['no_ba'],
-							'tanggal_masuk' => $dat['tanggal_masuk'],
-							'tanggal_keluar' => $dat['tanggal_keluar'],
-							'keterangan_masuk' => $dat['keterangan_masuk'],
-							'keterangan_keluar' => $dat['keterangan_keluar'],
-							'created_at' => $dat['created_at'],
-							'updated_at' => $dat['updated_at'],
-					);
+				return array(
+					'anggota_cu_id' => $kelas3->id,
+					'cu_id' => $dat['cu_id'],
+					'tp_id' => $dat['tp_id'],
+					'no_ba' => $dat['no_ba'],
+					'tanggal_masuk' => $dat['tanggal_masuk'],
+					'tanggal_keluar' => $dat['tanggal_keluar'],
+					'keterangan_masuk' => $dat['keterangan_masuk'],
+					'keterangan_keluar' => $dat['keterangan_keluar'],
+					'created_at' => $dat['created_at'],
+					'updated_at' => $dat['updated_at'],
+				);
 			}, $data2);
 
 			$kelas4 = AnggotaCuCu::insert($data2);
@@ -115,7 +115,7 @@ public function storeAll($cu)
 					$query->where('anggota_cu_cu_draft.cu_id',$cu);
 				});
 				// $kelas->nik = preg_replace('/[^A-Za-z0-9]/', '',$kelas->nik);
-			}
+		}
 
 			$datas = $kelas->get();
 			foreach($datas as $item){
@@ -131,24 +131,31 @@ public function storeAll($cu)
 
 				$data2 = array_map(function($dat) use ($kelas3) {
 					return array(
-							'anggota_cu_id' => $kelas3->id,
-							'cu_id' => $dat['cu_id'],
-							'tp_id' => $dat['tp_id'],
-							'no_ba' => $dat['no_ba'],
-							'tanggal_masuk' => $dat['tanggal_masuk'],
-							'tanggal_keluar' => $dat['tanggal_keluar'],
-							'keterangan_masuk' => $dat['keterangan_masuk'],
-							'keterangan_keluar' => $dat['keterangan_keluar'],
-							'created_at' => $dat['created_at'],
-							'updated_at' => $dat['updated_at'],
+						'anggota_cu_id' => $kelas3->id,
+						'cu_id' => $dat['cu_id'],
+						'tp_id' => $dat['tp_id'],
+						'no_ba' => $dat['no_ba'],
+						'tanggal_masuk' => $dat['tanggal_masuk'],
+						'tanggal_keluar' => $dat['tanggal_keluar'],
+						'keterangan_masuk' => $dat['keterangan_masuk'],
+						'keterangan_keluar' => $dat['keterangan_keluar'],
+						'created_at' => $dat['created_at'],
+						'updated_at' => $dat['updated_at'],
 					);
 				}, $data2);
 
 				$kelas4 = AnggotaCuCu::insert($data2);
+
+				if($cu != 'semua'){
+					AnggotaCuDraft::destroy($item->id);
+				}
+
 				$kelas2->delete();
 			}
 
-			$kelas->delete();
+			if($cu == 'semua'){
+				$kelas->delete();
+			}
 
 			\DB::commit();
 
@@ -290,8 +297,8 @@ public function destroyAll($cu)
 				foreach($datas as $item){
 					$kelas2 = AnggotaCuCuDraft::where('anggota_cu_draft_id', $item->id);
 					$kelas2->delete();
+					AnggotaCuDraft::destroy($item->id);
 				}
-				$kelas->delete();
 			}
 
 			\DB::commit();

diff --git a/app/Http/Controllers/AssesmentAccessController.php b/app/Http/Controllers/AssesmentAccessController.php
@@ -187,6 +187,22 @@ public function edit($id)
 				]);
 	}
 
+	public function editPenilaian($id)
+	{
+		$kelas2 = AssesmentAccess::findOrFail($id);
+		$kelas2->status = 'BELUM SELESAI DINILAI';
+		$kelas2->update();
+
+		$kelas = AssesmentAccess::with('cu','p1','p2','p3','p4')->findOrFail($id);
+		$kelas = $this->formatSingleQuery($kelas);
+
+		return response()
+				->json([
+						'form' => $kelas,
+						'option' => []
+				]);
+	}
+
 	public function update(Request $request, $id)
 	{
 		$this->validate($request, AssesmentAccess::$rules);

diff --git a/app/Http/Controllers/JalinanKlaimController.php b/app/Http/Controllers/JalinanKlaimController.php
@@ -1470,7 +1470,7 @@ public function history()
 	public function cariData($nik)
 	{
 		$table_data = AnggotaCu::with('anggota_cu_cu.cu','anggota_cu_cu.tp','anggota_produk_cu','Villages','Districts','Regencies','Provinces')->where('nik',$nik)->first();
-		
+
 		if($table_data){
 			return response()
 			->json([

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -167,36 +167,36 @@ class UserController extends Controller
 
 	public function index()
 	{
-			$table_data = User::with('pus','cu','aktivis.pekerjaan_aktif.cu','aktivis.pendidikan_tertinggi')->where('id','!=',1)->advancedFilter();
-			
-    	return response()
-			->json([
-				'model' => $table_data
-			]);
+		$table_data = User::with('pus','cu','aktivis.pekerjaan_aktif.cu','aktivis.pendidikan_tertinggi')->where('id','!=',1)->advancedFilter();
+
+		return response()
+		->json([
+			'model' => $table_data
+		]);
 	}
 
 	public function indexCu($id)
 	{
-			$table_data = User::with('pus','cu','aktivis.pekerjaan_aktif.cu','aktivis.pendidikan_tertinggi')->where('id','!=',1)->where('id_cu',$id)->advancedFilter();
-			
-    	return response()
-			->json([
-				'model' => $table_data
-			]);
+		$table_data = User::with('pus','cu','aktivis.pekerjaan_aktif.cu','aktivis.pendidikan_tertinggi')->where('id','!=',1)->where('id_cu',$id)->advancedFilter();
+
+		return response()
+		->json([
+			'model' => $table_data
+		]);
 	}
 
 	public function indexCuPermission($id)
 	{
-			$table_data1 = User::with('aktivis.pekerjaan_aktif')->where('id_cu',$id)->permission('verifikasi_pengurus_jalinan_klaim')->get();
-			$table_data2 = User::with('aktivis.pekerjaan_aktif')->where('id_cu',$id)->permission('verifikasi_pengawas_jalinan_klaim')->get();
-			$table_data3 = User::with('aktivis.pekerjaan_aktif')->where('id_cu',$id)->permission('verifikasi_manajemen_jalinan_klaim')->get();
-			
-    	return response()
-			->json([
-				'model1' => $table_data1,
-				'model2' => $table_data2,
-				'model3' => $table_data3,
-			]);
+		$table_data1 = User::with('aktivis.pekerjaan_aktif')->where('id_cu',$id)->permission('verifikasi_pengurus_jalinan_klaim')->get();
+		$table_data2 = User::with('aktivis.pekerjaan_aktif')->where('id_cu',$id)->permission('verifikasi_pengawas_jalinan_klaim')->get();
+		$table_data3 = User::with('aktivis.pekerjaan_aktif')->where('id_cu',$id)->permission('verifikasi_manajemen_jalinan_klaim')->get();
+
+		return response()
+		->json([
+			'model1' => $table_data1,
+			'model2' => $table_data2,
+			'model3' => $table_data3,
+		]);
 	}
 
 	public function getActivity($id)
@@ -354,7 +354,7 @@ public function updateHakAkses(Request $request, $id)
 		return response()
 			->json([
 				'saved' => true,
-				'message' => 'Hak Akses User ' .$kelas->username. ' berhasil diubah'
+				'message' => 'Hak Akses User ' .$kelas->username. ' berhasil diubah. Apabila user tersebut saat ini sudah login ke SIMO, maka untuk melihat perubahannya user tersebut mesti logout dan login lagin.'
 			]);
 	}