commit for issue #37 , #41

orientechnologies · Jan 30, 2014 · e0ae15a · e0ae15a
1 parent e264fda
commit e0ae15a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 141 deletions.
diff --git a/app/index.html b/app/index.html
@@ -22,7 +22,7 @@
     <link rel="stylesheet" href="components/bootstrap/docs/assets/css/bootstrap.css">
     <link rel="stylesheet" href="components/bootstrap/docs/assets/css/docs.css">
     <link rel="stylesheet" href="components/bootstrap-datepicker/css/datepicker.css"/>
-    <link rel="stylesheet" href="components/ng-grid/ng-grid.min.css"/>
+    <!--<link rel="stylesheet" href="components/ng-grid/ng-grid.min.css"/>-->
     <link rel="stylesheet" href="components/bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css"/>
     <link rel="stylesheet" href="styles/main.css">
 
@@ -83,7 +83,7 @@
 <script src="components/bootstrap/docs/assets/js/bootstrap.js"></script>
 <script src="components/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
 <script type="text/javascript" src="components/angular-local-storage/angular-local-storage.min.js"></script>
-<script type="text/javascript" src="components/ng-grid/ng-grid-2.0.7.min.js"></script>
+<!--<script type="text/javascript" src="components/ng-grid/ng-grid-2.0.7.min.js"></script>-->
 <script type="text/javascript" src="components/codemirror/lib/codemirror.js"></script>
 <script type="text/javascript" src="components/codemirror/mode/javascript/javascript.js"></script>
 <script type="text/javascript" src="components/codemirror/mode/sql/sql.js"></script>

diff --git a/app/index.html.orig b/app/index.html.orig
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -18,8 +18,7 @@ var deps = ['header.controller',
     'LocalStorageModule',
     'filters',
     'rendering',
-    'schema.controller',
-    'ngGrid'];
+    'schema.controller'];
 
 
 var App = angular.module('OrientDBStudioApp', deps);

diff --git a/app/scripts/controllers/function-controller.js b/app/scripts/controllers/function-controller.js
@@ -1,5 +1,5 @@
 var schemaModule = angular.module('function.controller', ['database.services']);
-schemaModule.controller("FunctionController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', 'FunctionApi', 'DocumentApi', '$modal', '$q', '$route', 'Spinner', function ($scope, $routeParams, $location, Database, CommandApi, FunctionApi, DocumentApi, $modal, $q, $route, Spinner) {
+schemaModule.controller("FunctionController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', 'FunctionApi', 'DocumentApi', '$modal', '$q', '$route', 'Spinner', 'Notification', function ($scope, $routeParams, $location, Database, CommandApi, FunctionApi, DocumentApi, $modal, $q, $route, Spinner, Notification) {
 
     $scope.database = Database;
     $scope.listClasses = $scope.database.listClasses();
@@ -100,7 +100,7 @@ schemaModule.controller("FunctionController", ['$scope', '$routeParams', '$locat
     }
     $scope.
         executeFunction = function () {
-
+        $scope.resultExecute = '';
 
         if ($scope.functionToExecute != undefined) {
             var functionNamee = $scope.nameFunction;
@@ -178,13 +178,17 @@ schemaModule.controller("FunctionController", ['$scope', '$routeParams', '$locat
             if ($scope.isNewFunction == true) {
                 DocumentApi.createDocument($scope.database.getName(), $scope.functionToExecute['@rid'], $scope.functionToExecute, function (data) {
                         $scope.getListFunction();
+                        var message = 'Function saved successfully. Server respond ' + JSON.stringify(data);
+                        Notification.push({content: message });
                     }
                 );
 
             }
             else {
                 DocumentApi.updateDocument($scope.database.getName(), $scope.functionToExecute['@rid'], $scope.functionToExecute, function (data) {
                     $scope.getListFunction();
+                    var message = 'Function saved successfully. Server respond ' + JSON.stringify(data);
+                    Notification.push({content: message });
                 });
             }
         }

diff --git a/app/scripts/services/database-services.js b/app/scripts/services/database-services.js
@@ -653,7 +653,7 @@ database.factory('FunctionApi', function ($http, $resource, Notification) {
             var records = data.result ? data.result.length : "";
             if (verbose) {
                 var noti = "Query executed in " + time + " sec. Returned " + records + " record(s)";
-//                Notification.push({content: noti});
+                Notification.push({content: noti});
             }
             callback(data);
         }).error(function (data) {