Skip to content

Commit

Permalink
fixed issue Issue #40 and e Issue #38
Browse files Browse the repository at this point in the history
  • Loading branch information
@wolf4ood
wolf4ood committed Jan 22, 2014
1 parent 44eaea6 commit e264fda
Show file tree
Hide file tree
Showing 3 changed files with 182 additions and 173 deletions.
301 changes: 151 additions & 150 deletions app/scripts/controllers/graph-controller.js
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
var GrapgController = angular.module('vertex.controller',['ui.bootstrap']);
GrapgController.controller("VertexCreateController",['$scope','$routeParams','$location','DocumentApi','Database','Notification',function($scope,$routeParams,$location,DocumentApi,Database,Notification){


var database = $routeParams.database;
var clazz = $routeParams.clazz
$scope.fixed = Database.header;
$scope.doc = DocumentApi.createNewDoc(clazz);
$scope.headers = Database.getPropertyFromDoc($scope.doc);
$scope.save = function(){
DocumentApi.createDocument(database,$scope.doc['@rid'],$scope.doc,function(data){
Notification.push({content : JSON.stringify(data)});
$location.path('/database/'+database + '/browse/edit/' + data['@rid'].replace('#',''));
});

}
var GrapgController = angular.module('vertex.controller', ['ui.bootstrap']);
GrapgController.controller("VertexCreateController", ['$scope', '$routeParams', '$location', 'DocumentApi', 'Database', 'Notification', function ($scope, $routeParams, $location, DocumentApi, Database, Notification) {


var database = $routeParams.database;
var clazz = $routeParams.clazz
$scope.fixed = Database.header;
$scope.doc = DocumentApi.createNewDoc(clazz);
$scope.headers = Database.getPropertyFromDoc($scope.doc);
$scope.save = function () {
DocumentApi.createDocument(database, $scope.doc['@rid'], $scope.doc, function (data) {
Notification.push({content: JSON.stringify(data)});
$location.path('/database/' + database + '/browse/edit/' + data['@rid'].replace('#', ''));
});

}
}]);
GrapgController.controller("VertexModalController",['$scope','$routeParams','$location','DocumentApi','Database','Notification',function($scope,$routeParams,$location,DocumentApi,Database,Notification){


$scope.reload = function(){
$scope.doc = DocumentApi.get({ database : $scope.db , document : $scope.rid},function(){
$scope.headers = Database.getPropertyFromDoc($scope.doc);
}, function(error){
Notification.push({content : JSON.stringify(error)});
$location.path('#/404');
});
}
$scope.save = function(){
DocumentApi.updateDocument($scope.db,$scope.rid,$scope.doc,function(data){
Notification.push({content : data});
});

}
$scope.reload();
GrapgController.controller("VertexModalController", ['$scope', '$routeParams', '$location', 'DocumentApi', 'Database', 'Notification', function ($scope, $routeParams, $location, DocumentApi, Database, Notification) {


$scope.reload = function () {
$scope.doc = DocumentApi.get({ database: $scope.db, document: $scope.rid}, function () {
$scope.headers = Database.getPropertyFromDoc($scope.doc);
}, function (error) {
Notification.push({content: JSON.stringify(error)});
$location.path('#/404');
});
}
$scope.save = function () {
DocumentApi.updateDocument($scope.db, $scope.rid, $scope.doc, function (data) {
Notification.push({content: data});
});

}
$scope.reload();
}]);
GrapgController.controller("VertexEditController",['$scope','$injector','$routeParams','$location','$modal','$q','DocumentApi','Database','CommandApi','Notification',function($scope,$injector,$routeParams,$location,$modal,$q,DocumentApi,Database,CommandApi,Notification){
GrapgController.controller("VertexEditController", ['$scope', '$injector', '$routeParams', '$location', '$modal', '$q', 'DocumentApi', 'Database', 'CommandApi', 'Notification', function ($scope, $injector, $routeParams, $location, $modal, $q, DocumentApi, Database, CommandApi, Notification) {

$injector.invoke(BaseEditController, this, {$scope: $scope});
$scope.label = 'Vertex';
Expand All @@ -44,199 +44,200 @@ GrapgController.controller("VertexEditController",['$scope','$injector','$routeP
$scope.canCreate = true;
$scope.canAdd = true;
$scope.popover = {
title : 'Add edge'
title: 'Add edge'
}

// Toggle modal
$scope.showModal = function(rid) {
$scope.showModal = function (rid) {
var modalScope = $scope.$new(true);
modalScope.db = $scope.database;
modalScope.rid = rid;
var modalPromise = $modal({template: 'views/database/modalEdit.html', persist: true, show: false, backdrop: 'static',scope: modalScope,modalClass : 'editEdge'});
$q.when(modalPromise).then(function(modalEl) {
var modalPromise = $modal({template: 'views/database/modalEdit.html', persist: true, show: false, backdrop: 'static', scope: modalScope, modalClass: 'editEdge'});
$q.when(modalPromise).then(function (modalEl) {
modalEl.modal('show');
});
};
$scope.showModalConnection = function(label) {
$scope.showModalConnection = function (label) {
var modalScope = $scope.$new(true);
modalScope.db = $scope.database;
modalScope.originRid = $scope.rid;
modalScope.container = $scope;
modalScope.label = label
var modalPromise = $modal({template: 'views/vertex/modalConnection.html', persist: true, show: false, backdrop: 'static',scope: modalScope,modalClass : 'createEdge'});
$q.when(modalPromise).then(function(modalEl) {
var modalPromise = $modal({template: 'views/vertex/modalConnection.html', persist: true, show: false, backdrop: 'static', scope: modalScope, modalClass: 'createEdge'});
$q.when(modalPromise).then(function (modalEl) {
modalEl.modal('show');
});
}
if(!$scope.doc){
if (!$scope.doc) {
$scope.reload();
}else {
} else {
$scope.headers = Database.getPropertyFromDoc($scope.doc);
$scope.isGraph = Database.isGraph($scope.doc['@class']);
$scope.incomings = Database.getEdge($scope.doc,'in_');
$scope.outgoings = Database.getEdge($scope.doc,'out_');
$scope.incomings = Database.getEdge($scope.doc, 'in_');
$scope.outgoings = Database.getEdge($scope.doc, 'out_');
$scope.exclude = $scope.outgoings.concat($scope.incomings);
$scope.outgoings = $scope.outgoings.concat((Database.getLink($scope.doc,$scope.exclude)));
$scope.outgoings = $scope.outgoings.concat((Database.getLink($scope.doc, $scope.exclude)));

$scope.label = Database.isEdge($scope.doc['@class']) ? "Edge" : "Vertex";

}

$scope.delete = function(){
$scope.delete = function () {
var recordID = $scope.doc['@rid']
Utilities.confirm($scope,$modal,$q,{
title : 'Warning!',
body : 'You are removing Vertex '+ recordID + '. Are you sure?',
success : function() {
Utilities.confirm($scope, $modal, $q, {
title: 'Warning!',
body: 'You are removing Vertex ' + recordID + '. Are you sure?',
success: function () {
var command = "DELETE Vertex " + recordID;
CommandApi.queryText({database : $scope.database, language : 'sql', text : command},function(data){
CommandApi.queryText({database: $scope.database, language: 'sql', text: command}, function (data) {
var clazz = $scope.doc['@class'];
$location.path('/database/'+$scope.database + '/browse/' + 'select * from ' + clazz);
$location.path('/database/' + $scope.database + '/browse/' + 'select * from ' + clazz);
});
}
});
}

$scope.filterArray = function(arr) {
if(arr instanceof Array){
$scope.filterArray = function (arr) {
if (arr instanceof Array) {
return arr;
}else {
} else {
var newArr = new Array;
newArr.push(arr);
return newArr;
}

}
$scope.follow= function(rid) {
var edgeDoc = DocumentApi.get({ database : $scope.database , document : rid},function(){
if(Database.isEdge(edgeDoc['@class'])){
$scope.follow = function (rid) {
var edgeDoc = DocumentApi.get({ database: $scope.database, document: rid}, function () {
if (Database.isEdge(edgeDoc['@class'])) {
$scope.showModal(rid);
}
else {
$scope.navigate(rid);
}

}, function(error){
Notification.push({content : JSON.stringify(error)});
}, function (error) {
Notification.push({content: JSON.stringify(error)});
$location.path('/404');
});

}
$scope.followEdge= function(rid,direction) {
var edgeDoc = DocumentApi.get({ database : $scope.database , document : rid},function(){
$scope.followEdge = function (rid, direction) {
var edgeDoc = DocumentApi.get({ database: $scope.database, document: rid}, function () {
var ridNavigate = rid;
if(Database.isEdge(edgeDoc['@class'])){
ridNavigate = edgeDoc[direction];
if (Database.isEdge(edgeDoc['@class'])) {
ridNavigate = edgeDoc[direction];
}
$scope.navigate(ridNavigate);
}, function(error){
Notification.push({content : JSON.stringify(error)});
}, function (error) {
Notification.push({content: JSON.stringify(error)});
$location.path('/404');
});

}
$scope.deleteLink = function(group,edge) {

Utilities.confirm($scope,$modal,$q,{
title : 'Warning!',
body : 'You are removing edge '+ edge + '. Are you sure?',
success : function() {
var edgeDoc = DocumentApi.get({ database : $scope.database , document : edge},function(){
var command =""
if(Database.isEdge(edgeDoc['@class'])){
$scope.deleteLink = function (group, edge) {

Utilities.confirm($scope, $modal, $q, {
title: 'Warning!',
body: 'You are removing edge ' + edge + '. Are you sure?',
success: function () {
var edgeDoc = DocumentApi.get({ database: $scope.database, document: edge}, function () {
var command = ""
if (Database.isEdge(edgeDoc['@class'])) {
command = "DELETE EDGE " + edge;
}
else {
if(group.contains('in_')){
if (group.contains('in_')) {
command = "DELETE EDGE FROM " + edge + " TO " + $scope.rid;
}else {
} else {
command = "DELETE EDGE FROM " + $scope.rid + " TO " + edge;
}
}
CommandApi.queryText({database : $scope.database, language : 'sql', text : command},function(data){
CommandApi.queryText({database: $scope.database, language: 'sql', text: command}, function (data) {
$scope.reload();
});
}, function(error){
Notification.push({content : JSON.stringify(error)});
}, function (error) {
Notification.push({content: JSON.stringify(error)});
$location.path('/404');
});

}
});
}
}]);
GrapgController.controller("VertexPopoverLabelController",['$scope','$routeParams','$location','DocumentApi','Database','Notification',function($scope,$routeParams,$location,DocumentApi,Database,Notification){

$scope.init = function(where){
$scope.where = where;
$scope.labels = Database.getClazzEdge();
}
$scope.addEdgeLabel = function(){
var name = "";
if($scope.where == "outgoings"){
name = "out_".concat($scope.popover.name);
}
else {
name = "in_".concat($scope.popover.name);
}
if($scope[$scope.where].indexOf(name)==-1)
$scope[$scope.where].push(name);
delete $scope.popover.name;
}
GrapgController.controller("VertexPopoverLabelController", ['$scope', '$routeParams', '$location', 'DocumentApi', 'Database', 'Notification', function ($scope, $routeParams, $location, DocumentApi, Database, Notification) {

$scope.init = function (where) {
$scope.where = where;
$scope.labels = Database.getClazzEdge();
}
$scope.addEdgeLabel = function () {
var name = "";
if ($scope.where == "outgoings") {
name = "out_".concat($scope.popover.name);
}
else {
name = "in_".concat($scope.popover.name);
}
if ($scope[$scope.where].indexOf(name) == -1)
$scope[$scope.where].push(name);
delete $scope.popover.name;
}

}]);

GrapgController.controller("VertexModalBrowseController",['$scope','$routeParams','$location','Database','CommandApi',function($scope,$routeParams,$location,Database,CommandApi){

$scope.database = Database;
$scope.limit = 20;
$scope.queries = new Array;
$scope.added = new Array;
$scope.editorOptions = {
lineWrapping : true,
lineNumbers: true,
readOnly: false,
theme : 'ambiance',
mode: 'text/x-sql',
GrapgController.controller("VertexModalBrowseController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', function ($scope, $routeParams, $location, Database, CommandApi) {

$scope.database = Database;
$scope.limit = 20;
$scope.queries = new Array;
$scope.added = new Array;
$scope.editorOptions = {
lineWrapping: true,
lineNumbers: true,
readOnly: false,
theme: 'ambiance',
mode: 'text/x-sql',
metadata: Database,
extraKeys: {
"Ctrl-Enter": function(instance) {
$scope.$apply(function(){
extraKeys: {
"Ctrl-Enter": function (instance) {
$scope.$apply(function () {
$scope.query();
});
},
"Ctrl-Space": "autocomplete"
}
};
$scope.query = function(){
CommandApi.queryText({database : $routeParams.database, language : 'sql', text : $scope.queryText, limit : $scope.limit, verbose : false },function(data){
if(data.result){
$scope.headers = Database.getPropertyTableFromResults(data.result);
$scope.results = data.result;
}
if($scope.queries.indexOf($scope.queryText)==-1)
$scope.queries.push($scope.queryText);
});
}
$scope.select = function(result){
var index = $scope.added.indexOf(result['@rid']);
if(index==-1){
$scope.added.push(result['@rid']);
}else {
$scope.added.splice(index,1);
}
}
$scope.createEdges = function(){

var command;
if($scope.label.contains('in_')){
command = "CREATE EDGE " + $scope.label.replace("in_","") + " FROM [" + $scope.added + "]" + " TO " + $scope.originRid;
}else {
command = "CREATE EDGE " + $scope.label.replace("out_","") + " FROM " + $scope.originRid + " TO [" + $scope.added + "]";
}
CommandApi.queryText({database : $routeParams.database, language : 'sql', text : command},function(data){
$scope.added = new Array;
$scope.container.reload();
});
}
}
};
$scope.query = function () {
CommandApi.queryText({database: $routeParams.database, language: 'sql', text: $scope.queryText, limit: $scope.limit, verbose: false }, function (data) {
if (data.result) {
$scope.headers = Database.getPropertyTableFromResults(data.result);
$scope.results = data.result;
}
if ($scope.queries.indexOf($scope.queryText) == -1)
$scope.queries.push($scope.queryText);
});
}
$scope.select = function (result) {
var index = $scope.added.indexOf(result['@rid']);
if (index == -1) {
$scope.added.push(result['@rid']);
} else {
$scope.added.splice(index, 1);
}
}
$scope.createEdges = function () {

var command;
if ($scope.label.contains('in_')) {
command = "CREATE EDGE " + $scope.label.replace("in_", "") + " FROM [" + $scope.added + "]" + " TO " + $scope.originRid;
} else {
command = "CREATE EDGE " + $scope.label.replace("out_", "") + " FROM " + $scope.originRid + " TO [" + $scope.added + "]";
}
CommandApi.queryText({database: $routeParams.database, language: 'sql', text: command}, function (data) {
$scope.added = new Array;
$scope.container.reload();
});

}
}]);
Loading

0 comments on commit e264fda

Please sign in to comment.