fix kelulusan

This commit is contained in:
hafifierahman
2021-01-17 08:46:07 +08:00
parent 28f00f7f39
commit 79aa543e69
4 changed files with 61 additions and 17 deletions
+44 -14
View File
@@ -21,23 +21,28 @@ class KelulusanController extends Controller
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('masalulus','=','')
->where('pelulus','!=','operasi')
->get();
return response()->json($kelulusan);
}
public function listdahlulus($kodcaw,$norujukan)
public function listdahlulus($kodcaw,$norujukan,Request $request)
{
$harini = Carbon::now();
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->where('masalulus','<>','')
->get();
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->where('masalulus','<>','')
->get();
return response()->json($kelulusan);
}
@@ -63,16 +68,39 @@ class KelulusanController extends Controller
$harini = new Carbon;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$pengesahan = $request->pengesahan;
if($pengesahan == 'khazanah')
{
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'masalulus'=> $harini->toTimeString(),
'khazanah'=> 'khazanah'
));
}
else
{
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'pelulus' => 'operasi'
));
}
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'masalulus'=> $harini->toTimeString()
));
if($request->sahkan === 1)
{
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('norujukan','=',$norujukan)
->update(array(
'pelulus' => 'dahlulus',
'masalulus'=> $harini->toTimeString()
));
}
return response()->json($kelulusan,201);
}
@@ -116,6 +144,7 @@ class KelulusanController extends Controller
'jumpinj' => $request->jumpinjam,
'jenistebus' => $request->jenistebus,
'teller' => $request->teller,
'pelulus' => 'minta',
'peloperasi' => $request->peloperasi
]);
@@ -209,6 +238,7 @@ class KelulusanController extends Controller
$kelulusan=Mohon::on($cawangan['mysql'])
->where('tarikh','=',$harini->toDateString())
->where('masalulus','=','')
->where('pelulus','=','operasi')
->get();
if(sizeof($kelulusan) != 0){