From 7c6b258cfcbbcd3a406a9c420972aa194512fbb7 Mon Sep 17 00:00:00 2001 From: Marco Lazzara Date: Fri, 29 Nov 2013 11:51:13 +0100 Subject: [PATCH] commit for issue #32 and #31 --- app/img/spinner.gif | Bin 12337 -> 8534 bytes app/index.html | 11 ++-- app/scripts/api.js | 4 +- .../controllers/database-controller.js | 22 +++++--- .../controllers/function-controller.js | 9 +++- app/scripts/controllers/schema-controller.js | 25 ++++++--- app/scripts/services/database-services.js | 16 ++++-- app/scripts/services/spinner-service.js | 48 ++++++++++++++++-- app/scripts/widgets/widget.js | 18 ++++++- app/styles/main.css | 19 +++++++ app/views/database/browse.html | 33 ++++++++---- app/views/database/editclass.html | 7 +++ app/views/database/newIndex.html | 4 ++ app/views/database/newProperty.html | 4 ++ app/views/spinner.html | 4 +- 15 files changed, 177 insertions(+), 47 deletions(-) diff --git a/app/img/spinner.gif b/app/img/spinner.gif index 55a0da6c24abec3b70ead46e62406ca65dd4ee5c..8be8ba338d5b5aec80593295f88bcaf6608bdf18 100644 GIT binary patch literal 8534 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 z z23q;-*;SFu4jB_v(74jA(SHL{koGE`Z@-;!Q$<_1Tf6ZFqo^mL>Sk=0Q6%KkAt z2;Ab0Z#SY?(CF4jwGpNkSy&(}Wnc__?&0A*?yQH3@2zUoo)L;0Ct? z4h8ynHz%JG0`qRkRjL`}SVyZw?`T|aW@a%i#GLKy9P`qXZ_(S2axj-6t$sfnCff|2 zdDW9*@>cdJ|H9ZNuc}i*wt4P{W>TIX!Sc)18KM2=qm@sezL=v0j0m@tTtA5EN$gA? z_Mxto(OwD**Pm(V+o|O{6ecXeBmOlX4f z2w%#$o#5{bEWPY6DT!1*8T(!|!DzPSr~UZz3p{>1=hTVg-+^;#&+VOX4|i*vhizat z?0Q^p7@f9=7$8KeRRZ_F#0rNFQ$kC$_S-5MvjDNJ-fSXA9oUOp)dp$i9TjTR!7i^K zA*-q0Hd7Sh~`+}o)c)Y$( z+?CJi1D=>WrX_D>Uztet5Pvr+-rhB32tLuiQdyqqBSjF`{s?rXr$tEP!K33A!it#Q zsT9z5{bNJRI6FV|@xEb|e?|s)?EhZj{(EEqia!0zv3^OSix67dq)8JfvZp?7m*VoI zx-UP6%c+2r)Pe4$PzWhKyLKBI{*6V2M@F$hJds2qc*iqg#g(lWE{+wkKbeIgtEo{b z`0Sj#e8sF1F&k1=Q*WclcPSs!-NHl>dwSLQ1B{E8 z6rko(7GCwfI{6V3Tc3|DMy{SlVA9O_mrVSSVj|-$10+yq-n|3~(tSL9z-A(5jqr?Y zO&ZzSWpT=nCr7M_XH9W;!>b+a^uR`AnimrgLB@ERr3KHy^!P9_UWI*+C&H*%g?25? z)Do9}5-d^Fi8C)nL4@_DAW25DJgr8dXtWD^F{^xR`AcaZ-FVf^41eeFoHQhBR)XUq z4h-xn-ED%!aM7V1Z2?M6ou2336@X+DE#Lq^Pq`fNGInrOJ_K9~P$U|k-XA`Oq1wn@ z--#H>VLZ2a_)iZPVaraH+x2(lA5;o*lOy{f&^$y*S)p*`lTDk|7RV}m+6?UZ)eMY% ztDQ_c7ZNw%rsJMeZ7}3}lcPPlvF&QHwX$ydDVv{$zy0Qt3*es7NMys2BU*Z))|;v7~DFQRpSu@8%q24%xljgx(wIb6_qM) zk6*6VGsu21OH|QRnN>CXy3)w4S(b{^lDV)Q<3UY25Mn~{oI3|%<&_4tVf`$#uCj8pM`A6Fvq G(|-Y9t#!u$ literal 12337 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 b&Dxs>Oo!@5?u^w=q!NkFx$|fg=;HqX20%pj diff --git a/app/index.html b/app/index.html index 287ad65d55a..53a3f8d75a8 100644 --- a/app/index.html +++ b/app/index.html @@ -42,11 +42,11 @@
-
-
+
+
+
-
@@ -93,7 +91,8 @@ - + diff --git a/app/scripts/api.js b/app/scripts/api.js index e56c189c975..37655a904fc 100644 --- a/app/scripts/api.js +++ b/app/scripts/api.js @@ -1,4 +1,4 @@ // -//var API = '/api/'; -var API = '../'; +var API = '/api/'; +//var API = '../'; diff --git a/app/scripts/controllers/database-controller.js b/app/scripts/controllers/database-controller.js index 2d219c8f97c..291ff6a5bb4 100644 --- a/app/scripts/controllers/database-controller.js +++ b/app/scripts/controllers/database-controller.js @@ -1,5 +1,5 @@ var dbModule = angular.module('database.controller', ['database.services']); -dbModule.controller("BrowseController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', 'Spinner', 'localStorageService', function ($scope, $routeParams, $location, Database, CommandApi, Spinner, localStorageService) { +dbModule.controller("BrowseController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', 'localStorageService', 'Spinner', function ($scope, $routeParams, $location, Database, CommandApi, localStorageService, Spinner) { $scope.database = Database; $scope.limit = 20; @@ -11,8 +11,10 @@ dbModule.controller("BrowseController", ['$scope', '$routeParams', '$location', $scope.queries = localStorageService.get("Queries"); $scope.language = 'sql'; $scope.countPage = 10; - $scope.countPageOptions = [10, 20, 50, 100]; + $scope.countPageOptions = [10, 20, 50, 100, 500, 1000, 2000, 5000]; $scope.table = true; + $scope.contentType = ['JSON', 'CSV']; + $scope.selectedContentType = $scope.contentType[0]; $scope.editorOptions = { lineWrapping: true, lineNumbers: true, @@ -41,7 +43,8 @@ dbModule.controller("BrowseController", ['$scope', '$routeParams', '$location', $scope.query = function () { - Spinner.loading = true; + Spinner.start(); + $scope.queryText = $scope.queryText.trim(); $scope.queryText = $scope.queryText.replace(/\n/g, " "); if ($scope.queryText.startsWith('g.')) { @@ -51,9 +54,13 @@ dbModule.controller("BrowseController", ['$scope', '$routeParams', '$location', $location.path('/database/' + $routeParams.database + '/browse/edit/' + $scope.queryText.replace('#', '')); } - CommandApi.queryText({database: $routeParams.database, language: $scope.language, text: $scope.queryText, limit: $scope.limit}, function (data) { - Spinner.loading = false; + var conttype; + if ($scope.selectedContentType == 'CSV') + conttype = 'text/csv'; + CommandApi.queryText({database: $routeParams.database, contentType: conttype, language: $scope.language, text: $scope.queryText, limit: $scope.limit}, function (data) { + if (data.result) { + $scope.headers = Database.getPropertyTableFromResults(data.result); if ($scope.headers.length == 00) { $scope.alerts = new Array; @@ -72,14 +79,17 @@ dbModule.controller("BrowseController", ['$scope', '$routeParams', '$location', } $scope.queries.unshift($scope.queryText); localStorageService.add("Queries", $scope.queries); + Spinner.stopSpinner(); } }, function (data) { + Spinner.stopSpinner(); $scope.headers = undefined; $scope.resultTotal = undefined; $scope.results = undefined; - Spinner.loading = false; }); + } + $scope.clear = function () { $scope.queries = new Array; localStorageService.add("Queries", $scope.queries); diff --git a/app/scripts/controllers/function-controller.js b/app/scripts/controllers/function-controller.js index d24089c3312..92f02a5111f 100644 --- 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', function ($scope, $routeParams, $location, Database, CommandApi, FunctionApi, DocumentApi, $modal, $q, $route) { +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) { $scope.database = Database; $scope.listClasses = $scope.database.listClasses(); @@ -110,11 +110,16 @@ schemaModule.controller("FunctionController", ['$scope', '$routeParams', '$locat for (i in $scope.parametersToExecute) { buildedParams = buildedParams.concat($scope.parametersToExecute[i] + '/'); } - + Spinner.start(); FunctionApi.executeFunction({database: $routeParams.database, functionName: $scope.nameFunction, parameters: buildedParams, limit: $scope.limit}, function (data) { if (data.result) { $scope.resultExecute = JSON.stringify(data.result); + Spinner.stopSpinner(); } + Spinner.stopSpinner(); + }, function (error) { + $scope.resultExecute = error; + Spinner.stopSpinner(); }); } } diff --git a/app/scripts/controllers/schema-controller.js b/app/scripts/controllers/schema-controller.js index 586fa83c249..542dabf6e29 100644 --- a/app/scripts/controllers/schema-controller.js +++ b/app/scripts/controllers/schema-controller.js @@ -99,7 +99,7 @@ schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$loca $scope.modificati = undefined; $scope.limit = 20; $scope.queries = new Array; - $scope.classClickedHeaders = ['name', 'type', 'linkedType', 'linkedClass', 'mandatory', 'readonly', 'notNull', 'min', 'max', 'Actions']; + $scope.classClickedHeaders = ['Name', 'Type', 'Linked_Type', 'Linked_Class', 'Mandatory', 'Read_Only', 'Not_Null', 'Min', 'Max','Collate', 'Actions']; $scope.property = null; $scope.property = Database.listPropertiesForClass(clazz); $scope.propertyNames = new Array; @@ -146,7 +146,7 @@ schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$loca $scope.queryText = "" $scope.modificati = new Array; $scope.listTypes = ['BINARY', 'BOOLEAN', 'EMBEDDED', 'EMBEDDEDLIST', 'EMBEDDEDMAP', 'EMBEDDEDSET', 'DECIMAL', 'FLOAT', 'DATE', 'DATETIME', 'DOUBLE', 'INTEGER', 'LINK', 'LINKLIST', 'LINKMAP', 'LINKSET', 'LONG', 'SHORT', 'STRING']; - + $scope.collateTypes = ['Case Insensitive', 'default']; $scope.modificato = function (result, prop) { var key = result['name']; if ($scope.modificati[result['name']] == undefined) { @@ -216,8 +216,10 @@ schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$loca var prop = arrayToUpdate[0]; var newValue = properties[result][prop] != '' ? properties[result][prop] : null; + if(newValue == 'Case Insensitive') + newValue = 'ci'; var sql = 'ALTER PROPERTY ' + clazz + '.' + keyName + ' ' + prop + ' ' + newValue; - + console.log(sql); CommandApi.queryText({database: $routeParams.database, language: 'sql', text: sql, limit: $scope.limit}, function (data) { if (data) { var index = arrayToUpdate.indexOf(prop); @@ -313,7 +315,7 @@ schemaModule.controller("ClassEditController", ['$scope', '$routeParams', '$loca }); } }]); -schemaModule.controller("IndexController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', '$modal', '$q', function ($scope, $routeParams, $location, Database, CommandApi, $modal, $q) { +schemaModule.controller("IndexController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', '$modal', '$q', 'Spinner', function ($scope, $routeParams, $location, Database, CommandApi, $modal, $q, Spinner) { $scope.listTypeIndex = [ 'DICTIONARY', 'FULLTEXT', 'UNIQUE', 'NOTUNIQUE', 'DICTIONARY_HASH_INDEX', 'FULLTEXT_HASH_INDEX', 'UNIQUE_HASH_INDEX', 'NOTUNIQUE_HASH_INDEX' ]; $scope.newIndex = {"name": "", "type": "", "fields": "" } @@ -322,6 +324,7 @@ schemaModule.controller("IndexController", ['$scope', '$routeParams', '$location $scope.nameIndexToShow = $scope.classInject + '.'; $scope.db.refreshMetadata($routeParams.database); $scope.property = Database.listPropertiesForClass($scope.classInject); + $scope.propertyNames = new Array; for (inn in $scope.property) { @@ -375,18 +378,20 @@ schemaModule.controller("IndexController", ['$scope', '$routeParams', '$location var sql = 'CREATE INDEX ' + $scope.nameIndexToShow + ' ON ' + $scope.classInject + ' ( ' + proppps + ' ) ' + $scope.newIndex['type']; $scope.newIndex['name'] = $scope.nameIndexToShow; $scope.newIndex['fields'] = proppps; - + Spinner.startSpinnerPopup(); CommandApi.queryText({database: $routeParams.database, language: 'sql', text: sql, limit: $scope.limit}, function (data) { $scope.hide(); $scope.parentScope.addIndexFromExt($scope.newIndex); + Spinner.stopSpinnerPopup(); }, function (error) { $scope.testMsgClass = 'alert alert-error'; $scope.testMsg = error; + Spinner.stopSpinnerPopup(); }); } }]); -schemaModule.controller("PropertyController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', '$modal', '$q', function ($scope, $routeParams, $location, Database, CommandApi, $modal, $q) { +schemaModule.controller("PropertyController", ['$scope', '$routeParams', '$location', 'Database', 'CommandApi', '$modal', '$q', 'Spinner', function ($scope, $routeParams, $location, Database, CommandApi, $modal, $q, Spinner) { $scope.property = {"name": "", "type": "", "linkedType": "", "linkedClass": "", "mandatory": "false", "readonly": "false", "notNull": "false", "min": null, "max": null} @@ -404,12 +409,15 @@ schemaModule.controller("PropertyController", ['$scope', '$routeParams', '$locat var linkedType = prop['linkedType'] != null ? prop['linkedType'] : ''; var linkedClass = prop['linkedClass'] != null ? prop['linkedClass'] : ''; var sql = 'CREATE PROPERTY ' + $scope.classInject + '.' + propName + ' ' + propType + ' ' + linkedType + ' ' + linkedClass; - console.log(sql); + Spinner.startSpinnerPopup(); CommandApi.queryText({database: $routeParams.database, language: 'sql', text: sql, limit: $scope.limit}, function (data) { - + Spinner.stopSpinnerPopup(); + }, function (error) { + Spinner.stopSpinnerPopup(); }); var i = 1; + Spinner.startSpinnerPopup(); for (entry in prop) { var sql = 'ALTER PROPERTY ' + $scope.classInject + '.' + propName + ' ' + entry + ' ' + prop[entry]; CommandApi.queryText({database: $routeParams.database, language: 'sql', text: sql, limit: $scope.limit}, function (data) { @@ -420,6 +428,7 @@ schemaModule.controller("PropertyController", ['$scope', '$routeParams', '$locat $scope.parentScope.indexes = Database.listIndexesForClass(clazz); $scope.parentScope.apply(); }); + Spinner.startSpinnerPopup(); $scope.hide(); } }); diff --git a/app/scripts/services/database-services.js b/app/scripts/services/database-services.js index 6cfbb7010ac..7f17c26d02f 100644 --- a/app/scripts/services/database-services.js +++ b/app/scripts/services/database-services.js @@ -439,7 +439,6 @@ database.factory('DatabaseApi', function ($http, $resource) { var urlWiki = "https://github.com/orientechnologies/orientdb-studio/wiki/Functions"; - var resource = $resource(API + 'database/:database'); resource.listDatabases = function (callback) { $http.get(API + 'listDatabases').success(callback); @@ -452,7 +451,6 @@ database.factory('DatabaseApi', function ($http, $resource) { return urlWiki; } - resource.connect = function (database, username, password, callback, error) { $http.defaults.headers.common['Authorization'] = 'Basic ' + Base64.encode(username + ':' + password); $http.get(API + 'connect/' + database).success(callback).error(error); @@ -487,7 +485,7 @@ database.factory('DatabaseApi', function ($http, $resource) { } return resource; }); -database.factory('CommandApi', function ($http, $resource, Notification) { +database.factory('CommandApi', function ($http, $resource, Notification, Spinner) { var resource = $resource(API + 'command/:database'); @@ -496,11 +494,16 @@ database.factory('CommandApi', function ($http, $resource, Notification) { var limit = params.limit || 20; var verbose = params.verbose != undefined ? params.verbose : true; var shallow = params.shallow != undefined ? '' : ',shallow'; +// var contentType = params.contentType || 'application/json'; //rid,type,version,class,attribSameRow,indent:2,dateAsLong,shalow,graph var text = API + 'command/' + params.database + "/" + params.language + "/-/" + limit + '?format=rid,type,version' + shallow + ',class,graph'; + + if (params.text) { var query = params.text.trim(); +// var config = {headers: "Content-Type: " + contentType}; $http.post(text, query).success(function (data) { + var time = ((new Date().getTime() - startTime) / 1000); var records = data.result ? data.result.length : ""; @@ -508,10 +511,13 @@ database.factory('CommandApi', function ($http, $resource, Notification) { var noti = "Query executed in " + time + " sec. Returned " + records + " record(s)"; Notification.push({content: noti}); } - if (data != undefined) + if (data != undefined) { callback(data); - else + } + else { callback('ok'); + } + }).error(function (data) { Notification.push({content: data}); if (error) error(data); diff --git a/app/scripts/services/spinner-service.js b/app/scripts/services/spinner-service.js index 596aefa71c8..d8b99f5ff86 100644 --- a/app/scripts/services/spinner-service.js +++ b/app/scripts/services/spinner-service.js @@ -9,10 +9,50 @@ var spinner = angular.module('spinner.services', []); -spinner.factory('Spinner',function(){ - - var spinner = { - loading : false +spinner.factory('Spinner', function () { + var spinnerOpts = { + lines: 9, // The number of lines to draw + length: 7, // The length of each line + width: 7, // The line thickness + radius: 19, // The radius of the inner circle + corners: 1, // Corner roundness (0..1) + rotate: 0, // The rotation offset + direction: 1, // 1: clockwise, -1: counterclockwise + color: [ + 'rgb(0,0,0)', + 'rgb(255,102,0)' + ], // #rgb or #rrggbb or array of colors + speed: 1, // Rounds per second + trail: 60, // Afterglow percentage + shadow: false, // Whether to render a shadow + hwaccel: false, // Whether to use hardware acceleration + className: 'spinner', // The CSS class to assign to the spinner + zIndex: 2e9, // The z-index (defaults to 2000000000) + top: 'auto', // Top position relative to parent in px + left: 'auto' // Left position relative to parent in px }; + var spinner = new Spinner(spinnerOpts); +// $(document).ready(function () { +// var target = document.getElementById('spinner'); +// spinner.spin(target); +// spinner.stop(); +// }) + spinner.start = function () { + var target = document.getElementById('spinner'); + spinner.spin(target); + $("#spinner-container").addClass('spinner-start') + } + spinner.stopSpinner = function () { + spinner.stop(); + $("#spinner-container").removeClass('spinner-start'); + + } + spinner.startSpinnerPopup = function () { + var target = document.getElementById('spinner-popup'); + spinner.spin(target); + } + spinner.stopSpinnerPopup = function () { + spinner.stop(); + } return spinner; }); \ No newline at end of file diff --git a/app/scripts/widgets/widget.js b/app/scripts/widgets/widget.js index ae827fbbfd7..55d9191df68 100644 --- a/app/scripts/widgets/widget.js +++ b/app/scripts/widgets/widget.js @@ -380,15 +380,29 @@ Widget.directive('dtpicker', function () { return { restrict: 'A', require: 'ngModel', - link: function (scope, element, attr,ngModel) { + link: function (scope, element, attr, ngModel) { element.datetimepicker({ format: 'dd/MM/yyyy hh:mm:ss', language: 'en' }); - element.on('changeDate', function(e) { + element.on('changeDate', function (e) { ngModel.$setViewValue(e.date); }); } }; }); +Widget.directive('collaterender', function () { + + + return { + restrict: 'A', + link: function (scope, element, attr, ngModel) { + + var value = scope.result['collate']; + if (value == 'ci') { + scope.result['collate'] = 'Case Insensitive'; + } + } + }; +}); diff --git a/app/styles/main.css b/app/styles/main.css index 754dc1fe588..08d17d46816 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -228,6 +228,17 @@ form .required label:after { background-color: grey; opacity: .8; } +.spinner-start{ + text-align: center; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 1000; + background-color: #d3d3d3; + opacity: .4; +} .ajax-loader { position: absolute; @@ -238,6 +249,13 @@ form .required label:after { display: block; } +#spinner, .spinner, #spinner-popup, .spinner-popup { + position: absolute; + left: 50%; + top: 50%; +} + + .fade-hide, .fade-show { -webkit-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1s; -moz-transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1s; @@ -407,6 +425,7 @@ ul.horizontallist, ol.horizontallist { table.editClass_panel { margin-left: 20px; } + table.editClass_panel>tbody>tr>td a { margin-left: 5px; } diff --git a/app/views/database/browse.html b/app/views/database/browse.html index 92af3f22823..12b295316f7 100644 --- a/app/views/database/browse.html +++ b/app/views/database/browse.html @@ -6,14 +6,27 @@
  • Ctrl + Space for sql autocomplete
    • + +
    - - - + + + - +
    + +
    + + + + +
    +
    @@ -24,7 +37,8 @@ - + +
    • @@ -57,7 +71,7 @@
      -
      +
      @@ -92,10 +106,11 @@
    + - - - + + +     diff --git a/app/views/database/newIndex.html b/app/views/database/newIndex.html index 94d74b1737b..7a6ca0cd1e8 100644 --- a/app/views/database/newIndex.html +++ b/app/views/database/newIndex.html @@ -13,6 +13,10 @@

    Index:{{newIndex['name']}}

    +
    +
    +
    +
    diff --git a/app/views/database/newProperty.html b/app/views/database/newProperty.html index 17f5c262456..4b8113dc34d 100644 --- a/app/views/database/newProperty.html +++ b/app/views/database/newProperty.html @@ -20,6 +20,10 @@

    Property: {{property['name']}}

    +
    +
    +
    +
    diff --git a/app/views/spinner.html b/app/views/spinner.html index aa3c863ea5b..82cc37680fa 100644 --- a/app/views/spinner.html +++ b/app/views/spinner.html @@ -1,3 +1 @@ -
    - -
    \ No newline at end of file +
    \ No newline at end of file