finishing up hold/resume

README.md

@@ -1,4 +1,34 @@
+Installing the Add-in
+=====================
+Prerequisites
+-------------
+* CIC 2016r1 or later
+
+Deploy Add-in
+-------------
+See http://help.inin.com/developer/cic/docs/connectaddin/tutorial-03-deployment.html for the latest deployment instructions.  
+
+Copy the src/jabra folder into your /client/addins directory and in the addins.json file, set the baseUrl to jabra.
+
+
+Developing Locally
+==================
+Configuring Interaction Connect Proxy
+-------------------------------------
+So that everything can be run locally without actually setting up the Interaction Connect app on the dev machine, a reverse proxy will serve up a remote client and the local addin.
+
+edit development_config.json and change the value of the connectUrl to point to an installed instance of Interaction Connect.
+
+Running the Server Locally
+--------------------------
+Execute
+
+    npm start
+
+to start the server.  Then open a web browser and go to http://localhost:8888
+
 Unit Testing
+------------
 to run Karma execute
 
     karma start

src/jabra/addin.html

@@ -45,22 +45,22 @@
     <div class='clearfix form-inline'>
       <div class='form-group'>
         <label >Active Device:</label> <div>{{activeDevice}}</div>
-        
+
     </div>
     <!--
     <div class='clearfix form-inline'>
       <div class='form-group'>
         <label >Mute State:</label>
         <label class='label label-danger'>Muted</label>
-    </div>-->
+    </div>
     </div>
     <div class='clearfix form-inline'>
       <div class='form-group'>
         <label >Hook State:</label>
         <label class='label '>On hook</label>
 
     </div>
-    </div>
+    </div>-->
   </div>
 </body>
 </html>

src/jabra/js/icwsSessionService.js

