Skip to content

Commit

Permalink
Merge pull request #94 from e-ucm/visShared
Browse files Browse the repository at this point in the history
Fixed shared visualizations between games of the same user
  • Loading branch information
Dan Cristian, Rotaru committed Feb 1, 2018
2 parents 5056417 + 8cfdf75 commit 78c5179
Showing 1 changed file with 38 additions and 22 deletions.
60 changes: 38 additions & 22 deletions app/public/js/controllers/kibana.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,32 +106,48 @@ angular.module('kibanaApp', ['ngStorage', 'services', 'ngFileUpload'])

if (checkboxList[visualizationId]) {
obj[nameList] = [visualizationId];
$http.put(CONSTANTS.PROXY + '/kibana/visualization/list/' + $scope.game._id, obj)
.success(function (data) {
listVisualizations.push(visualizationId);
$scope.waitOperation = false;
var exist;
$http.get(CONSTANTS.PROXY + '/kibana/templates/fields/' + visualizationId).success(function (data) {
data.forEach(function (field) {
exist = false;
$scope.visualizationFields.forEach(function (currentF) {
if (currentF === field) {
exist = true;
}

$http.get(CONSTANTS.PROXY + '/kibana/templates/index/' + visualizationId).success(function (data) {
$http.post(CONSTANTS.PROXY + '/kibana/visualization/game/' + $scope.game._id + '/' + visualizationId,
data._source).success(function () {
var body = JSON.parse(JSON.stringify($scope.dataWithField).split('.').join('(dot)'));
$http.post(CONSTANTS.PROXY + '/kibana/visualization/tuples/fields/game/' + $scope.game._id, body)
.success(function (data) {
$http.put(CONSTANTS.PROXY + '/kibana/visualization/list/' + $scope.game._id, obj)
.success(function (data) {
listVisualizations.push(visualizationId);
$scope.waitOperation = false;
var exist;
$http.get(CONSTANTS.PROXY + '/kibana/templates/fields/' + visualizationId).success(function (data) {
data.forEach(function (field) {
exist = false;
$scope.visualizationFields.forEach(function (currentF) {
if (currentF === field) {
exist = true;
}
});
if (!exist) {
$scope.visualizationFields.push(field);
}
});
}).error(function (data, status) {
console.error('Error on get /kibana/templates/fields' + visualizationId + ' ' +
JSON.stringify(data) + ', status: ' + status);
});

}).error(function (data, status) {
console.error('Error on post /kibana/visualization/list/' + $scope.game._id + ' ' +
JSON.stringify(data) + ', status: ' + status);
$scope.waitOperation = false;
});
if (!exist) {
$scope.visualizationFields.push(field);
}
});
}).error(function (data, status) {
console.error('Error on get /kibana/templates/fields' + visualizationId + ' ' +
}).error(function (data, status) {
console.error('Error on post /kibana/visualization/tuples/fields/game/' + $scope.game._id + ' ' +
JSON.stringify(data) + ', status: ' + status);
});

}).error(function (data, status) {
console.error('Error on post /kibana/visualization/list/' + $scope.game._id + ' ' +
JSON.stringify(data) + ', status: ' + status);
$scope.waitOperation = false;
console.error('Error on post /kibana/visualization/game/' + $scope.game._id + '/' + visualizationId + ' ' +
JSON.stringify(data) + ', status: ' + status);
});
});
} else {
$http.delete(CONSTANTS.PROXY + '/kibana/visualization/list/' + $scope.game._id + '/' + usr + '/' + visualizationId)
Expand Down

0 comments on commit 78c5179

Please sign in to comment.