b8733271 by G Manojkumar

Not to Play incoming ring when user is in call

1 parent fa1c5d0f
...@@ -426,7 +426,12 @@ function incomingPopupAlert(var1,var2,var3) ...@@ -426,7 +426,12 @@ function incomingPopupAlert(var1,var2,var3)
426 { 426 {
427 //var incomingnotify=growlSNotify(var1,var2,"top-right"); 427 //var incomingnotify=growlSNotify(var1,var2,"top-right");
428 //setTimeout(function(){$.gritter.remove(incomingnotify, {fade: true,speed: 'slow'});incomingnotify=0;},1500); 428 //setTimeout(function(){$.gritter.remove(incomingnotify, {fade: true,speed: 'slow'});incomingnotify=0;},1500);
429 if($('#userLoginRole').val()=="Supervisor")startRingTone(); 429 if((kstychCall['ts_Talk']===0 && kstychCall['ts_Call']===0)){
430 if($('#userLoginRole').val()=="Unit_Head")startRingTone();
431 //console.log($('#userLoginRole').val());
432 }
433 //console.log(kstychCall['ts_Talk']);
434 //console.log(kstychCall['ts_Call']);
430 //console.log($('#userLoginRole').val()); 435 //console.log($('#userLoginRole').val());
431 $.titleAlert(var1+" "+var2, { 436 $.titleAlert(var1+" "+var2, {
432 requireBlur:true, 437 requireBlur:true,
......
...@@ -242,6 +242,7 @@ foreach($tmodules as $mname=>$marr) ...@@ -242,6 +242,7 @@ foreach($tmodules as $mname=>$marr)
242 <?php } ?> 242 <?php } ?>
243 <div><a href="#" class="btn btn-primary" onclick="menuAction('message');return false;"><i class="fa fa-list"></i> <span>View all messages <?php if($messagescount>0)echo "($messagescount)"; ?></span></a></div> 243 <div><a href="#" class="btn btn-primary" onclick="menuAction('message');return false;"><i class="fa fa-list"></i> <span>View all messages <?php if($messagescount>0)echo "($messagescount)"; ?></span></a></div>
244 </ul> 244 </ul>
245 <input type="hidden" id="userLoginRole" value="{{Auth::user()->usertype}}">
245 </li> 246 </li>
246 <li class="dropdown notif" style='height:35px'> 247 <li class="dropdown notif" style='height:35px'>
247 <a href="#" class="dropdown-toggle" data-toggle="dropdown" style='height:35px' onclick='$("#topmenunotifucount").html("");'><i class="notif-block fa fa-bell"></i><span class="badge badge-info" id=topmenunotifucount><?php if(isset($meta['ncnt'])&&$meta['ncnt']>0)echo $meta['ncnt']; ?></span></a> 248 <a href="#" class="dropdown-toggle" data-toggle="dropdown" style='height:35px' onclick='$("#topmenunotifucount").html("");'><i class="notif-block fa fa-bell"></i><span class="badge badge-info" id=topmenunotifucount><?php if(isset($meta['ncnt'])&&$meta['ncnt']>0)echo $meta['ncnt']; ?></span></a>
......
...@@ -142,7 +142,6 @@ $user=Auth::user(); ...@@ -142,7 +142,6 @@ $user=Auth::user();
142 } 142 }
143 </style> 143 </style>
144 144
145 <input type="hidden" id="userLoginRole" value="{{Auth::user()->usertype}}">
146 <div class="layout-app"><!-- row-app --> 145 <div class="layout-app"><!-- row-app -->
147 <div class="row row-app"> 146 <div class="row row-app">
148 147
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!