@@ -46,6 +46,7 @@ clientaddin.factory('IcwsSessionService', function ($rootScope, $log, $interval,
         timeout: 2000,
         data: connectData
     };
+
     http(requestData, function (data, status) {
                                 $log.debug("got icws session");
                                 sessionId = data.sessionId;
@@ -81,15 +82,20 @@ clientaddin.factory('IcwsSessionService', function ($rootScope, $log, $interval,
 
   return{
     post:function(url, data, onSuccess, onFailure){
-      http({
+      var options = {
         method:'POST',
         url: serverUrl + '/icws/' + sessionId + url,
         headers:{
           'ININ-ICWS-CSRF-Token' : csrfToken
         },
-        timeout:2000,
-        data: data
-      },function (data, status) {
+        timeout:2000
+      };
+
+      if(data){
+        options.data = data;
+      }
+
+      http(options,function (data, status) {
           if(onSuccess){
             onSuccess(data,status);
           }

src/jabra/js/interactionService.js

@@ -6,18 +6,41 @@ clientaddin.factory('InteractionService', function ($rootScope, $log, QueueServi
             if(alertingInteractionId != null){
                 IcwsSessionService.post('/interactions/'+ alertingInteractionId + '/pickup')
             }
+            else{
+              throw "can't find call"
+            }
         },
         disconnectConnectedCall: function(){
           $log.debug("disconnecting selected call")
           var selectedCallId = QueueService.connectedCall();
 
           if(selectedCallId == null){
-            return;
+            throw "can't find call"
           }
 
           $log.debug("Disconnecting " + selectedCallId);
 
           IcwsSessionService.post('/interactions/'+ selectedCallId + '/disconnect')
+        },
+        holdConnectedCall: function(onSuccess, onFailure){
+            var selectedCallId = QueueService.connectedCall()
+            if(selectedCallId != null){
+                IcwsSessionService.post('/interactions/'+ selectedCallId + '/hold',{on:true}, onSuccess, onFailure)
+            }else{
+              if(onFailure){
+                onFailure();
+              }
+            }
+        },
+        pickupHeldCall: function(onSuccess, onFailure){
+            var selectedCallId = QueueService.heldInteraction()
+            if(selectedCallId != null){
+                IcwsSessionService.post('/interactions/'+ selectedCallId + '/pickup', null, onSuccess, onFailure)
+            }else{
+              if(onFailure){
+                onFailure();
+              }
+            }
         }
       }
 

src/jabra/js/jabraDeviceService.js

@@ -76,17 +76,19 @@ clientaddin.factory('JabraDeviceService', function($interval, $rootScope, $log,
           }
         }
         else if (data.indexOf(deviceevent.HoldCall) == 0){
-          sendCommand(command.Hold);
+          InteractionService.holdConnectedCall(function(){
+            sendCommand(command.Hold);
+          });
         }
         else if (data.indexOf(deviceevent.ResumeCall) == 0){
-          sendCommand(command.Resume);
-          sendCommand(command.OffHook);
+          InteractionService.pickupHeldCall(function(){
+            sendCommand(command.Resume);
+          });
         }
         else if(data.indexOf(deviceevent.HoldState) ==0){
             holdState = Boolean(data.replace(deviceevent.HoldState,''));
         }
         else if(data.indexOf(deviceevent.HookState) ==0){
-
             offHookState = data.replace(deviceevent.HookState,'') == "True";
         }else if (data == 'ConfirmRequestOk' && onOkGetDeviceState){
             onOkGetDeviceState = false;

src/jabra/js/queueService.js

@@ -3,6 +3,8 @@ clientaddin.factory('QueueService', function ($rootScope, $log, InitializationSe
   interactions={};
   queue = null;
 
+  var lastConnectedInteractionCount = -1;
+
   function broadcastConnectedInteractionCount(){
 
     var interactionCount = 0;
@@ -17,8 +19,10 @@ clientaddin.factory('QueueService', function ($rootScope, $log, InitializationSe
     }
   }
 
-  $rootScope.$broadcast("ConnectedInteractionCount" , interactionCount);
-
+  if(lastConnectedInteractionCount != interactionCount){
+    $rootScope.$broadcast("ConnectedInteractionCount" , interactionCount);
+    lastConnectedInteractionCount = interactionCount;
+  }
 }
 
 function startWatches(){
@@ -54,15 +58,15 @@ queue.on("interactionChanged", function(changedInteraction) {
   return;
 }
 */
-$log.debug("The interaction with ID", changedInteraction.interactionId, "was changed.");
+  $log.debug("The interaction with ID", changedInteraction.interactionId, "was changed.");
 
-interactions[changedInteraction.interactionId] = changedInteraction;
+  interactions[changedInteraction.interactionId] = changedInteraction;
 
-broadcastConnectedInteractionCount();
+  broadcastConnectedInteractionCount();
 
-if (!$rootScope.$$phase) {
-  $rootScope.$apply();
-}
+  if (!$rootScope.$$phase) {
+    $rootScope.$apply();
+  }
 });
 queue.on("interactionRemoved", function(removedEvent) {
   $log.debug("The interaction with ID", removedEvent.interactionId, "was removed.");
@@ -115,6 +119,18 @@ return{
   }
   return null;
 },
+heldInteraction: function(){
+  for(var id in interactions){
+    var interaction = interactions[id];
+
+    if(interaction.getAttribute(ININ.Addins.IC.Interactions.attributeNames.state) === ININ.Addins.IC.Interactions.stateAttributeValues.held)
+  {
+    return id;
+  }
+
+}
+return null;
+},
 connectedCall: function(){
   for(var id in interactions){
     var interaction = interactions[id];

test/interactionService.spec.js

@@ -38,13 +38,6 @@ describe('InteractionService', function() {
     });
 
     describe("when calling disconnect selected call", function(){
-        it('should do nothing if selected interaction id == null', function(){
-            spyOn(IcwsSessionServiceMock, 'post').and.callThrough();
-
-            InteractionService.disconnectConnectedCall();
-            expect(IcwsSessionServiceMock.post).not.toHaveBeenCalled();
-
-        })
 
         it('should call the icws disconnect on the selected call', function(){
             spyOn(QueueServiceMock,'connectedCall').and.returnValue('1234')
@@ -57,15 +50,6 @@ describe('InteractionService', function() {
     });
 
     describe("when calling answer alerting call", function(){
-        it('should do nothing there are no alerting calls', function(){
-            spyOn(QueueServiceMock, 'alertingInteraction').and.returnValue(null);
-            spyOn(IcwsSessionServiceMock, 'post').and.callThrough();
-
-            InteractionService.answerAlertingCall();
-            expect(IcwsSessionServiceMock.post).not.toHaveBeenCalled();
-
-        })
-
         it('should call the icws pickup on the alerting call', function(){
             spyOn(QueueServiceMock, 'alertingInteraction').and.returnValue(1234);
             spyOn(IcwsSessionServiceMock, 'post').and.callThrough();