stop dual load on calling
Showing
2 changed files
with
31 additions
and
6 deletions
This diff could not be displayed because it is too large.
| ... | @@ -634,9 +634,17 @@ function incomingPopupAlert(var1,var2,var3) | ... | @@ -634,9 +634,17 @@ function incomingPopupAlert(var1,var2,var3) |
| 634 | kDesktopNotification("",var1,var2,1500); | 634 | kDesktopNotification("",var1,var2,1500); |
| 635 | } | 635 | } |
| 636 | 636 | ||
| 637 | function outgoingCall() | 637 | function outgoingCall(redial='') |
| 638 | { | 638 | { |
| 639 | var dialersearchresults=''; | ||
| 640 | if (redial!="redial") { | ||
| 641 | var dialersearchresults='dialersearchresults'; | ||
| 639 | $("#dialersearchresults").html(""); | 642 | $("#dialersearchresults").html(""); |
| 643 | }else{ | ||
| 644 | |||
| 645 | var displaydata=$("#dialersearchresults").html(); | ||
| 646 | |||
| 647 | } | ||
| 640 | kSetDData('C','callnumber',$("#manualdialnumber_txt").val()); | 648 | kSetDData('C','callnumber',$("#manualdialnumber_txt").val()); |
| 641 | 649 | ||
| 642 | var datastr="kstychCall="+JSON.stringify(kstychCall); | 650 | var datastr="kstychCall="+JSON.stringify(kstychCall); |
| ... | @@ -648,7 +656,10 @@ function outgoingCall() | ... | @@ -648,7 +656,10 @@ function outgoingCall() |
| 648 | { | 656 | { |
| 649 | if(kstychCall['callnumber']!="") | 657 | if(kstychCall['callnumber']!="") |
| 650 | { | 658 | { |
| 651 | doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){ | 659 | doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){ |
| 660 | if (redial=="redial"){ | ||
| 661 | $("#dialersearchresults").html(displaydata); | ||
| 662 | } | ||
| 652 | if(kstychCall['crmid']!="") | 663 | if(kstychCall['crmid']!="") |
| 653 | { | 664 | { |
| 654 | kSetDData('C','mCallState','Call'); | 665 | kSetDData('C','mCallState','Call'); |
| ... | @@ -675,7 +686,10 @@ function outgoingCall() | ... | @@ -675,7 +686,10 @@ function outgoingCall() |
| 675 | 686 | ||
| 676 | if(kstychDialer['mDialerState']=="DialNext") | 687 | if(kstychDialer['mDialerState']=="DialNext") |
| 677 | { | 688 | { |
| 678 | doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){ | 689 | doAjax('dialer?action=newcall&client='+client,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){ |
| 690 | if (redial=="redial"){ | ||
| 691 | $("#dialersearchresults").html(displaydata); | ||
| 692 | } | ||
| 679 | if(kstychCall['crmid']!="") | 693 | if(kstychCall['crmid']!="") |
| 680 | { | 694 | { |
| 681 | kSetDData('C','mCallState','Call'); | 695 | kSetDData('C','mCallState','Call'); |
| ... | @@ -695,7 +709,10 @@ function outgoingCall() | ... | @@ -695,7 +709,10 @@ function outgoingCall() |
| 695 | 709 | ||
| 696 | if(kstychDialer['mDialerState']=="Progressive") | 710 | if(kstychDialer['mDialerState']=="Progressive") |
| 697 | { | 711 | { |
| 698 | doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){ | 712 | doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){ |
| 713 | if (redial=="redial"){ | ||
| 714 | $("#dialersearchresults").html(displaydata); | ||
| 715 | } | ||
| 699 | if(kstychCall['crmid']!="") | 716 | if(kstychCall['crmid']!="") |
| 700 | { | 717 | { |
| 701 | kSetDData('C','mCallState','Call'); | 718 | kSetDData('C','mCallState','Call'); |
| ... | @@ -965,7 +982,7 @@ function resetDialer() | ... | @@ -965,7 +982,7 @@ function resetDialer() |
| 965 | kSetDData('C','ts_Dispo',0); | 982 | kSetDData('C','ts_Dispo',0); |
| 966 | kSetDData('C','ts_Close',0); | 983 | kSetDData('C','ts_Close',0); |
| 967 | 984 | ||
| 968 | updateDialerState("action","dialnext"); | 985 | updateDialerState("action","dialnext","redial"); |
| 969 | 986 | ||
| 970 | return; | 987 | return; |
| 971 | } | 988 | } |
| ... | @@ -1124,9 +1141,17 @@ function updateDialerState(objstr,key,val,key2,val2) | ... | @@ -1124,9 +1141,17 @@ function updateDialerState(objstr,key,val,key2,val2) |
| 1124 | if(objstr=="action") | 1141 | if(objstr=="action") |
| 1125 | { | 1142 | { |
| 1126 | 1143 | ||
| 1127 | if(key=="dialnext") | 1144 | if(key=="dialnext" && val== "redial") |
| 1128 | { | 1145 | { |
| 1146 | alert(val+"1"); | ||
| 1147 | outgoingCall(val); | ||
| 1148 | |||
| 1149 | } | ||
| 1150 | if(key=="dialnext" && val== ""){ | ||
| 1151 | |||
| 1152 | alert(val+"2"); | ||
| 1129 | outgoingCall(); | 1153 | outgoingCall(); |
| 1154 | |||
| 1130 | } | 1155 | } |
| 1131 | if(key=="hangupall") | 1156 | if(key=="hangupall") |
| 1132 | { | 1157 | { | ... | ... |
-
Please register or sign in to post a comment