From c8985a3dbabc2532bd19185c1dd5097255243bad Mon Sep 17 00:00:00 2001 From: Denny Lim Date: Wed, 5 Feb 2014 07:54:32 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20[NOBTS]=20=20fi?= =?UTF-8?q?lterWizard=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3260 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../webapp/scripts/controllers/filteredMap.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/scripts/controllers/filteredMap.js b/src/main/webapp/scripts/controllers/filteredMap.js index 1e57c2d57..82ac2adfb 100644 --- a/src/main/webapp/scripts/controllers/filteredMap.js +++ b/src/main/webapp/scripts/controllers/filteredMap.js @@ -7,7 +7,7 @@ pinpointApp.controller('FilteredMapCtrl', [ 'filterConfig', '$scope', '$routePar var oNavbarVo, oTimeSliderVo; // define private variables of methods - var openFilteredMapWithFilterDataSet; + var openFilteredMapWithFilterVo; /** * initialize @@ -42,12 +42,11 @@ pinpointApp.controller('FilteredMapCtrl', [ 'filterConfig', '$scope', '$routePar }, 100); /** - * open filtered map with filter data set + * open filtered map with filterVo * @param filterDataSet */ - openFilteredMapWithFilterDataSet = function (filterDataSet) { - var newFilter = filteredMapUtil.parseFilter(filterDataSet, oNavbarVo.getApplication(), oNavbarVo.getFilter()), - url = '#/filteredMap/' + oNavbarVo.getApplication() + '/' + oNavbarVo.getPeriod() + '/' + oNavbarVo.getQueryEndTime() + '/' + encodeURIComponentFilter(newFilter); + openFilteredMapWithFilterVo = function (oServerMapFilterVo) { + var url = filteredMapUtil.getFilteredMapUrlWithFilterVo(oServerMapFilterVo, oNavbarVo); $window.open(url, ""); }; @@ -150,15 +149,15 @@ pinpointApp.controller('FilteredMapCtrl', [ 'filterConfig', '$scope', '$routePar /** * scope event on serverMap.openFilteredMap */ - $scope.$on('serverMap.openFilteredMap', function (event, filterDataSet) { - openFilteredMapWithFilterDataSet(filterDataSet); + $scope.$on('serverMap.openFilteredMap', function (event, oServerMapFilterVo) { + openFilteredMapWithFilterVo(oServerMapFilterVo); }); /** * scope event on linkInfoDetails.ResponseSummary.barClicked */ - $scope.$on('linkInfoDetails.ResponseSummary.barClicked', function (event, filterDataSet) { - openFilteredMapWithFilterDataSet(filterDataSet); + $scope.$on('linkInfoDetails.ResponseSummary.barClicked', function (event, oServerMapFilterVo) { + openFilteredMapWithFilterVo(oServerMapFilterVo); }); /**