diff --git a/.gitignore b/.gitignore index dec208bd..a088e422 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,8 @@ node_modules/ -app/bundle.js \ No newline at end of file +app/bundle.js + +.env + +package-lock.json \ No newline at end of file diff --git a/app/js/backbone-views.js b/app/js/backbone-views.js index 5623543e..a4c0ed11 100644 --- a/app/js/backbone-views.js +++ b/app/js/backbone-views.js @@ -3300,6 +3300,31 @@ var FileSaveView = Backbone.View.extend({ } }); + +/* +Active Tab elements push success +*/ +var ActiveTabPushSuccessView=Backbone.View.extend({ + initialize: function () { + var self= this; + self.template = _.template($('#active-tab-push-success-template').html()); + }, + render:function(){ + var self= this; + self.template = _.template($('#active-tab-push-success-template').html()); + + + $(self.el).html(self.template); + $(self.el).modal('show'); + + $(document).off("click", "#active-tab-push-success-confirm").on("click", "#active-tab-push-success-confirm", function (evt) { + $(self.el).modal('toggle'); + }); + + return this; + }, +}); + /* User Preferences View (Style, Map Properties, Layout etc) */ @@ -5837,6 +5862,7 @@ module.exports = { MapTabRearrangementPanel: MapTabRearrangementPanel, experimentTabPanel: experimentTabPanel, //GeneralPropertiesView: GeneralPropertiesView, + ActiveTabPushSuccessView: ActiveTabPushSuccessView, NeighborhoodQueryView: NeighborhoodQueryView, NeighborhoodQueryViewLocalDB: NeighborhoodQueryViewLocalDB, PathsBetweenQueryView: PathsBetweenQueryView, diff --git a/app/js/database-utilities.js b/app/js/database-utilities.js index 9a6d0aad..b22867d5 100644 --- a/app/js/database-utilities.js +++ b/app/js/database-utilities.js @@ -1,6 +1,7 @@ var nodeMatchUtilities = require("./node-match-utilities"); var graphALgos = require("./graph-algos"); var appUtilities = require("./app-utilities"); +const { ActiveTabPushSuccessView } = require("./backbone-views"); var databaseUtilities = { enableDatabase: true, @@ -422,7 +423,7 @@ var databaseUtilities = { } } } - + console.log('data',data); if (edges) { for (let i = 0; i < edges.length; i++) { databaseUtilities.edgesInDB[ @@ -434,7 +435,11 @@ var databaseUtilities = { ] = edges[i].identity.low; } } - + console.log("hiii"); + new ActiveTabPushSuccessView({ + el:'#prompt-confirmation-table', + }).render(); + console.log("hiii2"); }, error: function (req, status, err) { console.error("Error running query", status, err); diff --git a/app/js/node-match-utilities.js b/app/js/node-match-utilities.js index 5cf8c1e2..de34a99a 100644 --- a/app/js/node-match-utilities.js +++ b/app/js/node-match-utilities.js @@ -146,13 +146,13 @@ var nodeMatchUtilities = { return `${name}.class = ${nodeData}.class`; }, matchProcessNodesSource: function (name, nodeData) { - return `( ${name}.source_0 = ${nodeData}.source_0) and (NOT EXISTS(${name}.source_1 ) or ${name}.source_1 = ${nodeData}.source_1)`; + return `( ${name}.source_0 = ${nodeData}.source_0) and ((${name}.source_1 ) IS NULL or ${name}.source_1 = ${nodeData}.source_1)`; }, matchProcessNodesTarget: function (name, nodeData) { - return `( ${name}.target_0 = ${nodeData}.target_0) and (NOT EXISTS(${name}.target_1 ) or ${name}.target_1 = ${nodeData}.target_1)`; + return `( ${name}.target_0 = ${nodeData}.target_0) and ((${name}.target_1 ) IS NULL or ${name}.target_1 = ${nodeData}.target_1)`; }, matchProcessNodesModifier: function (name, nodeData) { - return `( ${name}.modifier_0 = ${nodeData}.modifier_0) and (NOT EXISTS(${name}.modifier_1 ) or ${name}.modifier_1 = ${nodeData}.modifier_1)`; + return `( ${name}.modifier_0 = ${nodeData}.modifier_0) and ((${name}.modifier_1 ) IS NULL or ${name}.modifier_1 = ${nodeData}.modifier_1)`; }, matchEdgesSource: function (name, nodeData) { return `${name}.source = ${nodeData}.source`; diff --git a/index.html b/index.html index bd718e48..3cf12316 100644 --- a/index.html +++ b/index.html @@ -861,6 +861,10 @@ +