added fixed khazanah boleh lulus terus
This commit is contained in:
@@ -11,15 +11,16 @@ class NotifikasiKelulusan implements ShouldBroadcast
|
|||||||
{
|
{
|
||||||
use Dispatchable, InteractsWithSockets, SerializesModels;
|
use Dispatchable, InteractsWithSockets, SerializesModels;
|
||||||
|
|
||||||
public $norujukan,$kelulusan,$siri,$komen,$teller;
|
public $norujukan,$kelulusan,$siri,$komen,$teller,$tagoperasi;
|
||||||
|
|
||||||
public function __construct($norujukan,$kelulusan,$siri,$komen,$teller)
|
public function __construct($norujukan,$kelulusan,$siri,$komen,$teller,$tagoperasi = null)
|
||||||
{
|
{
|
||||||
$this->norujukan = $norujukan;
|
$this->norujukan = $norujukan;
|
||||||
$this->kelulusan = $kelulusan;
|
$this->kelulusan = $kelulusan;
|
||||||
$this->siri = $siri;
|
$this->siri = $siri;
|
||||||
$this->komen = $komen;
|
$this->komen = $komen;
|
||||||
$this->teller = $teller;
|
$this->teller = $teller;
|
||||||
|
$this->tagoperasi = $tagoperasi;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function broadcastOn()
|
public function broadcastOn()
|
||||||
|
|||||||
@@ -608,7 +608,7 @@ class KhazanahController extends Controller
|
|||||||
if($updatelulus)
|
if($updatelulus)
|
||||||
{
|
{
|
||||||
if(isset($request->tagoperasi) && $request->tagoperasi == 1){
|
if(isset($request->tagoperasi) && $request->tagoperasi == 1){
|
||||||
event(new NotifikasiKelulusan($norujukan,"lulus",$request->recno,$request->komenubahhapus,$request->teller));
|
event(new NotifikasiKelulusan($norujukan,"lulus",$request->recno,$request->komenubahhapus,$request->teller,1));
|
||||||
}else{
|
}else{
|
||||||
event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
|
event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$request->teller));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2925,7 +2925,7 @@
|
|||||||
var channel = pusher.subscribe('notice-kelulusan');
|
var channel = pusher.subscribe('notice-kelulusan');
|
||||||
channel.bind('my-kelulusan', function(data) {
|
channel.bind('my-kelulusan', function(data) {
|
||||||
console.log(data,siricreated,teller,norujukan);
|
console.log(data,siricreated,teller,norujukan);
|
||||||
if(data.norujukan == norujukan && data.siri == recno && data.teller == teller)
|
if(data.norujukan == norujukan && data.siri == recno && data.teller == teller && data.tagoperasi == null)
|
||||||
{
|
{
|
||||||
if(data.kelulusan == 'lulus')
|
if(data.kelulusan == 'lulus')
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user