Repository: incubator-griffin Updated Branches: refs/heads/master 07f1a539c -> 7bf1b16d5
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/bower_components/font-awesome/fonts/fontawesome-webfont.ttf ---------------------------------------------------------------------- diff --git a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.ttf b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.ttf index 26dea79..014c380 100644 Binary files a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.ttf and b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.ttf differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff ---------------------------------------------------------------------- diff --git a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff index dc35ce3..693fc15 100644 Binary files a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff and b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff.bak ---------------------------------------------------------------------- diff --git a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff.bak b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff.bak index dc35ce3..8005005 100644 Binary files a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff.bak and b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff.bak differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 ---------------------------------------------------------------------- diff --git a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 index 500e517..8c14f4f 100644 Binary files a/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 and b/ui/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 differ http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/js/controllers/createrule-ac-ctrl.js ---------------------------------------------------------------------- diff --git a/ui/js/controllers/createrule-ac-ctrl.js b/ui/js/controllers/createrule-ac-ctrl.js index 118ca5f..4e00749 100644 --- a/ui/js/controllers/createrule-ac-ctrl.js +++ b/ui/js/controllers/createrule-ac-ctrl.js @@ -414,14 +414,25 @@ define(['./module'], function(controllers) { }; $scope.dataAsset = $scope.currentNodeTarget.name + ',' + $scope.currentNode.name; - for(var i = 0;i<$scope.selectionTarget.length;i++){ - console.log($scope.selection[i]); - var s =$scope.selection[i].split('.'); - var t = $scope.selectionTarget[i].split('.'); - console.log( $scope.matches[i]); - rule += "${source}['" + s[1] + "'] "+ $scope.matches[i]+" ${target}['" + t[1] + "'];" ; + var mappingRule = function(src, tgt, matches) { + var s = src.split('.'); + var t = tgt.split('.'); + return "$source['" + s[1] + "'] " + matches + " $target['" + t[1] + "']"; } + var rules = $scope.selectionTarget.map(function(item, i) { + return mappingRule($scope.selection[i], item, $scope.matches[i]); + }); + rule = rules.join(" AND "); + +// for(var i = 0;i<$scope.selectionTarget.length;i++){ +// console.log($scope.selection[i]); +// var s =$scope.selection[i].split('.'); +// var t = $scope.selectionTarget[i].split('.'); +// +// console.log( $scope.matches[i]); +// rule += "${source}['" + s[1] + "'] "+ $scope.matches[i]+" ${target}['" + t[1] + "'];" ; +// } $scope.rules = rule; @@ -444,7 +455,8 @@ define(['./module'], function(controllers) { console.log(JSON.stringify($scope.form.data)); // var newModel = $config.uri.newAccuracyModel; - var newModel = 'http://localhost:8080/measures/add'; + var BACKEND_SERVER = ''; + var newModel = BACKEND_SERVER + '/measures/add'; $http.post(newModel, this.data).success(function(data) { // if(data.status=='0') // { http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/7bf1b16d/ui/js/services/services.js ---------------------------------------------------------------------- diff --git a/ui/js/services/services.js b/ui/js/services/services.js index ccf2d7a..7b273b0 100644 --- a/ui/js/services/services.js +++ b/ui/js/services/services.js @@ -20,7 +20,8 @@ define(['./module'], function (services) { services.factory('$config', function(){ - var BACKEND_SERVER = 'http://localhost:8080'; + var BACKEND_SERVER = ''; +// var BACKEND_SERVER = 'http://localhost:8080'; // var BACKEND_SERVER = 'http://localhost:8080'; //dev env
