adding kode kegiatan, updating kegiatan

.gitignore

@@ -1,5 +1,5 @@
 /node_modules
-/public/hot
+/public/js/components
 /public/storage
 /storage/*.key
 /vendor

app/Http/Controllers/ArtikelKategoriController.php

@@ -66,7 +66,6 @@ public function store(Request $request)
 
 		$name = $request->name;
 
-
 		$kelas = ArtikelKategori::create($request->all());
 
 		return response()

app/Http/Controllers/KegiatanBKCUController.php

@@ -17,6 +17,7 @@
 use App\KegiatanKeputusan;
 use App\KegiatanPertanyaan;
 use App\KegiatanPilih;
+use App\KodeKegiatan;
 use App\Sertifikat;
 use App\SertifikatGenerate;
 use Illuminate\Http\Request;
@@ -34,7 +35,7 @@ class KegiatanBKCUController extends Controller{
 
 	public function index($kegiatan_tipe)
 	{
-		$table_data = Kegiatan::with('tempat','sasaran','Regencies','Provinces')->withCount('hasPeserta')->where('tipe',$kegiatan_tipe)->advancedFilter();
+		$table_data = Kegiatan::with('tempat','sasaran','Regencies','Provinces','kode')->withCount('hasPeserta')->where('tipe',$kegiatan_tipe)->advancedFilter();
 
 		return response()
 		->json([
@@ -44,7 +45,7 @@ public function index($kegiatan_tipe)
 
 	public function indexPeriode($kegiatan_tipe, $periode)
 	{
-		$table_data = Kegiatan::with('tempat','sasaran','Regencies','Provinces')->withCount('hasPeserta')->where('tipe',$kegiatan_tipe)->where('periode',$periode)->advancedFilter();
+		$table_data = Kegiatan::with('tempat','sasaran','Regencies','Provinces','kode')->withCount('hasPeserta')->where('tipe',$kegiatan_tipe)->where('periode',$periode)->advancedFilter();
 
 		return response()
 		->json([
@@ -332,7 +333,7 @@ public function indexKegiatan()
 	{
 		$periode = date("Y");
 
-		$table_data = Kegiatan::where('periode',$periode)->select('id','name','mulai','periode')->get();
+		$table_data = Kegiatan::where('periode',$periode)->select('id','name','mulai','periode','kode')->get();
 
 		return response()
 		->json([
@@ -426,7 +427,12 @@ public function store(Request $request, $kegiatan_tipe)
 	{	
 		$this->validate($request,Kegiatan::$rules);
 
-		$name = $request->name;
+		if($kegiatan_tipe == 'diklat_bkcu'){
+			$name = KodeKegiatan::where('id', $request->id_kode)->first();
+			$name = $name->name;
+		}else{
+			$name = $request->name;
+		}
 
 		// processing single image upload
 		if(!empty($request->gambar)){
@@ -440,10 +446,11 @@ public function store(Request $request, $kegiatan_tipe)
 			$fileName = '';
 		}
 
-		$kelas = Kegiatan::create($request->except('tipe','status','gambar') + [
+		$kelas = Kegiatan::create($request->except('tipe','status','gambar','name') + [
 			'tipe' => $kegiatan_tipe, 
 			'status' => '1', 
-			'gambar' => $fileName
+			'gambar' => $fileName,
+			'name' => $name
 		]);
 
 		$sasaran_ar = array();
@@ -785,7 +792,7 @@ public function storeTugasJawaban(Request $request, $kegiatan_tipe)
 
 	public function edit($id)
 	{
-		$kelas = Kegiatan::with('tempat','sasaran','panitia_dalam.pekerjaan_aktif.cu','panitia_luar','panitia_luar_lembaga','pilih')->findOrFail($id);
+		$kelas = Kegiatan::with('tempat','sasaran','panitia_dalam.pekerjaan_aktif.cu','panitia_luar','panitia_luar_lembaga','pilih','kode')->findOrFail($id);
 		$kelas2 = Sertifikat::where('id', $kelas->id_sertifikat)->get();
 
 		return response()
@@ -811,11 +818,15 @@ public function editTugasJawaban($id)
 	public function update(Request $request, $id)
 	{
 		// $this->validate($request, Kegiatan::$rules);
-
-		$name = $request->name;
-
 		$kelas = Kegiatan::with('pilih')->findOrFail($id);
 
+		if($kelas->tipe == 'diklat_bkcu'){
+			$name = KodeKegiatan::where('id', $request->id_kode)->first();
+			$name = $name->name;
+		}else{
+			$name = $kelas->name;
+		}
+
 		// processing single image upload
 		if(!empty($request->gambar)){
 			if($kelas->tipe == 'diklat_bkcu'){
@@ -828,8 +839,9 @@ public function update(Request $request, $id)
 			$fileName = '';
 		}
 
-		$kelas->update($request->except('gambar') + [
-			'gambar' => $fileName
+		$kelas->update($request->except('gambar','name') + [
+			'gambar' => $fileName,
+			'name' => $name,
 		]);
 
 		$sasaran_ar = array();

app/Http/Controllers/KodeKegiatanController.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\KodeKegiatan;
+use Illuminate\Http\Request;
+
+class KodeKegiatanController extends Controller
+{
+    protected $message = "Kode Kegiatan";
+    public function index()
+    {
+        $table_data = KodeKegiatan::advancedFilter();
+
+        return response()
+            ->json([
+                'model' => $table_data
+            ]);
+    }
+
+    public function create()
+    {
+        return response()
+            ->json([
+                'form' => KodeKegiatan::initialize(),
+                'rules' => KodeKegiatan::$rules,
+                'option' => []
+            ]);
+    }
+
+    public function store(Request $request)
+    {
+        $data = [
+            'kode' => $request->kode,
+            'nama' => $request->nama
+        ];
+        // $this->validate($data, KodeKegiatan::$rules);
+
+        $nama = $request->nama;
+
+        $kelas = KodeKegiatan::create($data);
+
+        return response()
+            ->json([
+                'saved' => true,
+                'message' => $this->message . ' ' . $nama . ' berhasil ditambah',
+                'id' => $kelas->id
+            ]);
+    }
+
+    public function edit($id)
+    {
+        $kelas = KodeKegiatan::findOrFail($id);
+
+        return response()
+            ->json([
+                'form' => $kelas,
+                'option' => []
+            ]);
+    }
+
+    public function update(Request $request, $id)
+    {
+        $data = [
+            'kode' => $request->kode,
+            'nama' => $request->nama
+        ];
+
+        $nama = $request->nama;
+        $kelas = KodeKegiatan::findOrFail($id);
+
+
+        $kelas->update($data);
+        return response()
+            ->json([
+                'saved' => true,
+                'message' => $this->message . ' ' . $nama . ' berhasil diubah'
+            ]);
+    }
+
+    public function destroy($id)
+    {
+        $kelas = KodeKegiatan::findOrFail($id);
+        $nama = $kelas->nama;
+        $kelas->delete();
+
+        return response()
+            ->json([
+                'deleted' => true,
+                'message' =>  $this->message . ' ' . $nama . ' berhasil dihapus'
+            ]);
+    }
+}

app/Http/Controllers/SertifikatController.php

@@ -14,6 +14,7 @@
 use Barryvdh\DomPDF\Facade as PDF;
 use DateTime;
 use App\KegiatanListMateri;
+use App\KegiatanMateriNilai;
 use App\Aktivis;
 
 
@@ -135,11 +136,18 @@ public function generateSertifikat(Request $formData)
         $nomorData = SertifikatGenerate::where('id_aktivis', $formData->aktivis_id)->where('id_kegiatan', $formData->kegiatan_id)->first();
         $sertifikat = Sertifikat::where('id', $kegiatanData->id_sertifikat)->select('gambar_depan', 'gambar_belakang', 'kode_sertifikat')->first();
 
-        $listMateri = KegiatanListMateri::select("kegiatan_list_materi.waktu", "kegiatan_list_materi.nama", "kegiatan_materi_nilai.nilai")
+        $cekNilai = KegiatanMateriNilai::where('kegiatan_id', $formData->kegiatan_id)->first();
+
+        if($cekNilai){
+            $listMateri = KegiatanListMateri::select("kegiatan_list_materi.waktu", "kegiatan_list_materi.nama", "kegiatan_materi_nilai.nilai")
             ->join("kegiatan_materi_nilai", "kegiatan_materi_nilai.materi_id", "=", "kegiatan_list_materi.id")
             ->where('kegiatan_materi_nilai.kegiatan_id', $formData->kegiatan_id)
             ->where('kegiatan_materi_nilai.aktivis_id', $formData->aktivis_id)
             ->get();
+        }else{
+            $listMateri = KegiatanListMateri::select("kegiatan_list_materi.waktu", "kegiatan_list_materi.nama")->where('kegiatan_id', $formData->kegiatan_id)
+            ->get();
+        }
 
         $sumWaktu = KegiatanListMateri::where('kegiatan_id', $formData->kegiatan_id)->sum('waktu');
         $sumNilai = KegiatanListMateri::join("kegiatan_materi_nilai", "kegiatan_materi_nilai.materi_id", "=", "kegiatan_list_materi.id")

app/Kegiatan.php

@@ -17,7 +17,7 @@ class Kegiatan extends Model {
     protected $dates = ['deleted_at'];
 
     public static $rules = [
-        'name' => 'required'
+        // 'name' => 'required'
     ];
 
     public function sluggable()
@@ -31,11 +31,11 @@ public function sluggable()
     }
 
     protected $fillable = [
-      'id_regencies','id_districts','id_regencies','id_provinces','id_tempat','id_sertifikat','kode_diklat','name','periode','durasi','mulai','selesai','jadwal','keterangan','keteranganBatal','status','tipe','peserta_max','peserta_max_cu','peserta_min','created_at','updated_at','deleted_at','gambar','tipe_tempat','keputusan_cu','keputusan_user','pertanyaan_cu','pertanyaan_user'
+      'id_regencies','id_districts','id_regencies','id_provinces','id_tempat','id_sertifikat','id_kode','kode_diklat','name','periode','durasi','mulai','selesai','jadwal','keterangan','keteranganBatal','status','tipe','peserta_max','peserta_max_cu','peserta_min','created_at','updated_at','deleted_at','gambar','tipe_tempat','keputusan_cu','keputusan_user','pertanyaan_cu','pertanyaan_user'
     ];
 
     protected $allowedFilters = [
-        'id','id_tempat','kode_diklat','name','periode','durasi','mulai','selesai','status','peserta_max','peserta_max_cu','peserta_min','created_at','updated_at','deleted_at','tipe_tempat',
+        'id','id_tempat','id_kode','kode_diklat','name','periode','durasi','mulai','selesai','status','peserta_max','peserta_max_cu','peserta_min','created_at','updated_at','deleted_at','tipe_tempat',
 
         'villages.name', 'districts.name', 'regencies.name', 'provinces.name','tempat.name'
     ];
@@ -111,4 +111,9 @@ public function hasKeputusan(){
     public function hasMateri(){
         return $this->hasMany('App\KegiatanMateri','kegiatan_id','id');
     }
+
+    public function kode()
+    {
+        return $this->belongsTo('App\KodeKegiatan', 'id_kode', 'id')->select('id', 'kode');
+    }
 }

app/KegiatanMateriNilai.php

@@ -0,0 +1,23 @@
+<?php
+namespace App;
+
+use illuminate\Database\Eloquent\Model;
+use Spatie\Activitylog\Traits\LogsActivity;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class KegiatanMateriNilai extends Model {
+
+    use LogsActivity, SoftDeletes;
+
+    protected $table = 'kegiatan_materi_nilai';
+    protected $dates = ['deleted_at'];
+    protected static $logFillable = true;
+    protected static $logOnlyDirty = true;
+
+    public static $rules = [
+        'name' => 'required'
+    ];
+
+    protected $fillable = ['aktivis_id','kegiatan_id','materi_id','nilai'];
+
+}

app/KodeKegiatan.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use App\Support\Dataviewer;
+use Spatie\Activitylog\Traits\LogsActivity;
+
+class KodeKegiatan extends Model
+{
+    use Dataviewer, LogsActivity;
+    protected $table = 'kegiatan_kode';
+    protected static $logFillable = true;
+
+    protected $fillable = [
+        'kode', 'name', 'created_at', 'updated_at'
+    ];
+
+    protected $allowedFilters = [
+        'id', 'kode', 'name'
+    ];
+
+    protected $orderable = [
+        'id', 'kode', 'name'
+    ];
+
+    public static function initialize()
+    {
+        return [
+            'kode' => '', 'name' => ''
+        ];
+    }
+
+    public static $rules = [
+        'kode' => 'required',
+        'name' => 'required'
+    ];
+
+}

app/Support/NotificationHelper.php

@@ -176,10 +176,10 @@ public static function self_assesment($request, $message)
 	public static function monitoring($request, $message)
 	{
 		if(Auth::user()->id_cu == 0){
-			$users = User::permission(['index_assesment_access'])->where('id_cu', $request->id_cu)->where('status',1)->where('login', '>=', \Carbon\Carbon::now()->subMonth(3))->get();	
+			$users = User::permission(['index_monitoring'])->where('id_cu', $request->id_cu)->where('status',1)->where('login', '>=', \Carbon\Carbon::now()->subMonth(3))->get();	
 			$cu_name = ' (PUSKOPCUINA) ';
 		}else{
-			$users = User::permission(['index_assesment_access'])->where('id_cu', 0)->where('status',1)->get();
+			$users = User::permission(['index_monitoring'])->where('id_cu', 0)->where('status',1)->get();
 			$cu = Cu::where('id', Auth::user()->id_cu)->select('id', 'name')->first();
 			$cu_name = ' (CU ' .$cu->name. ') ';	
 		}
@@ -195,10 +195,10 @@ public static function monitoring($request, $message)
 	public static function monitoring_pencapaian($request, $message)
 	{
 		if(Auth::user()->id_cu == 0){
-			$users = User::permission(['index_assesment_access'])->where('id_cu', $request->id_cu)->where('status',1)->where('login', '>=', \Carbon\Carbon::now()->subMonth(3))->get();	
+			$users = User::permission(['index_monitoring'])->where('id_cu', $request->id_cu)->where('status',1)->where('login', '>=', \Carbon\Carbon::now()->subMonth(3))->get();	
 			$cu_name = ' (PUSKOPCUINA) ';
 		}else{
-			$users = User::permission(['index_assesment_access'])->where('id_cu', 0)->where('status',1)->get();
+			$users = User::permission(['index_monitoring'])->where('id_cu', 0)->where('status',1)->get();
 			$cu = Cu::where('id', Auth::user()->id_cu)->select('id', 'name')->first();
 			$cu_name = ' (CU ' .$cu->name. ') ';	
 		}