Merge branch 'ghub_rvd_master' into ghub_rvdras_master

Conflicts: restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js restcomm/restcomm.rvd/src/main/webapp/js/app/services.js restcomm/restcomm.rvd/src/main/webapp/templates/directive/variableLookup.html
RestComm · Nov 3, 2014 · 27a6413 · 27a6413
2 parents e709b82 + 49d1e84
commit 27a6413
Show file tree

Hide file tree

Showing 17 changed files with 87 additions and 62 deletions.
diff --git a/...rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/ClientDialNoun.java b/...rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/ClientDialNoun.java
@@ -17,7 +17,7 @@ public void setDestination(String destination) {
     @Override
     public RcmlNoun render(Interpreter interpreter) throws InterpreterException {
         RcmlClientNoun rcmlNoun = new RcmlClientNoun();
-        rcmlNoun.setDestination(getDestination());
+        rcmlNoun.setDestination( interpreter.populateVariables(getDestination()) );
         return rcmlNoun;
     }
 }
diff --git a/...src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/ConferenceDialNoun.java b/...src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/ConferenceDialNoun.java
@@ -96,7 +96,7 @@ public RcmlNoun render(Interpreter interpreter) throws InterpreterException {
         rcmlNoun.setStartConferenceOnEnter(getStartConferenceOnEnter());
         rcmlNoun.setMaxParticipants(getMaxParticipants());
         rcmlNoun.setWaitMethod(getWaitMethod());
-        rcmlNoun.setDestination(getDestination());
+        rcmlNoun.setDestination( interpreter.populateVariables(getDestination() ));
 
         return rcmlNoun;
     }

diff --git a/...rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/NumberDialNoun.java b/...rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/NumberDialNoun.java
@@ -41,7 +41,7 @@ public RcmlNoun render(Interpreter interpreter) throws InterpreterException {
         }
 
         rcmlNoun.setSendDigits( getSendDigits() );
-        rcmlNoun.setDestination(getDestination());
+        rcmlNoun.setDestination( interpreter.populateVariables( getDestination() ));
 
         return rcmlNoun;
     }

diff --git a/...rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/SipuriDialNoun.java b/...rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/dial/SipuriDialNoun.java
@@ -17,7 +17,7 @@ public void setDestination(String destination) {
     @Override
     public RcmlNoun render(Interpreter interpreter) throws InterpreterException {
         RcmlSipuriNoun rcmlNoun = new RcmlSipuriNoun();
-        rcmlNoun.setDestination(getDestination());
+        rcmlNoun.setDestination( interpreter.populateVariables(getDestination() ));
         return rcmlNoun;
     }
 }
diff --git a/...estcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/fax/FaxStep.java b/...estcomm.rvd/src/main/java/org/mobicents/servlet/restcomm/rvd/model/steps/fax/FaxStep.java
@@ -71,8 +71,8 @@ public RcmlFaxStep render(Interpreter interpreter) {
             rcmlStep.setMethod(getMethod());
         }
 
-        rcmlStep.setFrom(getFrom());
-        rcmlStep.setTo(getTo());
+        rcmlStep.setFrom(interpreter.populateVariables(getFrom()));
+        rcmlStep.setTo(interpreter.populateVariables(getTo()));
         rcmlStep.setStatusCallback(getStatusCallback());
         rcmlStep.setText(interpreter.populateVariables(getText()));
 

diff --git a/restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js b/restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js
@@ -108,7 +108,7 @@ angular.module('Rvd').directive('lookupTarget', [function () {
 				var selStart = element[0].selectionStart;
 				var selEnd = element[0].selectionEnd;
 
-				console.log("lookupTarget received event");
+				//console.log("lookupTarget received event");
 			});
 		} 
 	}

