KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix kelulusan

Browse Source
This commit is contained in:
fifi97
2021-07-14 10:19:16 +08:00
parent 3e88adc198
commit c8c93c38ad
6 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/NotifikasiKelulusan.php
+3 -2
View File
@@ -11,14 +11,15 @@ class NotifikasiKelulusan implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $norujukan,$kelulusan,$siri,$komen;
public $norujukan,$kelulusan,$siri,$komen,$teller;
public function __construct($norujukan,$kelulusan,$siri,$komen)
public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
{
$this->norujukan = $norujukan;
$this->kelulusan = $kelulusan;
$this->siri = $siri;
$this->komen = $komen;
$this->teller = $teller;
}
public function broadcastOn()
app/Http/Controllers/KhazanahController.php
+12 -4
View File
@@ -596,6 +596,7 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah",
"namakhazanah" => $request->namakhazanah,
'siri' => $request->siri
])->json();
@@ -603,19 +604,22 @@ class KhazanahController extends Controller
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller']));
}
}else{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "khazanah",
'siri' => $request->siri,
"namakhazanah" => $request->namakhazanah,
"pembatalan" => "batal"
])->json();
$getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
}
}
@@ -632,6 +636,7 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri,
'namaoperasi' => $request->namaoperasi
])->json();
}else{
@@ -639,10 +644,13 @@ class KhazanahController extends Controller
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
"pengesahan" => "operasi",
'siri' => $request->siri,
"pembatalan" => "batal"
"pembatalan" => "batal",
'namaoperasi' => $request->namaoperasi
])->json();
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
$getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
}
app/Http/Controllers/OperasiController.php
+8 -2
View File
@@ -88,24 +88,30 @@ class OperasiController extends Controller
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 1,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
$getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller']));
}
}
else
{
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[
'sahkan' => 2,
'namaoperasi' => $request->namaoperasi,
'siri' => $request->siri
])->json();
$getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
if($updatelulus)
{
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller']));
}
}
resources/views/gadaian/index.blade.php
+2 -5
View File
@@ -851,9 +851,8 @@
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
@@ -969,9 +968,7 @@
channel.bind('my-kelulusan', function(data) {
// let message = JSON.stringify(data);
// console.log(message);
if(data.norujukan == norujukan && data.siri == siricreated)
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
resources/views/khazanah/kelulusan.blade.php
+8 -3
View File
@@ -264,7 +264,7 @@
async function updatelulus(e)
{
let api = "{{ config('api.url') }}";
let kodcaw = " {{ Auth::user()->cawangan }}";
let kodcaw = "{{ Auth::user()->cawangan }}";
const { value: katalaluan } = await Swal.fire({
title: 'Masukkan Katalaluan Semula',
@@ -320,6 +320,7 @@
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
let siri = $(e).data('siri');
let namakhazanah = "{{ Auth::user()->name }}";
$.ajax({
method:'put',
@@ -329,7 +330,8 @@
"norujukan" : norujukan,
"pelulus" : pelulus,
"siri" : siri,
'komen' : komen
'komen' : komen,
'namakhazanah' : namakhazanah
},
success:function(data){
Swal.fire({
@@ -397,6 +399,7 @@
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
let siri = $(e).data('siri');
let namakhazanah = "{{ Auth::user()->name }}";
$.ajax({
method:'put',
@@ -407,7 +410,9 @@
"pelulus" : pelulus,
"siri" : siri,
"komenkelulusan" : komenkelulusan,
"pembatalan" : "batal"
"pembatalan" : "batal",
'namakhazanah' : namakhazanah
},
success:function(data){
Swal.fire({
resources/views/operasi/kelulusan.blade.php
+6 -2
View File
@@ -313,6 +313,7 @@
let norujukan = $(e).data('norujukan');
let cawangankod = $(e).data('kodcaw');
let siri = $(e).data('siri');
let namaoperasi = "{{ Auth::user()->name }}";
$.ajax({
method:'put',
@@ -322,7 +323,8 @@
"norujukan" : norujukan,
"kodcaw" : cawangankod,
"komenkelulusan" : komenkelulusan,
"siri" : siri
"siri" : siri,
'namaoperasi' : namaoperasi
},
success:function(data){
console.log(data);
@@ -391,6 +393,7 @@
let norujukan = $(e).data('norujukan');
let siri = $(e).data('siri');
let cawangankod = $(e).data('kodcaw');
let namaoperasi = "{{ Auth::user()->name }}";
$.ajax({
method:'put',
@@ -401,7 +404,8 @@
"siri" : siri,
"kodcaw" : cawangankod,
"komenkelulusan" : komenkelulusan,
"pembatalan" : "batal"
"pembatalan" : "batal",
'namaoperasi' : namaoperasi
},
success:function(data){
Swal.fire({