Fix revisi Proposal (Monev)

app/Http/Controllers/Mahasiswa/MonevController.php

@@ -36,7 +36,7 @@ class MonevController extends Controller
         // $jadwal = now();
 
         $title    = 'Monev Internal '.$id;
-        $proposal = MonevInternal::with(['rProposal', 'rJenisMonev', 'rNilaiMonevAll'])
+        $proposal = MonevInternal::with(['rProposal', 'rProposal.rPeriode', 'rJenisMonev', 'rNilaiMonevAll'])
                     ->whereHas('rProposal', function ($query) use($nim){
                         $query->whereHas('rKelompok', function ($query) use($nim){
                             $query->whereHas('rAnggota', function ($query) use($nim){
@@ -51,7 +51,7 @@ class MonevController extends Controller
                     ->orderBy('created_at')
                     ->get();
 
-            //    dd($proposal);
+                    // dd($proposal);
         $data = [
             'proposal'  => $proposal,
             'title'     => $title,
@@ -144,9 +144,7 @@ class MonevController extends Controller
         $proposal = MonevInternal::with(['rProposal'])->find($pro['monev_id']);
 
         if ($pro['type'] !== 'produk') {
-        $file_nama  = $proposal->rProposal->rPeriode->nama.'_'.$proposal->rProposal->proposal_id.'.'.$pro['file']->getClientOriginalExtension();
-
-        Storage::disk('static')->put('simpmw/monev/'.$pro['monev'].'/'.$pro['type'].'/'.$file_nama, file_get_contents($pro['file']->getRealPath()));
+        $file_nama  = $proposal->rProposal->rPeriode->nama.'_'.$proposal->rProposal->proposal_id.'_'.now()->format('Y-m-d_H:i:s').'.'.$pro['file']->getClientOriginalExtension();
 
             if($pro['type'] == 'logbook'){
                 $proposal->logbook_file   = $file_nama;
@@ -159,6 +157,9 @@ class MonevController extends Controller
                 $proposal->akhir_date     = now();
             }elseif($pro['type'] == 'proposal'){
                 $proposal->upload_dokumen = $file_nama;
+                $proposal->rProposal->upload_dokumen = $file_nama;
+                $proposal->rProposal->updated_at = now();
+                $proposal->rProposal->save();
                 $proposal->date_upload    = now();
             }
         } else {
@@ -166,6 +167,11 @@ class MonevController extends Controller
             $proposal->produk_date    = now();
         }
 
+        if ($pro['type'] == 'proposal') {
+            Storage::disk('static')->put('simpmw/proposal/'.$proposal->rProposal->rPeriode->nama.'/'.$file_nama, file_get_contents($pro['file']->getRealPath()));
+        } else {
+            Storage::disk('static')->put('simpmw/monev/'.$pro['monev'].'/'.$pro['type'].'/'.$file_nama, file_get_contents($pro['file']->getRealPath()));
+        }
         $proposal->save();
 
         return redirect()->route('mahasiswa.monev-index', $pro['monev'])->with('success', 'Proposal Berhasil revisi');
@@ -282,11 +288,12 @@ class MonevController extends Controller
 
             $original_file = $key['nota_file']->getClientOriginalName();
             $file_nama  = $anggaran->rProposal->rPeriode->nama . '_Bukti-Anggaran_' . $anggaran->rProposal->proposal_id . '_' . pathinfo($original_file, PATHINFO_FILENAME) . '.' . $key['nota_file']->getClientOriginalExtension();
-            // dd($key);
 
             Storage::disk('static')->put('simpmw/monev/II/bukti-anggaran/' . $file_nama, file_get_contents($key['nota_file']->getRealPath()));
 
-            BuktiAnggaran::create([
+            BuktiAnggaran::updateOrCreate([
+                'id' => $key['id'],
+            ],[
                 'proposal_id' => $key['proposal_id'],
                 'monev_id' => $key['monev_id'],
                 'nama_kegiatan' => $key['nama_kegiatan'],