- Bug 6544 - YangMan - the execution time is not right
- service & method renamed
Change-Id: I15176340ff4bcacb1fb9a4d1f69ffd4a1ebc9f0f
Signed-off-by: michal.kovacik <mikovaci@cisco.com>
define([
'app/yangman/controllers/params-admin.controller',
define([
'app/yangman/controllers/params-admin.controller',
+ 'app/yangman/services/time-tracking.services',
], function (ParamsAdminCtrl) {
'use strict';
], function (ParamsAdminCtrl) {
'use strict';
RequestHeaderCtrl.$inject = [
'$mdDialog', '$mdToast', '$scope', '$rootScope', 'ENV', 'YangmanService', 'ParametersService',
RequestHeaderCtrl.$inject = [
'$mdDialog', '$mdToast', '$scope', '$rootScope', 'ENV', 'YangmanService', 'ParametersService',
- 'PathUtilsService', 'RequestsService', '$filter', 'DataBackupService', 'constants'
+ 'PathUtilsService', 'RequestsService', '$filter', 'DataBackupService', 'constants', 'TimeTrackingService'
];
function RequestHeaderCtrl($mdDialog, $mdToast, $scope, $rootScope, ENV, YangmanService, ParametersService,
];
function RequestHeaderCtrl($mdDialog, $mdToast, $scope, $rootScope, ENV, YangmanService, ParametersService,
- PathUtilsService, RequestService, $filter, DataBackupService, constants) {
+ PathUtilsService, RequestService, $filter, DataBackupService, constants,
+ TimeTrackingService) {
var requestHeader = this;
requestHeader.allOperations = [constants.OPERATION_GET, constants.OPERATION_POST, constants.OPERATION_PUT, constants.OPERATION_DELETE];
var requestHeader = this;
requestHeader.allOperations = [constants.OPERATION_GET, constants.OPERATION_POST, constants.OPERATION_PUT, constants.OPERATION_DELETE];
* Execute request operation
*/
function executeOperation(requestData, executeCbk){
* Execute request operation
*/
function executeOperation(requestData, executeCbk){
+ TimeTrackingService.startTimer();
var allowExecuteOperation =
requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_FORM && $scope.selectedSubApi ?
!PathUtilsService.checkEmptyIdentifiers($scope.selectedSubApi.pathArray) : true;
var allowExecuteOperation =
requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_FORM && $scope.selectedSubApi ?
!PathUtilsService.checkEmptyIdentifiers($scope.selectedSubApi.pathArray) : true;
}
// create and set history request
}
// create and set history request
+ requestHeader.statusObj.time = TimeTrackingService.returnTime();
+
historyReq.setExecutionData(
reqInfo.requestSrcData,
preparedReceivedData,
reqInfo.status,
reqInfo.status,
reqInfo.statusText,
historyReq.setExecutionData(
reqInfo.requestSrcData,
preparedReceivedData,
reqInfo.status,
reqInfo.status,
reqInfo.statusText,
+ requestHeader.statusObj.time
);
$scope.rootBroadcast(constants.YANGMAN_SAVE_EXECUTED_REQUEST, historyReq, function (){
);
$scope.rootBroadcast(constants.YANGMAN_SAVE_EXECUTED_REQUEST, historyReq, function (){
+ requestHeader.statusObj.time = TimeTrackingService.returnTime();
+
historyReq.setExecutionData(
reqInfo.requestSrcData,
response.data,
reqInfo.status,
reqInfo.status,
reqInfo.statusText,
historyReq.setExecutionData(
reqInfo.requestSrcData,
response.data,
reqInfo.status,
reqInfo.status,
reqInfo.statusText,
+ requestHeader.statusObj.time
);
$scope.rootBroadcast(constants.YANGMAN_SAVE_EXECUTED_REQUEST, historyReq, function (){
$scope.rootBroadcast(constants.YANGMAN_SELECT_THE_NEWEST_REQUEST);
);
$scope.rootBroadcast(constants.YANGMAN_SAVE_EXECUTED_REQUEST, historyReq, function (){
$scope.rootBroadcast(constants.YANGMAN_SELECT_THE_NEWEST_REQUEST);
--- /dev/null
+define([], function () {
+ 'use strict';
+
+ angular.module('app.yangman').service('TimeTrackingService', TimeTrackingService);
+
+ function TimeTrackingService(){
+ var service = {
+ startTimer: startTimer,
+ returnTime: returnTime,
+ },
+ timeStarted = 0;
+ return service;
+
+ function startTimer(){
+ timeStarted = new Date().getTime();
+ }
+
+ function returnTime(){
+ return new Date().getTime() - timeStarted;
+ }
+ }
+
+});
*/
function executeRequestOperation(selectedApi, selectedSubApi, operation, node, dataType, requestUrl,
requestData, params, successCbk, errorCbk) {
*/
function executeRequestOperation(selectedApi, selectedSubApi, operation, node, dataType, requestUrl,
requestData, params, successCbk, errorCbk) {
- var time = {
- started: 0,
- finished: 0,
- };
YangUtilsRestangularService.setFullResponse(true);
YangUtilsRestangularService.setFullResponse(true);
var allPreparedData = prepareAllRequestData(selectedApi, selectedSubApi, operation, node, dataType,
requestUrl, requestData, params);
var allPreparedData = prepareAllRequestData(selectedApi, selectedSubApi, operation, node, dataType,
requestUrl, requestData, params);
- // start track time response
- time.started = new Date().getMilliseconds();
-
// executing operation
allPreparedData.customRestangular.customOperation(
allPreparedData.operation.toLowerCase(),
// executing operation
allPreparedData.customRestangular.customOperation(
allPreparedData.operation.toLowerCase(),
);
function finishExecuting(response){
);
function finishExecuting(response){
- // finish track time response
- time.finished = new Date().getMilliseconds();
- var spentRequestTime = time.finished - time.started;
return {
status: response.status,
statusText: response.statusText,
return {
status: response.status,
statusText: response.statusText,
- time: spentRequestTime < 0 ? -(spentRequestTime) : spentRequestTime,
requestData: allPreparedData.reqData,
requestSrcData: allPreparedData.srcData,
};
requestData: allPreparedData.reqData,
requestSrcData: allPreparedData.srcData,
};