fix for sertifikat

t0n1zz · Jun 16, 2022 · f9cedcf · f9cedcf
1 parent fd12990
commit f9cedcf
Show file tree

Hide file tree

Showing 169 changed files with 7,314 additions and 566,572 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/Http/Controllers/KegiatanBKCUController.php b/app/Http/Controllers/KegiatanBKCUController.php
@@ -5,6 +5,7 @@
 use Auth;
 use File;
 use Image;
+use App\Nilai;
 use App\Kegiatan;
 use App\Support\Helper;
 use App\KegiatanPanitia;
@@ -439,11 +440,10 @@ public function store(Request $request, $kegiatan_tipe)
 			$fileName = '';
 		}
 
-		$kelas = Kegiatan::create($request->except('tipe','status','gambar','id_sertifikat') + [
+		$kelas = Kegiatan::create($request->except('tipe','status','gambar') + [
 			'tipe' => $kegiatan_tipe, 
 			'status' => '1', 
-			'gambar' => $fileName, 
-			'id_sertifikat' =>  $request->formSertifikat[0]['id_sertifikat']
+			'gambar' => $fileName
 		]);
 
 		$sasaran_ar = array();
@@ -876,17 +876,8 @@ public function updateStatus(Request $request, $id)
 
 		$kelas->status = $request->status;
 		$statusPeserta = $request->status;
-		$status= '';
-
-		if($request->status == 1){
-			$status= 'sedang menunggu';
-		}else if($request->status == 2){
-			$status= 'pendaftaran buka';
-		}else if($request->status == 3){
-			$status= 'pendaftaran tutup';
-		}else if($request->status == 4){
-			$status= 'sedang berjalan';
-		}else if($request->status == 5){
+
+		if($request->status == 5){
 			$periode = Kegiatan::where('id', $id)->select('periode')->get();
 			$idAktivis = KegiatanPeserta::where('kegiatan_id', $id)->select('aktivis_id')->get();
 			$lastNomor = SertifikatGenerate::where('periode', $periode->first()->periode)->max('nomor');
@@ -900,9 +891,6 @@ public function updateStatus(Request $request, $id)
 					SertifikatGenerate::create(['id_aktivis' => $peserta->aktivis_id, 'id_kegiatan' => $id, 'nomor' => $lastNomor, 'periode' => $periode->first()->periode]);
 				}
 			}
-			$status = 'terlaksana';
-		}else if($request->status == 6){
-			$status= 'batal';
 		}
 
 		if($request->status == 6){
@@ -913,10 +901,10 @@ public function updateStatus(Request $request, $id)
 
 		$kelas->update();
 
-		$dataPeserta = KegiatanPeserta::with('aktivis.pekerjaan_aktif')->where('kegiatan_id', $id)->get();
+		// $dataPeserta = KegiatanPeserta::with('aktivis.pekerjaan_aktif')->where('kegiatan_id', $id)->get();
 
 		if($statusPeserta){
-			$updatePeserta = KegiatanPeserta::where('kegiatan_id', $id)->where('status','!=',7)->update(['status' => $statusPeserta]);
+			KegiatanPeserta::where('kegiatan_id', $id)->where('status','!=',7)->update(['status' => $statusPeserta]);
 
 			// $id_cus = [];
 			// foreach($dataPeserta as $peserta){

diff --git a/app/Http/Controllers/SertifikatController.php b/app/Http/Controllers/SertifikatController.php
@@ -211,9 +211,15 @@ public function generateSertifikat(Request $formData)
 
         $hari = \Carbon\Carbon::parse($date_mulai)->diffInDays(\Carbon\Carbon::parse($date_selesai), false);
 
+        $hari = ($hari == 0 ? 1 : $hari);
+
         $tahun = $kegiatanData->periode;
 
-        $tgl = $mulai->format('d') . ' ' . $selesai->format('F') . ' ' . $selesai->format('Y') . " s.d " . $selesai->format('d') . ' ' . $selesai->format('F') . ' ' . $selesai->format('Y');
+        if($hari > 1){
+            $tgl = $mulai->format('d') . ' ' . $mulai->format('F') . ' ' . $mulai->format('Y') . " s.d " . $selesai->format('d') . ' ' . $selesai->format('F') . ' ' . $selesai->format('Y');
+        }else{
+            $tgl = $mulai->format('d') . ' ' . $mulai->format('F') . ' ' . $mulai->format('Y');
+        }
 
         $tglGenerate = $selesai->format('d') . ' ' . $selesai->format('F') . ' ' . $selesai->format('Y');
 

diff --git a/app/Http/Controllers/SuratController.php b/app/Http/Controllers/SuratController.php
@@ -326,13 +326,16 @@ public function destroy($id)
 			$kelas = Surat::findOrFail($id);
 			$name = $kelas->name;
 
-			$kelasDokumen = Dokumen::findOrFail($kelas->id_dokumen);
-
-			if(!empty($kelasDokumen->filename)){
-				File::delete($this->filepath . $kelasDokumen->filename);
-			}
+			if($kelas->id_dokumen){
+				$kelasDokumen = Dokumen::where('id',$kelas->id_dokumen)->first();
 
-			$kelasDokumen->delete();
+				if($kelasDokumen){
+					if(!empty($kelasDokumen->filename)){
+						File::delete($this->filepath . $kelasDokumen->filename);
+					}
+					$kelasDokumen->delete();
+				}
+			}
 
 			$kelas->delete();
 

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -217,17 +217,7 @@ public function index()
 
 	public function indexCu($id)
 	{
-		if($id == 0){
-			$tipe = 3;
-			$id = 1;
-		}else{
-			$tipe = 1;
-		}
-
-		$table_data = User::with(['aktivis.pekerjaans' => function ($q) use ($id,$tipe){
-			$q->with('cu')->where('tipe',$tipe)->where('id_tempat',$id)
-					->where('status',1);
-		}])->with('pus','cu','aktivis.pekerjaan_aktif.cu','aktivis.pendidikan_tertinggi')->where('id','!=',1)->where('id_cu',$id)->advancedFilter();
+		$table_data = User::with('pus','cu','aktivis.pekerjaan_aktif.cu','aktivis.pendidikan_tertinggi')->where('id','!=',1)->where('id_cu',$id)->advancedFilter();
 
 		return response()
 		->json([

diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
         "alexusmai/laravel-file-manager": "^2.5",
         "artesaos/seotools": "^0.12.1",
         "awobaz/compoships": "^2.1",
+        "barryvdh/laravel-dompdf": "0.8.*",
         "cviebrock/eloquent-sluggable": "^4.5.2",
         "fideloper/proxy": "~4.0",
         "intervention/image": "^2.4",