Skip to content

Commit a114dce

Browse files
committed
Merge branch 'master' of https://github.com/sipcapture/homer-ui
2 parents fbdc873 + ed45926 commit a114dce

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

js/modules/pages/controllers/dialogCtrl.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,17 @@
294294
if (msg.calldata) {
295295
console.log('Get call duration....');
296296
var dates = [];
297+
var dates1 = [];
298+
var minT200ok=0;
297299
for(var i=0; i<msg.calldata.length; i++) {
298300
dates.push(msg.calldata[i].milli_ts);
301+
if(msg.calldata[i].method=="200" && minT200ok==0){
302+
dates1.push(msg.calldata[i].milli_ts);
303+
minT200ok=msg.calldata[i].milli_ts;
304+
}
299305
}
300306
var maxT=new Date(Math.max.apply(null,dates));
301-
var minT=new Date(Math.min.apply(null,dates));
307+
var minT=new Date(Math.min.apply(null,dates1));
302308
var seconds = (maxT.getTime() - minT.getTime())/1000;
303309
//console.log('CALL SEC: '+seconds);
304310
// $scope.sess_duration = seconds.toFixed(1)+'s';

js/widgets/ripesearch/ripesearch.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ angular.module('homer.widgets.ripesearch', ['adf.provider'])
2020
controller: 'ripeCtrl',
2121
reload: true,
2222
resolve: {
23-
data: function(weatcherService, config){
23+
data: function(ripeSearchService, config){
2424
if (!config.rscount){ config.rscount = 4; }
2525
if (config.location){
26-
return weatcherService.get(config.location,config.rscount);
26+
return ripeSearchService.get(config.location,config.rscount);
2727
}
2828
}
2929
},
@@ -32,7 +32,7 @@ angular.module('homer.widgets.ripesearch', ['adf.provider'])
3232
}
3333
});
3434
})
35-
.service('weatcherService', function($q, $http, RIPEServiceUrl){
35+
.service('ripeSearchService', function($q, $http, RIPEServiceUrl){
3636
return {
3737
get: function(location,counter){
3838
var deferred = $q.defer();

js/widgets/weather/weather.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="weather" ng-if="data">
66
<h4>{{data.name}} ({{data.sys.country}})</h4>
77
<dl>
8-
<dt>Temprature:</dt>
8+
<dt>Temperature:</dt>
99
<dd>{{data.main.temp | number:2}}</dd>
1010
</dl>
1111
</div>

js/widgets/weather/weather.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ angular.module('sample.widgets.weather', ['adf.provider'])
3535
controller: 'weatherCtrl',
3636
reload: true,
3737
resolve: {
38-
data: function(weatcherService, config){
38+
data: function(weatherService, config){
3939
if (config.location){
40-
return weatcherService.get(config.location);
40+
return weatherService.get(config.location);
4141
}
4242
}
4343
},
@@ -46,7 +46,7 @@ angular.module('sample.widgets.weather', ['adf.provider'])
4646
}
4747
});
4848
})
49-
.service('weatcherService', function($q, $http, weatherServiceUrl){
49+
.service('weatherService', function($q, $http, weatherServiceUrl){
5050
return {
5151
get: function(location){
5252
var deferred = $q.defer();
@@ -68,4 +68,4 @@ angular.module('sample.widgets.weather', ['adf.provider'])
6868
})
6969
.controller('weatherCtrl', function($scope, data){
7070
$scope.data = data;
71-
});
71+
});

0 commit comments

Comments
 (0)