diff --git a/restcomm/restcomm.rvd/src/main/webapp/js/app/services.js b/restcomm/restcomm.rvd/src/main/webapp/js/app/services.js
@@ -398,12 +398,12 @@ angular.module('Rvd').service('variableRegistry', [function () {
 	}
 
 	service.addVariable = function (varInfo) {
-		console.log('adding variable' + varInfo.id)
+		//console.log('adding variable' + varInfo.id)
 		service.variables.push(varInfo);
 	}
 
 	service.removeVariable = function (varInfo) {
-		console.log('removing variable' + varInfo.id);
+		//console.log('removing variable' + varInfo.id);
 		service.variables.splice(service.variables.indexOf(varInfo), 1);
 	}
 

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/directive/variableLookup.html b/restcomm/restcomm.rvd/src/main/webapp/templates/directive/variableLookup.html
@@ -1,6 +1,6 @@
 <div ng-class="{'input-group-btn':view=='input-group', 'btn-group':view=='standalone', 'variable-lookup':view=='input-group' }">
   <button ng-if="view=='standalone'" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="insert RVD variable">
-	  Insert variable <span class="caret"></span>
+	  Lookup variable <span class="caret"></span>
   </button>
   <button ng-if="view=='input-group'" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="insert RVD variable">
 	  <span class="caret"></span>

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/dialStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/dialStep.html
@@ -26,11 +26,11 @@
 						</div>
 
 						<div ng-repeat='dialnoun in step.dialNouns'>
-							<div ng-switch on="dialnoun.dialType">
-								<div ng-switch-when="number">
-									<div  class="input-group input-group-sm form-group">
+								<div ng-if="dialnoun.dialType=='number'">
+									<div lookup-context class="input-group input-group-sm form-group">
 										<span class="input-group-addon rvd-handle"><i class='fa fa-phone'></i></span>
-										<input ng-model='dialnoun.destination' type='text' class='form-control' placeholder='1-444-555-6666' tooltip="Dial to number">
+										<input ng-model='dialnoun.destination' lookup-target type='text' class='form-control' placeholder='1-444-555-6666' tooltip="Dial to number">
+										<variable-lookup variable="dialnoun.destination" view="input-group"></variable-lookup>
 
 										<span ng-show='dialnoun.iface.advancedShown' class="input-group-addon" tooltip-popup-delay="1000" tooltip-trigger="mouseenter" tooltip="Send these DTMF tones after dialing the number">Send digits</span>
 										<input ng-model='dialnoun.sendDigits' auto-clear ng-show='dialnoun.iface.advancedShown'  type='text' class='form-control' placeholder='wwww1234' >
@@ -46,18 +46,19 @@
 										<span class="input-group-addon fa fa-times rvd-clickable" ng-click="removeDialNoun(step,dialnoun)"></span>
 									</div>
 								</div>
-								<div ng-switch-when="client">
-									<div  class="input-group input-group-sm form-group">
+								<div ng-if="dialnoun.dialType=='client'">								
+									<div lookup-context class="input-group input-group-sm form-group">
 										<span class="input-group-addon rvd-handle"><i class='fa fa-user'></i></span>
-										<input ng-model='dialnoun.destination' type='text' class='form-control' placeholder='thomas' tooltip="Dial to client">
+										<input ng-model='dialnoun.destination' lookup-target type='text' class='form-control' placeholder='thomas' tooltip="Dial to client">
+										<variable-lookup variable="dialnoun.destination" view="input-group"></variable-lookup>										
 										<span class="input-group-addon fa fa-times rvd-clickable" ng-click="removeDialNoun(step,dialnoun)"></span>
 									</div>
 								</div>	
-								<div ng-switch-when="conference" class='form-group conference-noun'>
-									<div  class="input-group input-group-sm">
+								<div ng-if="dialnoun.dialType=='conference'" class='form-group conference-noun'>
+									<div lookup-context class="input-group input-group-sm">
 										<span class="input-group-addon rvd-handle"><i class='fa fa-group'></i></span>
-										<input ng-model='dialnoun.destination' type='text' class='form-control' placeholder='1234' tooltip="Dial to conference">
-
+										<input ng-model='dialnoun.destination' lookup-target type='text' class='form-control' placeholder='1234' tooltip="Dial to conference">
+										<variable-lookup variable="dialnoun.destination" view="input-group"></variable-lookup>
 										<!-- 
 										<span class="input-group-addon help-tooltip" tooltip-popup-delay="1000" tooltip-trigger="mouseenter" tooltip="'">After hangup</span>
 										<select sync-model name='nextModule' ng-model='dialnoun.nextModule' ng-options='target.name as target.label for target in getAllTargets()' class="form-control">
@@ -99,21 +100,21 @@
 										<input ng-model='dialnoun.maxParticipants' auto-clear style="width:50px;" type='number' class='form-control' placeholder='3'>
 									</div>
 								</div>		
-								<div ng-switch-when="sipuri">
-									<div  class="input-group input-group-sm form-group">
+								<div ng-if="dialnoun.dialType=='sipuri'">								
+									<div lookup-context class="input-group input-group-sm form-group">
 										<span class="input-group-addon rvd-handle">sip:</span>
-										<input ng-model='dialnoun.destination' type='text' class='form-control' placeholder='sip:thomas@127.0.0.1:5080' tooltip="Dial to SIP URI">
+										<input ng-model='dialnoun.destination' lookup-target type='text' class='form-control' placeholder='sip:thomas@127.0.0.1:5080' tooltip="Dial to SIP URI">
+										<variable-lookup variable="dialnoun.destination" view="input-group"></variable-lookup>
 										<span class="input-group-addon fa fa-times rvd-clickable" ng-click="removeDialNoun(step,dialnoun)"></span>
 									</div>
 								</div>																								
-							</div>	
 						</div>	
 					</div>
 				</div>
 			</div>
 
 			<div class='row'>	
-				<div  class="col-md-12 input-group form-group">
+				<div lookup-context class="col-md-12 input-group form-group">
 					<span class="input-group-addon help-tooltip"  tooltip-trigger='mouseenter' tooltip-popup-delay='1000' tooltip='Choose the module to continue to after the end of the call. "core_DialCallStatus", "core_DialCallSid", "core_DialCallDuration" and "core_RecordingUrl" (if Recording is enabled) variables will be available.'>Continue to</span>
 					<select auto-clear ng-model='step.nextModule' sync-modules name='nextModule' ng-options='target.name as target.label for target in getAllTargets()' class="form-control"  style="min-width:140px;">
 						<option value=""></option>
@@ -127,7 +128,8 @@
 					<input ng-show='step.iface.advancedShown' ng-model='step.timeLimit' auto-clear type='number' class='form-control small-input' placeholder='14400'>
 
 					<span ng-show='step.iface.advancedShown' class="input-group-addon help-tooltip"  tooltip-popup-delay="1000" tooltip-trigger="mouseenter" tooltip="The caller ID that will appear to the called party when RestComm calls">Caller ID</span>
-					<input ng-show='step.iface.advancedShown' ng-model='step.callerId' auto-clear type='text' class='form-control'>
+					<input ng-show='step.iface.advancedShown' ng-model='step.callerId' lookup-target auto-clear type='text' class='form-control'>
+					<variable-lookup ng-show='step.iface.advancedShown' variable="step.callerId" view="input-group"></variable-lookup>
 
 					<span  class="input-group-addon fa fa-cog rvd-clickable" ng-click="step.iface.advancedShown = !step.iface.advancedShown"></span>
 				</div>

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/externalServiceStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/externalServiceStep.html
@@ -33,11 +33,12 @@
 
                         <div class='row'>
                             <div ng-repeat='urlParam in step.urlParams' class="col-md-5">
-                                <div  class="input-group input-group-sm form-group">
+                                <div lookup-context class="input-group input-group-sm form-group">
                                     <span class="input-group-addon">Name</span>
                                     <input ng-model='urlParam.name' class="form-control ng-pristine ng-valid ng-valid-pattern" type="text" required></input>
                                     <span class="input-group-addon">Value</span>
-                                    <input ng-model='urlParam.value' class="form-control ng-pristine ng-valid ng-valid-pattern" type="text" required></input>
+                                    <input ng-model='urlParam.value' lookup-target class="form-control ng-pristine ng-valid ng-valid-pattern" type="text" required></input>
+                                    <variable-lookup variable="urlParam.value" view="input-group"></variable-lookup>
                                     <span ng-click='removeUrlParam(step,urlParam)' class="input-group-addon fa fa-times rvd-clickable"></span>
                                 </div>
                             </div>
@@ -78,7 +79,7 @@ <h6><strong>Dynamic/Mapped routing</strong></h6>
 							<div class="col-md-5">
 								<div class="input-group input-group-sm form-group">
 									<span class="input-group-addon">Assign to</span>
-									<input ng-model='assignment.destVariable' type="text" class="form-control" placeholder='type variable name' required></input>
+									<input ng-model='assignment.destVariable' rvd-variable='assignment.destVariable' type="text" class="form-control" placeholder='type variable name' required></input>
 									<span class="input-group-addon">Scope</span>
 									<select ng-model='assignment.scope' class="form-control">
 										<option value='module'>module</option>

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/faxStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/faxStep.html
@@ -3,21 +3,28 @@
 			<step-heading></step-heading>	</div>
 
 	<div class="panel-body" ng-hide='step.iface.isCollapsed'>
-		<div class='row form-group'>
-			<div class='col-md-12'>
-				<span class="help-block">Fax content &nbsp;<i class="fa fa-info-circle rvd-clickable" popover='Type the fax content as text. Prepend variables with a dollar sign like "$variablename"' popover-placement='top'></i></span>
-				<textarea ng-model='step.text' class="form-control"></textarea>	
+		<div class='row'>
+			<div lookup-context class='col-md-12'>
+				<div class="form-group">
+					<span class="help-block">Fax content &nbsp;<i class="fa fa-info-circle rvd-clickable" popover='Type the fax content as text. Prepend variables with a dollar sign like "$variablename"' popover-placement='top'></i></span>
+					<textarea ng-model='step.text' lookup-target class="form-control"></textarea>	
+				</div>
+				<div class="form-group pull-right">
+					<variable-lookup variable="step.text" view="standalone"></variable-lookup>
+				</div>
 			</div>
 		</div>
 		<div class="row">
 			<div class='col-md-4'>
-				<div class="input-group form-group input-group-sm">
+				<div lookup-context class="input-group form-group input-group-sm">
 					<span class="input-group-addon">To<!-- &nbsp; <i class="fa fa-info-circle rvd-clickable" popover='The phone number of the recipient. When sending a fax during an incoming call, it defaults to the caller. When sending an fax during an outgoing call, it defaults to the called party.' popover-placement='top'></i> --></span>
-					<input type='text' name='to' auto-clear ng-model='step.to' class="form-control"></input>
+					<input ng-model='step.to' lookup-target auto-clear  type='text' name='to'  class="form-control"></input>
+					<variable-lookup variable="step.to" view="input-group"></variable-lookup>
 				</div>
-				<div class="input-group form-group input-group-sm">
+				<div lookup-context class="input-group form-group input-group-sm">
 					<span class="input-group-addon">From<!-- &nbsp; <i class="fa fa-info-circle rvd-clickable" popover='The phone number of the sender. When sending a fax during an incoming call, it defaults to the calling party. When sending a fax during an outgoing call, it defaults to the called party' popover-placement='top'></i>--></span>
-					<input type='text' name='from' auto-clear ng-model='step.from' class="form-control"></input>
+					<input ng-model='step.from' lookup-target auto-clear type='text' name='from'  class="form-control"></input>
+					<variable-lookup variable="step.from" view="input-group"></variable-lookup>
 				</div>			
 			</div>
 			<div class='col-md-8'>

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/gatherStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/gatherStep.html
@@ -37,7 +37,7 @@ <h4>Create a menu or collect digits</h4>
 								<input type="radio" ng-model="step.gatherType" value="collectdigits"> Collect digits
 								<!-- <input type="radio" ng-model="step.gatherType" value="custom"> Custom -->						
 						</div>
-						<div ng-show="step.gatherType=='menu'">
+						<div ng-if="step.gatherType=='menu'">
 							<div ng-repeat="mapping in step.menu.mappings" class='form-group row'>
 								<form name="form" novalidate>
 									<div class='col-md-4'>
@@ -68,13 +68,13 @@ <h4>Create a menu or collect digits</h4>
 								<button ng-click="addGatherMapping(step)" type="button" class="btn btn-primary btn-xs"><span>Add mapping</span></button>
 							</div>	
 						</div>
-						<div ng-show="step.gatherType=='collectdigits'">
+						<div ng-if="step.gatherType=='collectdigits'">
 							<form name="form" novalidate>
 								<div class='form-group row'>
 									<div class='col-md-12'>
 										<div class="input-group">
 											<span class="input-group-addon">Assign to</span>
-											<input name='collectVariable' class="form-control ng-pristine ng-valid ng-valid-pattern" type="text" placeholder="type the variable name" ng-pattern="/^[A-Za-z]+[A-Za-z0-9_]*$/" ng-model="step.collectdigits.collectVariable" required></input>
+											<input rvd-variable='step.collectdigits.collectVariable' ng-model="step.collectdigits.collectVariable" ng-pattern="/^[A-Za-z]+[A-Za-z0-9_]*$/" name='collectVariable' class="form-control ng-pristine ng-valid ng-valid-pattern" type="text" placeholder="type the variable name"   required></input>
 											<span class="input-group-addon">Scope</span>
 											<select ng-model='step.collectdigits.scope' class="form-control">
 												<option value='module'>module</option>

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/playStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/playStep.html
@@ -6,7 +6,7 @@
 	<div class="panel-body" ng-hide='step.iface.isCollapsed'>
 		<form name="form" novalidate>
 			<div class='form-group row'>
-				<div class="col-md-12">
+				<div lookup-context class="col-md-12">
 					<span class="help-block">Type the URL resource of the .wav file</span>
 					<div class="input-group">
 						<span class='input-group-addon'>Audio resource</span>
@@ -18,7 +18,8 @@
 							<span>remote &nbsp;</span>
 							<input ng-model='step.playType' value='remote' type="radio">
 						</span>		
-						<input name='wavUrl' ng-show='step.playType=="remote"' null-if-empty ng-model='step.remote.wavUrl' type='text' required class='form-control' placeholder='http://remoteserver/hello.wav'/>
+						<input  name='wavUrl' ng-show='step.playType=="remote"' null-if-empty ng-model='step.remote.wavUrl' lookup-target type='text' required class='form-control' placeholder='http://remoteserver/hello.wav'/>
+						<variable-lookup variable="step.remote.wavUrl" view="input-group" ng-show='step.playType=="remote"'></variable-lookup>
 						<select name='wavLocalFilename' ng-show='step.playType=="local"' ng-model='step.local.wavLocalFilename' ng-options='wavItem.filename as wavItem.filename for wavItem in wavList' class="form-control" required></select>
 					</div>
 					<div class="validation-error" ng-show="step.playType=='remote' && form.wavUrl.$invalid">Type a valid .wav resource URL</div>

diff --git a/restcomm/restcomm.rvd/src/main/webapp/templates/steps/sayStep.html b/restcomm/restcomm.rvd/src/main/webapp/templates/steps/sayStep.html
@@ -5,13 +5,16 @@
 		<div class="panel-body" ng-hide='step.iface.isCollapsed'>
 			<div class="row">
 				<div class="col-lg-12 col-md-12">
-					<div class="form-group">
-						<form name="form" novalidate>
-							<span class="help-block">Text &nbsp;<i class="fa fa-info-circle rvd-clickable" popover='Type the text that will be read to the user. Prepend variables names with a dollar sign e.g. "$variablename"' popover-placement='top'></i></span>
-							<textarea ng-model='step.phrase' name="phrase" class="form-control" required></textarea>	
-							<div ng-show="form.phrase.$invalid" class="validation-error">The phrase text is missing</div>
-						</form>
-					</div>
+					<form lookup-context name="form" novalidate>
+						<div class="form-group">
+								<span class="help-block">Text &nbsp;<i class="fa fa-info-circle rvd-clickable" popover='Type the text that will be read to the user. Prepend variables names with a dollar sign e.g. "$variablename"' popover-placement='top'></i></span>
+								<textarea ng-model='step.phrase' lookup-target name="phrase" class="form-control" required></textarea>	
+								<div ng-show="form.phrase.$invalid" class="validation-error pull-left">The phrase text is missing</div>
+						</div>
+						<div class="form-group pull-right">
+							<variable-lookup variable="step.phrase" view="standalone"></variable-lookup>
+						</div>
+					</form>
 				</div>
 			</div>